Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions packages/cm-browser/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,43 @@ import { browserDelegation } from "./delegation"

const port = ipcPort()

// OpenCode defaults for every bundled browser tool. Lifecycle tools use standing task authority and
// page tools rely on main's tab grant, so only opening a history result keeps an OpenCode prompt.
// These live here, not in the desktop's injected config, which merges after the user's global
// config and would replace their rules.
const PERMISSION_DEFAULTS = {
browser_create_tab: "allow",
browser_select_tab: "allow",
browser_close_tab: "allow",
desktop_set_panel: "allow",
browser_read_state: "allow",
browser_search_history: "allow",
browser_open_history: "ask",
browser_navigate: "allow",
browser_click: "allow",
browser_hover: "allow",
browser_drag: "allow",
browser_select_option: "allow",
browser_screenshot: "allow",
browser_visual_action: "allow",
browser_observe_console: "allow",
browser_observe_network: "allow",
browser_list_site_tools: "allow",
browser_execute_site_tool: "allow",
browser_fill: "allow",
browser_press_key: "allow",
browser_scroll: "allow",
browser_wait_for_element: "allow",
browser_wait_for_navigation: "allow",
}

export const server: Plugin = async () => ({
async config(config) {
// Defaults precede user rules, including wildcard rules and explicit deny/ask.
// Defaults precede user rules, including wildcard rules and explicit deny/ask. OpenCode applies
// the last matching rule, so any rule the user sets wins.
if (typeof config.permission === "string") return
const defaults = Object.fromEntries(
["browser_create_tab", "browser_select_tab", "browser_close_tab", "desktop_set_panel"]
.filter((key) => !Object.hasOwn(config.permission ?? {}, key))
.map((key) => [key, "allow"]),
Object.entries(PERMISSION_DEFAULTS).filter(([key]) => !Object.hasOwn(config.permission ?? {}, key)),
)
config.permission = { ...defaults, ...config.permission }
},
Expand Down
40 changes: 24 additions & 16 deletions packages/cm-browser/test/plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,34 @@ import { expect, test } from "bun:test"
import type { Plugin } from "@opencode-ai/plugin"
import { server } from "../src/plugin"

test("lifecycle defaults precede user wildcard and exact rules without overriding policy", async () => {
test("browser defaults precede user wildcard and exact rules without overriding policy", async () => {
const hooks = await server({} as Parameters<Plugin>[0])
const user = { "*": "ask", browser_create_tab: "deny", browser_select_tab: "ask" }
const user = {
"*": "ask",
browser_create_tab: "deny",
browser_select_tab: "ask",
browser_fill: "ask",
browser_execute_site_tool: "deny",
}
const config = { permission: user } as Parameters<NonNullable<typeof hooks.config>>[0]
await hooks.config!(config)
expect<unknown>(config.permission).toEqual({ browser_close_tab: "allow", desktop_set_panel: "allow", ...user })
expect(Object.keys(config.permission!)).toEqual([
"browser_close_tab",
"desktop_set_panel",
"*",
"browser_create_tab",
"browser_select_tab",
])
const fresh = {}
await hooks.config!(fresh)
expect(fresh).toEqual({
permission: {
browser_create_tab: "allow", browser_select_tab: "allow", browser_close_tab: "allow", desktop_set_panel: "allow",
},
// OpenCode applies the last matching rule, so every default must precede the user's rules.
expect(Object.keys(config.permission!).slice(-5)).toEqual(Object.keys(user))
expect(Object.keys(config.permission!)).toHaveLength(Object.keys(hooks.tool!).length + 1)
expect<unknown>(config.permission).toMatchObject({
browser_close_tab: "allow",
desktop_set_panel: "allow",
browser_read_state: "allow",
browser_open_history: "ask",
...user,
})
const fresh = {} as Parameters<NonNullable<typeof hooks.config>>[0]
await hooks.config!(fresh)
// Every bundled browser tool has a default. Only opening a history result keeps an OpenCode prompt.
expect(Object.keys(fresh.permission!).sort()).toEqual(Object.keys(hooks.tool!).sort())
expect(Object.entries(fresh.permission!).filter(([, action]) => action !== "allow")).toEqual([
["browser_open_history", "ask"],
])
for (const permission of ["ask", "deny", "allow"] as const) {
const policy = { permission }
// The legacy SDK type omits string and arbitrary-tool policies supported at runtime.
Expand Down
30 changes: 29 additions & 1 deletion packages/desktop/src/main/browser/delegation.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect, test } from "bun:test"
import { EventEmitter } from "node:events"
import { randomUUID } from "node:crypto"
import type { BrowserIpcResult, Request, WriteRequest } from "@cookiemonster/cm-browser/protocol"
import { success, type BrowserIpcResult, type Request, type WriteRequest } from "@cookiemonster/cm-browser/protocol"
import { attachBrowserBridge } from "./bridge"
import { resolveBrowserOwnerScope, setBrowserOwnerScopeResolver } from "./session-resolver"
import { createBrowserDelegations } from "./delegation"
Expand All @@ -14,6 +14,7 @@ import {
invalidateBrowserDocument,
setBrowserTabHandler,
setBrowserHistoryHandler,
setBrowserPanelHandler,
type BrowserRegistration,
} from "./registry"
import type { BrowserSession, BrowserSessionResolver } from "./session-resolver"
Expand Down Expand Up @@ -407,6 +408,33 @@ test("bounded tombstone table preserves live leases and rejects all future admis
}
})

test("ordinary task authority can set the panel and delegated authority cannot", async () => {
const f = fixture()
const calls: string[] = []
setBrowserPanelHandler(async (sessionID, request) => {
calls.push(`${sessionID}:${request.view}`)
return success({
tabID: "",
url: "",
title: "",
visibleText: "",
elements: [],
panelResult: { view: "review", browserReady: false },
})
})
try {
// The bridge passes task authority on every request, so an ordinary session must still reach the handler.
expect(await f.route({ op: "set_panel", view: "review" }, "parent")).toMatchObject({ ok: true })
expect(calls).toEqual(["parent:review"])
expect(await f.grant()).toMatchObject({ ok: true })
expect(await f.route({ op: "set_panel", view: "review" })).toMatchObject({ ok: false, code: "access_denied" })
expect(calls).toEqual(["parent:review"])
} finally {
setBrowserPanelHandler(undefined)
f.close()
}
})

test.each(["list_tabs", "prepare_write"] as const)("revoke between routing and delivery suppresses %s", async (op) => {
const f = fixture()
const replies: BrowserIpcResult[] = []
Expand Down
4 changes: 3 additions & 1 deletion packages/desktop/src/main/browser/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ async function route(
if (!browserAgentEnabled()) return failure("access_denied", "Browser agent access is disabled in browser settings.")
if (browserTaskPaused(message.sessionID)) return failure("access_denied", nativeT("desktop.browser.taskPaused"))
if (parsed.op === "set_panel") {
if (access) return failure("access_denied", nativeT("desktop.browser.operationUnavailable"))
// Only a delegated subagent's authority carries a lease token. The bridge passes ordinary task
// authority on every request, and the panel handler still checks native task ownership.
if (access?.token) return failure("access_denied", nativeT("desktop.browser.operationUnavailable"))
return routeBrowserPanel(message.sessionID, parsed, signal, deadline)
}
if (parsed.op === "prepare_tab" || "token" in parsed)
Expand Down
25 changes: 2 additions & 23 deletions packages/desktop/src/main/wpp-bridge/proxy/providerConfig.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -148,29 +148,8 @@ export function o1CodeConfigContent(browserPlugin, aePlugin, chromeDevTools = pr
...(chromeDevTools ? { "chrome-devtools": { ...O1_CODE_MCP["chrome-devtools"], enabled: true } } : {}),
},
...(plugins.length ? { plugin: plugins } : {}),
// AE defaults belong to its config hook, below user policy, not this high-precedence blob.
permission: {
browser_read_state: "allow",
browser_search_history: "allow",
browser_open_history: "ask",
// Lifecycle defaults come from the plugin config hook, below user policy.
browser_navigate: "allow",
browser_click: "allow",
browser_hover: "allow",
browser_drag: "allow",
browser_select_option: "allow",
browser_screenshot: "allow",
browser_visual_action: "allow",
browser_observe_console: "allow",
browser_observe_network: "allow",
browser_list_site_tools: "allow",
browser_execute_site_tool: "allow",
browser_fill: "allow",
browser_press_key: "allow",
browser_scroll: "allow",
browser_wait_for_element: "allow",
browser_wait_for_navigation: "allow",
},
// No permission block: this blob merges after the user's global config, so a rule here would
// replace theirs. Browser and AE defaults come from their plugins' config hooks, below user policy.
lsp: true,
})
}
Expand Down
32 changes: 6 additions & 26 deletions packages/desktop/src/main/wpp-bridge/proxy/providerConfig.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ test("leaves an unparseable file untouched", async () => {

for (const browser of [false, true]) {
for (const ae of [false, true]) {
test(`injected plugins browser=${browser} AE=${ae} never inject AE permissions`, () => {
test(`injected plugins browser=${browser} AE=${ae} never inject browser or AE permissions`, () => {
const browserPlugin = "file:///resources/cm-browser/plugin.mjs"
const aePlugin = [
"file:///resources/cm-ae/plugin.mjs",
Expand All @@ -512,10 +512,9 @@ for (const browser of [false, true]) {
const config = JSON.parse(o1CodeConfigContent(browser ? browserPlugin : undefined, ae ? aePlugin : undefined))
const plugins = [...(browser ? [browserPlugin] : []), ...(ae ? [aePlugin] : [])]
expect(config.plugin).toEqual(plugins.length ? plugins : undefined)
expect(config.permission).toEqual(JSON.parse(o1CodeConfigContent()).permission)
expect(Object.keys(config.permission).every((name) => name.startsWith("browser_"))).toBe(true)
expect(config.permission.browser_list_site_tools).toBe("allow")
expect(config.permission.browser_execute_site_tool).toBe("allow")
// The blob merges after the user's global config, so a permission here would replace their
// rules. Browser and AE defaults come from their plugins' config hooks, beneath user policy.
expect(config.permission).toBeUndefined()
// High-precedence injection cannot replace AE denies, wildcards or agent/mode policies.
const policy = {
permission: { ae_execute: "deny", "ae_*": "deny" },
Expand Down Expand Up @@ -566,27 +565,8 @@ test("injected config is self-contained for a clean bundled OpenCode install", (
})
expect(config.lsp).toBe(true)
expect(config.plugin).toEqual([plugin])
expect(config.permission).toEqual({
browser_read_state: "allow",
browser_search_history: "allow",
browser_open_history: "ask",
browser_navigate: "allow",
browser_click: "allow",
browser_hover: "allow",
browser_drag: "allow",
browser_select_option: "allow",
browser_screenshot: "allow",
browser_visual_action: "allow",
browser_observe_console: "allow",
browser_observe_network: "allow",
browser_list_site_tools: "allow",
browser_execute_site_tool: "allow",
browser_fill: "allow",
browser_press_key: "allow",
browser_scroll: "allow",
browser_wait_for_element: "allow",
browser_wait_for_navigation: "allow",
})
// Browser defaults come from the cm-browser config hook, beneath user policy.
expect(config.permission).toBeUndefined()
expect(Object.keys(models)).toEqual(MODEL_IDS)
expect(models["CM_Opus5.5-High"]).toMatchObject({
name: "CM_Opus5.5-High",
Expand Down
Loading