@gguf/pigbot 0.0.1 → 0.0.3

package/dist/cli/browser-cli-extension.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { STATE_DIR_PIGBOT } from "../config/paths.js";
+import { STATE_DIR } from "../config/paths.js";
 import { danger, info } from "../globals.js";
 import { copyToClipboard } from "../infra/clipboard.js";
 import { defaultRuntime } from "../runtime.js";
@@ -15,7 +15,7 @@ function bundledExtensionRootDir() {
     return path.resolve(here, "../../assets/chrome-extension");
 }
 function installedExtensionRootDir() {
-    return path.join(STATE_DIR_PIGBOT, "browser", "chrome-extension");
+    return path.join(STATE_DIR, "browser", "chrome-extension");
 }
 function hasManifest(dir) {
     return fs.existsSync(path.join(dir, "manifest.json"));
@@ -23,9 +23,9 @@ function hasManifest(dir) {
 export async function installChromeExtension(opts) {
     const src = opts?.sourceDir ?? bundledExtensionRootDir();
     if (!hasManifest(src)) {
-        throw new Error("Bundled Chrome extension is missing. Reinstall Pigbot and try again.");
+        throw new Error("Bundled Chrome extension is missing. Reinstall Moltbot and try again.");
     }
-    const stateDir = opts?.stateDir ?? STATE_DIR_PIGBOT;
+    const stateDir = opts?.stateDir ?? STATE_DIR;
     const dest = path.join(stateDir, "browser", "chrome-extension");
     fs.mkdirSync(path.dirname(dest), { recursive: true });
     if (fs.existsSync(dest)) {
@@ -67,9 +67,9 @@ export function registerBrowserExtensionCommands(browser, parentOpts) {
             "Next:",
             `- Chrome → chrome://extensions → enable “Developer mode”`,
             `- “Load unpacked” → select: ${displayPath}`,
-            `- Pin “Pigbot Browser Relay”, then click it on the tab (badge shows ON)`,
+            `- Pin “Moltbot Browser Relay”, then click it on the tab (badge shows ON)`,
             "",
-            `${theme.muted("Docs:")} ${formatDocsLink("/tools/chrome-extension", "docs.clawd.bot/tools/chrome-extension")}`,
+            `${theme.muted("Docs:")} ${formatDocsLink("/tools/chrome-extension", "docs.molt.bot/tools/chrome-extension")}`,
         ].join("\n")));
     });
     ext
