@poolzin/pool-bot 1.28.0 → 2026.1.26

package/dist/browser/client-actions-core.js

@@ -2,15 +2,9 @@ import { fetchBrowserJson } from "./client-fetch.js";
 function buildProfileQuery(profile) {
     return profile ? `?profile=${encodeURIComponent(profile)}` : "";
 }
-function withBaseUrl(baseUrl, path) {
-    const trimmed = baseUrl?.trim();
-    if (!trimmed)
-        return path;
-    return `${trimmed.replace(/\/$/, "")}${path}`;
-}
 export async function browserNavigate(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/navigate${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/navigate${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ url: opts.url, targetId: opts.targetId }),
@@ -19,7 +13,7 @@ export async function browserNavigate(baseUrl, opts) {
 }
 export async function browserArmDialog(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/hooks/dialog${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/hooks/dialog${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -33,7 +27,7 @@ export async function browserArmDialog(baseUrl, opts) {
 }
 export async function browserArmFileChooser(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/hooks/file-chooser${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/hooks/file-chooser${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -49,7 +43,7 @@ export async function browserArmFileChooser(baseUrl, opts) {
 }
 export async function browserWaitForDownload(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/wait/download${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/wait/download${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -62,7 +56,7 @@ export async function browserWaitForDownload(baseUrl, opts) {
 }
 export async function browserDownload(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/download${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/download${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -76,7 +70,7 @@ export async function browserDownload(baseUrl, opts) {
 }
 export async function browserAct(baseUrl, req, opts) {
     const q = buildProfileQuery(opts?.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/act${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/act${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(req),
@@ -85,7 +79,7 @@ export async function browserAct(baseUrl, req, opts) {
 }
 export async function browserScreenshotAction(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/screenshot${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/screenshot${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({

package/dist/browser/client-actions-observe.js

@@ -2,12 +2,6 @@ import { fetchBrowserJson } from "./client-fetch.js";
 function buildProfileQuery(profile) {
     return profile ? `?profile=${encodeURIComponent(profile)}` : "";
 }
-function withBaseUrl(baseUrl, path) {
-    const trimmed = baseUrl?.trim();
-    if (!trimmed)
-        return path;
-    return `${trimmed.replace(/\/$/, "")}${path}`;
-}
 export async function browserConsoleMessages(baseUrl, opts = {}) {
     const q = new URLSearchParams();
     if (opts.level)
@@ -17,11 +11,11 @@ export async function browserConsoleMessages(baseUrl, opts = {}) {
     if (opts.profile)
         q.set("profile", opts.profile);
     const suffix = q.toString() ? `?${q.toString()}` : "";
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/console${suffix}`), { timeoutMs: 20000 });
+    return await fetchBrowserJson(`${baseUrl}/console${suffix}`, { timeoutMs: 20000 });
 }
 export async function browserPdfSave(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/pdf${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/pdf${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId }),
@@ -37,7 +31,7 @@ export async function browserPageErrors(baseUrl, opts = {}) {
     if (opts.profile)
         q.set("profile", opts.profile);
     const suffix = q.toString() ? `?${q.toString()}` : "";
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/errors${suffix}`), { timeoutMs: 20000 });
+    return await fetchBrowserJson(`${baseUrl}/errors${suffix}`, { timeoutMs: 20000 });
 }
 export async function browserRequests(baseUrl, opts = {}) {
     const q = new URLSearchParams();
@@ -50,11 +44,11 @@ export async function browserRequests(baseUrl, opts = {}) {
     if (opts.profile)
         q.set("profile", opts.profile);
     const suffix = q.toString() ? `?${q.toString()}` : "";
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/requests${suffix}`), { timeoutMs: 20000 });
+    return await fetchBrowserJson(`${baseUrl}/requests${suffix}`, { timeoutMs: 20000 });
 }
 export async function browserTraceStart(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/trace/start${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/trace/start${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -68,7 +62,7 @@ export async function browserTraceStart(baseUrl, opts = {}) {
 }
 export async function browserTraceStop(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/trace/stop${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/trace/stop${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, path: opts.path }),
@@ -77,7 +71,7 @@ export async function browserTraceStop(baseUrl, opts = {}) {
 }
 export async function browserHighlight(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/highlight${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/highlight${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, ref: opts.ref }),
@@ -86,7 +80,7 @@ export async function browserHighlight(baseUrl, opts) {
 }
 export async function browserResponseBody(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/response/body${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/response/body${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({

package/dist/browser/client-actions-state.js

@@ -2,12 +2,6 @@ import { fetchBrowserJson } from "./client-fetch.js";
 function buildProfileQuery(profile) {
     return profile ? `?profile=${encodeURIComponent(profile)}` : "";
 }
-function withBaseUrl(baseUrl, path) {
-    const trimmed = baseUrl?.trim();
-    if (!trimmed)
-        return path;
-    return `${trimmed.replace(/\/$/, "")}${path}`;
-}
 export async function browserCookies(baseUrl, opts = {}) {
     const q = new URLSearchParams();
     if (opts.targetId)
@@ -15,11 +9,11 @@ export async function browserCookies(baseUrl, opts = {}) {
     if (opts.profile)
         q.set("profile", opts.profile);
     const suffix = q.toString() ? `?${q.toString()}` : "";
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/cookies${suffix}`), { timeoutMs: 20000 });
+    return await fetchBrowserJson(`${baseUrl}/cookies${suffix}`, { timeoutMs: 20000 });
 }
 export async function browserCookiesSet(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/cookies/set${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/cookies/set${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, cookie: opts.cookie }),
@@ -28,7 +22,7 @@ export async function browserCookiesSet(baseUrl, opts) {
 }
 export async function browserCookiesClear(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/cookies/clear${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/cookies/clear${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId }),
@@ -44,11 +38,11 @@ export async function browserStorageGet(baseUrl, opts) {
     if (opts.profile)
         q.set("profile", opts.profile);
     const suffix = q.toString() ? `?${q.toString()}` : "";
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/storage/${opts.kind}${suffix}`), { timeoutMs: 20000 });
+    return await fetchBrowserJson(`${baseUrl}/storage/${opts.kind}${suffix}`, { timeoutMs: 20000 });
 }
 export async function browserStorageSet(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/storage/${opts.kind}/set${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/storage/${opts.kind}/set${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -61,7 +55,7 @@ export async function browserStorageSet(baseUrl, opts) {
 }
 export async function browserStorageClear(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/storage/${opts.kind}/clear${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/storage/${opts.kind}/clear${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId }),
@@ -70,7 +64,7 @@ export async function browserStorageClear(baseUrl, opts) {
 }
 export async function browserSetOffline(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/offline${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/offline${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, offline: opts.offline }),
@@ -79,7 +73,7 @@ export async function browserSetOffline(baseUrl, opts) {
 }
 export async function browserSetHeaders(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/headers${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/headers${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, headers: opts.headers }),
@@ -88,7 +82,7 @@ export async function browserSetHeaders(baseUrl, opts) {
 }
 export async function browserSetHttpCredentials(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/credentials${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/credentials${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -102,7 +96,7 @@ export async function browserSetHttpCredentials(baseUrl, opts = {}) {
 }
 export async function browserSetGeolocation(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/geolocation${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/geolocation${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -118,7 +112,7 @@ export async function browserSetGeolocation(baseUrl, opts = {}) {
 }
 export async function browserSetMedia(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/media${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/media${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -130,7 +124,7 @@ export async function browserSetMedia(baseUrl, opts) {
 }
 export async function browserSetTimezone(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/timezone${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/timezone${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -142,7 +136,7 @@ export async function browserSetTimezone(baseUrl, opts) {
 }
 export async function browserSetLocale(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/locale${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/locale${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, locale: opts.locale }),
@@ -151,7 +145,7 @@ export async function browserSetLocale(baseUrl, opts) {
 }
 export async function browserSetDevice(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/device${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/device${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, name: opts.name }),
@@ -160,7 +154,7 @@ export async function browserSetDevice(baseUrl, opts) {
 }
 export async function browserClearPermissions(baseUrl, opts = {}) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/set/geolocation${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/set/geolocation${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId: opts.targetId, clear: true }),

package/dist/browser/client-fetch.js

@@ -1,91 +1,78 @@
+import { extractErrorCode, formatErrorMessage } from "../infra/errors.js";
+import { loadConfig } from "../config/config.js";
 import { formatCliCommand } from "../cli/command-format.js";
-import { createBrowserControlContext, startBrowserControlServiceFromConfig, } from "./control-service.js";
-import { createBrowserRouteDispatcher } from "./routes/dispatcher.js";
-function isAbsoluteHttp(url) {
-    return /^https?:\/\//i.test(url.trim());
+import { resolveBrowserConfig } from "./config.js";
+let cachedConfigToken = undefined;
+function getBrowserControlToken() {
+    const env = process.env.CLAWDBOT_BROWSER_CONTROL_TOKEN?.trim();
+    if (env)
+        return env;
+    if (cachedConfigToken !== undefined)
+        return cachedConfigToken;
+    try {
+        const cfg = loadConfig();
+        const resolved = resolveBrowserConfig(cfg.browser);
+        const token = resolved.controlToken?.trim() || "";
+        cachedConfigToken = token ? token : null;
+    }
+    catch {
+        cachedConfigToken = null;
+    }
+    return cachedConfigToken;
+}
+function unwrapCause(err) {
+    if (!err || typeof err !== "object")
+        return null;
+    const cause = err.cause;
+    return cause ?? null;
 }
 function enhanceBrowserFetchError(url, err, timeoutMs) {
-    const hint = isAbsoluteHttp(url)
-        ? "If this is a sandboxed session, ensure the sandbox browser is running and try again."
-        : `Start (or restart) the Moltbot gateway (Moltbot.app menubar, or \`${formatCliCommand("moltbot gateway")}\`) and try again.`;
-    const msg = String(err);
-    const msgLower = msg.toLowerCase();
-    const looksLikeTimeout = msgLower.includes("timed out") ||
-        msgLower.includes("timeout") ||
-        msgLower.includes("aborted") ||
-        msgLower.includes("abort") ||
-        msgLower.includes("aborterror");
-    if (looksLikeTimeout) {
-        return new Error(`Can't reach the clawd browser control service (timed out after ${timeoutMs}ms). ${hint}`);
+    const cause = unwrapCause(err);
+    const code = extractErrorCode(cause) ?? extractErrorCode(err) ?? "";
+    const hint = `Start (or restart) the Clawdbot gateway (Clawdbot.app menubar, or \`${formatCliCommand("clawdbot gateway")}\`) and try again.`;
+    if (code === "ECONNREFUSED") {
+        return new Error(`Can't reach the clawd browser control server at ${url} (connection refused). ${hint}`);
     }
-    return new Error(`Can't reach the clawd browser control service. ${hint} (${msg})`);
-}
-async function fetchHttpJson(url, init) {
-    const timeoutMs = init.timeoutMs ?? 5000;
-    const ctrl = new AbortController();
-    const t = setTimeout(() => ctrl.abort(), timeoutMs);
-    try {
-        const res = await fetch(url, { ...init, signal: ctrl.signal });
-        if (!res.ok) {
-            const text = await res.text().catch(() => "");
-            throw new Error(text || `HTTP ${res.status}`);
-        }
-        return (await res.json());
+    if (code === "ETIMEDOUT" || code === "UND_ERR_CONNECT_TIMEOUT") {
+        return new Error(`Can't reach the clawd browser control server at ${url} (timed out after ${timeoutMs}ms). ${hint}`);
     }
-    finally {
-        clearTimeout(t);
+    const msg = formatErrorMessage(err);
+    if (msg.toLowerCase().includes("abort")) {
+        return new Error(`Can't reach the clawd browser control server at ${url} (timed out after ${timeoutMs}ms). ${hint}`);
     }
+    return new Error(`Can't reach the clawd browser control server at ${url}. ${hint} (${msg})`);
 }
 export async function fetchBrowserJson(url, init) {
     const timeoutMs = init?.timeoutMs ?? 5000;
+    const ctrl = new AbortController();
+    const t = setTimeout(() => ctrl.abort(), timeoutMs);
+    let res;
     try {
-        if (isAbsoluteHttp(url)) {
-            return await fetchHttpJson(url, { ...init, timeoutMs });
-        }
-        const started = await startBrowserControlServiceFromConfig();
-        if (!started) {
-            throw new Error("browser control disabled");
-        }
-        const dispatcher = createBrowserRouteDispatcher(createBrowserControlContext());
-        const parsed = new URL(url, "http://localhost");
-        const query = {};
-        for (const [key, value] of parsed.searchParams.entries()) {
-            query[key] = value;
-        }
-        let body = init?.body;
-        if (typeof body === "string") {
-            try {
-                body = JSON.parse(body);
-            }
-            catch {
-                // keep as string
+        const token = getBrowserControlToken();
+        const mergedHeaders = (() => {
+            if (!token)
+                return init?.headers;
+            const h = new Headers(init?.headers ?? {});
+            if (!h.has("Authorization")) {
+                h.set("Authorization", `Bearer ${token}`);
             }
-        }
-        const dispatchPromise = dispatcher.dispatch({
-            method: init?.method?.toUpperCase() === "DELETE"
-                ? "DELETE"
-                : init?.method?.toUpperCase() === "POST"
-                    ? "POST"
-                    : "GET",
-            path: parsed.pathname,
-            query,
-            body,
+            return h;
+        })();
+        res = await fetch(url, {
+            ...init,
+            ...(mergedHeaders ? { headers: mergedHeaders } : {}),
+            signal: ctrl.signal,
         });
-        const result = await (timeoutMs
-            ? Promise.race([
-                dispatchPromise,
-                new Promise((_, reject) => setTimeout(() => reject(new Error("timed out")), timeoutMs)),
-            ])
-            : dispatchPromise);
-        if (result.status >= 400) {
-            const message = result.body && typeof result.body === "object" && "error" in result.body
-                ? String(result.body.error)
-                : `HTTP ${result.status}`;
-            throw new Error(message);
-        }
-        return result.body;
     }
     catch (err) {
         throw enhanceBrowserFetchError(url, err, timeoutMs);
     }
+    finally {
+        clearTimeout(t);
+    }
+    if (!res.ok) {
+        const text = await res.text().catch(() => "");
+        throw new Error(text ? `${res.status}: ${text}` : `HTTP ${res.status}`);
+    }
+    return (await res.json());
 }

package/dist/browser/client.js

@@ -1,48 +1,50 @@
+import { loadConfig } from "../config/config.js";
 import { fetchBrowserJson } from "./client-fetch.js";
+import { resolveBrowserConfig } from "./config.js";
+export function resolveBrowserControlUrl(overrideUrl) {
+    const cfg = loadConfig();
+    const resolved = resolveBrowserConfig(cfg.browser);
+    const url = overrideUrl?.trim() ? overrideUrl.trim() : resolved.controlUrl;
+    return url.replace(/\/$/, "");
+}
 function buildProfileQuery(profile) {
     return profile ? `?profile=${encodeURIComponent(profile)}` : "";
 }
-function withBaseUrl(baseUrl, path) {
-    const trimmed = baseUrl?.trim();
-    if (!trimmed)
-        return path;
-    return `${trimmed.replace(/\/$/, "")}${path}`;
-}
 export async function browserStatus(baseUrl, opts) {
     const q = buildProfileQuery(opts?.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/${q}`, {
         timeoutMs: 1500,
     });
 }
 export async function browserProfiles(baseUrl) {
-    const res = await fetchBrowserJson(withBaseUrl(baseUrl, `/profiles`), {
+    const res = await fetchBrowserJson(`${baseUrl}/profiles`, {
         timeoutMs: 3000,
     });
     return res.profiles ?? [];
 }
 export async function browserStart(baseUrl, opts) {
     const q = buildProfileQuery(opts?.profile);
-    await fetchBrowserJson(withBaseUrl(baseUrl, `/start${q}`), {
+    await fetchBrowserJson(`${baseUrl}/start${q}`, {
         method: "POST",
         timeoutMs: 15000,
     });
 }
 export async function browserStop(baseUrl, opts) {
     const q = buildProfileQuery(opts?.profile);
-    await fetchBrowserJson(withBaseUrl(baseUrl, `/stop${q}`), {
+    await fetchBrowserJson(`${baseUrl}/stop${q}`, {
         method: "POST",
         timeoutMs: 15000,
     });
 }
 export async function browserResetProfile(baseUrl, opts) {
     const q = buildProfileQuery(opts?.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/reset-profile${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/reset-profile${q}`, {
         method: "POST",
         timeoutMs: 20000,
     });
 }
 export async function browserCreateProfile(baseUrl, opts) {
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/profiles/create`), {
+    return await fetchBrowserJson(`${baseUrl}/profiles/create`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -55,19 +57,19 @@ export async function browserCreateProfile(baseUrl, opts) {
     });
 }
 export async function browserDeleteProfile(baseUrl, profile) {
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/profiles/${encodeURIComponent(profile)}`), {
+    return await fetchBrowserJson(`${baseUrl}/profiles/${encodeURIComponent(profile)}`, {
         method: "DELETE",
         timeoutMs: 20000,
     });
 }
 export async function browserTabs(baseUrl, opts) {
     const q = buildProfileQuery(opts?.profile);
-    const res = await fetchBrowserJson(withBaseUrl(baseUrl, `/tabs${q}`), { timeoutMs: 3000 });
+    const res = await fetchBrowserJson(`${baseUrl}/tabs${q}`, { timeoutMs: 3000 });
     return res.tabs ?? [];
 }
 export async function browserOpenTab(baseUrl, url, opts) {
     const q = buildProfileQuery(opts?.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/tabs/open${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/tabs/open${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ url }),
@@ -76,7 +78,7 @@ export async function browserOpenTab(baseUrl, url, opts) {
 }
 export async function browserFocusTab(baseUrl, targetId, opts) {
     const q = buildProfileQuery(opts?.profile);
-    await fetchBrowserJson(withBaseUrl(baseUrl, `/tabs/focus${q}`), {
+    await fetchBrowserJson(`${baseUrl}/tabs/focus${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ targetId }),
@@ -85,14 +87,14 @@ export async function browserFocusTab(baseUrl, targetId, opts) {
 }
 export async function browserCloseTab(baseUrl, targetId, opts) {
     const q = buildProfileQuery(opts?.profile);
-    await fetchBrowserJson(withBaseUrl(baseUrl, `/tabs/${encodeURIComponent(targetId)}${q}`), {
+    await fetchBrowserJson(`${baseUrl}/tabs/${encodeURIComponent(targetId)}${q}`, {
         method: "DELETE",
         timeoutMs: 5000,
     });
 }
 export async function browserTabAction(baseUrl, opts) {
     const q = buildProfileQuery(opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/tabs/action${q}`), {
+    return await fetchBrowserJson(`${baseUrl}/tabs/action${q}`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -130,7 +132,7 @@ export async function browserSnapshot(baseUrl, opts) {
         q.set("mode", opts.mode);
     if (opts.profile)
         q.set("profile", opts.profile);
-    return await fetchBrowserJson(withBaseUrl(baseUrl, `/snapshot?${q.toString()}`), {
+    return await fetchBrowserJson(`${baseUrl}/snapshot?${q.toString()}`, {
         timeoutMs: 20000,
     });
 }

package/dist/browser/config.js

@@ -1,6 +1,5 @@
-import { deriveDefaultBrowserCdpPortRange, deriveDefaultBrowserControlPort, DEFAULT_BROWSER_CONTROL_PORT, } from "../config/port-defaults.js";
-import { resolveGatewayPort } from "../config/paths.js";
-import { DEFAULT_CLAWD_BROWSER_COLOR, DEFAULT_CLAWD_BROWSER_ENABLED, DEFAULT_BROWSER_EVALUATE_ENABLED, DEFAULT_BROWSER_DEFAULT_PROFILE_NAME, DEFAULT_CLAWD_BROWSER_PROFILE_NAME, } from "./constants.js";
+import { deriveDefaultBrowserCdpPortRange, deriveDefaultBrowserControlPort, } from "../config/port-defaults.js";
+import { DEFAULT_CLAWD_BROWSER_COLOR, DEFAULT_CLAWD_BROWSER_CONTROL_URL, DEFAULT_CLAWD_BROWSER_ENABLED, DEFAULT_BROWSER_DEFAULT_PROFILE_NAME, DEFAULT_CLAWD_BROWSER_PROFILE_NAME, } from "./constants.js";
 import { CDP_PORT_RANGE_START, getUsedPorts } from "./profiles.js";
 function isLoopbackHost(host) {
     const h = host.trim().toLowerCase();
@@ -62,7 +61,7 @@ function ensureDefaultProfile(profiles, defaultColor, legacyCdpPort, derivedDefa
 /**
  * Ensure a built-in "chrome" profile exists for the Chrome extension relay.
  *
- * Note: this is a Moltbot browser profile (routing config), not a Chrome user profile.
+ * Note: this is a Clawdbot browser profile (routing config), not a Chrome user profile.
  * It points at the local relay CDP endpoint (controlPort + 1).
  */
 function ensureDefaultChromeExtensionProfile(profiles, controlPort) {
@@ -83,11 +82,22 @@ function ensureDefaultChromeExtensionProfile(profiles, controlPort) {
     };
     return result;
 }
-export function resolveBrowserConfig(cfg, rootConfig) {
+export function resolveBrowserConfig(cfg) {
     const enabled = cfg?.enabled ?? DEFAULT_CLAWD_BROWSER_ENABLED;
-    const evaluateEnabled = cfg?.evaluateEnabled ?? DEFAULT_BROWSER_EVALUATE_ENABLED;
-    const gatewayPort = resolveGatewayPort(rootConfig);
-    const controlPort = deriveDefaultBrowserControlPort(gatewayPort ?? DEFAULT_BROWSER_CONTROL_PORT);
+    const envControlUrl = process.env.CLAWDBOT_BROWSER_CONTROL_URL?.trim();
+    const controlToken = cfg?.controlToken?.trim() || undefined;
+    const derivedControlPort = (() => {
+        const raw = process.env.CLAWDBOT_GATEWAY_PORT?.trim();
+        if (!raw)
+            return null;
+        const gatewayPort = Number.parseInt(raw, 10);
+        if (!Number.isFinite(gatewayPort) || gatewayPort <= 0)
+            return null;
+        return deriveDefaultBrowserControlPort(gatewayPort);
+    })();
+    const derivedControlUrl = derivedControlPort ? `http://127.0.0.1:${derivedControlPort}` : null;
+    const controlInfo = parseHttpUrl(cfg?.controlUrl ?? envControlUrl ?? derivedControlUrl ?? DEFAULT_CLAWD_BROWSER_CONTROL_URL, "browser.controlUrl");
+    const controlPort = controlInfo.port;
     const defaultColor = normalizeHexColor(cfg?.color);
     const remoteCdpTimeoutMs = normalizeTimeoutMs(cfg?.remoteCdpTimeoutMs, 1500);
     const remoteCdpHandshakeTimeoutMs = normalizeTimeoutMs(cfg?.remoteCdpHandshakeTimeoutMs, Math.max(2000, remoteCdpTimeoutMs * 2));
@@ -100,9 +110,10 @@ export function resolveBrowserConfig(cfg, rootConfig) {
     else {
         const derivedPort = controlPort + 1;
         if (derivedPort > 65535) {
-            throw new Error(`Derived CDP port (${derivedPort}) is too high; check gateway port configuration.`);
+            throw new Error(`browser.controlUrl port (${controlPort}) is too high; cannot derive CDP port (${derivedPort})`);
         }
-        const derived = new URL(`http://127.0.0.1:${derivedPort}`);
+        const derived = new URL(controlInfo.normalized);
+        derived.port = String(derivedPort);
         cdpInfo = {
             parsed: derived,
             port: derivedPort,
@@ -124,8 +135,10 @@ export function resolveBrowserConfig(cfg, rootConfig) {
             : DEFAULT_CLAWD_BROWSER_PROFILE_NAME);
     return {
         enabled,
-        evaluateEnabled,
+        controlUrl: controlInfo.normalized,
+        controlHost: controlInfo.parsed.hostname,
         controlPort,
+        ...(controlToken ? { controlToken } : {}),
         cdpProtocol,
         cdpHost: cdpInfo.parsed.hostname,
         cdpIsLoopback: isLoopbackHost(cdpInfo.parsed.hostname),
@@ -175,6 +188,6 @@ export function resolveProfile(resolved, profileName) {
         driver,
     };
 }
-export function shouldStartLocalBrowserServer(_resolved) {
-    return true;
+export function shouldStartLocalBrowserServer(resolved) {
+    return isLoopbackHost(resolved.controlHost);
 }

package/dist/browser/constants.js

@@ -1,5 +1,5 @@
 export const DEFAULT_CLAWD_BROWSER_ENABLED = true;
-export const DEFAULT_BROWSER_EVALUATE_ENABLED = true;
+export const DEFAULT_CLAWD_BROWSER_CONTROL_URL = "http://127.0.0.1:18791";
 export const DEFAULT_CLAWD_BROWSER_COLOR = "#FF4500";
 export const DEFAULT_CLAWD_BROWSER_PROFILE_NAME = "clawd";
 export const DEFAULT_BROWSER_DEFAULT_PROFILE_NAME = "chrome";