feat(browser): replace the preview proxy with a real browser panel and an agent web tool (#2883)
The preview panel worked by proxying a dev server through OpenChamber's own origin and rewriting the HTML that came back. Anything the rewriter did not anticipate broke, and pages that refuse to be embedded never loaded at all. This deletes the proxy (-1604 lines and its tests) and merges the preview and browser panels into one surface backed by a real Chromium view. What the panel is now - A `<webview>` in its own session partition: logins and cookies persist, hot reload works because nothing is rewritten, DevTools are one click away. - Annotation: pick one element, drag a region, or draw freehand, write a note, and it reaches chat with a screenshot of the visible page with the marks on it. - Toolbar: hard reload, page zoom, device sizes, a light/dark switch that applies to the page rather than the app, and cookie/cache clearing scoped to the panel alone. - Several pages at once, each tab showing the page's own favicon, and an address bar that suggests pages already visited in this project. - Dev servers are listed from what is actually listening on the machine, checked against what a project announced, so a server is offered no matter how it was started. One that is still starting is waited for instead of failing. Remote dev servers The desktop app binds a local port and pipes raw bytes to the OpenChamber host over the existing authenticated connection, so the page keeps its own origin at the root of its own host. The reachable set is exactly what discovery reports and is re-checked per connection, so an authenticated client cannot dial arbitrary local services on the host. Links and redirects to another loopback port stay on the machine that served the page. A tunnel that cannot be opened is reported; it is never replaced by the plain loopback URL, which would answer from the user's own machine under a remote address. Agent control Browser actions are a separate `openchamber_web` tool: open, snapshot, click, type, scroll, inspect computed styles, resize between mobile/tablet/desktop, and capture a screenshot into `.openchamber/screenshots/` in the project. The existing `openchamber` tool keeps sessions, worktrees and scheduled tasks. Each has its own setting in the new Settings -> General -> OpenChamber Tools section, and the plugin is not injected at all when both are off. Capability belongs to the connected client, not to configuration: a client declares on its event stream that it can drive a page, which only a Chromium host does. Exactly one client performs each request — it claims the request before acting, and the first claim wins — because deciding by whose result arrives first would be too late for a click that already happened. No client listening is answered immediately with an explanation rather than a timeout. Runtime boundaries Web tabs get a plain iframe that can display a page but not inspect one. The VS Code extension no longer offers the surface at all, since nothing that makes the panel worth having works there. Mobile is unaffected. Native boundary Camera, microphone, location and device-picker requests from panel pages are denied — Electron grants them by default when no handler is set, and the panel loads whatever address the user types. Page capture, appearance emulation and storage clearing verify that their target belongs to the panel's own session instead of trusting a web-contents id from the renderer. Persisted state Stored `preview` tabs migrate to `browser` (v13 -> v14). Context panel tab limits are now per surface, so filling one surface no longer evicts another's tabs. Address history is stored per project and per runtime. Documentation `preview.mdx` and `desktop-browser.mdx` rewritten across all locales, the agent tool settings path corrected, new `DOCUMENTATION.md` for the browser-control broker and the dev tunnel, and the `ui-api-decoupling` skill updated where it still described the deleted proxy.
This commit is contained in:
committed by
GitHub
parent
50613bb170
commit
a5aa32446d
@@ -92,16 +92,18 @@ import { createGracefulShutdownRuntime } from './lib/opencode/shutdown-runtime.j
|
||||
import { createProjectConfigRuntime } from './lib/projects/project-config.js';
|
||||
import { createRemoteClientAuthRuntime } from './lib/client-auth/remote-clients.js';
|
||||
import { createClientPairingRuntime } from './lib/client-auth/pairing.js';
|
||||
import { createPreviewProxyRuntime } from './lib/preview/proxy-runtime.js';
|
||||
import { attachRealtimeProxy } from './lib/realtime-proxy.js';
|
||||
import { createRelayService } from './lib/relay/service.js';
|
||||
import { createRelayHostLock } from './lib/relay/host-lock.js';
|
||||
import { createAgentToolRuntime } from './lib/agent-tool/runtime.js';
|
||||
import { createBrowserControlBroker } from './lib/browser-control/broker.js';
|
||||
import { createDevServerScanner } from './lib/dev-servers/routes.js';
|
||||
import { createDevTunnelRuntime } from './lib/dev-tunnel/runtime.js';
|
||||
import { registerBrowserControlRoutes } from './lib/browser-control/routes.js';
|
||||
import { createSystemPromptRuntime } from './lib/system-prompt/runtime.js';
|
||||
import { createOpenChamberSessionService } from './lib/openchamber-sessions/routes.js';
|
||||
import { createScheduledTaskService } from './lib/scheduled-tasks/service.js';
|
||||
import { createOpenChamberControlService } from './lib/openchamber-control/service.js';
|
||||
import { createProxyMiddleware, responseInterceptor } from 'http-proxy-middleware';
|
||||
import webPush from 'web-push';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
@@ -1094,9 +1096,13 @@ const openCodeLifecycleRuntime = createOpenCodeLifecycleRuntime({
|
||||
},
|
||||
getManagedOpenCodeEnv: async () => {
|
||||
const settings = await readSettingsFromDiskMigrated().catch(() => null);
|
||||
const managedEnv = settings?.agentControlToolEnabled === false
|
||||
? {}
|
||||
: await (agentToolRuntime?.prepareManagedOpenCodeEnv() || {});
|
||||
// Each capability is its own tool and its own switch; the plugin is only
|
||||
// injected while at least one of them is on.
|
||||
const includeControl = settings?.agentControlToolEnabled !== false;
|
||||
const includeWeb = settings?.agentWebToolEnabled !== false;
|
||||
const managedEnv = includeControl || includeWeb
|
||||
? await (agentToolRuntime?.prepareManagedOpenCodeEnv({ includeControl, includeWeb }) || {})
|
||||
: {};
|
||||
if (settings?.optimizeSystemPrompt !== true) return managedEnv;
|
||||
|
||||
const configContent = managedEnv.OPENCODE_CONFIG_CONTENT ?? process.env.OPENCODE_CONFIG_CONTENT;
|
||||
@@ -1188,6 +1194,37 @@ const openChamberSessionService = createOpenChamberSessionService({
|
||||
waitForOpenCodeReady,
|
||||
emitSessionCreatedEvent,
|
||||
});
|
||||
// Browser actions are published to whichever OpenChamber clients are connected;
|
||||
// the one owning the browser panel answers. `emitRequest` returns the number of
|
||||
// clients reached so the broker can fail fast when nobody is listening.
|
||||
const browserControlBroker = createBrowserControlBroker({
|
||||
createId: () => `browser-${crypto.randomUUID()}`,
|
||||
emitRequest: (request) => {
|
||||
// Opening a page only needs a panel to open it in; everything else needs a
|
||||
// client that can actually drive one. Counting the right clients is what
|
||||
// lets the broker say "not here" instead of timing out.
|
||||
const needsBrowserView = request.action !== 'browser.open';
|
||||
let delivered = 0;
|
||||
for (const client of uiOpenChamberEventClients) {
|
||||
if (needsBrowserView && client.openchamberBrowserCapable !== true) continue;
|
||||
try {
|
||||
writeSseEvent(client, {
|
||||
type: 'openchamber:browser-control-request',
|
||||
properties: {
|
||||
requestId: request.requestId,
|
||||
action: request.action,
|
||||
parameters: request.parameters,
|
||||
},
|
||||
});
|
||||
delivered += 1;
|
||||
} catch {
|
||||
uiOpenChamberEventClients.delete(client);
|
||||
}
|
||||
}
|
||||
return delivered;
|
||||
},
|
||||
});
|
||||
|
||||
const openChamberControlService = createOpenChamberControlService({
|
||||
readSettingsFromDiskMigrated,
|
||||
sanitizeProjects,
|
||||
@@ -1196,6 +1233,7 @@ const openChamberControlService = createOpenChamberControlService({
|
||||
waitForOpenCodeReady,
|
||||
sessionService: openChamberSessionService,
|
||||
scheduledTaskService,
|
||||
browserControl: browserControlBroker,
|
||||
});
|
||||
|
||||
const ensureGlobalWatcherStarted = async () => {
|
||||
@@ -1653,6 +1691,24 @@ async function main(options = {}) {
|
||||
relayServiceInstance = relayService;
|
||||
relayService.registerRoutes(app);
|
||||
|
||||
registerBrowserControlRoutes(app, { express, broker: browserControlBroker });
|
||||
|
||||
// One scanner backs both discovery and the tunnel allowlist, so a port the
|
||||
// user can see is exactly a port the tunnel will dial.
|
||||
const devServerScanner = createDevServerScanner({ spawn, platform: process.platform });
|
||||
const listDevServers = () => devServerScanner.discover({
|
||||
ownPorts: [port, openCodePort].filter((value) => Number.isInteger(value) && value > 0),
|
||||
});
|
||||
|
||||
createDevTunnelRuntime({
|
||||
server,
|
||||
discoverDevServers: listDevServers,
|
||||
uiAuthController,
|
||||
isRequestOriginAllowed,
|
||||
rejectWebSocketUpgrade,
|
||||
logger: console,
|
||||
});
|
||||
|
||||
await featureRoutesRuntime.registerRoutes(app, {
|
||||
crypto,
|
||||
fs,
|
||||
@@ -1682,6 +1738,10 @@ async function main(options = {}) {
|
||||
buildOpenCodeUrl,
|
||||
getOpenCodeAuthHeaders,
|
||||
getOpenCodePort: () => openCodePort,
|
||||
// Dev-server discovery must not offer OpenChamber's own listeners back to
|
||||
// the user as something to preview.
|
||||
getOwnPorts: () => [port, openCodePort].filter((value) => Number.isInteger(value) && value > 0),
|
||||
devServerScanner,
|
||||
buildAugmentedPath,
|
||||
projectConfigRuntime,
|
||||
scheduledTasksRuntime,
|
||||
@@ -1695,20 +1755,6 @@ async function main(options = {}) {
|
||||
permissionAutoAcceptRuntime,
|
||||
});
|
||||
|
||||
const previewProxyRuntime = createPreviewProxyRuntime({
|
||||
crypto,
|
||||
URL,
|
||||
createProxyMiddleware,
|
||||
responseInterceptor,
|
||||
});
|
||||
previewProxyRuntime.attach(app, {
|
||||
server,
|
||||
express,
|
||||
uiAuthController,
|
||||
isRequestOriginAllowed,
|
||||
rejectWebSocketUpgrade,
|
||||
});
|
||||
|
||||
const startupPipelineResult = await startupPipelineRuntime.run({
|
||||
app,
|
||||
server,
|
||||
|
||||
Reference in New Issue
Block a user