@@ -80,8 +80,8 @@ export function registerBrowserExtensionCommands(browser, parentOpts) {
         const dir = installedExtensionRootDir();
         if (!hasManifest(dir)) {
             defaultRuntime.error(danger([
-                `Chrome extension is not installed. Run: "${formatCliCommand("pigbot browser extension install")}"`,
-                `Docs: ${formatDocsLink("/tools/chrome-extension", "docs.clawd.bot/tools/chrome-extension")}`,
+                `Chrome extension is not installed. Run: "${formatCliCommand("moltbot browser extension install")}"`,
+                `Docs: ${formatDocsLink("/tools/chrome-extension", "docs.molt.bot/tools/chrome-extension")}`,
             ].join("\n")));
             defaultRuntime.exit(1);
         }

package/dist/cli/browser-cli-inspect.js

@@ -1,9 +1,8 @@
-import { browserSnapshot, resolveBrowserControlUrl } from "../browser/client.js";
-import { browserScreenshotAction } from "../browser/client-actions.js";
 import { loadConfig } from "../config/config.js";
 import { danger } from "../globals.js";
 import { defaultRuntime } from "../runtime.js";
 import { shortenHomePath } from "../utils.js";
+import { callBrowserRequest } from "./browser-cli-shared.js";
 export function registerBrowserInspectCommands(browser, parentOpts) {
     browser
         .command("screenshot")
@@ -15,17 +14,20 @@ export function registerBrowserInspectCommands(browser, parentOpts) {
         .option("--type <png|jpeg>", "Output type (default: png)", "png")
         .action(async (targetId, opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         try {
-            const result = await browserScreenshotAction(baseUrl, {
-                targetId: targetId?.trim() || undefined,
-                fullPage: Boolean(opts.fullPage),
-                ref: opts.ref?.trim() || undefined,
-                element: opts.element?.trim() || undefined,
-                type: opts.type === "jpeg" ? "jpeg" : "png",
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/screenshot",
+                query: profile ? { profile } : undefined,
+                body: {
+                    targetId: targetId?.trim() || undefined,
+                    fullPage: Boolean(opts.fullPage),
+                    ref: opts.ref?.trim() || undefined,
+                    element: opts.element?.trim() || undefined,
+                    type: opts.type === "jpeg" ? "jpeg" : "png",
+                },
+            }, { timeoutMs: 20000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -54,7 +56,6 @@ export function registerBrowserInspectCommands(browser, parentOpts) {
         .option("--out <path>", "Write snapshot to a file")
         .action(async (opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         const format = opts.format === "aria" ? "aria" : "ai";
         const configMode = format === "ai" && loadConfig().browser?.snapshotDefaults?.mode === "efficient"
@@ -62,19 +63,24 @@ export function registerBrowserInspectCommands(browser, parentOpts) {
             : undefined;
         const mode = opts.efficient === true || opts.mode === "efficient" ? "efficient" : configMode;
         try {
-            const result = await browserSnapshot(baseUrl, {
+            const query = {
                 format,
                 targetId: opts.targetId?.trim() || undefined,
                 limit: Number.isFinite(opts.limit) ? opts.limit : undefined,
-                interactive: Boolean(opts.interactive) || undefined,
-                compact: Boolean(opts.compact) || undefined,
+                interactive: opts.interactive ? true : undefined,
+                compact: opts.compact ? true : undefined,
                 depth: Number.isFinite(opts.depth) ? opts.depth : undefined,
                 selector: opts.selector?.trim() || undefined,
                 frame: opts.frame?.trim() || undefined,
-                labels: Boolean(opts.labels) || undefined,
+                labels: opts.labels ? true : undefined,
                 mode,
                 profile,
-            });
+            };
+            const result = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/snapshot",
+                query,
+            }, { timeoutMs: 20000 });
             if (opts.out) {
                 const fs = await import("node:fs/promises");
                 if (result.format === "ai") {

package/dist/cli/browser-cli-manage.js

@@ -1,8 +1,7 @@
-import { browserCloseTab, browserCreateProfile, browserDeleteProfile, browserFocusTab, browserOpenTab, browserProfiles, browserResetProfile, browserStart, browserStatus, browserStop, browserTabAction, browserTabs, resolveBrowserControlUrl, } from "../browser/client.js";
-import { browserAct } from "../browser/client-actions-core.js";
 import { danger, info } from "../globals.js";
 import { defaultRuntime } from "../runtime.js";
 import { shortenHomePath } from "../utils.js";
+import { callBrowserRequest } from "./browser-cli-shared.js";
 import { runCommandWithRuntime } from "./cli-utils.js";
 function runBrowserCommand(action) {
     return runCommandWithRuntime(defaultRuntime, action, (err) => {
@@ -16,10 +15,13 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Show browser status")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         await runBrowserCommand(async () => {
-            const status = await browserStatus(baseUrl, {
-                profile: parent?.browserProfile,
+            const status = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/",
+                query: parent?.browserProfile ? { profile: parent.browserProfile } : undefined,
+            }, {
+                timeoutMs: 1500,
             });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(status, null, 2));
@@ -31,7 +33,6 @@ export function registerBrowserManageCommands(browser, parentOpts) {
                 `profile: ${status.profile ?? "clawd"}`,
                 `enabled: ${status.enabled}`,
                 `running: ${status.running}`,
-                `controlUrl: ${status.controlUrl}`,
                 `cdpPort: ${status.cdpPort}`,
                 `cdpUrl: ${status.cdpUrl ?? `http://127.0.0.1:${status.cdpPort}`}`,
                 `browser: ${status.chosenBrowser ?? "unknown"}`,
@@ -47,11 +48,18 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Start the browser (no-op if already running)")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            await browserStart(baseUrl, { profile });
-            const status = await browserStatus(baseUrl, { profile });
+            await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/start",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 15000 });
+            const status = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 1500 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(status, null, 2));
                 return;
@@ -65,11 +73,18 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Stop the browser (best-effort)")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            await browserStop(baseUrl, { profile });
-            const status = await browserStatus(baseUrl, { profile });
+            await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/stop",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 15000 });
+            const status = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 1500 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(status, null, 2));
                 return;
@@ -83,10 +98,13 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Reset browser profile (moves it to Trash)")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            const result = await browserResetProfile(baseUrl, { profile });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/reset-profile",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 20000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -104,10 +122,14 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("List open tabs")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            const tabs = await browserTabs(baseUrl, { profile });
+            const result = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/tabs",
+                query: profile ? { profile } : undefined,
+            }, { timeoutMs: 3000 });
+            const tabs = result.tabs ?? [];
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify({ tabs }, null, 2));
                 return;
@@ -126,13 +148,16 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Tab shortcuts (index-based)")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            const result = (await browserTabAction(baseUrl, {
-                action: "list",
-                profile,
-            }));
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/action",
+                query: profile ? { profile } : undefined,
+                body: {
+                    action: "list",
+                },
+            }, { timeoutMs: 10_000 });
             const tabs = result.tabs ?? [];
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify({ tabs }, null, 2));
@@ -152,13 +177,14 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("Open a new tab (about:blank)")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            const result = await browserTabAction(baseUrl, {
-                action: "new",
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/action",
+                query: profile ? { profile } : undefined,
+                body: { action: "new" },
+            }, { timeoutMs: 10_000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -172,7 +198,6 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .argument("<index>", "Tab index (1-based)", (v) => Number(v))
         .action(async (index, _opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         if (!Number.isFinite(index) || index < 1) {
             defaultRuntime.error(danger("index must be a positive number"));
@@ -180,11 +205,12 @@ export function registerBrowserManageCommands(browser, parentOpts) {
             return;
         }
         await runBrowserCommand(async () => {
-            const result = await browserTabAction(baseUrl, {
-                action: "select",
-                index: Math.floor(index) - 1,
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/action",
+                query: profile ? { profile } : undefined,
+                body: { action: "select", index: Math.floor(index) - 1 },
+            }, { timeoutMs: 10_000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -198,7 +224,6 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .argument("[index]", "Tab index (1-based)", (v) => Number(v))
         .action(async (index, _opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         const idx = typeof index === "number" && Number.isFinite(index) ? Math.floor(index) - 1 : undefined;
         if (typeof idx === "number" && idx < 0) {
@@ -207,11 +232,12 @@ export function registerBrowserManageCommands(browser, parentOpts) {
             return;
         }
         await runBrowserCommand(async () => {
-            const result = await browserTabAction(baseUrl, {
-                action: "close",
-                index: idx,
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/action",
+                query: profile ? { profile } : undefined,
+                body: { action: "close", index: idx },
+            }, { timeoutMs: 10_000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -225,10 +251,14 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .argument("<url>", "URL to open")
         .action(async (url, _opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            const tab = await browserOpenTab(baseUrl, url, { profile });
+            const tab = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/open",
+                query: profile ? { profile } : undefined,
+                body: { url },
+            }, { timeoutMs: 15000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(tab, null, 2));
                 return;
@@ -242,10 +272,14 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .argument("<targetId>", "Target id or unique prefix")
         .action(async (targetId, _opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
-            await browserFocusTab(baseUrl, targetId, { profile });
+            await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/tabs/focus",
+                query: profile ? { profile } : undefined,
+                body: { targetId },
+            }, { timeoutMs: 5000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify({ ok: true }, null, 2));
                 return;
@@ -259,14 +293,22 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .argument("[targetId]", "Target id or unique prefix (optional)")
         .action(async (targetId, _opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         await runBrowserCommand(async () => {
             if (targetId?.trim()) {
-                await browserCloseTab(baseUrl, targetId.trim(), { profile });
+                await callBrowserRequest(parent, {
+                    method: "DELETE",
+                    path: `/tabs/${encodeURIComponent(targetId.trim())}`,
+                    query: profile ? { profile } : undefined,
+                }, { timeoutMs: 5000 });
             }
             else {
-                await browserAct(baseUrl, { kind: "close" }, { profile });
+                await callBrowserRequest(parent, {
+                    method: "POST",
+                    path: "/act",
+                    query: profile ? { profile } : undefined,
+                    body: { kind: "close" },
+                }, { timeoutMs: 20000 });
             }
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify({ ok: true }, null, 2));
@@ -281,9 +323,12 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .description("List all browser profiles")
         .action(async (_opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         await runBrowserCommand(async () => {
-            const profiles = await browserProfiles(baseUrl);
+            const result = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/profiles",
+            }, { timeoutMs: 3000 });
+            const profiles = result.profiles ?? [];
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify({ profiles }, null, 2));
                 return;
@@ -313,14 +358,17 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .option("--driver <driver>", "Profile driver (clawd|extension). Default: clawd")
         .action(async (opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         await runBrowserCommand(async () => {
-            const result = await browserCreateProfile(baseUrl, {
-                name: opts.name,
-                color: opts.color,
-                cdpUrl: opts.cdpUrl,
-                driver: opts.driver === "extension" ? "extension" : undefined,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/profiles/create",
+                body: {
+                    name: opts.name,
+                    color: opts.color,
+                    cdpUrl: opts.cdpUrl,
+                    driver: opts.driver === "extension" ? "extension" : undefined,
+                },
+            }, { timeoutMs: 10_000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -335,9 +383,11 @@ export function registerBrowserManageCommands(browser, parentOpts) {
         .requiredOption("--name <name>", "Profile name to delete")
         .action(async (opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         await runBrowserCommand(async () => {
-            const result = await browserDeleteProfile(baseUrl, opts.name);
+            const result = await callBrowserRequest(parent, {
+                method: "DELETE",
+                path: `/profiles/${encodeURIComponent(opts.name)}`,
+            }, { timeoutMs: 20_000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;

package/dist/cli/browser-cli-shared.js

@@ -1 +1,34 @@
-export {};
+import { callGatewayFromCli } from "./gateway-rpc.js";
+function normalizeQuery(query) {
+    if (!query)
+        return undefined;
+    const out = {};
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined)
+            continue;
+        out[key] = String(value);
+    }
+    return Object.keys(out).length ? out : undefined;
+}
+export async function callBrowserRequest(opts, params, extra) {
+    const resolvedTimeoutMs = typeof extra?.timeoutMs === "number" && Number.isFinite(extra.timeoutMs)
+        ? Math.max(1, Math.floor(extra.timeoutMs))
+        : typeof opts.timeout === "string"
+            ? Number.parseInt(opts.timeout, 10)
+            : undefined;
+    const resolvedTimeout = typeof resolvedTimeoutMs === "number" && Number.isFinite(resolvedTimeoutMs)
+        ? resolvedTimeoutMs
+        : undefined;
+    const timeout = typeof resolvedTimeout === "number" ? String(resolvedTimeout) : opts.timeout;
+    const payload = await callGatewayFromCli("browser.request", { ...opts, timeout }, {
+        method: params.method,
+        path: params.path,
+        query: normalizeQuery(params.query),
+        body: params.body,
+        timeoutMs: resolvedTimeout,
+    }, { progress: extra?.progress });
+    if (payload === undefined) {
+        throw new Error("Unexpected browser.request response");
+    }
+    return payload;
+}

package/dist/cli/browser-cli-state.cookies-storage.js

@@ -1,20 +1,22 @@
-import { resolveBrowserControlUrl } from "../browser/client.js";
-import { browserCookies, browserCookiesClear, browserCookiesSet, browserStorageClear, browserStorageGet, browserStorageSet, } from "../browser/client-actions.js";
 import { danger } from "../globals.js";
 import { defaultRuntime } from "../runtime.js";
+import { callBrowserRequest } from "./browser-cli-shared.js";
 export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
     const cookies = browser.command("cookies").description("Read/write cookies");
     cookies
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         try {
-            const result = await browserCookies(baseUrl, {
-                targetId: opts.targetId?.trim() || undefined,
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "GET",
+                path: "/cookies",
+                query: {
+                    targetId: opts.targetId?.trim() || undefined,
+                    profile,
+                },
+            }, { timeoutMs: 20000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -35,14 +37,17 @@ export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (name, value, opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         try {
-            const result = await browserCookiesSet(baseUrl, {
-                targetId: opts.targetId?.trim() || undefined,
-                cookie: { name, value, url: opts.url },
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/cookies/set",
+                query: profile ? { profile } : undefined,
+                body: {
+                    targetId: opts.targetId?.trim() || undefined,
+                    cookie: { name, value, url: opts.url },
+                },
+            }, { timeoutMs: 20000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -60,13 +65,16 @@ export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (opts, cmd) => {
         const parent = parentOpts(cmd);
-        const baseUrl = resolveBrowserControlUrl(parent?.url);
         const profile = parent?.browserProfile;
         try {
-            const result = await browserCookiesClear(baseUrl, {
-                targetId: opts.targetId?.trim() || undefined,
-                profile,
-            });
+            const result = await callBrowserRequest(parent, {
+                method: "POST",
+                path: "/cookies/clear",
+                query: profile ? { profile } : undefined,
+                body: {
+                    targetId: opts.targetId?.trim() || undefined,
+                },
+            }, { timeoutMs: 20000 });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -88,15 +96,17 @@ export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
             .option("--target-id <id>", "CDP target id (or unique prefix)")
             .action(async (key, opts, cmd2) => {
             const parent = parentOpts(cmd2);
-            const baseUrl = resolveBrowserControlUrl(parent?.url);
             const profile = parent?.browserProfile;
             try {
-                const result = await browserStorageGet(baseUrl, {
-                    kind,
-                    key: key?.trim() || undefined,
-                    targetId: opts.targetId?.trim() || undefined,
-                    profile,
-                });
+                const result = await callBrowserRequest(parent, {
+                    method: "GET",
+                    path: `/storage/${kind}`,
+                    query: {
+                        key: key?.trim() || undefined,
+                        targetId: opts.targetId?.trim() || undefined,
+                        profile,
+                    },
+                }, { timeoutMs: 20000 });
                 if (parent?.json) {
                     defaultRuntime.log(JSON.stringify(result, null, 2));
                     return;
@@ -116,16 +126,18 @@ export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
             .option("--target-id <id>", "CDP target id (or unique prefix)")
             .action(async (key, value, opts, cmd2) => {
             const parent = parentOpts(cmd2);
-            const baseUrl = resolveBrowserControlUrl(parent?.url);
             const profile = parent?.browserProfile;
             try {
-                const result = await browserStorageSet(baseUrl, {
-                    kind,
-                    key,
-                    value,
-                    targetId: opts.targetId?.trim() || undefined,
-                    profile,
-                });
+                const result = await callBrowserRequest(parent, {
+                    method: "POST",
+                    path: `/storage/${kind}/set`,
+                    query: profile ? { profile } : undefined,
+                    body: {
+                        key,
+                        value,
+                        targetId: opts.targetId?.trim() || undefined,
+                    },
+                }, { timeoutMs: 20000 });
                 if (parent?.json) {
                     defaultRuntime.log(JSON.stringify(result, null, 2));
                     return;
@@ -143,14 +155,16 @@ export function registerBrowserCookiesAndStorageCommands(browser, parentOpts) {
             .option("--target-id <id>", "CDP target id (or unique prefix)")
             .action(async (opts, cmd2) => {
             const parent = parentOpts(cmd2);
-            const baseUrl = resolveBrowserControlUrl(parent?.url);
             const profile = parent?.browserProfile;
             try {
-                const result = await browserStorageClear(baseUrl, {
-                    kind,
-                    targetId: opts.targetId?.trim() || undefined,
-                    profile,
-                });
+                const result = await callBrowserRequest(parent, {
+                    method: "POST",
+                    path: `/storage/${kind}/clear`,
+                    query: profile ? { profile } : undefined,
+                    body: {
+                        targetId: opts.targetId?.trim() || undefined,
+                    },
+                }, { timeoutMs: 20000 });
                 if (parent?.json) {
                     defaultRuntime.log(JSON.stringify(result, null, 2));
                     return;