@gguf/pigbot 0.0.1 → 0.0.3

package/dist/channels/plugins/group-mentions.js

@@ -1,4 +1,4 @@
-import { resolveChannelGroupRequireMention, resolveChannelGroupToolsPolicy, } from "../../config/group-policy.js";
+import { resolveChannelGroupRequireMention, resolveChannelGroupToolsPolicy, resolveToolsBySender, } from "../../config/group-policy.js";
 import { resolveSlackAccount } from "../../slack/accounts.js";
 function normalizeDiscordSlug(value) {
     if (!value)
@@ -140,6 +140,10 @@ export function resolveGoogleChatGroupToolPolicy(params) {
         channel: "googlechat",
         groupId: params.groupId,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     });
 }
 export function resolveSlackGroupRequireMention(params) {
@@ -190,6 +194,10 @@ export function resolveTelegramGroupToolPolicy(params) {
         channel: "telegram",
         groupId: chatId ?? params.groupId,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     });
 }
 export function resolveWhatsAppGroupToolPolicy(params) {
@@ -198,6 +206,10 @@ export function resolveWhatsAppGroupToolPolicy(params) {
         channel: "whatsapp",
         groupId: params.groupId,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     });
 }
 export function resolveIMessageGroupToolPolicy(params) {
@@ -206,6 +218,10 @@ export function resolveIMessageGroupToolPolicy(params) {
         channel: "imessage",
         groupId: params.groupId,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     });
 }
 export function resolveDiscordGroupToolPolicy(params) {
@@ -219,9 +235,27 @@ export function resolveDiscordGroupToolPolicy(params) {
                 ? (channelEntries[channelSlug] ?? channelEntries[`#${channelSlug}`])
                 : undefined) ??
             (groupChannel ? channelEntries[normalizeDiscordSlug(groupChannel)] : undefined);
+        const senderPolicy = resolveToolsBySender({
+            toolsBySender: entry?.toolsBySender,
+            senderId: params.senderId,
+            senderName: params.senderName,
+            senderUsername: params.senderUsername,
+            senderE164: params.senderE164,
+        });
+        if (senderPolicy)
+            return senderPolicy;
         if (entry?.tools)
             return entry.tools;
     }
+    const guildSenderPolicy = resolveToolsBySender({
+        toolsBySender: guildEntry?.toolsBySender,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
+    });
+    if (guildSenderPolicy)
+        return guildSenderPolicy;
     if (guildEntry?.tools)
         return guildEntry.tools;
     return undefined;
@@ -253,6 +287,15 @@ export function resolveSlackGroupToolPolicy(params) {
         }
     }
     const resolved = matched ?? channels["*"];
+    const senderPolicy = resolveToolsBySender({
+        toolsBySender: resolved?.toolsBySender,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
+    });
+    if (senderPolicy)
+        return senderPolicy;
     if (resolved?.tools)
         return resolved.tools;
     return undefined;
@@ -263,5 +306,9 @@ export function resolveBlueBubblesGroupToolPolicy(params) {
         channel: "bluebubbles",
         groupId: params.groupId,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     });
 }

package/dist/channels/plugins/helpers.js

@@ -6,7 +6,7 @@ export function resolveChannelDefaultAccountId(params) {
     return params.plugin.config.defaultAccountId?.(params.cfg) ?? accountIds[0] ?? DEFAULT_ACCOUNT_ID;
 }
 export function formatPairingApproveHint(channelId) {
-    const listCmd = formatCliCommand(`pigbot pairing list ${channelId}`);
-    const approveCmd = formatCliCommand(`pigbot pairing approve ${channelId} <code>`);
+    const listCmd = formatCliCommand(`moltbot pairing list ${channelId}`);
+    const approveCmd = formatCliCommand(`moltbot pairing approve ${channelId} <code>`);
     return `Approve via: ${listCmd} / ${approveCmd}`;
 }

package/dist/channels/plugins/message-action-names.js

