@underactive/pi-topping-web-tools 0.1.0 → 0.2.1

package/src/web-browser/index.ts

@@ -13,14 +13,13 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Text } from "@earendil-works/pi-tui";
-import { mkdtemp, writeFile } from "node:fs/promises";
+import { mkdtemp, realpath, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { Type } from "typebox";
 import {
 	closeBrowserManager,
 	getBrowserManager,
-	type BrowserManager,
 	type ConsoleEntry,
 	type DialogEntry,
 	type NavigateResult,
@@ -30,6 +29,11 @@ import {
 	type TabInfo,
 } from "./browser-manager.ts";
 import { checkUrlPermission, upgradeHttpToHttps, validateURL } from "./permissions.ts";
+import { requestHostPermission } from "../permission-prompt.ts";
+import { listGrants } from "../permission-store.ts";
+import { isInsideCwd } from "../pdf-extract.ts";
+import { suppressNotifications } from "../env.ts";
+import { publishBrowserState, registerBrowserFeeds } from "./feeds.ts";
 
 const ACTIONS = [
 	"navigate",
@@ -128,15 +132,27 @@ function formatTabs(tabs: TabInfo[]): string {
 		.join("\n");
 }
 
-async function wrapUntrustedContent(mgr: BrowserManager, text: string): Promise<string> {
-	const info = await mgr.getPageInfoAsync();
-	return `<untrusted-content url="${info.url}">\n${text}\n</untrusted-content>`;
+function wrapUntrustedContent(url: string, text: string): string {
+	const safeUrl = url.replaceAll('"', "%22");
+	return `<untrusted-content url="${safeUrl}">\n${text}\n</untrusted-content>`;
 }
 
 function isAbortError(err: unknown): boolean {
 	return err instanceof Error && (err.name === "AbortError" || err.message.includes("Aborted"));
 }
 
+function blockReason(permission: string): string {
+	return permission.startsWith("block:") ? permission.slice("block:".length) : permission;
+}
+
+async function resolveLocalFilePath(input: string): Promise<string> {
+	try {
+		return await realpath(resolve(input));
+	} catch {
+		throw new Error(`Cannot upload file: no such file "${input}"`);
+	}
+}
+
 async function truncateTextResult(
 	text: string,
 	details: WebBrowserDetails,
@@ -184,21 +200,41 @@ function browserStatus(ctx: ExtensionContext, text: string, tone: "success" | "m
 	return ctx.ui.theme.fg(tone, `browser: ${text}`);
 }
 
-function updateBrowserStatus(ctx: ExtensionContext, info: { url: string; title?: string }): void {
+export function browserLabel(url: string): string {
 	try {
-		const parsed = new URL(info.url);
-		const label = parsed.protocol === "file:" ? "local file" : parsed.hostname;
-		ctx.ui.setStatus("browser", browserStatus(ctx, label, "success"));
+		const parsed = new URL(url);
+		return parsed.protocol === "file:" ? "local file" : parsed.hostname || "ready";
 	} catch {
-		ctx.ui.setStatus("browser", browserStatus(ctx, "ready", "muted"));
+		return "ready";
+	}
+}
+
+function syncBrowserOpen(ctx: ExtensionContext, url: string): void {
+	const label = browserLabel(url);
+	publishBrowserState(label, 1);
+	if (!suppressNotifications()) {
+		ctx.ui.setStatus("browser", browserStatus(ctx, label, label === "ready" ? "muted" : "success"));
+	}
+}
+
+function syncBrowserClosed(ctx: ExtensionContext): void {
+	publishBrowserState("", 0);
+	if (!suppressNotifications()) {
+		ctx.ui.setStatus("browser", undefined);
 	}
 }
 
 export default function (pi: ExtensionAPI) {
 	const sessionPermissions = new Map<string, "allow" | "deny">();
+	registerBrowserFeeds(pi);
 
 	pi.on("session_start", async (_event, ctx) => {
-		ctx.ui.setStatus("browser", undefined);
+		const info = await getBrowserManager().getPageInfoAsync();
+		if (info.isOpen) {
+			syncBrowserOpen(ctx, info.url);
+		} else {
+			syncBrowserClosed(ctx);
+		}
 	});
 
 	pi.on("session_shutdown", async () => {
@@ -214,7 +250,7 @@ export default function (pi: ExtensionAPI) {
 		if (input.action === "navigate" && input.url) {
 			const permission = await checkUrlPermission(input.url, ctx, sessionPermissions);
 			if (permission !== "allow") {
-				return { block: true, reason: permission.slice(6) };
+				return { block: true, reason: blockReason(permission) };
 			}
 
 			return undefined;
@@ -224,7 +260,7 @@ export default function (pi: ExtensionAPI) {
 			const info = await getBrowserManager().getPageInfoAsync();
 			const permission = await checkUrlPermission(info.url, ctx, sessionPermissions);
 			if (permission !== "allow") {
-				return { block: true, reason: permission.slice(6) };
+				return { block: true, reason: blockReason(permission) };
 			}
 		}
 
@@ -247,6 +283,7 @@ export default function (pi: ExtensionAPI) {
 				`  Network issues: ${info.networkCount}`,
 				`  Dialogs captured: ${info.dialogCount}`,
 				`  Session-approved hosts: ${sessionPermissions.size}`,
+				`  Saved hosts: ${listGrants().filter((g) => g.scope === "web_browser").length}`,
 			];
 			ctx.ui.notify(lines.join("\n"), "info");
 		},
@@ -256,7 +293,7 @@ export default function (pi: ExtensionAPI) {
 		description: "Force close the headless browser",
 		handler: async (_args, ctx) => {
 			await closeBrowserManager();
-			ctx.ui.setStatus("browser", undefined);
+			syncBrowserClosed(ctx);
 			ctx.ui.notify("Browser closed", "info");
 		},
 	});
@@ -427,7 +464,7 @@ export default function (pi: ExtensionAPI) {
 			try {
 				if (action === "close") {
 					await closeBrowserManager();
-					ctx.ui.setStatus("browser", undefined);
+					syncBrowserClosed(ctx);
 					return {
 						content: [{ type: "text", text: "Browser closed." }],
 						details: { action } satisfies WebBrowserDetails,
@@ -455,7 +492,7 @@ export default function (pi: ExtensionAPI) {
 
 						const upgraded = upgradeHttpToHttps(params.url);
 						const result: NavigateResult = await mgr.navigate(upgraded, { timeout, signal });
-						updateBrowserStatus(ctx, result);
+						syncBrowserOpen(ctx, result.url);
 
 						const text = `Navigated to ${result.url}\nTitle: ${result.title}${result.statusCode ? `\nStatus: ${result.statusCode}` : ""}`;
 						return {
@@ -479,7 +516,7 @@ export default function (pi: ExtensionAPI) {
 							signal,
 						});
 						const info = await mgr.getPageInfoAsync();
-						updateBrowserStatus(ctx, info);
+						syncBrowserOpen(ctx, info.url);
 						const dims = `${shot.width}×${shot.height}`;
 						const dimsNote = `${dims}${shot.fullPage ? " (full page)" : ""}`;
 
@@ -630,8 +667,9 @@ export default function (pi: ExtensionAPI) {
 						const value = await mgr.evaluate(params.script, { signal });
 						const text = typeof value === "string" ? value : JSON.stringify(value, null, 2) ?? String(value);
 						const truncated = await truncateTextResult(text, { action });
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -639,8 +677,9 @@ export default function (pi: ExtensionAPI) {
 					case "get_content": {
 						const html = await mgr.content({ signal });
 						const truncated = await truncateTextResult(html, { action });
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -648,8 +687,9 @@ export default function (pi: ExtensionAPI) {
 					case "get_text": {
 						const text = await mgr.getText(params.selector, { timeout, signal, frame: params.frame });
 						const truncated = await truncateTextResult(text, { action });
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -657,8 +697,9 @@ export default function (pi: ExtensionAPI) {
 					case "get_markdown": {
 						const md = await mgr.getMarkdown({ timeout, signal });
 						const truncated = await truncateTextResult(md, { action });
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -694,8 +735,9 @@ export default function (pi: ExtensionAPI) {
 							frame: params.frame,
 						});
 						const truncated = await truncateTextResult(snapshot, { action });
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -707,8 +749,9 @@ export default function (pi: ExtensionAPI) {
 							action,
 							consoleCount: entries.length,
 						});
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -720,8 +763,9 @@ export default function (pi: ExtensionAPI) {
 							action,
 							networkCount: entries.length,
 						});
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -759,8 +803,8 @@ export default function (pi: ExtensionAPI) {
 							const permission = await checkUrlPermission(cookieUrl, ctx, sessionPermissions);
 							if (permission !== "allow") {
 								return {
-									content: [{ type: "text", text: permission.slice(6) }],
-									details: { action, error: permission.slice(6) } satisfies WebBrowserDetails,
+									content: [{ type: "text", text: blockReason(permission) }],
+									details: { action, error: blockReason(permission) } satisfies WebBrowserDetails,
 									isError: true,
 								};
 							}
@@ -841,6 +885,24 @@ export default function (pi: ExtensionAPI) {
 								isError: true,
 							};
 						}
+						for (const file of params.files) {
+							const resolved = await resolveLocalFilePath(file);
+							if (isInsideCwd(resolved)) continue;
+							const permission = await requestHostPermission(ctx, {
+								scope: "web_browser",
+								label: `Allow web_browser to upload local file ${resolved}?`,
+								key: `file://${resolved}`,
+								sessionPermissions,
+								durable: false,
+							});
+							if (!permission.allowed) {
+								return {
+									content: [{ type: "text", text: permission.reason }],
+									details: { action, error: permission.reason } satisfies WebBrowserDetails,
+									isError: true,
+								};
+							}
+						}
 						const msg = await mgr.uploadFile(params.selector, params.files, {
 							frame: params.frame,
 							timeout,
@@ -870,8 +932,9 @@ export default function (pi: ExtensionAPI) {
 							action,
 							dialogCount: entries.length,
 						});
+						const info = await mgr.getPageInfoAsync();
 						return {
-							content: [{ type: "text", text: await wrapUntrustedContent(mgr, truncated.text) }],
+							content: [{ type: "text", text: wrapUntrustedContent(info.url, truncated.text) }],
 							details: truncated.details,
 						};
 					}
@@ -899,7 +962,7 @@ export default function (pi: ExtensionAPI) {
 						}
 						const msg = await mgr.switchTab(params.index);
 						const info = await mgr.getPageInfoAsync();
-						updateBrowserStatus(ctx, info);
+						syncBrowserOpen(ctx, info.url);
 						return {
 							content: [{ type: "text", text: msg }],
 							details: { action, bytes: Buffer.byteLength(msg) } satisfies WebBrowserDetails,

package/src/web-browser/permissions.ts

@@ -7,7 +7,8 @@
  */
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { isPreapprovedHost } from "../permissions.ts";
+import { isPreapprovedHost, permissionKey } from "../permissions.ts";
+import { requestHostPermission } from "../permission-prompt.ts";
 
 export const MAX_URL_LENGTH = 2000;
 
@@ -44,6 +45,37 @@ export function validateURL(url: string): boolean {
 	return parsed.protocol === "http:" || parsed.protocol === "https:";
 }
 
+function isPrivateIpv4Octets(octets: number[]): boolean {
+	if (octets.some((n) => n > 255)) {
+		return false;
+	}
+	const [a, b] = octets;
+	return (
+		a === 127 ||
+		a === 0 ||
+		a === 10 ||
+		(a === 172 && b >= 16 && b <= 31) ||
+		(a === 192 && b === 168) ||
+		(a === 169 && b === 254)
+	);
+}
+
+function mappedIpv4Octets(suffix: string): number[] | undefined {
+	// Dotted-quad form: ::ffff:10.0.0.1
+	const dotted = /^(\d{1,3}(?:\.\d{1,3}){3})$/.exec(suffix);
+	if (dotted) {
+		return dotted[1].split(".").map((part) => Number.parseInt(part, 10));
+	}
+	// Two hex groups form: ::ffff:a00:1
+	const hex = /^([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i.exec(suffix);
+	if (hex) {
+		const high = Number.parseInt(hex[1], 16);
+		const low = Number.parseInt(hex[2], 16);
+		return [high >> 8, high & 0xff, low >> 8, low & 0xff];
+	}
+	return undefined;
+}
+
 export function isLocalOrPrivateHost(hostname: string): boolean {
 	const host =
 		hostname.startsWith("[") && hostname.endsWith("]") ? hostname.slice(1, -1) : hostname;
@@ -54,28 +86,23 @@ export function isLocalOrPrivateHost(hostname: string): boolean {
 	if (host.endsWith(".local")) {
 		return true;
 	}
-	if (/^(fc|fd|fe80:)/i.test(host) || /^::ffff:7f/i.test(host)) {
+	if (/^(fc|fd|fe80:)/i.test(host)) {
 		return true;
 	}
 
-	if (!/^\d{1,3}(?:\.\d{1,3}){3}$/.test(host)) {
-		return false;
+	const mapped = /^::ffff:(.+)$/i.exec(host);
+	if (mapped) {
+		const octets = mappedIpv4Octets(mapped[1]);
+		if (octets && isPrivateIpv4Octets(octets)) {
+			return true;
+		}
 	}
 
-	const octets = host.split(".").map((part) => Number.parseInt(part, 10));
-	if (octets.some((n) => n > 255)) {
+	if (!/^\d{1,3}(?:\.\d{1,3}){3}$/.test(host)) {
 		return false;
 	}
 
-	const [a, b] = octets;
-	if (a === 127) return true;
-	if (a === 0) return true;
-	if (a === 10) return true;
-	if (a === 172 && b >= 16 && b <= 31) return true;
-	if (a === 192 && b === 168) return true;
-	if (a === 169 && b === 254) return true;
-
-	return false;
+	return isPrivateIpv4Octets(host.split(".").map((part) => Number.parseInt(part, 10)));
 }
 
 export function upgradeHttpToHttps(url: string): string {
@@ -91,18 +118,6 @@ export function upgradeHttpToHttps(url: string): string {
 	return url;
 }
 
-export function permissionKey(url: string): string {
-	try {
-		const parsed = new URL(url);
-		if (parsed.protocol === "file:") {
-			return `file://${parsed.pathname}`;
-		}
-		return `${parsed.protocol}//${parsed.host}`;
-	} catch {
-		return url;
-	}
-}
-
 export type PermissionResult = "allow" | `block:${string}`;
 
 export async function checkUrlPermission(
@@ -131,32 +146,19 @@ export async function checkUrlPermission(
 	}
 
 	const key = permissionKey(url);
-	const sessionDecision = sessionPermissions.get(key);
-	if (sessionDecision === "allow") {
+	const isDurable = protocol !== "file:";
+	const label = isDurable ? `Allow web_browser to ${hostname}?` : `Allow web_browser to local file ${pathname}?`;
+
+	const result = await requestHostPermission(ctx, {
+		scope: "web_browser",
+		label,
+		key,
+		sessionPermissions,
+		durable: isDurable,
+	});
+
+	if (result.allowed) {
 		return "allow";
 	}
-	if (sessionDecision === "deny") {
-		return `block:Denied by user for ${key}`;
-	}
-
-	if (!ctx.hasUI) {
-		return `block:web_browser to ${key} blocked (no UI for confirmation)`;
-	}
-
-	const label = protocol === "file:" ? `Allow web_browser to local file ${pathname}?` : `Allow web_browser to ${hostname}?`;
-	const choice = await ctx.ui.select(label, ["Allow once", "Allow for this session", "Deny"]);
-
-	if (choice === "Allow for this session") {
-		sessionPermissions.set(key, "allow");
-		return "allow";
-	}
-	if (choice === "Deny") {
-		sessionPermissions.set(key, "deny");
-		return `block:Denied by user for ${key}`;
-	}
-	if (choice === "Allow once") {
-		return "allow";
-	}
-
-	return `block:Denied by user for ${key}`;
+	return `block:${result.reason}`;
 }

package/src/web-permissions.ts

@@ -0,0 +1,73 @@
+/**
+ * /web-permissions — list and revoke saved web-tool host permissions.
+ *
+ * Shows all active durable grants from the permission store.
+ * Users can select entries to revoke them. Bundled preapproved hosts
+ * (from the shared allowlist) are not listed and cannot be deleted here.
+ */
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { listGrants, removeGrant, type Grant } from "./permission-store.ts";
+
+function formatRemaining(expiresAt: number): string {
+	const ms = expiresAt - Date.now();
+	if (ms <= 0) return "expired";
+	const hours = Math.floor(ms / (60 * 60 * 1000));
+	const days = Math.floor(hours / 24);
+	const remHours = hours % 24;
+	if (days > 0) return `${days}d ${remHours}h`;
+	return `${hours}h`;
+}
+
+function formatEntry(grant: Grant): string {
+	return `${grant.origin} \u2014 ${grant.scope} \u2014 expires in ${formatRemaining(grant.expiresAt)}`;
+}
+
+export default function (pi: ExtensionAPI) {
+	pi.registerCommand("web-permissions", {
+		description: "List and revoke saved web-tool host permissions",
+		handler: async (_args, ctx) => {
+			if (!ctx.hasUI) {
+				ctx.ui.notify("The /web-permissions command requires an interactive session.", "warning");
+				return;
+			}
+
+			while (true) {
+				const grants = listGrants();
+
+				if (grants.length === 0) {
+					ctx.ui.notify(
+						"No saved host permissions. Bundled preapproved hosts still apply.",
+						"info",
+					);
+					return;
+				}
+
+				grants.sort((a, b) => a.origin.localeCompare(b.origin) || a.scope.localeCompare(b.scope));
+
+				const options = [...grants.map(formatEntry), "Done"];
+				const choice = await ctx.ui.select("Saved host permissions:", options);
+
+				if (choice === "Done" || choice === undefined) {
+					return;
+				}
+
+				// Find the selected grant by matching the formatted entry.
+				const index = grants.findIndex((g) => formatEntry(g) === choice);
+				if (index === -1) continue;
+
+				const grant = grants[index];
+				const confirmed = await ctx.ui.confirm(
+					"Remove permission?",
+					`${grant.scope} \u2192 ${grant.origin}`,
+				);
+
+				if (confirmed) {
+					await removeGrant(grant.scope, grant.origin);
+					ctx.ui.notify(`Removed permission for ${grant.origin}`, "info");
+				}
+				// Loop back to show updated list.
+			}
+		},
+	});
+}