Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(browser): activate managed live browsers for Jarvis agents

rubenluetke10-beep6e2f7caf6bca
diff --git a/jarvis/agent_chat/tool_catalog.py b/jarvis/agent_chat/tool_catalog.py
index 4914dd840e..db76e7efd0 100644
--- a/jarvis/agent_chat/tool_catalog.py
+++ b/jarvis/agent_chat/tool_catalog.py
@@ -175,7 +175,7 @@ def live_catalog(brain: Any, *, cwd: str = "", stance: str = "ask") -> list[Tool
tools = dict(getattr(brain, "_tools", {}) or {})
tools.update(folder_tools(Path(cwd or Path.home()), stance=stance))
- tools.update(lead_browser_tools())
+ tools.update(lead_browser_tools(read_only=stance == "plan"))
if stance == "plan":
tools = plan_filter(tools)
plugins = load_catalog().plugins
diff --git a/jarvis/brain/tool_gateway.py b/jarvis/brain/tool_gateway.py
index 4a3474ac73..0ae7913612 100644
--- a/jarvis/brain/tool_gateway.py
+++ b/jarvis/brain/tool_gateway.py
@@ -166,7 +166,7 @@ class BrainSupervisorToolGateway:
description=tool.description,
input_schema=copy.deepcopy(tool.schema),
risk_tier=cast(RiskTier, tool.risk_tier),
- is_action_tool=True,
+ is_action_tool=bool(getattr(tool, "is_action_tool", True)),
risk_tier_for_args=getattr(tool, "risk_tier_for_args", None),
)
)
diff --git a/jarvis/mcp/jarvis_tools_server.py b/jarvis/mcp/jarvis_tools_server.py
index 6f3eb279a4..b20f25d529 100644
--- a/jarvis/mcp/jarvis_tools_server.py
+++ b/jarvis/mcp/jarvis_tools_server.py
@@ -172,6 +172,9 @@ def build_server() -> Any:
name=str(entry.name),
description=str(entry.description or entry.name),
inputSchema=schema,
+ annotations=types.ToolAnnotations(
+ readOnlyHint=entry.risk_tier == "safe" and not entry.is_action_tool,
+ ),
)
)
return tools
diff --git a/jarvis/society/browser/bridge.py b/jarvis/society/browser/bridge.py
index 60e6fd2e66..33c4281b01 100644
--- a/jarvis/society/browser/bridge.py
+++ b/jarvis/society/browser/bridge.py
@@ -46,8 +46,11 @@ class ApprovedBrowserAction:
schema = {"type": "object", "properties": {"action": {"type": "object"}}}
is_action_tool = True
- def __init__(self, apply: Any) -> None:
+ def __init__(self, apply: Any, *, read_only: bool = False) -> None:
self._apply = apply
+ if read_only:
+ self.risk_tier = "safe"
+ self.is_action_tool = False
async def execute(self, args: dict, ctx: Any) -> ToolResult:
result = await self._apply()
@@ -78,7 +81,9 @@ async def wait_for_browser_approval(runtime: Any, approval_id: str, session: Any
await runtime.approvals.resolve(approval_id, approve=False, note="Browser task ended")
-async def execute_live(runtime: Any, caller: Any, jobs: Any, args: dict, ctx: Any) -> ToolResult:
+async def execute_live(
+ runtime: Any, caller: Any, jobs: Any, args: dict, ctx: Any, *, read_only: bool = False
+) -> ToolResult:
from jarvis.core.config import get_jarvis_agent_secret, override_provider_secrets
from ..approvals import Verdict, decide
@@ -212,7 +217,13 @@ async def execute_live(runtime: Any, caller: Any, jobs: Any, args: dict, ctx: An
"done",
"wait",
}
- tier = "monitor" if name in read_actions else "ask"
+ if read_only and name not in read_actions:
+ denied = True
+ return {
+ "ok": False,
+ "error": "This browser task is read-only; writing actions are blocked.",
+ }
+ tier = ("safe" if read_only else "monitor") if name in read_actions else "ask"
verdict = decide(current, "core:browser", tier, verb=name)
if verdict is Verdict.BLOCK:
denied = True
@@ -234,7 +245,7 @@ async def execute_live(runtime: Any, caller: Any, jobs: Any, args: dict, ctx: An
live.stop_turn(caller.agent_id, turn_trace)
return {"ok": False, "error": stopped_message}
result = await executor.execute(
- ApprovedBrowserAction(payload["apply"]),
+ ApprovedBrowserAction(payload["apply"], read_only=read_only),
{"action": proposal},
user_utterance=getattr(ctx, "user_utterance", ""),
trace_id=trace if isinstance(trace, UUID) else uuid4(),
@@ -243,6 +254,11 @@ async def execute_live(runtime: Any, caller: Any, jobs: Any, args: dict, ctx: An
return {"ok": result.success, "error": result.error}
task = str(args.get("task") or "").strip()
+ if read_only:
+ task = (
+ "READ-ONLY: use navigation, reading and extraction only; no clicks, inputs, uploads or writes. "
+ + task
+ )
workspace = (Path(runtime.data_dir) / "society" / caller.agent_id / "workspace").resolve()
files = []
for raw in args.get("files") or []:
diff --git a/jarvis/society/browser/tool.py b/jarvis/society/browser/tool.py
index 3c668f30b8..e737bd6110 100644
--- a/jarvis/society/browser/tool.py
+++ b/jarvis/society/browser/tool.py
@@ -32,7 +32,7 @@ BROWSER_TOOL_NAME: Final[str] = "society_browser"
CAPABILITY_ID: Final[str] = "core:browser"
-def lead_browser_tools(session: Any = None) -> dict[str, Any]:
+def lead_browser_tools(session: Any = None, *, read_only: bool = False) -> dict[str, Any]:
"""The Jarvis root chat drives the same browser shown on the lead's card."""
from ..runtime import current_runtime
@@ -41,7 +41,13 @@ def lead_browser_tools(session: Any = None) -> dict[str, Any]:
return {}
pick = (session.provider, session.model) if session is not None else None
return {
- BROWSER_TOOL_NAME: BrowserTool(runtime, runtime.lead_id, runtime.browser, model_pick=pick)
+ BROWSER_TOOL_NAME: BrowserTool(
+ runtime,
+ runtime.lead_id,
+ runtime.browser,
+ model_pick=pick,
+ read_only=read_only or getattr(session, "permission_mode", "") in ("plan", "read-only"),
+ )
}
@@ -104,11 +110,17 @@ class BrowserTool:
jobs: BrowserJobs,
*,
model_pick: tuple[str, str] | None = None,
+ read_only: bool = False,
) -> None:
self._runtime = runtime
self._agent_id = agent_id
self._jobs = jobs
self._model_pick = model_pick
+ self._read_only = read_only
+ if read_only:
+ self.risk_tier = "safe"
+ self.is_action_tool = False
+ self.description = "Read-only agent browser: navigate, inspect and extract website content. Form input, clicks, uploads and file writes are blocked in this mode."
def risk_tier_for_args(self, args: dict[str, Any]) -> str | None:
if self._jobs._python is None:
@@ -138,7 +150,7 @@ class BrowserTool:
if self._jobs._python is None:
from .bridge import execute_live
- return await execute_live(rt, caller, self._jobs, args, ctx)
+ return await execute_live(rt, caller, self._jobs, args, ctx, read_only=self._read_only)
if not self._jobs.is_installed():
return _failure(
FailureReason.BLOCKED_BY_POLICY,
diff --git a/jarvis/society/surface.py b/jarvis/society/surface.py
index 783f83c380..3cc1633b97 100644
--- a/jarvis/society/surface.py
+++ b/jarvis/society/surface.py
@@ -215,16 +215,20 @@ async def _scoped_tool_for_session(session_id: str, capability: str) -> Tool | N
agent = await rt.roster.get(agent_id)
if agent is None or str(agent.state) != "active":
return None
+ read_only = str(agent.permission_ceiling) == "safe"
service = rt.chat_service()
if service is not None:
session = service.store.get_session(session_id)
- if session is None or session.permission_mode in ("plan", "read-only"):
+ if session is None:
+ return None
+ read_only = session.permission_mode in ("plan", "read-only")
+ if read_only and capability != "core:browser":
return None
tool: Tool
if capability == "core:browser":
from .browser.tool import BrowserTool
- tool = cast(Tool, BrowserTool(rt, agent_id, rt.browser))
+ tool = cast(Tool, BrowserTool(rt, agent_id, rt.browser, read_only=read_only))
else:
tool = cast(Tool, CodingSessionTool(rt, agent_id, session_id=session_id))
picked = select_tools(
@@ -275,7 +279,15 @@ def society_tools(cfg: Any, brain: Any, session: Any) -> dict[str, Tool]:
if rt.browser.is_installed() or rt.browser.live.model_resolver is not None:
from .browser.tool import BrowserTool
- tools[BrowserTool.name] = cast(Tool, BrowserTool(rt, agent_id, rt.browser))
+ tools[BrowserTool.name] = cast(
+ Tool,
+ BrowserTool(
+ rt,
+ agent_id,
+ rt.browser,
+ read_only=getattr(session, "permission_mode", "") in ("plan", "read-only"),
+ ),
+ )
return tools
diff --git a/tests/contract/test_browser_contract.py b/tests/contract/test_browser_contract.py
index 613cd41fac..a32eebfee9 100644
--- a/tests/contract/test_browser_contract.py
+++ b/tests/contract/test_browser_contract.py
@@ -81,7 +81,7 @@ async def test_jarvis_chat_uses_the_lead_browser_with_its_selected_model(tmp_pat
await runtime.ensure_started()
seen = []
- async def execute(rt, caller, jobs, args, ctx):
+ async def execute(rt, caller, jobs, args, ctx, *, read_only=False):
seen.append((caller.agent_id, caller.provider, caller.model))
return ToolResult(True, {"ok": True}, None)
diff --git a/tests/contract/test_browser_desktop_mcp.py b/tests/contract/test_browser_desktop_mcp.py
index d710779db5..72b9e0b541 100644
--- a/tests/contract/test_browser_desktop_mcp.py
+++ b/tests/contract/test_browser_desktop_mcp.py
@@ -74,3 +74,67 @@ async def test_browser_is_scoped_and_runs_through_the_executor():
unscoped = SupervisorToolRequest(trace_id=uuid4(), origin="worker", user_utterance="Read")
assert not (await gateway.execute("society_browser", {}, unscoped)).success
assert len(seen) == 1
+
+
+async def test_plan_session_gets_readonly_browser_but_not_coding_control(tmp_path):
+ from jarvis.society.runtime import SocietyRuntime
+ from jarvis.society.surface import browser_tool_for_session, coding_tool_for_session
+
+ rt = SocietyRuntime(tmp_path, seed_starter_team=False)
+ await rt.ensure_started()
+ try:
+ await rt.roster.create(name="Nala", permission_ceiling="safe")
+ rt.chat_service = lambda: SimpleNamespace(
+ store=SimpleNamespace(get_session=lambda _: SimpleNamespace(permission_mode="plan"))
+ )
+ browser = await browser_tool_for_session("society:nala")
+ assert browser is not None and browser.risk_tier == "safe"
+ assert browser.is_action_tool is False
+ assert await coding_tool_for_session("society:nala") is None
+ await rt.roster.update("nala", {"denies": ["core:browser"]})
+ assert await browser_tool_for_session("society:nala") is None
+ finally:
+ await rt.close()
+
+
[email protected]("action_name", ["navigate", "input", "click", "upload_file"])
+async def test_readonly_browser_enforces_action_boundary(tmp_path, monkeypatch, action_name):
+ from jarvis.society.runtime import SocietyRuntime
+ from jarvis.society.browser.bridge import execute_live
+
+ monkeypatch.setattr("jarvis.core.config.get_jarvis_agent_secret", lambda _: None)
+ rt = SocietyRuntime(tmp_path, seed_starter_team=False)
+ await rt.ensure_started()
+ applied = []
+
+ async def apply():
+ applied.append(action_name)
+ return {}
+
+ async def execute(tool, args, **kwargs):
+ assert tool.risk_tier == "safe"
+ return await tool.execute(args, None)
+
+ async def run(agent, *, action, **kwargs):
+ verdict = await action({"action": {action_name: {}}, "apply": apply})
+ return {"ok": verdict["ok"], "error": verdict.get("error"), "artifacts": []}
+
+ rt.browser.live.model_resolver = lambda _: SimpleNamespace(complete=lambda *_: None)
+ rt.browser.live.executor = SimpleNamespace(execute=execute)
+ rt.browser.live.run = run
+ try:
+ agent, _ = await rt.roster.create(
+ name="Reader", provider="openai", permission_ceiling="safe"
+ )
+ result = await execute_live(
+ rt,
+ agent,
+ rt.browser,
+ {"task": "Read"},
+ SimpleNamespace(trace_id="one", config={}),
+ read_only=True,
+ )
+ assert result.success == (action_name == "navigate")
+ assert applied == (["navigate"] if action_name == "navigate" else [])
+ finally:
+ await rt.close()