From f9dcdf7f6dcdf2979693a9f179eda2b9995d57ae Mon Sep 17 00:00:00 2001 From: amankumarsingh77 Date: Tue, 28 Jul 2026 01:19:58 +0530 Subject: refactor: close the remaining unguarded type assertions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Types the event-queue iterator's TReturn as undefined so the terminal result needs no cast; declares the isError field the pi runtime reads by duck-typing; binds socket to a local const in the daemon transport; replaces the @ts-ignore on the optional sharp import with a non-literal specifier so src/ still typechecks where sharp was not installed. Adds src/util/guards.ts as the single home for narrowing over unknown — isRecord plus scalar/array readers — and converts the two private isObject copies in cdp/types.ts and daemon/protocol.ts along with every inline `as Record` in domains/js.ts and domains/render.ts. Gives Accessibility.getFullAXTree a real result schema, closing the last unvalidated CDP boundary: only nodeId is required, every object carries additionalProperties, and each AX value stays Unknown, so the tree decodes as a whole or fails as a whole rather than being filtered. Guards the five tool-result `details` readers, the daemon attach response, the persisted session state, the browser-namespace flag, and the fs errno narrowing, each feeding an already-present failure path. The daemon-transport socket binding is not a bug fix: send() runs synchronously inside sendWithTimeout's promise executor, so socket cannot be reassigned between the check and the write. It removes the assertion and makes the write immune to a later refactor that adds an await. Two assertions survive by design and are documented in the task report: the never->unknown re-widening in util/tool.ts, which the type-erased tool registry makes unavoidable, and the AsyncFunction constructor lookup in domains/js.ts, which JavaScript exposes no typed binding for. Co-Authored-By: Claude Opus 5 (1M context) --- src/domains/js.ts | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/domains/js.ts') diff --git a/src/domains/js.ts b/src/domains/js.ts index 61dbe53..6d9ace0 100644 --- a/src/domains/js.ts +++ b/src/domains/js.ts @@ -8,6 +8,7 @@ import { getMarkdownTheme, keyHint } from "@mariozechner/pi-coding-agent"; import { type Result, err, ok } from "../util/result"; import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool"; import { applyTruncation } from "../util/truncate"; +import { asNumber, asRecord, asString, isRecord } from "../util/guards"; const COMPACT_PREVIEW_BYTES = 120; @@ -80,10 +81,14 @@ export const executeJsTool = defineBrowserTool({ }, renderResult(result, expanded, theme) { - const details = result.details as - | { valueLength?: number; full?: string; pretty?: string; fullOutputPath?: string } - | undefined; - if (!details) return new Text(theme.fg("error", "execute_js: no details"), 0, 0); + const raw = asRecord(result.details); + if (raw === undefined) return new Text(theme.fg("error", "execute_js: no details"), 0, 0); + const details = { + valueLength: asNumber(raw["valueLength"]), + full: asString(raw["full"]), + pretty: asString(raw["pretty"]), + fullOutputPath: asString(raw["fullOutputPath"]), + }; const len = details.valueLength ?? 0; const full = details.full ?? ""; @@ -141,9 +146,7 @@ const MAX_SOURCE_BYTES = 1_000_000; type ContentItem = { readonly type: "text"; readonly text: string }; const isContentItem = (v: unknown): v is ContentItem => - typeof v === "object" && v !== null - && (v as Readonly>)["type"] === "text" - && typeof (v as Readonly>)["text"] === "string"; + isRecord(v) && v["type"] === "text" && typeof v["text"] === "string"; export const runScriptTool = defineBrowserTool({ name: "browser_run_script", @@ -211,12 +214,12 @@ export const runScriptTool = defineBrowserTool({ requireFromHere, ac.signal, (u: unknown) => { - if (typeof u !== "object" || u === null) return; - const content = (u as Readonly>)["content"]; + if (!isRecord(u)) return; + const content = u["content"]; if (!Array.isArray(content) || content.length === 0) return; - const first = content[0]; - if (typeof first !== "object" || first === null) return; - const txt = (first as Readonly>)["text"]; + const first: unknown = content[0]; + if (!isRecord(first)) return; + const txt = first["text"]; if (typeof txt !== "string") return; try { onUpdate({ text: txt }); } catch { /* swallow */ } }, @@ -230,10 +233,10 @@ export const runScriptTool = defineBrowserTool({ clearTimeout(timeoutTimer); if (signal !== undefined) signal.removeEventListener("abort", onAbort); - if (typeof result !== "object" || result === null) { + if (!isRecord(result)) { return err({ kind: "invalid_state", message: `Script must return an object; got ${JSON.stringify(result)}` }); } - const content = (result as Readonly>)["content"]; + const content = result["content"]; if (!Array.isArray(content)) { return err({ kind: "invalid_state", message: "Script return value must have a content array" }); } @@ -241,11 +244,8 @@ export const runScriptTool = defineBrowserTool({ return err({ kind: "invalid_state", message: "Script content array must contain { type: 'text', text: string } items" }); } const textOut = content.map((c) => c.text).join("\n"); - const details = (result as Readonly>)["details"]; - const isPlainObject = typeof details === "object" && details !== null && !Array.isArray(details); - return isPlainObject - ? ok({ text: textOut, details: details as Readonly> }) - : ok({ text: textOut }); + const details = result["details"]; + return isRecord(details) ? ok({ text: textOut, details }) : ok({ text: textOut }); } catch (e) { clearTimeout(timeoutTimer); if (signal !== undefined) signal.removeEventListener("abort", onAbort); -- cgit v1.2.3