@@ -25,6 +25,7 @@ export const CHANNEL_MESSAGE_ACTION_NAMES = [
     "thread-reply",
     "search",
     "sticker",
+    "sticker-search",
     "member-info",
     "role-info",
     "emoji-list",

package/dist/channels/plugins/normalize/imessage.js

@@ -0,0 +1,36 @@
+import { normalizeIMessageHandle } from "../../../imessage/targets.js";
+// Service prefixes that indicate explicit delivery method; must be preserved during normalization
+const SERVICE_PREFIXES = ["imessage:", "sms:", "auto:"];
+const CHAT_TARGET_PREFIX_RE = /^(chat_id:|chatid:|chat:|chat_guid:|chatguid:|guid:|chat_identifier:|chatidentifier:|chatident:)/i;
+export function normalizeIMessageMessagingTarget(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return undefined;
+    // Preserve service prefix if present (e.g., "sms:+1555" → "sms:+15551234567")
+    const lower = trimmed.toLowerCase();
+    for (const prefix of SERVICE_PREFIXES) {
+        if (lower.startsWith(prefix)) {
+            const remainder = trimmed.slice(prefix.length).trim();
+            const normalizedHandle = normalizeIMessageHandle(remainder);
+            if (!normalizedHandle)
+                return undefined;
+            if (CHAT_TARGET_PREFIX_RE.test(normalizedHandle))
+                return normalizedHandle;
+            return `${prefix}${normalizedHandle}`;
+        }
+    }
+    const normalized = normalizeIMessageHandle(trimmed);
+    return normalized || undefined;
+}
+export function looksLikeIMessageTargetId(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return false;
+    if (/^(imessage:|sms:|auto:)/i.test(trimmed))
+        return true;
+    if (CHAT_TARGET_PREFIX_RE.test(trimmed))
+        return true;
+    if (trimmed.includes("@"))
+        return true;
+    return /^\+?\d{3,}$/.test(trimmed);
+}

package/dist/channels/plugins/onboarding/imessage.js

@@ -213,7 +213,7 @@ export const imessageOnboardingAdapter = {
         }
         await prompter.note([
             "This is still a work in progress.",
-            "Ensure Pigbot has Full Disk Access to Messages DB.",
+            "Ensure Moltbot has Full Disk Access to Messages DB.",
             "Grant Automation permission for Messages when prompted.",
             "List chats with: imsg chats --limit 20",
             `Docs: ${formatDocsLink("/imessage", "imessage")}`,

package/dist/channels/plugins/onboarding/signal.js

@@ -244,9 +244,9 @@ export const signalOnboardingAdapter = {
             }
         }
         await prompter.note([
-            'Link device with: signal-cli link -n "Pigbot"',
+            'Link device with: signal-cli link -n "Moltbot"',
             "Scan QR in Signal → Linked Devices",
-            `Then run: ${formatCliCommand("pigbot gateway call channels.status --params '{\"probe\":true}'")}`,
+            `Then run: ${formatCliCommand("moltbot gateway call channels.status --params '{\"probe\":true}'")}`,
             `Docs: ${formatDocsLink("/signal", "signal")}`,
         ].join("\n"), "Signal next steps");
         return { cfg: next, accountId: signalAccountId };

package/dist/channels/plugins/onboarding/slack.js

@@ -25,11 +25,11 @@ function setSlackDmPolicy(cfg, dmPolicy) {
     };
 }
 function buildSlackManifest(botName) {
-    const safeName = botName.trim() || "Pigbot";
+    const safeName = botName.trim() || "Moltbot";
     const manifest = {
         display_information: {
             name: safeName,
-            description: `${safeName} connector for Pigbot`,
+            description: `${safeName} connector for Moltbot`,
         },
         features: {
             bot_user: {
@@ -43,7 +43,7 @@ function buildSlackManifest(botName) {
             slash_commands: [
                 {
                     command: "/clawd",
-                    description: "Send a message to Pigbot",
+                    description: "Send a message to Moltbot",
                     should_escape: false,
                 },
             ],
@@ -312,7 +312,7 @@ export const slackOnboardingAdapter = {
         let appToken = null;
         const slackBotName = String(await prompter.text({
             message: "Slack bot display name (used for manifest)",
-            initialValue: "Pigbot",
+            initialValue: "Moltbot",
         })).trim();
         if (!accountConfigured) {
             await noteSlackTokenHelp(prompter, slackBotName);

package/dist/channels/plugins/onboarding/telegram.js

@@ -25,16 +25,16 @@ async function noteTelegramTokenHelp(prompter) {
         "3) Copy the token (looks like 123456:ABC...)",
         "Tip: you can also set TELEGRAM_BOT_TOKEN in your env.",
         `Docs: ${formatDocsLink("/telegram")}`,
-        "Website: https://clawd.bot",
+        "Website: https://molt.bot",
     ].join("\n"), "Telegram bot token");
 }
 async function noteTelegramUserIdHelp(prompter) {
     await prompter.note([
-        `1) DM your bot, then read from.id in \`${formatCliCommand("pigbot logs --follow")}\` (safest)`,
+        `1) DM your bot, then read from.id in \`${formatCliCommand("moltbot logs --follow")}\` (safest)`,
         "2) Or call https://api.telegram.org/bot<bot_token>/getUpdates and read message.from.id",
         "3) Third-party: DM @userinfobot or @getidsbot",
         `Docs: ${formatDocsLink("/telegram")}`,
-        "Website: https://clawd.bot",
+        "Website: https://molt.bot",
     ].join("\n"), "Telegram user id");
 }
 async function promptTelegramAllowFrom(params) {
@@ -57,12 +57,20 @@ async function promptTelegramAllowFrom(params) {
             return null;
         const username = stripped.startsWith("@") ? stripped : `@${stripped}`;
         const url = `https://api.telegram.org/bot${token}/getChat?chat_id=${encodeURIComponent(username)}`;
-        const res = await fetch(url);
-        const data = (await res.json().catch(() => null));
-        const id = data?.ok ? data?.result?.id : undefined;
-        if (typeof id === "number" || typeof id === "string")
-            return String(id);
-        return null;
+        try {
+            const res = await fetch(url);
+            if (!res.ok)
+                return null;
+            const data = (await res.json().catch(() => null));
+            const id = data?.ok ? data?.result?.id : undefined;
+            if (typeof id === "number" || typeof id === "string")
+                return String(id);
+            return null;
+        }
+        catch {
+            // Network error during username lookup - return null to prompt user for numeric ID
+            return null;
+        }
     };
     const parseInput = (value) => value
         .split(/[\n,;]+/g)

package/dist/channels/plugins/onboarding/whatsapp.js

@@ -37,7 +37,7 @@ async function promptWhatsAppAllowFrom(cfg, _runtime, prompter, options) {
     const existingAllowFrom = cfg.channels?.whatsapp?.allowFrom ?? [];
     const existingLabel = existingAllowFrom.length > 0 ? existingAllowFrom.join(", ") : "unset";
     if (options?.forceAllowlist) {
-        await prompter.note("We need the sender/owner number so Pigbot can allowlist you.", "WhatsApp number");
+        await prompter.note("We need the sender/owner number so Moltbot can allowlist you.", "WhatsApp number");
         const entry = await prompter.text({
             message: "Your personal WhatsApp number (the phone you will message from)",
             placeholder: "+15555550123",
@@ -81,11 +81,11 @@ async function promptWhatsAppAllowFrom(cfg, _runtime, prompter, options) {
         message: "WhatsApp phone setup",
         options: [
             { value: "personal", label: "This is my personal phone number" },
-            { value: "separate", label: "Separate phone just for Pigbot" },
+            { value: "separate", label: "Separate phone just for Moltbot" },
         ],
     }));
     if (phoneMode === "personal") {
-        await prompter.note("We need the sender/owner number so Pigbot can allowlist you.", "WhatsApp number");
+        await prompter.note("We need the sender/owner number so Moltbot can allowlist you.", "WhatsApp number");
         const entry = await prompter.text({
             message: "Your personal WhatsApp number (the phone you will message from)",
             placeholder: "+15555550123",
@@ -273,7 +273,7 @@ export const whatsappOnboardingAdapter = {
             }
         }
         else if (!linked) {
-            await prompter.note(`Run \`${formatCliCommand("pigbot channels login")}\` later to link WhatsApp.`, "WhatsApp");
+            await prompter.note(`Run \`${formatCliCommand("moltbot channels login")}\` later to link WhatsApp.`, "WhatsApp");
         }
         next = await promptWhatsAppAllowFrom(next, runtime, prompter, {
             forceAllowlist: forceAllowFrom,

package/dist/channels/plugins/outbound/telegram.js

@@ -50,4 +50,44 @@ export const telegramOutbound = {
         });
         return { channel: "telegram", ...result };
     },
+    sendPayload: async ({ to, payload, accountId, deps, replyToId, threadId }) => {
+        const send = deps?.sendTelegram ?? sendMessageTelegram;
+        const replyToMessageId = parseReplyToMessageId(replyToId);
+        const messageThreadId = parseThreadId(threadId);
+        const telegramData = payload.channelData?.telegram;
+        const quoteText = typeof telegramData?.quoteText === "string" ? telegramData.quoteText : undefined;
+        const text = payload.text ?? "";
+        const mediaUrls = payload.mediaUrls?.length
+            ? payload.mediaUrls
+            : payload.mediaUrl
+                ? [payload.mediaUrl]
+                : [];
+        const baseOpts = {
+            verbose: false,
+            textMode: "html",
+            messageThreadId,
+            replyToMessageId,
+            quoteText,
+            accountId: accountId ?? undefined,
+        };
+        if (mediaUrls.length === 0) {
+            const result = await send(to, text, {
+                ...baseOpts,
+                buttons: telegramData?.buttons,
+            });
+            return { channel: "telegram", ...result };
+        }
+        // Telegram allows reply_markup on media; attach buttons only to first send.
+        let finalResult;
+        for (let i = 0; i < mediaUrls.length; i += 1) {
+            const mediaUrl = mediaUrls[i];
+            const isFirst = i === 0;
+            finalResult = await send(to, isFirst ? text : "", {
+                ...baseOpts,
+                mediaUrl,
+                ...(isFirst ? { buttons: telegramData?.buttons } : {}),
+            });
+        }
+        return { channel: "telegram", ...(finalResult ?? { messageId: "unknown", chatId: to }) };
+    },
 };

package/dist/channels/plugins/pairing-message.js

@@ -1 +1 @@
-export const PAIRING_APPROVED_MESSAGE = "✅ Pigbot access approved. Send a message to start chatting.";
+export const PAIRING_APPROVED_MESSAGE = "✅ Moltbot access approved. Send a message to start chatting.";

package/dist/channels/plugins/status-issues/bluebubbles.js

@@ -42,7 +42,7 @@ export function collectBlueBubblesStatusIssues(accounts) {
                 accountId,
                 kind: "config",
                 message: "Not configured (missing serverUrl or password).",
-                fix: "Run: pigbot channels add bluebubbles --http-url <server-url> --password <password>",
+                fix: "Run: moltbot channels add bluebubbles --http-url <server-url> --password <password>",
             });
             continue;
         }

package/dist/channels/plugins/status-issues/whatsapp.js

@@ -34,7 +34,7 @@ export function collectWhatsAppStatusIssues(accounts) {
                 accountId,
                 kind: "auth",
                 message: "Not linked (no WhatsApp Web session).",
-                fix: `Run: ${formatCliCommand("pigbot channels login")} (scan QR on the gateway host).`,
+                fix: `Run: ${formatCliCommand("moltbot channels login")} (scan QR on the gateway host).`,
             });
             continue;
         }
@@ -44,7 +44,7 @@ export function collectWhatsAppStatusIssues(accounts) {
                 accountId,
                 kind: "runtime",
                 message: `Linked but disconnected${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`,
-                fix: `Run: ${formatCliCommand("pigbot doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`,
+                fix: `Run: ${formatCliCommand("moltbot doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`,
             });
         }
     }

package/dist/channels/registry.js

@@ -12,7 +12,7 @@ export const CHAT_CHANNEL_ORDER = [
 ];
 export const CHANNEL_IDS = [...CHAT_CHANNEL_ORDER];
 export const DEFAULT_CHAT_CHANNEL = "whatsapp";
-const WEBSITE_URL = "https://clawd.bot";
+const WEBSITE_URL = "https://molt.bot";
 const CHAT_CHANNEL_META = {
     telegram: {
         id: "telegram",

package/dist/cli/acp-cli.js

@@ -15,7 +15,7 @@ export function registerAcpCli(program) {
         .option("--reset-session", "Reset the session key before first use", false)
         .option("--no-prefix-cwd", "Do not prefix prompts with the working directory", false)
         .option("--verbose, -v", "Verbose logging to stderr", false)
-        .addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/acp", "docs.clawd.bot/cli/acp")}\n`)
+        .addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/acp", "docs.molt.bot/cli/acp")}\n`)
         .action((opts) => {
         try {
             serveAcpGateway({
@@ -39,7 +39,7 @@ export function registerAcpCli(program) {
         .command("client")
         .description("Run an interactive ACP client against the local ACP bridge")
         .option("--cwd <dir>", "Working directory for the ACP session")
-        .option("--server <command>", "ACP server command (default: pigbot)")
+        .option("--server <command>", "ACP server command (default: moltbot)")
         .option("--server-args <args...>", "Extra arguments for the ACP server")
         .option("--server-verbose", "Enable verbose logging on the ACP server", false)
         .option("--verbose, -v", "Verbose client logging", false)

package/dist/cli/argv.js

@@ -89,18 +89,25 @@ export function buildParseArgv(params) {
     const programName = params.programName ?? "";
     const normalizedArgv = programName && baseArgv[0] === programName
         ? baseArgv.slice(1)
-        : baseArgv[0]?.endsWith("pigbot")
+        : baseArgv[0]?.endsWith("moltbot")
             ? baseArgv.slice(1)
             : baseArgv;
     const executable = (normalizedArgv[0]?.split(/[/\\]/).pop() ?? "").toLowerCase();
-    const looksLikeNode = normalizedArgv.length >= 2 &&
-        (executable === "node" ||
-            executable === "node.exe" ||
-            executable === "bun" ||
-            executable === "bun.exe");
+    const looksLikeNode = normalizedArgv.length >= 2 && (isNodeExecutable(executable) || isBunExecutable(executable));
     if (looksLikeNode)
         return normalizedArgv;
-    return ["node", programName || "pigbot", ...normalizedArgv];
+    return ["node", programName || "moltbot", ...normalizedArgv];
+}
+const nodeExecutablePattern = /^node-\d+(?:\.\d+)*(?:\.exe)?$/;
+function isNodeExecutable(executable) {
+    return (executable === "node" ||
+        executable === "node.exe" ||
+        executable === "nodejs" ||
+        executable === "nodejs.exe" ||
+        nodeExecutablePattern.test(executable));
+}
+function isBunExecutable(executable) {
+    return executable === "bun" || executable === "bun.exe";
 }
 export function shouldMigrateStateFromPath(path) {
     if (path.length === 0)

package/dist/cli/banner.js

@@ -2,6 +2,7 @@ import { resolveCommitHash } from "../infra/git-commit.js";
 import { visibleWidth } from "../terminal/ansi.js";
 import { isRich, theme } from "../terminal/theme.js";
 import { pickTagline } from "./tagline.js";
+import { resolveCliName } from "./cli-name.js";
 let bannerEmitted = false;
 const graphemeSegmenter = typeof Intl !== "undefined" && "Segmenter" in Intl
     ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
@@ -23,7 +24,8 @@ export function formatCliBannerLine(version, options = {}) {
     const commitLabel = commit ?? "unknown";
     const tagline = pickTagline(options);
     const rich = options.richTty ?? isRich();
-    const title = "🦞 Pigbot";
+    const cliName = resolveCliName(options.argv ?? process.argv, options.env);
+    const title = cliName === "moltbot" ? "🦞 Moltbot" : "🦞 Moltbot";
     const prefix = "🦞 ";
     const columns = options.columns ?? process.stdout.columns ?? 120;
     const plainFullLine = `${title} ${version} (${commitLabel}) — ${tagline}`;

package/dist/cli/browser-cli-actions-input/register.element.js

@@ -1,7 +1,6 @@
-import { browserAct } from "../../browser/client-actions.js";
 import { danger } from "../../globals.js";
 import { defaultRuntime } from "../../runtime.js";
-import { requireRef, resolveBrowserActionContext } from "./shared.js";
+import { callBrowserAct, requireRef, resolveBrowserActionContext } from "./shared.js";
 export function registerBrowserElementCommands(browser, parentOpts) {
     browser
         .command("click")
@@ -12,7 +11,7 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .option("--button <left|right|middle>", "Mouse button to use")
         .option("--modifiers <list>", "Comma-separated modifiers (Shift,Alt,Meta)")
         .action(async (ref, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         const refValue = requireRef(ref);
         if (!refValue)
             return;
@@ -23,14 +22,18 @@ export function registerBrowserElementCommands(browser, parentOpts) {
                 .filter(Boolean)
             : undefined;
         try {
-            const result = await browserAct(baseUrl, {
-                kind: "click",
-                ref: refValue,
-                targetId: opts.targetId?.trim() || undefined,
-                doubleClick: Boolean(opts.double),
-                button: opts.button?.trim() || undefined,
-                modifiers,
-            }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: {
+                    kind: "click",
+                    ref: refValue,
+                    targetId: opts.targetId?.trim() || undefined,
+                    doubleClick: Boolean(opts.double),
+                    button: opts.button?.trim() || undefined,
+                    modifiers,
+                },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -52,19 +55,23 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .option("--slowly", "Type slowly (human-like)", false)
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (ref, text, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         const refValue = requireRef(ref);
         if (!refValue)
             return;
         try {
-            const result = await browserAct(baseUrl, {
-                kind: "type",
-                ref: refValue,
-                text,
-                submit: Boolean(opts.submit),
-                slowly: Boolean(opts.slowly),
-                targetId: opts.targetId?.trim() || undefined,
-            }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: {
+                    kind: "type",
+                    ref: refValue,
+                    text,
+                    submit: Boolean(opts.submit),
+                    slowly: Boolean(opts.slowly),
+                    targetId: opts.targetId?.trim() || undefined,
+                },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -82,9 +89,13 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .argument("<key>", "Key to press (e.g. Enter)")
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (key, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         try {
-            const result = await browserAct(baseUrl, { kind: "press", key, targetId: opts.targetId?.trim() || undefined }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: { kind: "press", key, targetId: opts.targetId?.trim() || undefined },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -102,9 +113,13 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .argument("<ref>", "Ref id from snapshot")
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (ref, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         try {
-            const result = await browserAct(baseUrl, { kind: "hover", ref, targetId: opts.targetId?.trim() || undefined }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: { kind: "hover", ref, targetId: opts.targetId?.trim() || undefined },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -123,17 +138,22 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .option("--timeout-ms <ms>", "How long to wait for scroll (default: 20000)", (v) => Number(v))
         .action(async (ref, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         const refValue = requireRef(ref);
         if (!refValue)
             return;
         try {
-            const result = await browserAct(baseUrl, {
-                kind: "scrollIntoView",
-                ref: refValue,
-                targetId: opts.targetId?.trim() || undefined,
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: {
+                    kind: "scrollIntoView",
+                    ref: refValue,
+                    targetId: opts.targetId?.trim() || undefined,
+                    timeoutMs: Number.isFinite(opts.timeoutMs) ? opts.timeoutMs : undefined,
+                },
                 timeoutMs: Number.isFinite(opts.timeoutMs) ? opts.timeoutMs : undefined,
-            }, { profile });
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -152,14 +172,18 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .argument("<endRef>", "End ref id")
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (startRef, endRef, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         try {
-            const result = await browserAct(baseUrl, {
-                kind: "drag",
-                startRef,
-                endRef,
-                targetId: opts.targetId?.trim() || undefined,
-            }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: {
+                    kind: "drag",
+                    startRef,
+                    endRef,
+                    targetId: opts.targetId?.trim() || undefined,
+                },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;
@@ -178,14 +202,18 @@ export function registerBrowserElementCommands(browser, parentOpts) {
         .argument("<values...>", "Option values to select")
         .option("--target-id <id>", "CDP target id (or unique prefix)")
         .action(async (ref, values, opts, cmd) => {
-        const { parent, baseUrl, profile } = resolveBrowserActionContext(cmd, parentOpts);
+        const { parent, profile } = resolveBrowserActionContext(cmd, parentOpts);
         try {
-            const result = await browserAct(baseUrl, {
-                kind: "select",
-                ref,
-                values,
-                targetId: opts.targetId?.trim() || undefined,
-            }, { profile });
+            const result = await callBrowserAct({
+                parent,
+                profile,
+                body: {
+                    kind: "select",
+                    ref,
+                    values,
+                    targetId: opts.targetId?.trim() || undefined,
+                },
+            });
             if (parent?.json) {
                 defaultRuntime.log(JSON.stringify(result, null, 2));
                 return;