@rudderhq/cli 0.5.1 → 0.5.2-canary.1

package/dist/index.js

@@ -43,7 +43,7 @@ var init_chat_work_manifest = __esm({
 });
 
 // ../packages/shared/dist/constants.js
-var ORGANIZATION_STATUSES, ORGANIZATION_INTELLIGENCE_PROFILE_PURPOSES, ORGANIZATION_INTELLIGENCE_PROFILE_STATUSES, DEPLOYMENT_MODES, DEPLOYMENT_EXPOSURES, AUTH_BASE_URL_MODES, AGENT_STATUSES, AGENT_RUNTIME_TYPES, AGENT_ROLES, AGENT_ICON_NAMES, AGENT_OREO_ICON_PREFIX, AGENT_OREO_SHAPE_IDS, AGENT_OREO_PALETTE_IDS, AGENT_DICEBEAR_NOTIONISTS_ICON_PREFIX, AGENT_AVATAR_BACKGROUND_PRESET_IDS, ISSUE_STATUSES, ISSUE_PRIORITIES, AGENT_INTEGRATION_PROVIDERS, AGENT_INTEGRATION_STATUSES, AGENT_INTEGRATION_TRANSPORTS, AGENT_INTEGRATION_PROVIDER_REGIONS, AGENT_INTEGRATION_CHAT_TYPES, AGENT_INTEGRATION_DROP_REASONS, AGENT_INTEGRATION_OUTBOUND_STATUSES, CUSTOM_INTEGRATION_KINDS, CUSTOM_INTEGRATION_SCOPES, CUSTOM_INTEGRATION_STATUSES, CUSTOM_INTEGRATION_TOOL_STATUSES, CUSTOM_INTEGRATION_BINDING_STATUSES, CUSTOM_INTEGRATION_TOOL_CALL_STATUSES, CALENDAR_SOURCE_TYPES, CALENDAR_OWNER_TYPES, CALENDAR_VISIBILITIES, CALENDAR_SOURCE_STATUSES, CALENDAR_EVENT_KINDS, CALENDAR_EVENT_STATUSES, CALENDAR_SOURCE_MODES, CHAT_CONVERSATION_STATUSES, CHAT_ISSUE_CREATION_MODES, CHAT_MESSAGE_ROLES, CHAT_MESSAGE_KINDS, CHAT_MESSAGE_STATUSES, CHAT_CONTEXT_ENTITY_TYPES, GOAL_LEVELS, GOAL_STATUSES, PROJECT_STATUSES, ORGANIZATION_RESOURCE_KINDS, ORGANIZATION_RESOURCE_SOURCE_TYPES, PROJECT_RESOURCE_ATTACHMENT_ROLES, AUTOMATION_STATUSES, AUTOMATION_CONCURRENCY_POLICIES, AUTOMATION_CATCH_UP_POLICIES, AUTOMATION_OUTPUT_MODES, AUTOMATION_TRIGGER_SIGNING_MODES, PROJECT_COLORS, PROJECT_ICONS, APPROVAL_TYPES, SECRET_PROVIDERS, STORAGE_PROVIDERS, BILLING_TYPES, FINANCE_EVENT_KINDS, FINANCE_DIRECTIONS, FINANCE_UNITS, BUDGET_SCOPE_TYPES, BUDGET_METRICS, BUDGET_WINDOW_KINDS, BUDGET_INCIDENT_RESOLUTION_ACTIONS, INVITE_JOIN_TYPES, JOIN_REQUEST_TYPES, JOIN_REQUEST_STATUSES, PERMISSION_KEYS, PLUGIN_STATUSES, PLUGIN_CATEGORIES, PLUGIN_CAPABILITIES, PLUGIN_UI_SLOT_TYPES, PLUGIN_RESERVED_COMPANY_ROUTE_SEGMENTS, PLUGIN_LAUNCHER_PLACEMENT_ZONES, PLUGIN_LAUNCHER_ACTIONS, PLUGIN_LAUNCHER_BOUNDS, PLUGIN_LAUNCHER_RENDER_ENVIRONMENTS, PLUGIN_UI_SLOT_ENTITY_TYPES, PLUGIN_STATE_SCOPE_KINDS;
+var ORGANIZATION_STATUSES, ORGANIZATION_INTELLIGENCE_PROFILE_PURPOSES, ORGANIZATION_INTELLIGENCE_PROFILE_STATUSES, DEPLOYMENT_MODES, DEPLOYMENT_EXPOSURES, AUTH_BASE_URL_MODES, AGENT_STATUSES, AGENT_RUNTIME_TYPES, AGENT_ROLES, AGENT_ICON_NAMES, AGENT_OREO_ICON_PREFIX, AGENT_OREO_SHAPE_IDS, AGENT_OREO_PALETTE_IDS, AGENT_DICEBEAR_NOTIONISTS_ICON_PREFIX, AGENT_AVATAR_BACKGROUND_PRESET_IDS, ISSUE_STATUSES, ISSUE_PRIORITIES, AGENT_INTEGRATION_PROVIDERS, AGENT_INTEGRATION_STATUSES, AGENT_INTEGRATION_TRANSPORTS, AGENT_INTEGRATION_PROVIDER_REGIONS, AGENT_INTEGRATION_CHAT_TYPES, AGENT_INTEGRATION_DROP_REASONS, AGENT_INTEGRATION_OUTBOUND_STATUSES, RUDDER_AGENT_V1_MCP_TOOL_NAMES, RUDDER_BROWSER_MCP_TOOL_NAMES2, RUDDER_CORE_MCP_TOOL_NAMES2, CUSTOM_INTEGRATION_KINDS, CUSTOM_INTEGRATION_SCOPES, CUSTOM_INTEGRATION_STATUSES, CUSTOM_INTEGRATION_TOOL_STATUSES, CUSTOM_INTEGRATION_BINDING_STATUSES, CUSTOM_INTEGRATION_TOOL_CALL_STATUSES, CALENDAR_SOURCE_TYPES, CALENDAR_OWNER_TYPES, CALENDAR_VISIBILITIES, CALENDAR_SOURCE_STATUSES, CALENDAR_EVENT_KINDS, CALENDAR_EVENT_STATUSES, CALENDAR_SOURCE_MODES, CHAT_CONVERSATION_STATUSES, CHAT_ISSUE_CREATION_MODES, CHAT_MESSAGE_ROLES, CHAT_MESSAGE_KINDS, CHAT_MESSAGE_STATUSES, CHAT_CONTEXT_ENTITY_TYPES, GOAL_LEVELS, GOAL_STATUSES, PROJECT_STATUSES, ORGANIZATION_RESOURCE_KINDS, ORGANIZATION_RESOURCE_SOURCE_TYPES, PROJECT_RESOURCE_ATTACHMENT_ROLES, AUTOMATION_STATUSES, AUTOMATION_CONCURRENCY_POLICIES, AUTOMATION_CATCH_UP_POLICIES, AUTOMATION_OUTPUT_MODES, AUTOMATION_TRIGGER_SIGNING_MODES, PROJECT_COLORS, PROJECT_ICONS, APPROVAL_TYPES, SECRET_PROVIDERS, STORAGE_PROVIDERS, BILLING_TYPES, FINANCE_EVENT_KINDS, FINANCE_DIRECTIONS, FINANCE_UNITS, BUDGET_SCOPE_TYPES, BUDGET_METRICS, BUDGET_WINDOW_KINDS, BUDGET_INCIDENT_RESOLUTION_ACTIONS, INVITE_JOIN_TYPES, JOIN_REQUEST_TYPES, JOIN_REQUEST_STATUSES, PERMISSION_KEYS, PLUGIN_STATUSES, PLUGIN_CATEGORIES, PLUGIN_CAPABILITIES, PLUGIN_UI_SLOT_TYPES, PLUGIN_RESERVED_COMPANY_ROUTE_SEGMENTS, PLUGIN_LAUNCHER_PLACEMENT_ZONES, PLUGIN_LAUNCHER_ACTIONS, PLUGIN_LAUNCHER_BOUNDS, PLUGIN_LAUNCHER_RENDER_ENVIRONMENTS, PLUGIN_UI_SLOT_ENTITY_TYPES, PLUGIN_STATE_SCOPE_KINDS;
 var init_constants = __esm({
   "../packages/shared/dist/constants.js"() {
     "use strict";
@@ -216,6 +216,104 @@ var init_constants = __esm({
       "unsupported_message_type"
     ];
     AGENT_INTEGRATION_OUTBOUND_STATUSES = ["pending", "streaming", "final", "error"];
+    RUDDER_AGENT_V1_MCP_TOOL_NAMES = [
+      "rudder_agent_me",
+      "rudder_agent_inbox",
+      "rudder_agent_capabilities",
+      "rudder_agent_update",
+      "rudder_agent_skills_create",
+      "rudder_agent_skills_enable",
+      "rudder_agent_skills_sync",
+      "rudder_issue_get",
+      "rudder_issue_search",
+      "rudder_issue_context",
+      "rudder_issue_checkout",
+      "rudder_issue_comment",
+      "rudder_issue_comments_list",
+      "rudder_issue_comments_get",
+      "rudder_issue_update",
+      "rudder_issue_review",
+      "rudder_issue_commit",
+      "rudder_issue_done",
+      "rudder_issue_block",
+      "rudder_project_list",
+      "rudder_project_get",
+      "rudder_project_create",
+      "rudder_project_update",
+      "rudder_user_activity",
+      "rudder_library_file_list",
+      "rudder_library_file_get",
+      "rudder_library_file_ref",
+      "rudder_library_file_link",
+      "rudder_library_file_put",
+      "rudder_approval_get",
+      "rudder_approval_issues",
+      "rudder_approval_comment",
+      "rudder_skill_list",
+      "rudder_skill_get",
+      "rudder_skill_file",
+      "rudder_skill_import",
+      "rudder_skill_scan_local",
+      "rudder_skill_scan_projects",
+      "rudder_browser_tabs",
+      "rudder_browser_user_tabs",
+      "rudder_browser_open",
+      "rudder_browser_navigate",
+      "rudder_browser_back",
+      "rudder_browser_forward",
+      "rudder_browser_reload",
+      "rudder_browser_viewport",
+      "rudder_browser_visibility",
+      "rudder_browser_snapshot",
+      "rudder_browser_locator",
+      "rudder_browser_cua",
+      "rudder_browser_dom_cua",
+      "rudder_browser_dialog",
+      "rudder_browser_clipboard",
+      "rudder_browser_logs",
+      "rudder_browser_download",
+      "rudder_browser_assets",
+      "rudder_browser_content",
+      "rudder_browser_wait",
+      "rudder_browser_read",
+      "rudder_browser_click",
+      "rudder_browser_type",
+      "rudder_browser_screenshot",
+      "rudder_browser_close",
+      "rudder_automation_list",
+      "rudder_automation_get",
+      "rudder_automation_runs",
+      "rudder_automation_triggers_list",
+      "rudder_automation_triggers_create",
+      "rudder_automation_triggers_update",
+      "rudder_automation_triggers_delete",
+      "rudder_automation_triggers_rotate_secret",
+      "rudder_automation_create",
+      "rudder_automation_update",
+      "rudder_automation_enable",
+      "rudder_automation_disable",
+      "rudder_automation_run",
+      "rudder_chat_list",
+      "rudder_chat_search",
+      "rudder_chat_get",
+      "rudder_chat_messages",
+      "rudder_chat_transcript",
+      "rudder_chat_read",
+      "rudder_chat_create",
+      "rudder_chat_send",
+      "rudder_chat_archive",
+      "rudder_runs_list",
+      "rudder_runs_by_skill",
+      "rudder_runs_get",
+      "rudder_runs_events",
+      "rudder_runs_log",
+      "rudder_runs_transcript",
+      "rudder_runs_errors",
+      "rudder_runs_cancel",
+      "rudder_runs_retry"
+    ];
+    RUDDER_BROWSER_MCP_TOOL_NAMES2 = RUDDER_AGENT_V1_MCP_TOOL_NAMES.filter((name) => name.startsWith("rudder_browser_"));
+    RUDDER_CORE_MCP_TOOL_NAMES2 = RUDDER_AGENT_V1_MCP_TOOL_NAMES.filter((name) => !name.startsWith("rudder_browser_"));
     CUSTOM_INTEGRATION_KINDS = ["custom_api", "mcp_server"];
     CUSTOM_INTEGRATION_SCOPES = ["organization", "agent"];
     CUSTOM_INTEGRATION_STATUSES = ["active", "disabled", "error", "revoked"];
@@ -1149,13 +1247,14 @@ function isCanonicalPortableLibraryPath(value, allowRoot) {
   const segments = value.split("/");
   return segments.every((segment) => Boolean(segment) && segment !== "." && segment !== ".." && !segment.startsWith("~"));
 }
-var uuid, nonBlankId, libraryPathSchema, libraryDirectoryPathSchema, browserUrlSchema, messengerSavedViewTargetSchema, savedViewMetadataShape, createMessengerSavedViewSchema, updateMessengerSavedViewSchema, reorderMessengerSavedViewsSchema, listMessengerSavedViewsQuerySchema;
+var uuid, nonBlankId, viewInstanceIdSchema, libraryPathSchema, libraryDirectoryPathSchema, browserUrlSchema, messengerSavedViewTargetSchema, savedViewMetadataShape, createMessengerSavedViewSchema, messengerSavedViewAnchorSchema, keepMessengerSavedViewSchema, updateMessengerSavedViewSchema, reorderMessengerSavedViewsSchema, listMessengerSavedViewsQuerySchema;
 var init_messenger = __esm({
   "../packages/shared/dist/validators/messenger.js"() {
     "use strict";
     init_chat();
     uuid = z3.string().uuid();
     nonBlankId = z3.string().trim().min(1).max(240);
+    viewInstanceIdSchema = z3.string().trim().min(1).max(1e3);
     libraryPathSchema = z3.string().max(4096).refine((value) => isCanonicalPortableLibraryPath(value, false), "Library path must be canonical and relative");
     libraryDirectoryPathSchema = z3.string().max(4096).refine((value) => isCanonicalPortableLibraryPath(value, true), "Library directory path must be canonical and relative");
     browserUrlSchema = z3.string().trim().min(1).max(8192).refine((value) => {
@@ -1167,12 +1266,19 @@ var init_messenger = __esm({
       }
     }, "Browser URL must be an absolute HTTP(S) URL");
     messengerSavedViewTargetSchema = z3.discriminatedUnion("kind", [
-      z3.object({ kind: z3.literal("browser"), tabId: nonBlankId, url: browserUrlSchema }).strict(),
-      z3.object({ kind: z3.literal("automation"), automationId: uuid }).strict(),
-      z3.object({ kind: z3.literal("library_document"), documentId: uuid }).strict(),
-      z3.object({ kind: z3.literal("library_entry"), entryId: uuid, path: libraryPathSchema }).strict(),
-      z3.object({ kind: z3.literal("library_file"), filePath: libraryPathSchema }).strict(),
-      z3.object({ kind: z3.literal("library_directory"), directoryPath: libraryDirectoryPathSchema }).strict()
+      z3.object({ kind: z3.literal("browser"), tabId: nonBlankId, url: browserUrlSchema, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({ kind: z3.literal("automation"), automationId: uuid, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({ kind: z3.literal("library_document"), documentId: uuid, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({ kind: z3.literal("library_entry"), entryId: uuid, path: libraryPathSchema, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({ kind: z3.literal("library_file"), filePath: libraryPathSchema, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({ kind: z3.literal("library_directory"), directoryPath: libraryDirectoryPathSchema, viewInstanceId: viewInstanceIdSchema }).strict(),
+      z3.object({
+        kind: z3.literal("local_app"),
+        desktopInstallationId: nonBlankId,
+        appPublicId: nonBlankId,
+        localBindingId: nonBlankId,
+        viewInstanceId: viewInstanceIdSchema
+      }).strict()
     ]);
     savedViewMetadataShape = {
       title: z3.string().trim().min(1).max(240),
@@ -1183,12 +1289,27 @@ var init_messenger = __esm({
       target: messengerSavedViewTargetSchema,
       ...savedViewMetadataShape
     }).strict();
+    messengerSavedViewAnchorSchema = z3.discriminatedUnion("kind", [
+      z3.object({ kind: z3.literal("chat"), conversationId: uuid }).strict(),
+      z3.object({ kind: z3.literal("issue"), issueId: uuid }).strict()
+    ]);
+    keepMessengerSavedViewSchema = z3.object({
+      target: messengerSavedViewTargetSchema,
+      ...savedViewMetadataShape,
+      clientMutationId: uuid,
+      placement: z3.discriminatedUnion("kind", [
+        z3.object({ kind: z3.literal("anchor"), anchor: messengerSavedViewAnchorSchema }).strict(),
+        z3.object({ kind: z3.literal("group"), groupId: uuid }).strict()
+      ])
+    }).strict();
     updateMessengerSavedViewSchema = z3.object({
       target: messengerSavedViewTargetSchema.optional(),
       title: savedViewMetadataShape.title.optional(),
       subtitle: savedViewMetadataShape.subtitle,
       favicon: savedViewMetadataShape.favicon,
-      hidden: z3.boolean().optional()
+      // Compatibility-only escape hatch for legacy hidden rows. The current
+      // group-only Saved View model has no operation that creates hidden rows.
+      hidden: z3.literal(false).optional()
     }).strict().refine((value) => Object.keys(value).length > 0, "At least one field is required");
     reorderMessengerSavedViewsSchema = z3.object({
       ids: z3.array(uuid).max(500)
@@ -7641,6 +7762,15 @@ var RUDDER_MCP_TOOL_DESCRIPTORS = [
     "requiresAgentId": true,
     "attachesRunIdWhenAvailable": false
   },
+  {
+    "capabilityId": "browser.user-tabs",
+    "name": "rudder_browser_user_tabs",
+    "description": "List user-visible tabs currently open in Rudder's built-in Browser without taking control of them.",
+    "mutating": false,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": false
+  },
   {
     "capabilityId": "browser.open",
     "name": "rudder_browser_open",
@@ -7659,6 +7789,150 @@ var RUDDER_MCP_TOOL_DESCRIPTORS = [
     "requiresAgentId": true,
     "attachesRunIdWhenAvailable": true
   },
+  {
+    "capabilityId": "browser.back",
+    "name": "rudder_browser_back",
+    "description": "Navigate a run-owned Rudder Browser tab back in history.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.forward",
+    "name": "rudder_browser_forward",
+    "description": "Navigate a run-owned Rudder Browser tab forward in history.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.reload",
+    "name": "rudder_browser_reload",
+    "description": "Reload a run-owned Rudder Browser tab.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.viewport",
+    "name": "rudder_browser_viewport",
+    "description": "Inspect, set, or reset the responsive viewport for the current Rudder Browser run.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.visibility",
+    "name": "rudder_browser_visibility",
+    "description": "Inspect or change whether the current run's selected Rudder Browser tab is visible.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.snapshot",
+    "name": "rudder_browser_snapshot",
+    "description": "Capture a bounded DOM and accessibility-oriented snapshot, including frame structure and ephemeral node ids.",
+    "mutating": false,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.locator",
+    "name": "rudder_browser_locator",
+    "description": "Perform read-only bounded Browser locator text, attribute, state, count, or wait operations.",
+    "mutating": false,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.cua",
+    "name": "rudder_browser_cua",
+    "description": "Perform trusted coordinate mouse, scroll, drag, keyboard, and text input in a run-owned Browser tab.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.dom-cua",
+    "name": "rudder_browser_dom_cua",
+    "description": "Inspect a bounded read-only DOM snapshot with ephemeral node ids.",
+    "mutating": false,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.dialog",
+    "name": "rudder_browser_dialog",
+    "description": "Inspect, accept, or dismiss the active JavaScript dialog in a run-owned Browser tab.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.clipboard",
+    "name": "rudder_browser_clipboard",
+    "description": "Read or write the isolated virtual clipboard for the current Browser run without touching the OS clipboard.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.logs",
+    "name": "rudder_browser_logs",
+    "description": "Read bounded console and runtime logs captured for a run-owned Browser tab.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.download",
+    "name": "rudder_browser_download",
+    "description": "Download explicit locator media without dispatching page input into a bounded run-owned artifact.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.assets",
+    "name": "rudder_browser_assets",
+    "description": "List page assets or bundle an explicit bounded selection into a run-owned temporary artifact.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.content",
+    "name": "rudder_browser_content",
+    "description": "Export current page content or an eligible Google Workspace document into a bounded run-owned artifact.",
+    "mutating": true,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
+  {
+    "capabilityId": "browser.wait",
+    "name": "rudder_browser_wait",
+    "description": "Wait for bounded URL, text, disappearance, or time conditions in a run-owned Browser tab.",
+    "mutating": false,
+    "requiresOrgId": true,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
   {
     "capabilityId": "browser.read",
     "name": "rudder_browser_read",
@@ -7999,7 +8273,188 @@ function mcpNumber(description) {
 function mcpStringArray(description) {
   return { type: "array", items: { type: "string" }, description };
 }
+function browserMcpInputSchema(id) {
+  const string = (description, extra = {}) => ({ type: "string", description, ...extra });
+  const number = (description, extra = {}) => ({ type: "number", description, ...extra });
+  const boolean = (description) => ({ type: "boolean", description });
+  const schema = (properties, required = []) => ({
+    type: "object",
+    additionalProperties: false,
+    properties,
+    ...required.length > 0 ? { required } : {}
+  });
+  const locatorAtom = schema({
+    strategy: string("Locator strategy.", { enum: ["css", "testId", "href", "role", "label", "placeholder", "text"] }),
+    value: string("Selector, role, label, placeholder, href, test id, or text value.", { minLength: 1, maxLength: 2e3 }),
+    name: string("Accessible name used with the role strategy.", { maxLength: 2e3 }),
+    exact: boolean("Require an exact text or attribute match.")
+  }, ["strategy", "value"]);
+  const simpleLocator = schema({
+    ...locatorAtom.properties,
+    filter: schema({
+      hasText: string("Required descendant text.", { maxLength: 2e3 }),
+      hasNotText: string("Excluded descendant text.", { maxLength: 2e3 }),
+      visible: boolean("Filter by current visibility."),
+      has: locatorAtom,
+      hasNot: locatorAtom
+    }),
+    and: locatorAtom,
+    or: locatorAtom,
+    index: number("Zero-based locator match index.", { minimum: 0, maximum: 499 }),
+    position: string("Locator endpoint after an explicit count.", { enum: ["first", "last"] })
+  }, ["strategy", "value"]);
+  const locator = schema({
+    ...simpleLocator.properties,
+    frame: { type: "array", maxItems: 8, items: string("CSS iframe selector.", { minLength: 1, maxLength: 1e3 }) },
+    scope: simpleLocator
+  }, ["strategy", "value"]);
+  const baseTab = { tabId: string("Run-owned Rudder Browser tab id.", { minLength: 1, maxLength: 160 }) };
+  switch (id) {
+    case "browser.tabs":
+    case "browser.user-tabs":
+      return schema({});
+    case "browser.open":
+      return schema({ url: string("HTTP or HTTPS URL.", { minLength: 1, maxLength: 8192 }) }, ["url"]);
+    case "browser.navigate":
+      return schema({ ...baseTab, url: string("HTTP or HTTPS URL.", { minLength: 1, maxLength: 8192 }) }, ["tabId", "url"]);
+    case "browser.back":
+    case "browser.forward":
+    case "browser.reload":
+    case "browser.read":
+    case "browser.close":
+      return schema(baseTab, ["tabId"]);
+    case "browser.viewport":
+      return schema({
+        action: string("Viewport action.", { enum: ["get", "set", "reset"] }),
+        width: number("Viewport width in CSS pixels.", { minimum: 320, maximum: 3840 }),
+        height: number("Viewport height in CSS pixels.", { minimum: 240, maximum: 2160 })
+      }, ["action"]);
+    case "browser.visibility":
+      return schema({ visible: boolean("Whether the selected Agent Browser tab is visible.") });
+    case "browser.snapshot":
+      return schema({
+        ...baseTab,
+        boxes: boolean("Include viewport-relative element boxes."),
+        depth: number("Maximum snapshot tree depth.", { minimum: 1, maximum: 30 }),
+        maxNodes: number("Maximum snapshot nodes.", { minimum: 1, maximum: 3e3 })
+      }, ["tabId"]);
+    case "browser.locator":
+      return schema({
+        ...baseTab,
+        action: string("Read-only locator action.", { enum: ["count", "allTextContents", "textContent", "innerText", "attribute", "visible", "enabled", "checked", "selected", "wait"] }),
+        locator,
+        name: string("Attribute name for attribute reads.", { maxLength: 200 }),
+        state: string("Wait state.", { enum: ["attached", "detached", "visible", "hidden"] }),
+        timeoutMs: number("Wait timeout in milliseconds.", { minimum: 0, maximum: 3e4 })
+      }, ["tabId", "action", "locator"]);
+    case "browser.cua":
+      return schema({
+        ...baseTab,
+        action: string("Coordinate input or inspection action.", { enum: ["click", "doubleClick", "move", "scroll", "drag", "keypress", "type", "elementInfo"] }),
+        x: number("Viewport X coordinate."),
+        y: number("Viewport Y coordinate."),
+        scrollX: number("Horizontal scroll delta."),
+        scrollY: number("Vertical scroll delta."),
+        button: { oneOf: [number("Mouse button number.", { minimum: 1, maximum: 5 }), string("Mouse button.", { enum: ["left", "middle", "right"] })] },
+        keys: { type: "array", maxItems: 10, items: string("Keyboard key or modifier.", { minLength: 1, maxLength: 100 }) },
+        text: string("Text to type.", { maxLength: 1e5 }),
+        path: { type: "array", minItems: 2, maxItems: 200, items: schema({ x: number("Path X coordinate."), y: number("Path Y coordinate.") }, ["x", "y"]) }
+      }, ["tabId", "action"]);
+    case "browser.dom-cua":
+      return schema({
+        ...baseTab,
+        action: string("Read-only DOM snapshot action.", { enum: ["get"] }),
+        depth: number("Maximum DOM depth.", { minimum: 1, maximum: 30 }),
+        maxNodes: number("Maximum DOM nodes.", { minimum: 1, maximum: 3e3 })
+      }, ["tabId", "action"]);
+    case "browser.dialog":
+      return schema({
+        ...baseTab,
+        action: string("Dialog action.", { enum: ["get", "accept", "dismiss"] }),
+        promptText: string("Prompt response text.", { maxLength: 1e4 })
+      }, ["tabId", "action"]);
+    case "browser.clipboard":
+      return schema({
+        action: string("Virtual clipboard action.", { enum: ["read", "readText", "write", "writeText", "clear"] }),
+        text: string("Plain clipboard text.", { maxLength: 5e5 }),
+        items: {
+          type: "array",
+          maxItems: 20,
+          items: schema({
+            presentationStyle: string("Clipboard presentation style.", { enum: ["unspecified", "inline", "attachment"] }),
+            entries: {
+              type: "array",
+              maxItems: 20,
+              items: schema({
+                mimeType: string("Clipboard MIME type.", { minLength: 1, maxLength: 200 }),
+                text: string("Text clipboard payload.", { maxLength: 5e5 }),
+                base64: string("Base64 clipboard payload.", { maxLength: 65e4 })
+              }, ["mimeType"])
+            }
+          }, ["entries"])
+        }
+      }, ["action"]);
+    case "browser.logs":
+      return schema({
+        ...baseTab,
+        levels: { type: "array", maxItems: 5, items: string("Log level.", { enum: ["debug", "info", "log", "warn", "error"] }) },
+        filter: string("Case-insensitive log substring filter.", { maxLength: 2e3 }),
+        limit: number("Maximum log entries.", { minimum: 1, maximum: 500 }),
+        clear: boolean("Clear the tab log buffer after reading.")
+      }, ["tabId"]);
+    case "browser.download":
+      return schema({
+        ...baseTab,
+        mode: string("Read-only media download mode.", { enum: ["media"] }),
+        locator
+      }, ["tabId", "mode", "locator"]);
+    case "browser.assets":
+      return schema({
+        ...baseTab,
+        action: string("Asset action.", { enum: ["list", "bundle"] }),
+        inventoryId: string("Prior asset inventory id.", { maxLength: 160 }),
+        assetIds: { type: "array", minItems: 1, maxItems: 100, items: string("Asset id.", { maxLength: 160 }) },
+        kinds: { type: "array", minItems: 1, maxItems: 4, items: string("Asset kind.", { enum: ["font", "image", "stylesheet", "video"] }) }
+      }, ["tabId", "action"]);
+    case "browser.content":
+      return schema({
+        ...baseTab,
+        format: string("Content export format.", { enum: ["text", "pdf", "md", "docx", "xlsx", "csv", "pptx"] })
+      }, ["tabId", "format"]);
+    case "browser.wait":
+      return schema({
+        ...baseTab,
+        url: string("URL substring.", { maxLength: 8192 }),
+        text: string("Text that must appear.", { maxLength: 1e4 }),
+        textGone: string("Text that must disappear.", { maxLength: 1e4 }),
+        timeMs: number("Fixed bounded delay in milliseconds.", { minimum: 0, maximum: 3e4 }),
+        timeoutMs: number("Wait timeout in milliseconds.", { minimum: 0, maximum: 3e4 })
+      }, ["tabId"]);
+    case "browser.click":
+      return schema({ ...baseTab, ref: string("Element reference returned by rudder_browser_read.", { maxLength: 160 }) }, ["tabId", "ref"]);
+    case "browser.type":
+      return schema({
+        ...baseTab,
+        ref: string("Element reference returned by rudder_browser_read.", { maxLength: 160 }),
+        text: string("Text to enter.", { maxLength: 1e5 }),
+        submit: boolean("Submit the owning form after typing.")
+      }, ["tabId", "ref", "text"]);
+    case "browser.screenshot":
+      return schema({
+        ...baseTab,
+        fullPage: boolean("Capture the full scrollable page."),
+        format: string("Image format.", { enum: ["png", "jpeg"] }),
+        quality: number("JPEG quality.", { minimum: 1, maximum: 100 }),
+        clip: schema({ x: number("Clip X coordinate."), y: number("Clip Y coordinate."), width: number("Clip width.", { minimum: 1 }), height: number("Clip height.", { minimum: 1 }) }, ["x", "y", "width", "height"]),
+        locator
+      }, ["tabId"]);
+    default:
+      return schema({});
+  }
+}
 function rudderMcpInputSchemaForCapability(id) {
+  if (id.startsWith("browser."))
+    return browserMcpInputSchema(id);
   const properties = {};
   const add = (key, value) => {
     properties[key] = value;
@@ -8244,6 +8699,7 @@ var RUDDER_BROWSER_MCP_TOOL_NAMES = RUDDER_BROWSER_MCP_TOOL_CONTRACTS.map((tool)
 
 // ../packages/agent-runtime-utils/dist/rudder-mcp.js
 var RUDDER_MCP_SERVER_NAME = "rudder-tools";
+var RUDDER_BROWSER_MCP_SERVER_NAME = "rudder-browser";
 var RUDDER_MCP_LEGACY_SERVER_NAMES = [
   ["rudder", "control", "plane"].join("-"),
   ["rudder", "operating", "layer"].join("-")
@@ -8280,7 +8736,7 @@ import os from "node:os";
 import path2 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
-// src/agent-v1-registry.ts
+// src/agent-v1-capabilities.ts
 var AGENT_CLI_CAPABILITIES = [
   {
     id: "agent.me",
@@ -8894,6 +9350,18 @@ var AGENT_CLI_CAPABILITIES = [
     requiresRunId: true,
     attachesRunIdWhenAvailable: false
   },
+  {
+    id: "browser.user-tabs",
+    command: "rudder browser user-tabs",
+    category: "browser",
+    description: "List user-visible tabs currently open in Rudder's built-in Browser without taking control of them.",
+    mutating: false,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: false
+  },
   {
     id: "browser.open",
     command: "rudder browser open <url>",
@@ -8918,6 +9386,198 @@ var AGENT_CLI_CAPABILITIES = [
     requiresRunId: true,
     attachesRunIdWhenAvailable: true
   },
+  {
+    id: "browser.back",
+    command: "rudder browser back <tab-id>",
+    category: "browser",
+    description: "Navigate a run-owned Rudder Browser tab back in history.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.forward",
+    command: "rudder browser forward <tab-id>",
+    category: "browser",
+    description: "Navigate a run-owned Rudder Browser tab forward in history.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.reload",
+    command: "rudder browser reload <tab-id>",
+    category: "browser",
+    description: "Reload a run-owned Rudder Browser tab.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.viewport",
+    command: "rudder browser viewport --action <get|set|reset> [--width <px> --height <px>]",
+    category: "browser",
+    description: "Inspect, set, or reset the responsive viewport for the current Rudder Browser run.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.visibility",
+    command: "rudder browser visibility [--visible <true|false>]",
+    category: "browser",
+    description: "Inspect or change whether the current run's selected Rudder Browser tab is visible.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.snapshot",
+    command: "rudder browser snapshot <tab-id> [--input <json>]",
+    category: "browser",
+    description: "Capture a bounded DOM and accessibility-oriented snapshot, including frame structure and ephemeral node ids.",
+    mutating: false,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.locator",
+    command: "rudder browser locator <tab-id> --input <json>",
+    category: "browser",
+    description: "Perform read-only bounded Browser locator text, attribute, state, count, or wait operations.",
+    mutating: false,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.cua",
+    command: "rudder browser cua <tab-id> --input <json>",
+    category: "browser",
+    description: "Perform trusted coordinate mouse, scroll, drag, keyboard, and text input in a run-owned Browser tab.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.dom-cua",
+    command: "rudder browser dom-cua <tab-id> --input <json>",
+    category: "browser",
+    description: "Inspect a bounded read-only DOM snapshot with ephemeral node ids.",
+    mutating: false,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.dialog",
+    command: "rudder browser dialog <tab-id> --input <json>",
+    category: "browser",
+    description: "Inspect, accept, or dismiss the active JavaScript dialog in a run-owned Browser tab.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.clipboard",
+    command: "rudder browser clipboard --input <json>",
+    category: "browser",
+    description: "Read or write the isolated virtual clipboard for the current Browser run without touching the OS clipboard.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.logs",
+    command: "rudder browser logs <tab-id> [--input <json>]",
+    category: "browser",
+    description: "Read bounded console and runtime logs captured for a run-owned Browser tab.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.download",
+    command: "rudder browser download <tab-id> --input <json>",
+    category: "browser",
+    description: "Download explicit locator media without dispatching page input into a bounded run-owned artifact.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.assets",
+    command: "rudder browser assets <tab-id> --input <json>",
+    category: "browser",
+    description: "List page assets or bundle an explicit bounded selection into a run-owned temporary artifact.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.content",
+    command: "rudder browser content <tab-id> --input <json>",
+    category: "browser",
+    description: "Export current page content or an eligible Google Workspace document into a bounded run-owned artifact.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
+  {
+    id: "browser.wait",
+    command: "rudder browser wait <tab-id> --input <json>",
+    category: "browser",
+    description: "Wait for bounded URL, text, disappearance, or time conditions in a run-owned Browser tab.",
+    mutating: false,
+    contract: "agent-v1",
+    requiresOrgId: true,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
   {
     id: "browser.read",
     command: "rudder browser read <tab-id>",
@@ -8956,7 +9616,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "browser.screenshot",
-    command: "rudder browser screenshot <tab-id>",
+    command: "rudder browser screenshot <tab-id> [--input <json>]",
     category: "browser",
     description: "Capture a screenshot of a run-owned Rudder Browser tab.",
     mutating: false,
@@ -9351,6 +10011,8 @@ var AGENT_CLI_CAPABILITIES = [
     attachesRunIdWhenAvailable: true
   }
 ];
+
+// src/agent-v1-registry.ts
 var CATEGORY_TITLES = {
   agent: "Agent",
   issue: "Issue",
@@ -9392,14 +10054,19 @@ function buildAgentCliCapabilitiesManifest(contract = "agent-v1") {
   };
 }
 function buildAgentV1McpToolsManifest(contract = "agent-v1", options = {}) {
-  const capabilities = buildAgentCliCapabilitiesManifest(contract).capabilities.filter((entry) => options.browserEnabled !== false || entry.category !== "browser");
+  const surface = options.surface ?? "core";
+  const capabilities = buildAgentCliCapabilitiesManifest(contract).capabilities.filter((entry) => {
+    if (surface === "all") return true;
+    if (surface === "browser") return entry.category === "browser";
+    return entry.category !== "browser";
+  });
   const semanticContractByCapability = new Map(
     RUDDER_MCP_CANONICAL_TOOL_DEFINITIONS.map((tool) => [tool.capabilityId, tool])
   );
   return {
     schema: "rudder.agent-mcp-tools/v1",
     contract,
-    serverName: "rudder-tools",
+    serverName: surface === "browser" ? "rudder-browser" : "rudder-tools",
     tools: capabilities.map((entry) => {
       const semanticContract = semanticContractByCapability.get(entry.id);
       if (!semanticContract) {
@@ -9457,12 +10124,14 @@ var RudderApiClient = class {
   apiKey;
   agentId;
   runId;
+  signal;
   recoverAuth;
   constructor(opts) {
     this.apiBase = opts.apiBase.replace(/\/+$/, "");
     this.apiKey = opts.apiKey?.trim() || void 0;
     this.agentId = opts.agentId?.trim() || void 0;
     this.runId = opts.runId?.trim() || void 0;
+    this.signal = opts.signal;
     this.recoverAuth = opts.recoverAuth;
   }
   get(path24, opts) {
@@ -9520,7 +10189,8 @@ var RudderApiClient = class {
     }
     const response = await fetch(url, {
       ...init,
-      headers
+      headers,
+      signal: init.signal ?? this.signal
     });
     if (opts?.ignoreNotFound && response.status === 404) {
       return null;
@@ -9602,7 +10272,9 @@ function toStringRecord(headers) {
 // src/agent-v1-mcp-server.ts
 init_version();
 var RUDDER_MCP_MAX_TOOL_RESULT_BYTES = 1e6;
+var RUDDER_BROWSER_MCP_MAX_TOOL_RESULT_BYTES = 16e6;
 var RUDDER_MCP_MAX_INLINE_TEXT_BYTES = 32e3;
+var RUDDER_BROWSER_LIVENESS_INTERVAL_MS = 1e3;
 var RESERVED_MODEL_ARGUMENTS = /* @__PURE__ */ new Set([
   "orgId",
   "org_id",
@@ -9650,6 +10322,7 @@ function buildAgentV1ToolCallPlan(toolName, rawArgs, env = buildMcpServerEnv())
   const capability = getAgentCliCapabilityById(capabilityId);
   rejectModelProvidedRuntimeIdentity(input);
   rejectUnsupportedToolArguments(toolName, input);
+  rejectUnsupportedBrowserLocatorAction(toolName, input);
   assertBrowserCapabilityEnabled(capabilityId, env);
   assertRuntimeMcpContext(capability, env);
   const tempFiles = [];
@@ -9671,7 +10344,7 @@ function buildAgentV1ToolCallPlan(toolName, rawArgs, env = buildMcpServerEnv())
     tempFiles
   };
 }
-async function runAgentV1McpJsonRpcMessage(message, env = buildMcpServerEnv()) {
+async function runAgentV1McpJsonRpcMessage(message, env = buildMcpServerEnv(), surface = "core", options = {}) {
   const isNotification = message.id === void 0;
   const id = message.id ?? null;
   try {
@@ -9679,13 +10352,10 @@ async function runAgentV1McpJsonRpcMessage(message, env = buildMcpServerEnv()) {
       case "notifications/initialized":
         return isNotification ? null : rpcResult(id, {});
       case "initialize":
-        const contractManifest = buildAgentV1McpToolsManifest("agent-v1").tools.map(rudderMcpSemanticToolContract);
-        const coreContractHash = fingerprintRudderMcpToolManifest(
-          contractManifest.filter((tool) => !tool.name.startsWith("rudder_browser_"))
-        );
-        const browserContractHash = fingerprintRudderMcpToolManifest(
-          contractManifest.filter((tool) => tool.name.startsWith("rudder_browser_"))
-        );
+        const coreContractManifest = buildAgentV1McpToolsManifest("agent-v1").tools.map(rudderMcpSemanticToolContract);
+        const browserContractManifest = buildAgentV1McpToolsManifest("agent-v1", { surface: "browser" }).tools.map(rudderMcpSemanticToolContract);
+        const coreContractHash = fingerprintRudderMcpToolManifest(coreContractManifest);
+        const browserContractHash = fingerprintRudderMcpToolManifest(browserContractManifest);
         return rpcResult(id, {
           protocolVersion: requestedProtocolVersion(message.params) ?? "2024-11-05",
           capabilities: {
@@ -9698,16 +10368,21 @@ async function runAgentV1McpJsonRpcMessage(message, env = buildMcpServerEnv()) {
               }
             }
           },
-          serverInfo: { name: RUDDER_MCP_SERVER_NAME, version: resolveCliVersion() }
+          serverInfo: {
+            name: surface === "browser" ? RUDDER_BROWSER_MCP_SERVER_NAME : RUDDER_MCP_SERVER_NAME,
+            version: resolveCliVersion()
+          }
         });
       case "tools/list":
         return rpcResult(id, {
-          tools: buildAgentV1McpToolsManifest("agent-v1", {
-            browserEnabled: browserCapabilityEnabled(env)
-          }).tools.map(toMcpToolListEntry)
+          tools: surface === "browser" && !browserCapabilityEnabled(env) ? [] : buildAgentV1McpToolsManifest("agent-v1", { surface }).tools.map(toMcpToolListEntry)
         });
       case "tools/call":
-        return boundedToolCallRpcResponse(id, await callToolSafely(message.params, env));
+        return boundedToolCallRpcResponse(
+          id,
+          await callToolSafely(message.params, env, surface, options.signal),
+          surface
+        );
       default:
         if (isNotification) return null;
         return rpcError(id, -32601, `Unsupported JSON-RPC method: ${String(message.method ?? "")}`);
@@ -9717,26 +10392,84 @@ async function runAgentV1McpJsonRpcMessage(message, env = buildMcpServerEnv()) {
     return rpcError(id, -32e3, errorMessage(err), errorDetails(err));
   }
 }
-async function runMcpStdioServer(env = buildMcpServerEnv()) {
+async function runMcpStdioServer(env = buildMcpServerEnv(), surface = "core", options = {}) {
+  const stdin = options.input ?? process.stdin;
+  const output = options.output ?? process.stdout;
+  let revoked = false;
+  let activeRequest = null;
+  const revoke = () => {
+    revoked = true;
+    activeRequest?.abort();
+    stdin.destroy();
+  };
+  const stopLivenessMonitor = surface === "browser" ? (options.startLivenessMonitor ?? startBrowserMcpLivenessMonitor)(env, revoke) : () => void 0;
   let buffer = "";
   let mode = null;
-  process.stdin.setEncoding("utf8");
-  for await (const chunk of process.stdin) {
-    buffer += chunk;
-    const parsed = parseMcpStdioMessages(buffer, mode);
-    mode = parsed.mode ?? mode;
-    buffer = parsed.remainder;
-    for (const message of parsed.messages) {
-      const response = await runAgentV1McpJsonRpcMessage(message, env);
-      if (!response) continue;
-      const payload = JSON.stringify(response);
-      process.stdout.write(parsed.mode === "framed" ? `Content-Length: ${Buffer.byteLength(payload, "utf8")}\r
+  stdin.setEncoding("utf8");
+  try {
+    for await (const chunk of stdin) {
+      if (revoked) break;
+      buffer += chunk;
+      const parsed = parseMcpStdioMessages(buffer, mode);
+      mode = parsed.mode ?? mode;
+      buffer = parsed.remainder;
+      for (const message of parsed.messages) {
+        if (revoked) break;
+        activeRequest = new AbortController();
+        const response = await runAgentV1McpJsonRpcMessage(
+          message,
+          env,
+          surface,
+          { signal: activeRequest.signal }
+        );
+        activeRequest = null;
+        if (revoked) break;
+        if (!response) continue;
+        const payload = JSON.stringify(response);
+        output.write(parsed.mode === "framed" ? `Content-Length: ${Buffer.byteLength(payload, "utf8")}\r
 \r
 ${payload}` : `${payload}
 `);
+      }
     }
+  } catch (error) {
+    if (!revoked) throw error;
+  } finally {
+    activeRequest?.abort();
+    stopLivenessMonitor();
   }
 }
+function startBrowserMcpLivenessMonitor(env, onRevoked, options = {}) {
+  const intervalMs = Math.max(100, options.intervalMs ?? RUDDER_BROWSER_LIVENESS_INTERVAL_MS);
+  const probe = options.probe ?? (async () => {
+    await mcpApiClient(env).post("/api/browser/liveness", {});
+  });
+  let stopped = false;
+  let timer = null;
+  const schedule = () => {
+    if (stopped) return;
+    timer = setTimeout(() => void tick(), intervalMs);
+    timer.unref?.();
+  };
+  const tick = async () => {
+    try {
+      await probe();
+    } catch (error) {
+      if (error instanceof ApiRequestError && ["browser_disabled", "browser_runtime_unsupported", "browser_run_inactive", "browser_run_forbidden"].includes(error.code ?? "")) {
+        stopped = true;
+        onRevoked(error.code ?? "browser_disabled");
+        return;
+      }
+    }
+    schedule();
+  };
+  schedule();
+  return () => {
+    stopped = true;
+    if (timer) clearTimeout(timer);
+    timer = null;
+  };
+}
 function parseMcpStdioMessages(buffer, mode = null) {
   const messages = [];
   const detectedMode = mode ?? detectMcpStdioMode(buffer);
@@ -9778,9 +10511,9 @@ function detectMcpStdioMode(buffer) {
   if (/^Content-Length:/iu.test(trimmed)) return "framed";
   return "newline";
 }
-async function callToolSafely(params, env) {
+async function callToolSafely(params, env, surface, signal) {
   try {
-    return await callTool(params, env);
+    return await callTool(params, env, surface, signal);
   } catch (err) {
     const details = errorDetails(err);
     const payload = {
@@ -9799,12 +10532,18 @@ async function callToolSafely(params, env) {
     };
   }
 }
-async function callTool(params, env) {
+async function callTool(params, env, surface, signal) {
   const record = isRecord2(params) ? params : {};
   const toolName = typeof record.name === "string" ? record.name : "";
+  const exposed = buildAgentV1McpToolsManifest("agent-v1", { surface }).tools.some((tool) => tool.name === toolName);
+  if (!exposed) {
+    const err = new Error(`Rudder MCP tool is not exposed by the ${surface} server: ${toolName || "(missing)"}`);
+    err.code = "rudder_mcp_tool_not_available";
+    throw err;
+  }
   const args = record.arguments;
   const plan = buildAgentV1ToolCallPlan(toolName, args, env);
-  const directResult = await callToolDirectlyIfSupported(toolName, args, env);
+  const directResult = await callToolDirectlyIfSupported(toolName, args, env, signal);
   if (directResult) return directResult;
   const tempDir = plan.tempFiles.length > 0 ? await fs.mkdtemp(path2.join(os.tmpdir(), "rudder-mcp-")) : null;
   const materializedArgs = [...plan.args];
@@ -9820,7 +10559,10 @@ async function callTool(params, env) {
     const result = await runRudderCli(materializedArgs, plan.env);
     if (result.exitCode === 0) {
       const text6 = result.stdout.trim() || "{}";
-      return mcpSuccessFromJsonText(text6);
+      return mcpSuccessFromJsonText(
+        text6,
+        surface === "browser" ? RUDDER_BROWSER_MCP_MAX_TOOL_RESULT_BYTES : RUDDER_MCP_MAX_TOOL_RESULT_BYTES
+      );
     }
     const payload = {
       status: "error",
@@ -9840,24 +10582,28 @@ async function callTool(params, env) {
     if (tempDir) await fs.rm(tempDir, { recursive: true, force: true });
   }
 }
-async function callToolDirectlyIfSupported(toolName, rawArgs, env) {
+async function callToolDirectlyIfSupported(toolName, rawArgs, env, signal) {
   const capabilityId = toolNameToCapabilityId(toolName);
   if (!capabilityId) return null;
   const input = isRecord2(rawArgs) ? rawArgs : {};
-  const api = mcpApiClient(env);
+  const api = mcpApiClient(env, signal);
+  const success = (data) => mcpSuccess(
+    data,
+    capabilityId.startsWith("browser.") ? RUDDER_BROWSER_MCP_MAX_TOOL_RESULT_BYTES : RUDDER_MCP_MAX_TOOL_RESULT_BYTES
+  );
   switch (capabilityId) {
     case "agent.me":
-      return mcpSuccess(await api.get("/api/agents/me"));
+      return success(await api.get("/api/agents/me"));
     case "agent.inbox":
-      return mcpSuccess(await api.get("/api/agents/me/inbox-lite"));
+      return success(await api.get("/api/agents/me/inbox-lite"));
     case "issue.get":
-      return mcpSuccess(await api.get(`/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}`));
+      return success(await api.get(`/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}`));
     case "issue.context": {
       const params = new URLSearchParams();
       const wakeCommentId = optionalString(input.wakeCommentId);
       if (wakeCommentId) params.set("wakeCommentId", wakeCommentId);
       const query = params.toString();
-      return mcpSuccess(await api.get(
+      return success(await api.get(
         `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/heartbeat-context${query ? `?${query}` : ""}`
       ));
     }
@@ -9867,7 +10613,7 @@ async function callToolDirectlyIfSupported(toolName, rawArgs, env) {
         agentId: optionalString(env.RUDDER_AGENT_ID),
         expectedStatuses
       });
-      return mcpSuccess(await api.post(
+      return success(await api.post(
         `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/checkout`,
         payload
       ));
@@ -9877,58 +10623,87 @@ async function callToolDirectlyIfSupported(toolName, rawArgs, env) {
         body: requiredAnyString(input, ["body", "comment"]),
         reopen: input.reopen === true ? true : void 0
       });
-      return mcpSuccess(await api.post(
+      return success(await api.post(
         `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/comments`,
         payload
       ));
     }
     case "issue.done": {
       const comment = requiredAnyString(input, ["comment", "body"]);
-      return mcpSuccess(await api.patch(
+      return success(await api.patch(
         `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}`,
         { status: "done", comment }
       ));
     }
     case "browser.tabs":
-      return mcpSuccess(await api.post("/api/browser/tabs", {}));
+      return success(await api.post("/api/browser/tabs", {}));
+    case "browser.user-tabs":
+      return success(await api.post("/api/browser/user_tabs", {}));
     case "browser.open":
-      return mcpSuccess(await api.post("/api/browser/open", {
+      return success(await api.post("/api/browser/open", {
         url: requiredString(input, "url")
       }));
     case "browser.navigate":
-      return mcpSuccess(await api.post("/api/browser/navigate", {
+      return success(await api.post("/api/browser/navigate", {
         tabId: requiredString(input, "tabId"),
         url: requiredString(input, "url")
       }));
+    case "browser.back":
+    case "browser.forward":
+    case "browser.reload":
+      return success(await api.post(`/api/browser/${capabilityId.slice("browser.".length)}`, {
+        tabId: requiredString(input, "tabId")
+      }));
+    case "browser.viewport":
+      return success(await api.post("/api/browser/viewport", {
+        action: requiredString(input, "action"),
+        ...input.width !== void 0 ? { width: input.width } : {},
+        ...input.height !== void 0 ? { height: input.height } : {}
+      }));
+    case "browser.visibility":
+      return success(await api.post("/api/browser/visibility", {
+        ...typeof input.visible === "boolean" ? { visible: input.visible } : {}
+      }));
+    case "browser.snapshot":
+    case "browser.locator":
+    case "browser.cua":
+    case "browser.dialog":
+    case "browser.clipboard":
+    case "browser.logs":
+    case "browser.download":
+    case "browser.assets":
+    case "browser.content":
+    case "browser.wait":
+      return success(await api.post(`/api/browser/${capabilityId.slice("browser.".length)}`, input));
+    case "browser.dom-cua":
+      return success(await api.post("/api/browser/dom_cua", input));
     case "browser.read":
-      return mcpSuccess(await api.post("/api/browser/read", {
+      return success(await api.post("/api/browser/read", {
         tabId: requiredString(input, "tabId")
       }));
     case "browser.click":
-      return mcpSuccess(await api.post("/api/browser/click", {
+      return success(await api.post("/api/browser/click", {
         tabId: requiredString(input, "tabId"),
         ref: requiredString(input, "ref")
       }));
     case "browser.type":
-      return mcpSuccess(await api.post("/api/browser/type", {
+      return success(await api.post("/api/browser/type", {
         tabId: requiredString(input, "tabId"),
         ref: requiredString(input, "ref"),
         text: requiredString(input, "text"),
         ...input.submit === true ? { submit: true } : {}
       }));
     case "browser.screenshot":
-      return mcpSuccess(await api.post("/api/browser/screenshot", {
-        tabId: requiredString(input, "tabId")
-      }));
+      return success(await api.post("/api/browser/screenshot", input));
     case "browser.close":
-      return mcpSuccess(await api.post("/api/browser/close", {
+      return success(await api.post("/api/browser/close", {
         tabId: requiredString(input, "tabId")
       }));
     default:
       return null;
   }
 }
-function mcpApiClient(env) {
+function mcpApiClient(env, signal) {
   const apiBase = optionalString(env.RUDDER_API_URL);
   if (!apiBase) {
     const err = new Error("Rudder MCP runtime context is incomplete. Missing RUDDER_API_URL.");
@@ -9939,13 +10714,22 @@ function mcpApiClient(env) {
     apiBase,
     apiKey: optionalString(env.RUDDER_API_KEY) ?? void 0,
     agentId: optionalString(env.RUDDER_AGENT_ID) ?? void 0,
-    runId: optionalString(env.RUDDER_RUN_ID) ?? void 0
+    runId: optionalString(env.RUDDER_RUN_ID) ?? void 0,
+    signal
   });
 }
-function mcpSuccess(data) {
-  return mcpSuccessFromJsonText(JSON.stringify(data ?? {}));
+function mcpSuccess(data, maxResultBytes = RUDDER_MCP_MAX_TOOL_RESULT_BYTES) {
+  if (isRecord2(data) && (data.mimeType === "image/png" || data.mimeType === "image/jpeg") && typeof data.base64 === "string" && data.base64.length > 0) {
+    const { base64, ...metadata } = data;
+    return {
+      content: [{ type: "image", data: base64, mimeType: data.mimeType }],
+      structuredContent: metadata,
+      isError: false
+    };
+  }
+  return mcpSuccessFromJsonText(JSON.stringify(data ?? {}), maxResultBytes);
 }
-function mcpSuccessFromJsonText(text6) {
+function mcpSuccessFromJsonText(text6, maxResultBytes = RUDDER_MCP_MAX_TOOL_RESULT_BYTES) {
   const structured = structuredContentFromJsonText(text6);
   const textBytes = Buffer.byteLength(text6, "utf8");
   const inlineText = textBytes <= RUDDER_MCP_MAX_INLINE_TEXT_BYTES ? text6 : JSON.stringify({
@@ -9960,22 +10744,23 @@ function mcpSuccessFromJsonText(text6) {
     isError: false
   };
   const resultBytes = Buffer.byteLength(JSON.stringify(result), "utf8");
-  if (resultBytes <= RUDDER_MCP_MAX_TOOL_RESULT_BYTES) return result;
-  return mcpResponseTooLarge(resultBytes);
+  if (resultBytes <= maxResultBytes) return result;
+  return mcpResponseTooLarge(resultBytes, maxResultBytes);
 }
-function boundedToolCallRpcResponse(id, result) {
+function boundedToolCallRpcResponse(id, result, surface) {
   const response = rpcResult(id, result);
   const responseBytes = Buffer.byteLength(JSON.stringify(response), "utf8");
-  if (responseBytes <= RUDDER_MCP_MAX_TOOL_RESULT_BYTES) return response;
-  return rpcResult(id, mcpResponseTooLarge(responseBytes));
+  const maxBytes = surface === "browser" ? RUDDER_BROWSER_MCP_MAX_TOOL_RESULT_BYTES : RUDDER_MCP_MAX_TOOL_RESULT_BYTES;
+  if (responseBytes <= maxBytes) return response;
+  return rpcResult(id, mcpResponseTooLarge(responseBytes, maxBytes));
 }
-function mcpResponseTooLarge(responseBytes) {
+function mcpResponseTooLarge(responseBytes, maxBytes = RUDDER_MCP_MAX_TOOL_RESULT_BYTES) {
   const payload = {
     status: "error",
     code: "rudder_mcp_response_too_large",
     message: "Rudder MCP response exceeded the bounded tool-result budget. Use pagination or a ranged log read.",
     details: {
-      maxBytes: RUDDER_MCP_MAX_TOOL_RESULT_BYTES,
+      maxBytes,
       responseBytes
     }
   };
@@ -10200,10 +10985,46 @@ function cliArgsForCapability(capabilityId, input, tempFiles, env) {
     }
     case "browser.tabs":
       return ["browser", "tabs"];
+    case "browser.user-tabs":
+      return ["browser", "user-tabs"];
     case "browser.open":
       return ["browser", "open", requiredString(input, "url")];
     case "browser.navigate":
       return ["browser", "navigate", requiredString(input, "tabId"), requiredString(input, "url")];
+    case "browser.back":
+      return ["browser", "back", requiredString(input, "tabId")];
+    case "browser.forward":
+      return ["browser", "forward", requiredString(input, "tabId")];
+    case "browser.reload":
+      return ["browser", "reload", requiredString(input, "tabId")];
+    case "browser.viewport": {
+      const args = ["browser", "viewport", "--action", requiredString(input, "action")];
+      pushOptional(args, "--width", input.width);
+      pushOptional(args, "--height", input.height);
+      return args;
+    }
+    case "browser.visibility": {
+      const args = ["browser", "visibility"];
+      if (typeof input.visible === "boolean") args.push("--visible", String(input.visible));
+      return args;
+    }
+    case "browser.snapshot":
+    case "browser.locator":
+    case "browser.cua":
+    case "browser.dom-cua":
+    case "browser.dialog":
+    case "browser.logs":
+    case "browser.download":
+    case "browser.assets":
+    case "browser.content":
+    case "browser.wait": {
+      const tabId = requiredString(input, "tabId");
+      const payload = { ...input };
+      delete payload.tabId;
+      return ["browser", capabilityId.slice("browser.".length), tabId, "--input", JSON.stringify(payload)];
+    }
+    case "browser.clipboard":
+      return ["browser", "clipboard", "--input", JSON.stringify(input)];
     case "browser.read":
       return ["browser", "read", requiredString(input, "tabId")];
     case "browser.click":
@@ -10213,8 +11034,12 @@ function cliArgsForCapability(capabilityId, input, tempFiles, env) {
       pushBoolean(args, "--submit", input.submit);
       return args;
     }
-    case "browser.screenshot":
-      return ["browser", "screenshot", requiredString(input, "tabId")];
+    case "browser.screenshot": {
+      const tabId = requiredString(input, "tabId");
+      const payload = { ...input };
+      delete payload.tabId;
+      return Object.keys(payload).length > 0 ? ["browser", "screenshot", tabId, "--input", JSON.stringify(payload)] : ["browser", "screenshot", tabId];
+    }
     case "browser.close":
       return ["browser", "close", requiredString(input, "tabId")];
     case "automation.list": {
@@ -10446,7 +11271,7 @@ function requestedProtocolVersion(params) {
   return typeof params.protocolVersion === "string" && params.protocolVersion.trim().length > 0 ? params.protocolVersion.trim() : null;
 }
 function toolNameToCapabilityId(toolName) {
-  const manifest = buildAgentV1McpToolsManifest("agent-v1");
+  const manifest = buildAgentV1McpToolsManifest("agent-v1", { surface: "all" });
   return manifest.tools.find((tool) => tool.name === toolName)?.id ?? null;
 }
 function requiredString(input, key) {
@@ -10524,7 +11349,7 @@ function rejectModelProvidedRuntimeIdentity(input) {
   throw err;
 }
 function rejectUnsupportedToolArguments(toolName, input) {
-  const tool = buildAgentV1McpToolsManifest("agent-v1").tools.find((entry) => entry.name === toolName);
+  const tool = buildAgentV1McpToolsManifest("agent-v1", { surface: "all" }).tools.find((entry) => entry.name === toolName);
   if (!tool) return;
   const supported = new Set(Object.keys(tool.inputSchema.properties));
   const unsupported = Object.keys(input).filter((key) => !supported.has(key)).sort();
@@ -10533,6 +11358,26 @@ function rejectUnsupportedToolArguments(toolName, input) {
   err.code = "rudder_mcp_invalid_arguments";
   throw err;
 }
+var READ_ONLY_BROWSER_LOCATOR_ACTIONS = /* @__PURE__ */ new Set([
+  "count",
+  "allTextContents",
+  "textContent",
+  "innerText",
+  "attribute",
+  "visible",
+  "enabled",
+  "checked",
+  "selected",
+  "wait"
+]);
+function rejectUnsupportedBrowserLocatorAction(toolName, input) {
+  const locatorActionUnsupported = toolName === "rudder_browser_locator" && !READ_ONLY_BROWSER_LOCATOR_ACTIONS.has(String(input.action));
+  const downloadModeUnsupported = toolName === "rudder_browser_download" && input.mode !== "media";
+  if (!locatorActionUnsupported && !downloadModeUnsupported) return;
+  const err = new Error(locatorActionUnsupported ? "rudder_browser_locator is read-only; use rudder_browser_click, rudder_browser_type, or rudder_browser_cua to interact." : "rudder_browser_download supports read-only media downloads only; use an explicit interaction tool before reading download evidence.");
+  err.code = "rudder_mcp_invalid_arguments";
+  throw err;
+}
 function normalizeRuntimeIdentityKey(key) {
   return key.replace(/[^a-z0-9]/giu, "").toLowerCase();
 }
@@ -12857,6 +13702,16 @@ function formatAutomationRun(row) {
 }
 
 // src/commands/client/browser.ts
+function parseBrowserInput(input) {
+  if (!input) return {};
+  try {
+    const parsed = JSON.parse(input);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("not an object");
+    return parsed;
+  } catch {
+    throw new TypeError("--input must be a JSON object");
+  }
+}
 async function runBrowserAction(action, payload, options) {
   try {
     const context = resolveCommandContext(options, { requireCompany: true });
@@ -12872,6 +13727,10 @@ function registerBrowserCommands(program) {
     browser.command("tabs").description(getAgentCliCapabilityById("browser.tabs").description),
     { includeCompany: true }
   ).action((options) => runBrowserAction("tabs", {}, options));
+  addCommonClientOptions(
+    browser.command("user-tabs").description(getAgentCliCapabilityById("browser.user-tabs").description),
+    { includeCompany: true }
+  ).action((options) => runBrowserAction("user_tabs", {}, options));
   addCommonClientOptions(
     browser.command("open").description(getAgentCliCapabilityById("browser.open").description).argument("<url>", "HTTP or HTTPS URL"),
     { includeCompany: true }
@@ -12880,6 +13739,60 @@ function registerBrowserCommands(program) {
     browser.command("navigate").description(getAgentCliCapabilityById("browser.navigate").description).argument("<tab-id>", "Run-owned Browser tab id").argument("<url>", "HTTP or HTTPS URL"),
     { includeCompany: true }
   ).action((tabId, url, options) => runBrowserAction("navigate", { tabId, url }, options));
+  for (const action of ["back", "forward", "reload"]) {
+    addCommonClientOptions(
+      browser.command(action).description(getAgentCliCapabilityById(`browser.${action}`).description).argument("<tab-id>", "Run-owned Browser tab id"),
+      { includeCompany: true }
+    ).action((tabId, options) => runBrowserAction(action, { tabId }, options));
+  }
+  addCommonClientOptions(
+    browser.command("viewport").description(getAgentCliCapabilityById("browser.viewport").description).requiredOption("--action <action>", "get, set, or reset").option("--width <pixels>", "Viewport width", Number).option("--height <pixels>", "Viewport height", Number),
+    { includeCompany: true }
+  ).action((options) => runBrowserAction("viewport", {
+    action: options.action,
+    ...options.width !== void 0 ? { width: options.width } : {},
+    ...options.height !== void 0 ? { height: options.height } : {}
+  }, options));
+  addCommonClientOptions(
+    browser.command("visibility").description(getAgentCliCapabilityById("browser.visibility").description).option("--visible <boolean>", "Show or hide the selected Agent Browser tab"),
+    { includeCompany: true }
+  ).action((options) => {
+    const visible = options.visible === void 0 ? void 0 : options.visible === "true" ? true : options.visible === "false" ? false : (() => {
+      throw new TypeError("--visible must be true or false");
+    })();
+    return runBrowserAction("visibility", {
+      ...visible !== void 0 ? { visible } : {}
+    }, options);
+  });
+  for (const action of [
+    "snapshot",
+    "locator",
+    "cua",
+    "dom-cua",
+    "dialog",
+    "logs",
+    "download",
+    "assets",
+    "content",
+    "wait"
+  ]) {
+    addCommonClientOptions(
+      browser.command(action).description(getAgentCliCapabilityById(`browser.${action}`).description).argument("<tab-id>", "Run-owned Browser tab id").option("--input <json>", "JSON object with bounded Browser action arguments"),
+      { includeCompany: true }
+    ).action((tabId, options) => runBrowserAction(
+      action === "dom-cua" ? "dom_cua" : action,
+      { tabId, ...parseBrowserInput(options.input) },
+      options
+    ));
+  }
+  addCommonClientOptions(
+    browser.command("clipboard").description(getAgentCliCapabilityById("browser.clipboard").description).requiredOption("--input <json>", "JSON object with virtual clipboard action arguments"),
+    { includeCompany: true }
+  ).action((options) => runBrowserAction(
+    "clipboard",
+    parseBrowserInput(options.input),
+    options
+  ));
   addCommonClientOptions(
     browser.command("read").description(getAgentCliCapabilityById("browser.read").description).argument("<tab-id>", "Run-owned Browser tab id"),
     { includeCompany: true }
@@ -12898,9 +13811,9 @@ function registerBrowserCommands(program) {
     ...options.submit ? { submit: true } : {}
   }, options));
   addCommonClientOptions(
-    browser.command("screenshot").description(getAgentCliCapabilityById("browser.screenshot").description).argument("<tab-id>", "Run-owned Browser tab id"),
+    browser.command("screenshot").description(getAgentCliCapabilityById("browser.screenshot").description).argument("<tab-id>", "Run-owned Browser tab id").option("--input <json>", "JSON object with full-page, clip, locator, or format options"),
     { includeCompany: true }
-  ).action((tabId, options) => runBrowserAction("screenshot", { tabId }, options));
+  ).action((tabId, options) => runBrowserAction("screenshot", { tabId, ...parseBrowserInput(options.input) }, options));
   addCommonClientOptions(
     browser.command("close").description(getAgentCliCapabilityById("browser.close").description).argument("<tab-id>", "Run-owned Browser tab id"),
     { includeCompany: true }
@@ -18696,8 +19609,11 @@ function createProgram() {
     await doctor(opts);
   });
   program.command("env").description("Print environment variables for deployment").option("-c, --config <path>", "Path to config file").option("-d, --data-dir <path>", DATA_DIR_OPTION_HELP).action(envCommand);
-  program.command("mcp-server").description("Run the first-party Rudder Agent V1 MCP server over stdio").action(async () => {
-    await runMcpStdioServer();
+  program.command("mcp-server").description("Run the first-party Rudder Agent V1 MCP server over stdio").option("--server <surface>", "MCP surface to expose (core or browser)", "core").action(async (opts) => {
+    if (opts.server !== "core" && opts.server !== "browser") {
+      throw new Error(`Unsupported Rudder MCP server surface: ${opts.server}`);
+    }
+    await runMcpStdioServer(void 0, opts.server);
   });
   program.command("configure").description("Update configuration sections").option("-c, --config <path>", "Path to config file").option("-d, --data-dir <path>", DATA_DIR_OPTION_HELP).option("-s, --section <section>", "Section to configure (llm, database, logging, server, storage, secrets)").action(configure);
   program.command("db:backup").description("Create a one-off database backup using current config").option("-c, --config <path>", "Path to config file").option("-d, --data-dir <path>", DATA_DIR_OPTION_HELP).option("--dir <path>", "Backup output directory (overrides config)").option("--retention-days <days>", "Retention window used for pruning", (value) => Number(value)).option("--filename-prefix <prefix>", "Backup filename prefix", "rudder").option("--json", "Print backup metadata as JSON").action(async (opts) => {