Skip to content

feat(mcp): OAB MCP Facade MVP — shared openab-mcp crate + broker loopback HTTP server - #1448

Merged
thepagent merged 3 commits into
mainfrom
feat/oab-mcp-facade-mvp
Jul 24, 2026
Merged

feat(mcp): OAB MCP Facade MVP — shared openab-mcp crate + broker loopback HTTP server#1448
thepagent merged 3 commits into
mainfrom
feat/oab-mcp-facade-mvp

Conversation

@chaodu-agent

@chaodu-agent chaodu-agent commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

0. Discord Discussion URL

Design discussed in the OpenAB Discord; the governing design is ADR PR #1446 (OAB MCP Adapter, §6.2 as amended for the broker-hosted loopback HTTP transport). No public Discord URL is included in the repository context.

1. What problem does this solve?

Implements the MVP of the OAB MCP Adapter ADR (#1446): the OAB MCP Facade — a loopback-only Streamable HTTP MCP server exposing exactly two agent-facing tools, search_capabilities and execute_capability, so any MCP-capable coding CLI on the host (Kiro, Claude Code, Codex, …) connects to http://127.0.0.1:<port>/mcp. The broker serves it in-process, enabled by a [mcp] section in config.toml.

It also closes a real gap the ADR's least-privilege profiles depend on: the accepted MCP ADR (§5.6) documents tool_filter glob include/exclude lists and the config schema parses them, but nothing enforced them until now.

2. How it works

config.toml                       coding CLI (Kiro / Claude Code / …)
  [mcp]                              │  MCP over http://127.0.0.1:8848/mcp
  listen = "127.0.0.1:8848"          ▼
        │                     OAB MCP Facade  (in openab broker process)
        └── presence spawns ──►  search_capabilities / execute_capability
                                     │
                              crates/openab-mcp  (extracted shared runtime)
                                     │  lazy connect · tool_filter · OAuth
                                     ▼  jsonschema · breaker · redaction
                              downstream MCP servers (mcp.json)
  • New workspace crate crates/openab-mcp: the entire MCP runtime extracted from openab-agent — outbound client (Streamable HTTP + stdio), OAuth/PKCE + auth.json credential store (moved wholesale: atomic writes, corruption quarantine, refresh locks), layered mcp.json config, tool cache, circuit breaker, jsonschema argument validation, secret redaction — plus the new facade. The broker links it; openab-agent re-exports it (crate::{mcp,auth} shims, shared LLM type layer, HostBridge). One runtime, two hosts, zero duplication.
  • One dispatcher, two frontends (ADR §6.4): the facade delegates to the same meta_tool call path the native agent uses.
  • tool_filter enforcement at both boundaries: discovery drops filtered tools before caching; execution rejects filtered names before any connect.
  • Loopback-only, no auth: non-loopback binds are refused at startup; the endpoint carries no authentication layer, so the host/pod boundary is the trust boundary (documented in the ADR, the config example, and the startup log line).
  • Backward compatible: no [mcp] section → no listener, no behavior change. mcp.json remains the only provider source of truth ([mcp] carries listener settings only — ADR Alternative E).
  • openab-agent mcp-facade --listen 127.0.0.1:8848 serves the same facade standalone.
  • from_config no longer implicitly binds an LLM provider (the crate has no concrete providers); the agent injects it via set_provider alongside the host bridge — sampling behavior unchanged for the agent, correctly absent for the broker.

3. Scope

Root workspace (new crate + broker wiring + Dockerfile.unified dummy-stage + CI paths) and openab-agent (re-export shims). ACP session/new mcpServers advertisement is a documented follow-up — the loopback URL is already reachable by any CLI the operator points at it.

4. Validation

On macOS arm64:

  • openab-mcp: 198 tests pass (moved runtime/meta-tool/auth tests + facade tests + loopback-bind validation)
  • openab-agent: fmt clean, clippy -D warnings = 0 findings, 62 tests pass
  • Root workspace: clippy --workspace --all-features -D warnings = 0 errors; openab-core tests pass incl. 3 new [mcp] parse tests (only failure is the documented pre-existing secrets::resolve_exec_nonzero_exit macOS-env issue, identical on main)
  • Live smoke (standalone): initialize handshake returns oab-mcp-facade; tools/list returns exactly the two tools; --listen 0.0.0.0:… refused
  • Live smoke (broker): binary with [mcp] in config.toml binds the facade at startup and answers initialize with oab-mcp-facade on 127.0.0.1:18850/mcp
  • Test-race fix verified: 8 acp.rs env-mutating tests moved from a private ENV_LOCK to temp_env (single global lock domain); full agent suite green in parallel runs

Review Contract

Goal

Ship the OAB MCP Facade MVP per ADR #1446 §6.2 (as amended): a loopback-only Streamable HTTP MCP server exposing exactly search_capabilities/execute_capability, hosted in-process by the broker when [mcp] is present in config.toml, backed by the MCP runtime extracted into the shared crates/openab-mcp crate — with the ADR's tool_filter least-privilege contract actually enforced.

Non-goals

  • Authentication on the facade endpoint (loopback + host boundary is the MVP trust model; token/socket-permission scheme is a follow-up).
  • ACP session/new mcpServers advertisement of the facade URL (follow-up; not required for CLIs configured directly).
  • Notion/Gmail live OAuth validation (ADR rollout steps 2–3; requires interactive login).
  • Renaming/moving auth.json or mcp.json locations; provider config stays in mcp.json (no second source of truth).
  • Gateway crate changes (it does not depend on openab-mcp).

Accepted Residual Risks

  • Unauthenticated loopback endpoint: any process on the host can call authorized capabilities when [mcp] is enabled. Mitigations: loopback-only bind enforced at startup, explicit warnings in ADR/config example/startup log, opt-in activation; deployments colocating untrusted processes must not enable it.
  • Broker gains the runtime dependency set (rmcp, jsonschema, oauth2, axum) — accepted for one-runtime/zero-duplication; binary size impact is bounded and the gateway is unaffected.
  • The extraction moves auth.json code wholesale; behavior is regression-tested (198 tests) but subtle path/permission differences on exotic platforms would surface only in the follow-up provider validation.
  • search_capabilities with no query lists the full filtered catalog (token-heavy on very large downstream catalogs); mitigated by enforced include filters and the query parameter.
  • Facade sampling requests are declined (broker has no LLM provider) — correct for a non-LLM host, noted for provider docs.

Acceptance Criteria

  • Both workspaces: fmt/clippy/test green per §4 with zero introduced clippy findings vs origin/main on the same toolchain.
  • [mcp] absent → no listener (config parse test); present → listener on the configured loopback address (live smoke), default 127.0.0.1:8848.
  • Non-loopback listen refused at startup (unit test + live smoke).
  • Facade tools/list returns exactly the two documented tools; initialize identifies oab-mcp-facade.
  • A tool_filter-excluded tool is invisible to discovery and rejected pre-connect at execution (regression tests, incl. the Gmail default-profile send/delete block).
  • One failing provider does not fail discovery; it is reported in unavailable with a redacted error (regression test).
  • openab-agent behavior unchanged through the re-export shims (62 agent tests green, incl. ACP session, model-switch, sampling paths).

Follow-ups

  • ACP session/new mcpServers advertisement of the facade URL (currently hardcoded [] in openab-core, unchanged here).
  • Facade endpoint authentication (bearer token or unix-socket permissions).
  • Notion, then Gmail (preview) provider validation and checked-in profile examples (ADR rollout steps 2–3).
  • tools/list_changed-driven cache invalidation surfaced through the facade; optional result cap/pagination for large catalogs.
  • Consider trimming openab-agent's now-redundant direct deps further (kept minimal already).

…er enforcement

Implements the OAB MCP Adapter ADR (#1446) MVP slice in openab-agent:

- New 'openab-agent mcp-facade' subcommand: inbound stdio MCP server
  exposing exactly search_capabilities / execute_capability (ADR §6.1,
  §6.4), backed by the existing McpRuntimeManager + meta_tool dispatcher
  (one capability dispatcher, two frontends).
- search_capabilities: lazy discovery across all configured servers with
  per-provider failure isolation, name-collision qualification
  (server:tool), risk labels from MCP tool annotations, and redacted
  provider errors in an 'unavailable' list.
- execute_capability: exact-name resolution against current discovery,
  then delegation to the shared call path (jsonschema argument
  validation, timeouts, circuit breaker, redaction).
- tool_filter enforcement (accepted MCP ADR §5.6 contract, previously
  parsed but unenforced): glob include/exclude applied at discovery
  (fetch_tools, pre-cache) and execution (call_tool, pre-connect) for
  both the meta-tool and the facade.
- rmcp features: + server, transport-io.

Broker-side ACP session/new mcpServers advertisement is PR-2.
@chaodu-obk

chaodu-obk Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

LGTM ✅ - The OAB MCP Facade MVP is correctly scoped and enforces the documented least-privilege tool surface.

Note

No Critical or Important findings were identified for the reviewed commit.

What This PR Does

This PR adds the agent-facing OAB MCP Facade MVP as an openab-agent mcp-facade stdio server. It exposes exactly two tools, search_capabilities and execute_capability, and makes the existing tool_filter configuration enforceable for discovery and execution.

How It Works

The facade reuses the existing meta_tool dispatcher and McpRuntimeManager, so schema validation, timeouts, circuit breaking, redaction, and policy enforcement remain single-sourced. Discovery connects lazily to configured providers, isolates provider failures in an unavailable list, filters tools before caching, and qualifies duplicate names as server:tool. Execution resolves an exact current discovery result and applies the pre-connect filter gate before dispatch.

Findings

# Severity Finding Location
1 🟢 Shared dispatcher and runtime preserve one enforcement path for the native meta-tool and the facade. openab-agent/src/mcp/facade.rs:167-190
2 🟢 tool_filter is applied before caching and is independently enforced before a guessed tool can connect. openab-agent/src/mcp/meta_tool.rs:156-166, openab-agent/src/mcp/meta_tool.rs:449-460
3 🟢 Provider failure isolation and secret-redacted unavailable responses are implemented and covered by tests. openab-agent/src/mcp/facade.rs:114-131, openab-agent/src/mcp/facade.rs:423-447
4 🟢 The public facade surface is constrained to the two documented tools with schemas and initialization metadata. openab-agent/src/mcp/facade.rs:208-247, openab-agent/src/mcp/facade.rs:267-283
5 🟢 Duplicate qualification and include/exclude filter semantics have focused regression tests. openab-agent/src/mcp/facade.rs:372-388, openab-agent/src/mcp/config.rs:559-615
Finding Details

🟢 F1: Shared dispatcher and runtime

The facade delegates execution through meta_tool::dispatch(Action::Call) instead of duplicating provider lifecycle or security behavior. This keeps argument validation, timeout handling, breaker behavior, and redaction aligned with the existing native path.

🟢 F2: Defense-in-depth filter enforcement

Filtered tools are removed before the shared tools cache is populated, and guessed filtered names are rejected before connect. This satisfies the least-privilege contract at both discovery and execution boundaries.

🟢 F3: Failure isolation and redaction

Discovery continues across configured providers when one fails and returns a concise redacted error under unavailable, preserving access to healthy providers without exposing provider secrets.

🟢 F4: Narrow protocol surface

The stdio server advertises exactly search_capabilities and execute_capability, identifies itself as oab-mcp-facade, keeps logs on stderr, and serializes provider results as MCP text content.

🟢 F5: Focused regression coverage

The patch covers empty catalogs, unavailable providers, unknown execution names, duplicate-name qualification, glob semantics, include/exclude precedence, and the Gmail least-privilege profile shape.

Addressing External Reviewer Feedback

No external GitHub reviewer comments or submitted reviews were present for this round, so there is no unresolved external feedback to address.

Baseline Check
  • PR opened: 2026-07-24
  • Base branch: main
  • Merge-base: 967270087ab74b32bcba9f6bc89a402e7abc3aca
  • Main already has: the existing downstream MCP runtime and native mcp meta-tool, but not the inbound facade, its two-tool protocol surface, or enforced tool_filter behavior.
  • Net-new value: a per-session stdio facade with progressive disclosure and least-privilege filtering, without changing broker advertisement or the native meta-tool contract.

5. Three Reasons We Might Not Need This PR

  1. The broker integration is deferred - Until the follow-up broker advertisement lands, the new facade command is not yet exposed through normal ACP session setup.
  2. Provider discovery remains potentially large - An unqualified search can return a large filtered catalog, so production profiles may still need result caps or pagination.
  3. The facade adds another protocol boundary - Maintaining a second MCP server frontend increases integration surface compared with using the native meta-tool alone.

These are documented scope and rollout trade-offs, not blockers for this MVP.

Validation

  • git diff --check: passed.
  • Local source review completed against origin/main...pr-1448 at the exact requested SHA.
  • Rust validation could not run in this environment because cargo, rustc, and rustup are not installed.

chaodu-obk[bot]
chaodu-obk Bot previously approved these changes Jul 24, 2026

@chaodu-obk chaodu-obk Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✅ - No Critical or Important findings were identified.

Consolidated review: #1448 (comment)

GitHub event: APPROVE

…back HTTP server

Implements the OAB MCP Adapter ADR (#1446) MVP:

- New workspace crate crates/openab-mcp: the MCP runtime extracted from
  openab-agent (client runtime, OAuth/PKCE + auth.json store, layered
  mcp.json config, tool cache, circuit breaker, jsonschema validation,
  redaction) plus the new OAB MCP Facade — an inbound MCP server
  exposing exactly search_capabilities / execute_capability.
- Facade transport: loopback-only Streamable HTTP (http://127.0.0.1:
  <port>/mcp). Non-loopback binds are refused. Any MCP-capable coding
  CLI on the host can connect.
- Broker activation: presence of [mcp] in config.toml starts the
  listener in-process (absent = no listener, backward compatible).
  openab-agent re-exports the crate (crate::{mcp,auth} shims + llm type
  layer + HostBridge) — one runtime, two hosts, zero duplication.
- tool_filter enforcement (accepted MCP ADR §5.6, previously parsed but
  unenforced): glob include/exclude applied at discovery (pre-cache)
  and execution (pre-connect), for the meta-tool and facade alike.
- openab-agent mcp-facade --listen: standalone facade server.
- acp.rs env-mutating tests moved to temp_env (single global lock
  domain; a private ENV_LOCK raced with temp_env-based tests once the
  moved tests changed binary scheduling); session_new_missing_key now
  sandboxes HOME instead of deleting the developer's real auth.json.
- Dockerfile.unified + ci-openab-agent.yml updated for the new member.
@chaodu-agent
chaodu-agent force-pushed the feat/oab-mcp-facade-mvp branch from 4c12c65 to 26a8395 Compare July 24, 2026 11:40
@chaodu-agent chaodu-agent changed the title feat(agent): OAB MCP Facade MVP — mcp-facade stdio server + tool_filter enforcement feat(mcp): OAB MCP Facade MVP — shared openab-mcp crate + broker loopback HTTP server Jul 24, 2026
The workspace gained crates/openab-mcp but only Dockerfile.unified's
dummy stage was updated; the base and per-CLI Dockerfiles failed at
'cargo build' with 'failed to load manifest for workspace member'.
Apply the same COPY/mkdir/stub/rm/touch pattern everywhere (incl.
Dockerfile.gateway/builder/native/agentcore, which share the pattern
but are outside this PR's smoke matrix).
@chaodu-agent

Copy link
Copy Markdown
Collaborator Author

Gmail live validation report (ADR rollout step 3, run early per maintainer request)

Ran the Gmail hosted-MCP profile end-to-end against gmailmcp.googleapis.com/mcp/v1 using this PR's binaries (8f6ff4f, macOS arm64: broker + openab-agent). Summary: the facade side is fully green; execution is blocked upstream by Google's Developer Preview enrollment; and one real bug found in the OAuth flow (no refresh token for Google providers).

What passed ✅

Step Result
Custom-provider OAuth (PKCE S256 paste-back, provider: "google") ● logged in: gmail; credentials stored in auth.json (0600)
mcp doctor config / oauth / live connect all green
Standalone facade (mcp-facade, loopback) initializeoab-mcp-facade; tools/list = exactly the two tools
search_capabilities 6 capabilities returned (create_draft, list_drafts, get_thread, get_message, search_threads, list_labels) — the tool_filter include-list correctly hid label_*/create_label (§6.5 least-privilege enforced at discovery)
Lazy connect + schema passthrough Google's full input_schema (incl. $defs) surfaced intact through execute_capability discovery

Blocked upstream ⛔ — Google preview gating (not a PR bug)

Every tools/call returns isError: true / "The caller does not have permission". Isolation chain with the same access token:

  • Gmail REST (gmail.googleapis.com/gmail/v1/users/me/labels) → 200 OK
  • Gmail MCP initialize + tools/listOK
  • Gmail MCP tools/call (any tool) → denied
  • Bypassing the facade and calling gmailmcp.googleapis.com directly → identical denial (facade behavior is byte-equivalent to a direct client)
  • X-Goog-User-Project header, and a token re-minted after program signup → no change

Cause: the Gmail MCP server requires Google Workspace Developer Preview Program enrollment — per-account and per-GCP-project (the program registers your project; approval is manual, "about a week"). Suggest adding to the ADR §6.5 Gmail profile / §9 risks: execution (not discovery) is gated on DPP enrollment of both the authorizing account and the OAuth client's GCP project; REST access is not a valid preflight signal for MCP access.

Bug found 🐛 — no refresh token from Google (headless blocker)

The paste-back authorize URL contains no access_type=offline (Google's requirement for issuing refresh tokens; prompt=consent also relevant for re-grants). Result: auth.json's token_response has access_token / expires_in: 3600 / refresh_token_expires_in — but no refresh_token. Confirmed by a failed refresh grant (HTTP 400) and a second interactive login (same shape).

Impact: for any Google provider the session dies after ~1h and recovery requires an interactive re-login — unusable for the headless bot deployments (ECS) this is destined for. Suggested fix: when resolving a custom provider whose authorize endpoint is accounts.google.com, append access_type=offline (+prompt=consent) to the authorize URL, or add a general oauth.extra_authorize_params map to OAuthConfig so provider quirks don't need code changes.

Recommendation — today's evidence tips rollout step 5 toward the native adapter

The ADR already stages this decision (§10 step 5: hosted MCP vs native Gmail adapter) and documents OpenWorker's native Gmail REST connector as prior art (§5.3). Today's run adds three concrete data points in favor of the Capability Plugin / native Gmail adapter path (§6.1), at least until Gmail MCP reaches GA:

  1. The same OAuth token that MCP rejects works perfectly against Gmail REST (verified live: users/me/labels → 200). An OpenWorker-style connector (search_threads/get_message/create_draft over REST, exactly the six-capability §6.5 profile) needs no DPP enrollment, no per-project registration, no preview wait.
  2. DPP terms make hosted Gmail MCP unshippable pre-GA: program terms (ii)/(iv) prohibit including preview features in public applications and granting end users outside the developer's domain access to pre-GA integrations. For OAB as a product, the hosted path is a validation-only track until GA — the native adapter is the only Gmail path that can reach users today.
  3. The facade makes the swap invisible: §6.1 already normalizes native adapters behind search_capabilities/execute_capability, so shipping a native Gmail connector now and re-pointing to hosted MCP at GA changes zero agent-facing surface. Adopt OpenWorker's specific lessons per §5.3: approval-gated send (drafts-only in our profile), per-account token refresh (which also sidesteps the refresh-token bug above at the adapter level — the adapter owns its access_type=offline), and privacy filters before content reaches the agent.

Hosted-MCP validation continues in parallel (DPP application submitted) — it remains the right long-term default per the ADR; this only re-sequences what ships first.

State

  • DPP application submitted; will re-run the execution matrix (search/read/draft + draft-review-cleanup) on approval — token re-auth only, no other changes needed.
  • Preview image ghcr.io/openabdev/openab:pr1448 built green; b2 (ECS) e2e is staged behind the same approval — and behind the refresh-token fix, which is a hard prerequisite for headless.

@thepagent
thepagent merged commit 3149c1d into main Jul 24, 2026
47 of 48 checks passed
@chaodu-agent

Copy link
Copy Markdown
Collaborator Author

Follow-up: DPP application rejected — hosted Gmail MCP is Workspace-account-only during preview

Closing the loop on the validation report above. The Developer Preview Program application was rejected: "We could not verify your Google Workspace account" — the program requires a Google Workspace account; consumer @gmail.com accounts are not accepted.

Implications, stronger than the original finding:

  1. Consumer Gmail mailboxes cannot use the hosted Gmail MCP server at all during preview — this is not a waiting-period problem. Even a successful re-application with a Workspace account would authorize that Workspace mailbox, not a consumer one.
  2. The native adapter (feat(mcp): native Gmail adapter — §6.5 profile over GA REST as stdio MCP server #1449) is therefore the only Gmail path for consumer-account use cases until Google opens the hosted server to consumer accounts (presumably at GA) — upgrading it from "pre-GA ship vehicle" to "sole option for a whole account class".
  3. The hosted-MCP validation track (ADR rollout step 3) can only be completed against a Workspace mailbox; recommend noting in the ADR §6.5 Gmail profile that the hosted path's availability is account-type-dependent, and re-evaluating at GA.

Meanwhile #1449 has been validated end-to-end in production topology: b2 (ECS) → OAB MCP Facade (search_capabilities/execute_capability) → gmail-native adapter (loopback Streamable HTTP) → Gmail GA REST, with the facade audit trail confirming the dispatch (call_tool server="gmail" tool="search_threads" outcome="ok").

thepagent pushed a commit that referenced this pull request Jul 25, 2026
…MCP server (#1449)

* feat(mcp): native Gmail adapter — six-tool §6.5 profile over Gmail REST as stdio MCP server

Capability Plugin per ADR §5.3/§6.1 and rollout step 5, motivated by live
validation (PR #1448): hosted Gmail MCP gates tools/call behind Workspace
Developer Preview enrollment and its terms bar pre-GA shipping, while the
same OAuth token works against GA Gmail REST.

- crates/openab-mcp/src/native/gmail.rs: search_threads / get_thread /
  get_message / list_labels / list_drafts / create_draft with names and
  argument shapes mirroring the hosted server (GA cut-over = config-only);
  drafts-only write surface; header-injection-hardened MIME builder;
  Gmail-id validation before path use.
- Own OAuth login (PKCE S256 paste-back) sending access_type=offline +
  prompt=consent — stores a refresh token (the rmcp-driven flow cannot),
  single-flight refresh with rotation-tolerant persistence via the shared
  auth.json McpCredentialStore under the gmail-native key.
- Served over stdio (openab-agent gmail-native serve|login): registered in
  mcp.json as a normal stdio server, so tool_filter, schema validation,
  breaker, timeouts, and redaction apply unchanged.

* style: cargo fmt + fix injection-test assertion (address guard trips on control char first)

* style: final rustfmt

* refactor(gmail-native): serve over loopback Streamable HTTP instead of stdio

Same transport and trust model as the OAB MCP Facade (require_loopback
reused; non-loopback binds refused; no auth layer — host boundary is the
trust boundary). mcp.json registration becomes a "type": "http" entry at
http://127.0.0.1:8850/mcp. Drops the rmcp transport-io feature.

* docs: gmail-native operator guide (setup, registration, security notes)

* refactor: move gmail-native serve|login to the broker binary

openab-agent is the coding agent (ACP client + MCP client toolchain);
long-running serving surfaces belong to the broker binary, which every
bot image already ships — the b2 validation required smuggling the agent
binary into the container precisely because the adapter lived on the
wrong binary. openab-agent keeps the client-side mcp CLI only.

* style: fmt + doc reference fix

* refactor(cli): nest under `openab mcp <addon> <action>` namespace

Maintainer direction: MCP add-ons get one namespace (openab mcp
gmail-native serve|login); long-running serving remains config-driven
([mcp] + openab run). Standalone/dev serving and interactive logins are
the namespace's job.

* style: fmt

---------

Co-authored-by: chaodu-agent <chaodu-agent@users.noreply.github.com>
thepagent pushed a commit that referenced this pull request Jul 25, 2026
* docs: OAB MCP Facade operator guide

Documents the #1448 feature: enablement (broker [mcp] / standalone),
the two-tool surface, audit lines, client registration (incl. the kiro
--agent config gotcha), trust model, and the pod-vs-fleet positioning
relative to octobroker (ADR §4.1).

* docs: add mermaid architecture diagram to the facade guide

* docs: describe facade-only run mode (replaces removed openab-agent mcp-facade)

---------

Co-authored-by: chaodu-agent <chaodu-agent@users.noreply.github.com>
pahud pushed a commit to brettchien/openab that referenced this pull request Jul 25, 2026
…browser tunnel wiring alongside the [mcp] facade block; Cargo.lock regenerated
brettchien added a commit to brettchien/openab that referenced this pull request Jul 26, 2026
…tic-advertise, trust gate

Rewrites reverse-MCP ADR §6.2-§6.6 now that the facade seam landed upstream
(openabdev#1448/openabdev#1453 facade, openabdev#1454 session-aware CapabilitySource, openabdev#1446 ADR):

- §6.2 expose every client-declared type:acp server through ONE in-process
  CapabilitySource (AcpTunnelSource) registered with the facade, rather than
  the bespoke per-(session,server) loopback proxies + N mcp.json entries.
  Sources are registered once at construction, so the source fans out
  internally and routes on the <server>.<tool> prefix to (channel_id,
  server_id). Session identity moves to the facade's SessionTokens.
- §6.3 drop notifications/tools/list_changed outright — facade discovery is
  pull-based (search_capabilities re-reads per call), so nothing caches a
  tool list to invalidate. Keep the static-advertise posture, implemented as
  fetch-once-per-declared-server + per-(channel,server) cache; unavailability
  is a call error, not a vanishing catalog entry.
- §6.4 new trust requirement: openabdev#1454 assumes operator-granted tool sets, but a
  tunnel source's tools are client-declared — require an operator allowlist
  (default: browser only) plus a per-declared-server tool_filter.
- §6.5 records what this retires and leaves stdio bridge-mode removal as an
  explicit operator call; flags the meta-tool-vs-direct hop as open.
- Browser ADR: correct D4 (list_changed dropped, static-advertise kept) and
  add a supersession notice over D2/D3/D5.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
brettchien added a commit to brettchien/openab that referenced this pull request Jul 26, 2026
…vers divergence

Follows the merge of main (adapter ADR openabdev#1446, gmail doc openabdev#1455) into this branch:

- Link the OAB MCP Adapter ADR directly now that it is present, and note the
  whole facade series (openabdev#1446/openabdev#1448/openabdev#1449/openabdev#1450/openabdev#1453/openabdev#1454) is merged with no
  facade PR left open — §6 builds on a settled foundation.
- Cite adapter ADR §6.2 / Alternative C ("no second generic inbound MCP server",
  browser and external capabilities share one delivery mechanism), which makes
  retiring the bespoke per-session proxy (F5) an upstream design requirement
  rather than optional cleanup.
- Record an unresolved divergence: the adapter ADR says the facade is delivered
  via ACP `mcpServers` and explicitly not by editing CLI config files, while the
  as-built `write_facade_mcp_config` does write a static entry — deliberately,
  since browser D2 found Cursor ignores ACP-passed mcpServers. Flagged for the
  facade contract owner instead of unilaterally reconciling.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
thepagent pushed a commit that referenced this pull request Aug 3, 2026
…1447)

* docs(acp): add MCP-over-ACP browser-control implementation blueprint (§7)

Break the north-star (LLM operating the browser via MCP over /acp) into T0–T7 with
sub-tasks, an OpenAB-side vs extension-side ownership split meeting at the MCP-over-ACP
wire contract (T4), and the key findings that reshape the work: the agent→client request
direction already exists on the downstream hop (request_permission is auto-replied in
openab-core, so T1 is a relay not green-field), and mcpServers is currently [] (T5 injects
a core proxy). Suggested order + which items are heavy.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): resolve MCP-over-ACP browser-control design (D1-D4) + flow diagrams

Fold the resolved design decisions into the browser-control ADR §7:

- D1: auto-approve all browser tool permissions (core keeps auto-replying
  request_permission); fine-grained control deferred. Drops the dedicated
  request_permission-relay task; T1's server->client machinery stays (needed by
  the upstream MCP tunnel).
- D2: inject the proxy via each agent's native MCP config (Cursor ->
  .cursor/mcp.json), not ACP session/new mcpServers (Cursor ignores those; cf.
  zed-industries/zed#50924). Content (HTTP url+headers) is portable; no universal
  config location exists.
- D3: downstream (agent<->core) is a normal in-process Streamable-HTTP MCP server
  on loopback (via rmcp), NOT an on-ACP-stream tunnel (the ACP maintainer backed
  off on-stream MCP; cf. discussion #58). Upstream (core/gateway<->extension) is
  the one legitimate tunnel and adopts the official MCP-over-ACP RFD framing
  (mcp/connect + mcp/message); the RFD's "type":"acp" downstream injection is
  unused (Cursor unsupported).
- D4: core's HTTP MCP server is always-on and decoupled from the extension WS, so
  the WS can attach after session start; core static-advertises the browser
  toolset and emits notifications/tools/list_changed on attach/detach.

Also adds a TL;DR flow, an as-designed execution flow, a detailed message-level
runtime sequence, and the T0 spike checklist; updates Findings/Tasks/Ownership
accordingly (T3 dropped, T4 = RFD framing, T5 = HTTP MCP server + per-adapter
config injection).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): server-initiated request direction (T1.2/1.3)

Add the agent->client REQUEST direction to the ACP WebSocket server, the
plumbing the MCP-over-ACP tunnel needs. The base only had client->server
requests plus server->client notifications; this adds:

- route_client_response(): the read loop now recognises an inbound client
  *response* (id present, no `method`, carries result/error) and routes it to
  the waiting request via a per-connection pending map, instead of answering it
  with -32600. Gated on !is_notification so notification/request handling is
  untouched.
- pending_requests: Arc<Mutex<HashMap<u64, oneshot::Sender<Value>>>> per
  connection, drained on disconnect so in-flight awaiters unblock with
  "connection closed" rather than hanging until timeout.
- send_request() + JsonRpcRequestOut: mint an id, register the oneshot, send the
  frame over the existing outbound channel, timeout-await the correlated
  response. Landed with #[allow(dead_code)] as ready infrastructure; its caller
  arrives with T1.4 (the core<->gateway bridge).

Mirrors the existing client-side pattern in
openab-core/src/acp/connection.rs. Adds an acp_requests test module (route +
send_request round-trip, id minting, request/notification rejection, unmatched
id). Gate green: clippy -D warnings + test --test-threads=1 + build, --features
unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* refactor(gateway/acp): construct trivial responses from generated types (T2.1)

Migrate the three trivial outbound response payloads from hand-rolled `json!`
to the generated `acp_schema` types, so the wire shape is type-checked:

- session/new  → NewSessionResponse { session_id: SessionId(..) }
- session/resume → ResumeSessionResponse::default() (serializes to {})
- prompt final → PromptResponse { stop_reason }, with `stop_reason` now a typed
  StopReason enum (EndTurn / Cancelled) instead of a &str literal.

rename + skip_serializing_if make the emitted wire byte-identical to the prior
`json!`, so the existing conforms::<T> round-trip tests and handler behaviour
tests are unchanged (292 pass). handle_initialize stays hand-rolled for now
(nested agentCapabilities/agentInfo; low value, per base ADR §7 the trivial chat
subset does not require typed construction). The remaining T2.2 (typing the
mcp/connect + mcp/message bidirectional frames) lands with T4.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): MCP-over-ACP tunnel frame API (T4.1)

Add the gateway-side helpers for the official MCP-over-ACP RFD tunnel
(agentclientprotocol.com/rfds/mcp-over-acp), built on the T1 send_request
machinery (its first real callers):

- mcp_connect(acpId) -> connectionId
- mcp_message_request(connectionId, method, params) -> inner MCP result
- mcp_disconnect(connectionId)
- McpConnectParams / McpConnectResult / McpMessageParams / McpDisconnectParams
  (hand-rolled: these RFC methods are not in the generated acp_schema, which
  only has the session/new McpServer* declaration types + McpCapabilities), plus
  frame_result() to unwrap a response frame's result / surface its error.

Per the RFD, mcp/message flattens the inner MCP method/params into the params
object WITHOUT the inner MCP id; correlation is purely by the outer ACP id, and
the response result is the inner MCP result payload. Adds a mock-tunnel
round-trip test (mcp/connect -> connectionId, mcp/message tools/list -> result).

Helpers carry #[allow(dead_code)] until T5 wires them to the core MCP proxy
(their real caller). Remaining T4: session/new "type":"acp" parsing + advertise
mcpCapabilities.acp, gateway<->core routing (with T5), contract doc.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): scaffold MCP proxy server deps + static browser toolset (T5.1a)

Introduce the core-hosted MCP proxy for MCP-over-ACP browser control (D3/D4),
starting with the dependency integration + the static tool set:

- openab-core gains optional rmcp (server + transport-streamable-http-server),
  axum 0.8 (matches the gateway, one axum in the workspace), and tokio-util,
  gated behind a new `acp-mcp` feature so non-acp builds don't pull them. The
  root `acp` feature (included by `unified`) now enables `openab-core/acp-mcp`.
  This is the workspace's first rmcp server-side usage; it resolves + compiles
  cleanly alongside openab-agent's rmcp client features.
- New `mcp_proxy` module (feature-gated) with `browser_tools()`: the fixed
  DOM-semantic tool set (click / read_dom / navigate / type / screenshot) that,
  per D4, core static-advertises regardless of whether an extension is attached.
  Built from rmcp `Tool::new` + typed input schemas; unit-tested.

`browser_tools()` carries #[allow(dead_code)] until the ServerHandler wires it.
Next (T5.1b): ServerHandler impl + spawn_mcp_server (loopback + bearer axum
listener); then T5.2 config injection and T5.3 tunnel wiring.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): MCP proxy ServerHandler + loopback server (T5.1b)

Stand up the core-hosted MCP server the colocated agent connects to (D3):

- ProxyHandler impls rmcp ServerHandler: get_info advertises the tools
  capability; list_tools returns the static browser tool set (D4 static-
  advertise); call_tool returns "browser not connected" until the tunnel is
  wired (T5.3) — failing gracefully rather than hiding the tools (D4).
- spawn_mcp_server binds an OS-assigned 127.0.0.1 port with its own axum
  listener (StreamableHttpService, stateless + JSON responses), graceful
  shutdown via a CancellationToken. The caller hands the port to the agent's
  native MCP config in T5.2.

An HTTP integration test spawns the server, confirms it binds loopback, and
that an MCP initialize returns a result advertising the tools capability.
Bearer auth on the listener is added in T5.2 (the token is minted alongside the
.cursor/mcp.json injection). Tunnel wiring (RemoteExtensionChannel -> mcp_connect
/mcp_message) is T5.3.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): bearer gate on the MCP proxy server (T5.2 part 1)

Even bound to loopback, the core MCP server now requires the token the agent's
MCP config carries (D3), so another local process on the host can't reach the
browser tools. spawn_mcp_server takes a `bearer` and layers an axum middleware
that returns 401 when Authorization: Bearer <token> is absent or wrong; the
caller mints the token and shares it with the agent config.

Tests: authed initialize -> 200 + tools capability; missing / wrong token -> 401.

Remaining T5.2: the per-agent adapter writes { url: 127.0.0.1:<port>, headers:
Authorization Bearer } into the agent's native MCP config (Cursor ->
.cursor/mcp.json) before boot, and wires spawn_mcp_server into openab startup.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): correct runtime diagram — mcp/message flattens, no inner id

The MCP-over-ACP RFD flattens the inner MCP method/params into the mcp/message
params and does NOT carry an inner MCP id; correlation on the upstream tunnel is
by the outer ACP id alone, and the response result IS the inner MCP result
payload. Fix the detailed runtime sequence + the id-space note: mcp#7 lives only
on the agent<->core HTTP hop; the core proxy maps its downstream mcp#7 <-> the
upstream acp#55. (Was: "carried verbatim agent<->core<->extension".)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): parse + record client-declared type:acp mcpServers (T4)

The browser extension declares its MCP-over-ACP server in session/new via the
RFD's mcpServers entry {"type":"acp","id":...,"name":...}. Parse those (raw,
since the "acp" transport is an RFD proposal not in the generated schema) and
record them per session (AcpSession.acp_mcp_servers), so the gateway can later
mcp/connect to them (T5.3). session/resume re-records them since the client
re-presents mcpServers. http/sse/stdio servers are ignored (the agent connects
to those itself). D5-agnostic: needed regardless of the core MCP server topology.

Field is #[allow(dead_code)] until the mcp/connect wiring consumes it. Tests:
parse keeps only acp entries (+ empty cases); session/new records them.

Not done here: advertising mcpCapabilities.acp in initialize — the generated
McpCapabilities has only http/sse (the RFD acp flag isn't in stable v1), and
since we own both ends the extension can declare type:acp unconditionally; left
as a follow-up.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs: MCP-over-ACP tunnel contract for the extension (T4.3)

The spec the browser extension (katashiro, T6) implements: the gateway<->extension
hop of MCP-over-ACP. Covers the type:acp session/new declaration, mcp/connect ->
connectionId, mcp/message (inner method/params flattened, correlate by outer ACP
id, result = inner MCP result), mcp/disconnect, the baseline browser tool set
(click/read_dom/navigate/type/screenshot), and that permissions are auto-approved
(D1) + the WS may attach after session start (D4).

D5-agnostic (only the external hop; OpenAB-internal proxy/topology is out of
scope), so it lets the extension side proceed in parallel. Linked from ADR §7 T4.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): TunnelHandle — per-connection MCP tunnel handle (T5.3)

The reusable abstraction the core MCP proxy needs to reach a specific browser:
TunnelHandle bundles one /acp connection's outbound channel + pending-request map
+ id counter + the mcp/connect connectionId, and exposes async mcp_message() /
disconnect() that tunnel an inner MCP request to that extension and await the
result. Built on the T1/T4.1 send_request + mcp_message_request helpers.

D5-agnostic: both the per-session and shared core-server designs route through
this same handle. Round-trip test via a mock extension driver. Next: register a
TunnelHandle per session's channel_id (after mcp/connect) in a shared registry
(AppState), and consume it from the core ProxyHandler.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): tunnel registry + establish_and_register_tunnel (T5.3)

- AcpTunnelRegistry (channel_id -> TunnelHandle), mirroring AcpReplyRegistry, so
  the core MCP proxy can look up the tunnel for a given browser session.
- establish_and_register_tunnel: mcp/connect to a session's declared "type":"acp"
  server, build a TunnelHandle from the returned connectionId, and register it
  under the session's channel_id. First real caller of mcp_connect/send_request.
  Documented as spawn-only (awaiting mcp_connect inline in the read loop would
  deadlock, since only that loop delivers the response).

Test: a mock extension answers mcp/connect; the handle lands in the registry
keyed by channel_id. #[allow(dead_code)] until the read loop spawns it and it's
threaded through AppState (next). Then the core ProxyHandler consumes the
registry to forward tools/list + tools/call.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway): thread AcpTunnelRegistry through AppState (T5.3)

Add acp_tunnel_registry: Option<AcpTunnelRegistry> to AppState alongside
acp_reply_registry (same #[cfg(feature="acp")] gate), initialized wherever the
reply registry is. This is the shared handle the connection read loop will
populate (spawning establish_and_register_tunnel per declared type:acp server)
and the core MCP proxy will consume to route a tool call to the right browser.

No behaviour change yet — the field is constructed but not read until the
read-loop spawn wiring lands next. Gate green: clippy -D warnings + test
--test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(gateway/acp): open MCP tunnels on session/new + cleanup (T5.3)

Wire the tunnel producer into the connection read loop:

- handle_acp_connection mints a per-connection next_req_id (Arc<AtomicU64>) for
  server-initiated requests.
- handle_session_new returns the minted channel_id alongside the response.
- On session/new, for each declared "type":"acp" server, tokio::spawn
  establish_and_register_tunnel (mcp/connect -> register a TunnelHandle under the
  channel_id). Spawned, never awaited inline: it awaits mcp/connect whose
  response only this same read loop delivers, so awaiting inline would deadlock.
  The task is tracked in prompt_tasks (aborted on disconnect).
- Disconnect cleanup now removes the connection's channel_ids from BOTH the reply
  and tunnel registries (gathered once).

Live behaviour needs a real extension (T7); this lands the plumbing + keeps the
unit tests green. Next: the core ProxyHandler consumes acp_tunnel_registry to
forward tools/list + tools/call to the right browser.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): BrowserTunnel trait + ProxyHandler forwards tool calls (T5.3, D6-a')

Add the core-side tunnel interface (D6-a'): `trait BrowserTunnel { async fn
call(channel_id, method, params) }`, implemented by the root (bridging to the
gateway registry) so no core<->gateway crate dependency is introduced — matching
the existing ChatAdapter pattern.

- ProxyHandler now carries its session channel_id + an Option<Arc<dyn
  BrowserTunnel>> (D5-a: one server per session). call_tool forwards the tool as
  an MCP tools/call over the tunnel; list_tools stays static-advertised (D4);
  no tunnel / no browser attached -> "browser not connected" (D4).
- spawn_mcp_server takes (channel_id, tunnel) and builds a per-session
  ProxyHandler in the service factory.

Tests: forward via a mock BrowserTunnel; not-connected without one.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): start_session_server — per-session server + .cursor/mcp.json (T5.2/D5-a)

start_session_server(channel_id, workdir, tunnel): mint a fresh bearer, start the
loopback MCP proxy for that session, and MERGE an `openab-browser` HTTP entry
(url + Authorization: Bearer) into <workdir>/.cursor/mcp.json without clobbering
any servers already there (Cursor's native config; D2). Returns the bound addr +
a CancellationToken the pool cancels to stop the server on session evict.

Tests: writes the cursor config (url+bearer); merges into an existing mcp.json.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(core): start per-session MCP proxy on agent spawn (T5.2/D5-a)

Wire the per-session MCP proxy into the pool's agent-launch path (feature
acp-mcp):

- For a browser (`acp:`) session, get_or_create starts a loopback MCP server +
  writes .cursor/mcp.json BEFORE spawning the agent, so the agent connects to it
  on boot. Non-acp sessions (Discord, etc.) are untouched.
- Lifecycle: the server's CancellationToken drop_guard is stored INSIDE the
  AcpConnection (new mcp_server_guard field), so the server is cancelled whenever
  the connection is dropped — through any evict/suspend/hung-kill path — without
  touching each removal site. On a failed spawn/init the guard drops early and
  cancels too.
- SessionPool gains a browser_tunnel field + with_browser_tunnel() builder (set
  by the root, D6-a'); passed into each per-session ProxyHandler.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(root): wire the browser tunnel bridge end-to-end (T5.3, D6-a')

RootBrowserTunnel (src/browser_tunnel.rs) implements openab-core's BrowserTunnel
trait by looking up a channel_id in the gateway's AcpTunnelRegistry and calling
TunnelHandle.mcp_message — the root glue that connects the two sibling crates
without either depending on the other (mirrors the ChatAdapter pattern).

Wiring in `openab run` (feature acp): create ONE shared acp_tunnel_registry
before the pool; give the pool a RootBrowserTunnel over it
(with_browser_tunnel), and inject the SAME registry into the gateway AppState so
acp_server populates the exact map the bridge reads.

This closes the loop: agent tools/call -> core per-session MCP proxy ->
RootBrowserTunnel -> gateway TunnelHandle -> mcp/message -> extension. Live path
still needs a real extension + deploy (T7); everything compiles + unit tests
green.

Gate green: clippy -D warnings + test --test-threads=1 + build, --features unified.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): record the as-built OpenAB side (D5-a + D6-a', end-to-end)

Add a §7 "As-built" section documenting the two decisions settled during
implementation and the realised call path: D5 = per-session MCP server bound to
the existing channel_id map (lifetime tied to the AcpConnection via a
CancellationToken DropGuard); D6 = BrowserTunnel trait in core + impl in the root
(RootBrowserTunnel), keeping core/gateway sibling-independent like the existing
ChatAdapter glue. Notes remaining T5.4 / T6 / T7.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* test(e2e): MCP-over-ACP tunnel producer section in acp-ws-smoke (T7)

Add a "MCP-over-ACP tunnel" section to the smoke suite: a mock extension declares
a {type:acp} mcpServers entry in session/new, then asserts the gateway issues a
server-initiated mcp/connect carrying the declared acpId, and answers it with a
connectionId (registering the tunnel). This exercises the live read-loop spawn +
server->client request path end-to-end — the concurrency unit tests can't reach.

Runs against a live server (deploy T7). The tunnel path is inert for normal
sessions (only triggers on a type:acp declaration), so it does not affect
existing ACP traffic.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* test(e2e): complete the MCP-over-ACP tunnel suite (fan-out + filtering)

Extend the tunnel section from a single-server check to full producer coverage
via a collect_mcp_connects() helper: single type:acp → exactly one mcp/connect;
fan-out (two type:acp servers → one distinct mcp/connect each, distinct request
ids); mixed acp+http mcpServers → only the acp entry is tunnelled. All
deterministic. Validated live against Falcon: 34/34 (tunnel 7/7).

The agent→tool→browser leg is out of the WS suite's reach (needs a real
extension, T6). Run: OPENAB_ACP_TOKEN=<key> uv run scripts/acp-ws-smoke.py ws://<host>/acp

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp-mcp): address Mira review nits — constant-time bearer + string-number id

Two non-blocking hardening nits from the openab-side review:

- mcp_proxy require_bearer: compare the loopback MCP bearer in constant time
  (subtle::ConstantTimeEq, matching the gateway's feishu/wecom signature checks)
  so a wrong token can't be recovered byte-by-byte via response timing. Adds
  `subtle` as an optional dep under the `acp-mcp` feature.
- acp_server route_client_response: accept a stringified-number JSON-RPC id
  ("1") in addition to a numeric id, so a spec-loose client's responses still
  correlate to their pending request instead of being silently dropped.

Gate (targeted, no repo-wide fmt — this container's rustfmt disagrees with the
branch on pre-existing import ordering): clippy clean on both crates;
openab-core mcp_proxy tests 8/8, openab-gateway acp_server tests 35/35 green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp-mcp): establish the browser tunnel on session/resume, not just session/new

katashiro persists its ACP session and RECONNECTS via session/resume (not
session/new), re-declaring its "type":"acp" browser MCP server each time. The
session/new branch spawns establish_and_register_tunnel for each declared server,
but session/resume only recorded them in the session state and never opened a
tunnel — so a resumed browser session had no entry in the tunnel registry and the
core MCP proxy returned "no browser attached to session acp_<uuid>" on every call.

Mirror the session/new logic in the resume branch: derive the same deterministic
channel_id from the sessionId and spawn establish_and_register_tunnel for each
declared type:acp server. This is what makes the live loop work across katashiro's
auto-reconnect (which always resumes).

Gate: clippy clean, openab-gateway acp_server tests 35/35.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore(acp-mcp): log browser tunnel open/register for live-session observability

establish_and_register_tunnel is reached only when a client declared a "type":"acp"
server, so an info line there answers "did the extension advertise itself?" from
the gateway log alone (the raw upstream session frame isn't otherwise logged).
Logs on open and on successful registry insert.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp-mcp): raise ACP frame cap 1→8 MiB for browser-tool results

Browser tool results carried over the MCP-over-ACP tunnel (notably screenshots)
routinely exceed the old 1 MiB inbound frame cap, which closed the WebSocket
mid-response and wedged the extension in a reconnect loop. 8 MiB gives ample room
for a compressed screenshot / large DOM snapshot while staying a sane DoS bound.
Pairs with the katashiro-side switch to JPEG screenshots.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp-mcp): one browser tunnel per session — fix fan-out overwrite/orphan (M-B1)

The tunnel registry is keyed by channel_id, and both the session/new and session/resume
paths looped over every declared type:acp server calling establish_and_register_tunnel.
With >1 server each insert overwrote the previous under the same channel_id, leaving the
earlier tunnel opened-but-unreachable (orphaned). The core proxy only ever resolves a browser
by channel_id, so one tunnel per session is the actual model. Factor both call sites into
spawn_browser_tunnel(), which establishes only the first declared server and warns on extras.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp-mcp): 0600 mcp.json + strip stale bearer on evict (M-B2)

start_session_server wrote <workdir>/.cursor/mcp.json with tokio::fs::write, leaving it at
the umask default (typically 0644) — but the file embeds the live loopback bearer token, so
any local user could read it. Write via write_private() which chmods it 0600. Also, on session
evict (CancellationToken fires) strip the now-dead openab-browser entry so a stale credential
doesn't linger; guarded to only remove the entry if it still points at our addr, so a
concurrent/reconnected session that already replaced it isn't clobbered (the mcp.json path is
shared across acp: sessions). Adds a 0600 assertion to the existing config-write test.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore(acp-mcp): lock subtle dependency

Cargo.lock was missing the openab-core `subtle` entry added for the constant-time
bearer compare, which would fail a `--locked` build. No code change.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(mcp-proxy): write openab-browser into kiro-cli config too, not just Cursor

start_session_server now merges the openab-browser entry into BOTH .cursor/mcp.json
and .kiro/settings/mcp.json (each CLI ignores the other's), and cleans both on evict.
kiro-cli parses the {url, headers} shape identically. Deployed as acpmcp-kirofix.
Also add .dockerignore (exclude target/, .git/, data/) for the acp image builds.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs: browser MCP agent setup — per-variant mcp.json how-to (Phase 2 #8)

How the openab-browser tools reach each agent CLI: the per-session loopback proxy +
where openab writes the {url, headers} entry per variant (Cursor/Kiro auto today;
Claude/Codex/Gemini paths documented, not yet auto). Honest caveat: static manual
config awaits the stable-endpoint redesign (#9).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(mcp-proxy): per-pod browser-bridge socket server (Option C, P1)

serve_browser_socket: one unix socket multiplexes all sessions; the openab
browser-bridge shim forwards {channel_id, inner MCP request} frames, routed via
dispatch_browser_mcp -> the shared BrowserTunnel by channel. Reuses browser_tools()
+ tunnel.call (single source of truth vs the HTTP ProxyHandler). +8 tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(cli): openab browser-bridge subcommand — stdio MCP relay to the browser socket (Option C, P2)

A thin per-session shim: reads OPENAB_BROWSER_CHANNEL, wraps each stdin MCP request
as {channel_id, request}, forwards to the per-pod core socket, relays responses to
stdout verbatim. All browser MCP logic stays in core; the agent's config line is
static. Gated by feature acp. + wrap/relay tests over in-memory pipes.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(acp): inject OPENAB_BROWSER_CHANNEL into the agent env (Option C, P3)

AcpConnection::spawn gains a browser_channel param; for an acp: session the pool
passes the channel_id so the agent (and the browser-bridge shim it later spawns)
inherits it and routes browser tool calls to THIS session's tunnel. env_clear-safe
(re-injected explicitly). + set_browser_channel unit tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(mcp-proxy): static write-once browser-bridge config (Option C, P4)

write_bridge_mcp_config writes the SAME {command:openab, args:[browser-bridge]} entry
to cursor + kiro mcp.json — no port/bearer, so it never goes stale and can't clobber
across sessions (the root cause of multi-window browser flakiness). Merges without
touching the user's servers; idempotent. Additive — P5 wires the proxy/bridge toggle.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat: OPENAB_BROWSER_MODE proxy|bridge toggle wiring (Option C, P5)

BrowserMode + browser_mode() (default proxy) + shared browser_socket_path(). Pool
branches: proxy = per-session HTTP server (unchanged default); bridge = static
write-once config, no per-session server. Broker starts the per-pod socket server once
in bridge mode. browser-bridge shim uses the shared socket path. + parse tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(browser-bridge): resolve channel via process-ancestry, not env (Option C, b2 B1)

The MCP client scrubs the child env (cursor gives the bridge only HOME/PATH/USER or
the pod env, never the per-session OPENAB_BROWSER_CHANNEL), so env inheritance can't
carry the channel. resolve_channel() now walks up the PPID chain and reads
OPENAB_BROWSER_CHANNEL from the ancestor agent's /proc/<pid>/environ (openab injected
it via the pool) — generic across all stdio-MCP vendors. Logs the resolved channel to
stderr. + parse_ppid_from_stat / parse_channel_from_environ unit tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* feat(mcp-proxy): revert bridge config to pure {command,args} (Option C, b2 B2)

Drop the ${OPENAB_BROWSER_CHANNEL} config env — cursor doesn't expand it (spawns from
pod/clean env). The bridge now resolves its channel via process-ancestry (B1), so the
config is a byte-identical static entry again: idempotent, never stale, no clobber.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(acp): add acp_mcp_servers to test-only AcpSession initializers

The 4 AcpSession constructors in `mod acp_review_fixes` tests missed the
acp_mcp_servers field added in T4, breaking `cargo test -p openab-gateway
--features acp` (E0063). build/clippy don't compile this crate's test
target under `acp`, so only CI caught it. Also syncs Cargo.lock to the
already-committed openab 0.10.0 version.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(acp): split into reverse-MCP mechanism ADR + browser-control ADR, embed diagrams

Two ADRs instead of one:
- acp-server-websocket-reverse-mcp.md — the generic reverse-MCP-over-ACP mechanism
  (roles, call route, protocol gap, §6 multi-server generalization: compound-key
  routing, dynamic tools/list + list_changed, per-server Option B). Embeds the
  architecture + MCP-usage sequence diagrams (mermaid), using browser control as the
  example. Flipped Proposed -> Accepted (as-built in #1447).
- acp-server-websocket-mcp-browser.md — the browser-specific design + the contract the
  browser extension implements (D1-D6, detailed id-paired runtime sequence, tasks,
  as-built). Defers the mechanism to the reverse-MCP ADR.

Update base ADR + tunnel-contract cross-links; mark base §6 browser critical-path done.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): correct D4 list_changed overclaim in browser ADR

list_changed is designed but not yet implemented (0 hits in gateway/core
crates); it was described as shipped alongside static-advertise. Reword to
mark it as P2b-tracked (reverse-MCP §6.2), not as-built.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* refactor(acp): compound-key (channel_id,server_id) tunnel registry + rename BrowserTunnel->AcpMcpTunnel (P1, Fork A)

Behavior-preserving refactor toward generic multi-server MCP-over-ACP
(reverse-MCP ADR §6). No functional change for the single browser server.

- AcpTunnelRegistry: HashMap<String,_> -> HashMap<(String,String),_>; register
  under the client-declared srv.id; evict all (channel_id,*) on teardown.
- Core trait BrowserTunnel -> AcpMcpTunnel; call() gains a server_id param.
- Read side (Fork A): the single-browser proxy + bridge pass an empty server_id
  sentinel; RootBrowserTunnel resolves the sole tunnel on the channel (errors if
  ambiguous). Real per-server read-side routing (bridge-frame server_id) is
  deferred to P2.

Gate: build --features acp, clippy --workspace -D warnings (+unified),
test -p openab-gateway --features acp — all green (307 passed).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore: regenerate Cargo.lock for merged deps

* fix(mcp-proxy): register browser server in kiro per-agent configs (--agent mode)

When kiro-cli runs with --agent <name> — as every OAB bot deployment
does — the MCP server list comes from .kiro/agents/<name>.json and tools
are gated by that file's default-deny allowedTools, NOT from
.kiro/settings/mcp.json (verified live on the b2 fleet deployment; see
docs/gmail-native.md 'Kiro CLI gotcha'). Without this, browser tools are
invisible to exactly the deployments this feature targets.

- merge_kiro_agent_configs: merge the openab-browser entry into every
  .kiro/agents/*.json and add @openab-browser to allowedTools; agent
  files carry unrelated config, so unparseable files are skipped, never
  clobbered (unlike the settings writer); macOS ._* droppings ignored;
  idempotent; 0600 (proxy entries carry a live bearer).
- cleanup_kiro_agent_configs on session evict: remove the entry and
  revoke the allowlist grant only when the URL is still ours, preserving
  a concurrent session's live entry (same rule as the settings cleanup).
- Wired into both the per-session proxy writer and the static Option C
  bridge writer; 4 new tests.

* feat(mcp): browser capabilities through the session-aware facade (Facade mode, default)

Routes browser tools through the OAB MCP Facade as a session-aware
in-process capability source (openab-mcp #1454), replacing per-session
proxy servers as the default transport. Proxy and Option C bridge modes
are unchanged and remain explicit opt-outs (OPENAB_BROWSER_MODE).

- src/browser_source.rs: CapabilitySource over the existing AcpMcpTunnel
  (requires_session; D4 static-advertise; tunnel errors surface as MCP
  error results); FacadeRegistrar adapts the facade's SessionTokens to
  core's new SessionTokenRegistrar hook (core stays openab-mcp-free).
- core mcp_proxy: BrowserMode::Facade (new default; runtime fallback to
  Proxy when no facade is serving), write_facade_mcp_config — a static,
  write-once 'openab' entry whose Authorization references
  ${OPENAB_SESSION_TOKEN}; the per-session secret rides the agent
  process env instead of config files, eliminating the shared-workdir
  clobber class entirely (incl. kiro --agent files + @openab allowlist).
- pool: with_facade_sessions wiring; mints/injects the token per spawn,
  revokes via the same DropGuard plumbing proxy mode uses.
- main: facade constructed with the BrowserSource; one listener, one
  discovery surface (search_capabilities/execute_capability).
- rmcp re-exported from openab-mcp for source implementors.
- docs: facade-mode section in the browser setup guide.

* fix: facade_serving is acp-only — derive it, don't flag it (default-features -D warnings)

* docs(adr): §6 builds on the OAB MCP Facade — one AcpTunnelSource, static-advertise, trust gate

Rewrites reverse-MCP ADR §6.2-§6.6 now that the facade seam landed upstream
(#1448/#1453 facade, #1454 session-aware CapabilitySource, #1446 ADR):

- §6.2 expose every client-declared type:acp server through ONE in-process
  CapabilitySource (AcpTunnelSource) registered with the facade, rather than
  the bespoke per-(session,server) loopback proxies + N mcp.json entries.
  Sources are registered once at construction, so the source fans out
  internally and routes on the <server>.<tool> prefix to (channel_id,
  server_id). Session identity moves to the facade's SessionTokens.
- §6.3 drop notifications/tools/list_changed outright — facade discovery is
  pull-based (search_capabilities re-reads per call), so nothing caches a
  tool list to invalidate. Keep the static-advertise posture, implemented as
  fetch-once-per-declared-server + per-(channel,server) cache; unavailability
  is a call error, not a vanishing catalog entry.
- §6.4 new trust requirement: #1454 assumes operator-granted tool sets, but a
  tunnel source's tools are client-declared — require an operator allowlist
  (default: browser only) plus a per-declared-server tool_filter.
- §6.5 records what this retires and leaves stdio bridge-mode removal as an
  explicit operator call; flags the meta-tool-vs-direct hop as open.
- Browser ADR: correct D4 (list_changed dropped, static-advertise kept) and
  add a supersession notice over D2/D3/D5.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): align §6 with the merged facade series + record the mcpServers divergence

Follows the merge of main (adapter ADR #1446, gmail doc #1455) into this branch:

- Link the OAB MCP Adapter ADR directly now that it is present, and note the
  whole facade series (#1446/#1448/#1449/#1450/#1453/#1454) is merged with no
  facade PR left open — §6 builds on a settled foundation.
- Cite adapter ADR §6.2 / Alternative C ("no second generic inbound MCP server",
  browser and external capabilities share one delivery mechanism), which makes
  retiring the bespoke per-session proxy (F5) an upstream design requirement
  rather than optional cleanup.
- Record an unresolved divergence: the adapter ADR says the facade is delivered
  via ACP `mcpServers` and explicitly not by editing CLI config files, while the
  as-built `write_facade_mcp_config` does write a static entry — deliberately,
  since browser D2 found Cursor ignores ACP-passed mcpServers. Flagged for the
  facade contract owner instead of unilaterally reconciling.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): tighten §6.4 trust gate — deny-all tool_filter + pinned browser tool set

Falcon's review of §6 (F7): the operator allowlist of declared server names is
not a trust boundary on its own. The name is chosen by the same remote client
that declares the tools, so a client may declare a server named `browser` and
publish an arbitrary tool set under it.

Align the §6.6 F4 summary with the requirement §6.4 now states: the
per-declared-server tool_filter is deny-all by default, and the `browser` entry
ships pinned to its five known tools so a same-name declaration cannot inject
others.

Co-Authored-By: Claude <noreply@anthropic.com>

* docs(adr): §6.1/§6.2 — declared id vs name, and last-attach-wins on same-name tunnels

Found while scoping F1': the routing contract as written could not be
implemented. A declaration is {type:"acp", id, name} and the reference client
mints `id` as a fresh crypto.randomUUID() per connection while `name`
("browser") is stable. The registry is keyed by `id`, but the `<server>`
segment of a tool name (`browser.click`) and the §6.4 allowlist are the `name` —
so routing "on the prefix to the matching (channel_id, server_id) tunnel" can
never match: the key is a UUID the tool name never contains.

Record what review settled (Mira + Falcon, 2026-07-26):
- registry stays keyed by (channel_id, id) — keying by name would let two
  same-name tunnels overwrite each other, the fan-out collapse §6 fixes — but
  must also record the declared name so a source can enumerate (name, id);
- trust gating is keyed by name, since ids are per-connection UUIDs;
- same-name collisions are last-attach-wins: the new tunnel replaces and evicts
  the older entry. Answering "ambiguous" there would wedge the client out of its
  own tools on every reconnect, because each reconnect mints a new id.

Also clarify that the prefix selects the tunnel and is NOT stripped: the full
published name is what goes over the tunnel, since that is what the server's own
tools/call expects.

Co-Authored-By: Claude <noreply@anthropic.com>

* feat(acp): record declared server name, establish all declared tunnels, LWW on re-attach

Tunnel-layer plumbing for §6 F1' (generalising the capability source to N
client-declared servers). Behaviour-neutral for today's single-browser client:
one declared server still yields exactly one tunnel.

A declaration is {type:"acp", id, name} and the two fields have different
lifetimes — the reference client mints `id` as a fresh crypto.randomUUID() per
connection while `name` ("browser") is stable. The registry is keyed by `id`,
but a tool name carries the `name` (browser.click) and the §6.4 trust gate is
keyed by it too, so the name has to survive registration to be routable.

- TunnelHandle records the declared `server_name` and exposes it.
- establish_and_register_tunnel takes the declared name and resolves a
  re-declared name last-attach-wins: the new tunnel evicts stale same-name
  entries on the channel. Because a reconnect mints a new id, the dead tunnel
  would otherwise linger beside the live one, and answering "ambiguous, pass a
  server_id" there would wedge the client out of its own tools on every
  reconnect. The eviction is also what bounds registry growth.
- spawn_browser_tunnel -> spawn_acp_tunnels now establishes EVERY declared
  server. The old first-only limit existed because the registry was keyed by
  channel_id alone, where a second server overwrote the first and orphaned its
  tunnel; the compound key removed that collision.
- AcpMcpTunnel gains servers(channel_id) -> Vec<(name, id)>, implemented by
  RootBrowserTunnel over the registry. This is what lets a capability source
  resolve a tool prefix back to a tunnel; matching a prefix against the
  registry key alone can never work, since the key is a UUID the tool name
  never contains. Default impl is empty so test doubles are unaffected.

The source-side consumer (AcpTunnelSource routing + the §6.4 trust gate) is the
next step; nothing reads servers() yet.

Co-Authored-By: Claude <noreply@anthropic.com>

* feat(acp): route client-declared servers by name and gate their tool sets

Second half of §6 F1' — the consumer of the tunnel plumbing added in 5dc45de0.
BrowserSource becomes AcpTunnelSource: it fans out to every client-declared
MCP server instead of assuming one implicit browser, and enforces the §6.4
trust gate. Behaviour for today's single-browser client is unchanged.

Routing (§6.1/§6.2): the `<server>` prefix of a published tool name is the
declared *name*, while the registry is keyed by the per-connection `id`, so
`call` resolves name -> (channel_id, id) via the registry enumeration. The
full published name is forwarded (`browser.click`), not the suffix — the
prefix selects the tunnel, it is not stripped, because the server's own
tools/call expects the name it published.

Trust gate (§6.4), two independent checks:
- the declared name must be in the operator allowlist (default: browser only);
- the tool must be one that server is pinned to.
The second is not redundant with the first. The name is chosen by the same
remote client that declares the tools, so a client can re-declare the trusted
name `browser` and publish `browser.exec`; the pin is what refuses it. Denied
calls never reach the tunnel. Both cases are covered by tests.

`browser` appears only as an entry in the default policy table — deliberately
data, not a branch — so the routing code stays generic and admitting another
client-side MCP service is a table entry (§6.2: no browser-specific branch).

tools() serves the policy table statically and is deliberately NOT intersected
with the tunnels currently attached: intersecting would make the catalog flap
as a tab detaches, which §6.3 forbids, and would lose the pre-attach discovery
D4 already provided. Availability is reported by call, never by a shrinking
catalog. Session *scope* — restricting to the servers a given client declared —
is a separate axis needing F3's declaration cache, so tools() ignores ctx for
now; an allowlisted server's pinned tools are advertised to every session,
which is the status quo for the browser.

Co-Authored-By: Claude <noreply@anthropic.com>

* docs(adr): §6.3 — policy entries seed the catalog; cache narrows, never grants

Found while scoping the discovery cache: §6.3 said an un-cached declared server
"contributes an empty set", which contradicts the static-advertise posture that
§6.4's pinned sets and D4 both rely on, and which the source implemented in
ba94efec (browser's pinned tools are advertised before the extension attaches —
confirmed correct on review).

Record the layering review settled instead:
- a server's §6.4 policy entry is its pre-attach SEED as well as its filter, so
  a pinned server never drops to empty just because nothing has attached;
- the per-(channel_id, server_id) cache holds fetched ∩ allowed and replaces the
  seed once a fetch succeeds, narrowing the catalog to what the server really
  publishes without ever widening past the policy;
- a declared server with no policy entry contributes nothing because §6.4 is
  deny-all, not because it is un-cached. Caching is never itself a grant.

Also record the ordering consequence: deny-all plus pinned entries that already
carry full Tool schemas means fetching cannot surface anything the operator has
not already permitted, so the discovery cache is invisible until the
operator-facing config surface exists. The config surface lands first; the cache
then supplies real schemas once operators may list tools by name alone.

Co-Authored-By: Claude <noreply@anthropic.com>

* feat(mcp): operator config surface for the client-declared server allowlist

Completes the §6.4 gate: enforcement landed in ba94efec, but the allowlist and
per-server tool filter were a hardcoded table with no way for an operator to
change them. Adds [[mcp.acp_servers]] entries of {name, tools}.

Keyed by the declared name, never the id — the reference client mints its id as
a fresh UUID per connection, so an allowlist of ids could not match twice.

ServerPolicy now separates the two jobs that were conflated in one field, which
is the layering §6.3 settled:
- `allowed` is the deny-all gate over tool NAMES;
- `seed` is the pre-attach advertisement (full Tool values), always a subset of
  `allowed`, so narrowing the policy narrows the catalog and can never widen it.

Operators may list tools by name alone. For a server with a built-in catalog the
schemas are taken from it and narrowed to what was permitted, so restricting the
browser to read_dom needs no restated JSON schema. A server admitted by name
with no built-in catalog has no seed yet: it dispatches, but advertises nothing
until discovery caching can fetch its real schemas — which is precisely the job
that gives the cache a non-redundant purpose.

Two deliberate behaviours, both tested:
- an ABSENT/empty section keeps the built-in browser default, so omitting the
  config cannot silently break existing browser control;
- writing ANY entry takes over the allowlist wholesale — browser is not retained
  alongside an operator's list, so the config never grants more than it states.

Co-Authored-By: Claude <noreply@anthropic.com>

* feat(acp): discovery cache — fetch each declared server's real tools/list

Implements §6 F3'. A server an operator admitted by name alone had no schemas to
advertise; it could dispatch but was invisible. Discovery fills that gap, which
is the job that gives the cache a non-redundant purpose.

Two deviations from §6.3 as written, both applied to the ADR in this commit:

1. The cache is keyed by (channel_id, NAME), not (channel_id, server_id). Ids
   are minted per connection, so an id-keyed entry would be orphaned by exactly
   the reconnect the cache exists to survive — it could never outlive the attach
   that populated it, which is the opposite of "serve regardless of current
   attach state". This is a corollary of the id-vs-name distinction §6.1 already
   records. Same-name collisions are impossible under last-attach-wins, so the
   name is a safe key. Covered by a test that reconnects under a fresh id.

2. Discovery is pull-triggered, not attach-triggered: a declared server with no
   cache entry has its fetch started from the next tools() call and its real set
   appears one discovery round later. The facade re-reads the catalog on every
   call, so one round of staleness is the whole cost, and it avoids threading an
   attach hook from the gateway (which owns attach) into the root (which owns
   the source).

The cache stores what the server PUBLISHED, unfiltered, and the policy is
applied on read. Filtering on read means tightening the policy takes effect
immediately rather than waiting for an entry to be invalidated, and it keeps the
invariant that caching is never itself a grant: a server that publishes a tool
the operator never permitted stays both invisible and uncallable. Tested.

A failed fetch leaves the seed in place — a seeded server never drops to empty —
and clears its in-flight marker so the next round retries. Repeated discovery
rounds do not pile up duplicate tools/list requests on one tunnel.

Co-Authored-By: Claude <noreply@anthropic.com>

* test(acp): two client-declared servers in one session

Covers the multi-server claim §6.2 makes, through the real source: one session
declares `browser` and a second, non-browser server; both are discovered and
callable, tool names do not collide, and each server's policy is enforced
independently.

- both servers contribute to one catalog, each under its own prefix, with no
  duplicate names (the case a naive un-prefixed catalog would collapse);
- each tool reaches the tunnel of the server that declared it, by name -> id;
- a permission granted to one server does not leak to another: browser.click is
  permitted while notes.click is refused, proving the gate is per-server rather
  than a global tool-name allowlist — an easy thing to regress in a refactor and
  invisible with only one server configured;
- one server detaching leaves its neighbour callable.

SCOPE: this is the source-side half of F6, not a full end-to-end. F6 asks that
"the agent discovers + calls tools from BOTH", and the agent-side leg runs
through the facade's meta-tools — which cannot be exercised while facade mode is
not live anywhere (no [mcp] configured; the browser deployment runs
OPENAB_BROWSER_MODE=bridge). That is the same precondition F5 is blocked on. The
gateway-side half — two type:acp servers each getting their own mcp/connect — is
already covered by section_tunnel in scripts/acp-ws-smoke.py. What remains
genuinely unproven is the facade <-> source seam.

Co-Authored-By: Claude <noreply@anthropic.com>

* refactor(mcp): rename the client-declared browser surface to katashiro.*

Counterpart to the katashiro-side rename. `browser` / `browser.*` collided
with Playwright MCP's `browser_*` tools; the declared name and tool prefix
become `katashiro` / `katashiro.*`.

- mcp_proxy::browser_tools(): the five seed tools (D4 static-advertise)
- browser_source::builtin_catalogs(): the catalog key, and every test that
  rides the default policy
- config: the acp_servers doc comment naming the built-in default
- docs: tunnel contract declaration + tool table, agent-setup tool list

Both injection-regression tests (`unpinned_tool_on_an_allowlisted_server_is
_refused`, `caching_is_never_itself_a_grant`) called `browser.exec`. Left
unrenamed they still assert is_err, but for the wrong reason — an unknown
server name rather than an unpinned tool on a trusted one — quietly gutting
the check. They now call `katashiro.exec`.

Names only; policy semantics, routing and schemas unchanged.

Co-Authored-By: Claude <noreply@anthropic.com>

* docs(adr): follow the katashiro.* rename through both ADRs

270a2ffd renamed the client-declared surface (`browser.*` -> `katashiro.*`) in code,
config and the tunnel contract, but the two ADRs still described the old tool names —
including the §6.4 pinned-tool list and the runtime sequence diagrams, which readers
would otherwise copy verbatim into a policy that no longer matches.

The one remaining `browser.click` is inside a verbatim quote of upstream #1454's
sources.rs doc comment and is left as written.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs: lead the browser-MCP setup guide with facade mode, demote proxy/bridge

The guide still opened with the per-session loopback proxy as "how it reaches
the agent" and only mentioned the facade in a trailing section, so a reader
took the superseded design as current. Facade mode has been the default since
bf37d25e.

- Lead with a mode table (facade default; proxy/bridge as explicit opt-outs)
  and the `[mcp]` + `[[mcp.acp_servers]]` config needed to enable it.
- Document what actually changes under the facade: one listener, a static
  write-once entry referencing `${OPENAB_SESSION_TOKEN}` (secret rides the
  process env, not a file), and discovery via search_capabilities rather than
  the agent's own tools/list.
- Note the consequence the old text got backwards: because the entry is static,
  hand-configuring a variant openab doesn't auto-write is now viable. The old
  "gated on a stable browser-MCP endpoint" caveat is resolved, not pending.
- Keep proxy's per-variant config table under an explicit "Legacy" heading.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(adr): fold the browser ADR into the reverse-MCP ADR as its worked example

Consolidates the ACP ADR family from four documents to three (base, the original
@pahud proposal, and this one). The browser design was split out earlier in this
PR, but with the facade integration the two documents had grown overlapping
diagrams and the browser ADR had accumulated content that no longer described
anything shipping.

Folded in as §7 "Worked example — browser control": the toolset (incl. why the
declared name moved to `katashiro`), D1-D6 with their supersession notice, and
the message-level round-trip with the two id spaces.

Dropped rather than carried over:
- "Execution flow (bootstrap)" — described the pre-facade per-session-proxy boot
  path and duplicated D2/D3/D5.
- "Tasks (as executed)" — project-management history; the commits are the record.
- The separate context/references sections, which duplicated §1 and §11.

Net ~90 lines smaller than the two documents were. Referrers updated, including
the two links in the merged OAB MCP Adapter ADR; no dangling references remain.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(mcp): note that mcp.audit must be named in RUST_LOG or auditing is silently off

`mcp.audit` is a bare tracing target, not under the `openab` prefix, so the
filter the deployment docs and our own fleet use —
`RUST_LOG=openab=debug,openab_agent=debug` — matches none of the audit events
and drops every audit line. Nothing indicates that auditing is disabled, so a
deployment can believe it has a tool-call audit trail and have none.

Found while verifying a live facade dispatch: the call demonstrably executed
(the tool result reached the agent) with zero audit output.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs: warn that a leftover mode entry silently bypasses the facade

Each transport writer only adds its own mcp.json entry — facade writes `openab`,
bridge writes `openab-browser` — and neither removes the other's. An agent that
has run in both modes therefore loads both servers, exposing the same
`katashiro.*` tools twice: once through the facade (policy + audit) and once
straight through the old transport (neither). The model calls the direct one and
the call leaves no audit trail at all, while appearing to work perfectly.

Corrects the evidence in 1c1919ce: that commit attributed the missing audit
lines to `RUST_LOG` alone, having assumed the observed call was a facade
dispatch. It was not — a stale bridge entry was carrying it. The RUST_LOG note
there is still correct and still required; it was simply not the reason auditing
looked dead in that instance.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* ci: run the acp-mcp core and acp root tests

`cargo test --workspace` builds with default features, so two sets of tests this
PR added never compiled in CI: openab-core's `acp-mcp`-gated mcp_proxy tests and
the root package's `acp`-gated browser_source / browser_bridge tests. 67 tests
between them — including the capability source's routing and trust-gate
coverage — so the fixes they back could not gate a merge.

Add two steps mirroring the existing acp-gateway one.

The core step is filtered to `mcp_proxy::` on purpose. `acp-mcp` gates exactly
one module, so the filter loses no coverage, and an unfiltered `-p openab-core`
would pull in hooks::tests — the parallel flake the gateway step's comment
already documents avoiding.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(acp): do not open tunnels after a rejected session/resume

The read loop derived its own channel_id from the requested sessionId and used
that as the condition for spawning tunnels. A well-formed `sess_<uuid>` derives
successfully on all four of the handler's rejection paths — missing sessionId,
malformed sessionId, per-connection cap, busy — so the guard was not checking
what it appeared to check. Combined with last-write-wins same-name re-attach,
a refused resume could evict the live tunnel it had just been refused in favour
of: a client mid-prompt (busy) or over the cap would knock out the browser
control of the session that legitimately held it.

handle_session_resume now returns (JsonRpcResponse, Option<String>), handing
back the channel only when the resume actually succeeded, and the loop spawns
only on that Some. This mirrors handle_session_new's (resp, channel_id) and
deletes the independent derivation rather than adding a second check beside it —
leaving the derive in place would keep a misleading guard available for reuse.

Regression coverage asserts a None channel on each of the four rejections. The
over-cap and busy cases are the load-bearing ones: their sessionIds are well
formed and their sessions really exist, so the old guard produced a channel and
spawned.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(acp): do not mint a facade session token when its config write fails

When write_facade_mcp_config failed, the code warned and carried on: it minted
OPENAB_SESSION_TOKEN and spawned the agent anyway. The agent then had no
`openab` entry, so it could not reach the facade at all, while a live credential
stayed registered for that channel until eviction — and the only trace was a
warning.

Mint only when the write succeeded. The session still starts; it simply has no
browser capabilities, which is the honest description of what happened. The
failure is logged at ERROR, and with no token there is no revoke guard to arm.

Two alternatives were considered and rejected. Aborting session setup lets a
config-write failure kill an otherwise working agent, and browser control is one
capability among many. Falling back to a direct transport is worse than it
looks: proxy and bridge write into the same workdir, so a failure there is
likely to repeat, and silently switching to a direct entry re-creates the
facade-bypass this PR's other fix exists to remove.

Extracted setup_facade_session so the invariant is testable — the pool's tests
are pure-function units and driving the real path spawns an agent. A counting
registrar proves mint is never called when the write fails, forced by making
<workdir>/.cursor a file so create_dir_all errors.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(mcp): retire the direct browser transport when facade mode sets up

The facade writer added its `openab` entry but left any previous
`openab-browser` entry in place, so both loaded and the model could take the
direct path — reaching the browser without passing through facade policy and
audit. Observed live 2026-07-26 and until now only documented.

Remove the stale entry from all three places the direct transports wrote:
.cursor/mcp.json, .kiro/settings/mcp.json, and the kiro per-agent files. For the
agent files the `@openab-browser` grant goes too — `allowedTools` is default
deny, so a leftover grant is what keeps the bypass reachable even once the
server entry is gone; removing one without the other is a half fix.

Ownership is decided by exact shape, never by the key. `openab-browser` is not
proof we wrote it, and an operator may have configured their own server there.
Only the two shapes we ever wrote are removable: the bridge entry
{command:"openab",args:["browser-bridge"]}, and the per-session proxy entry —
a loopback http://127.0.0.1:<port>/mcp url carrying a bearer header. A remote
url, a bearer-less loopback, a different command or an empty port are treated as
operator-owned and preserved verbatim.

The matcher deliberately errs toward under-removal: a leftover entry only
preserves the bypass, while deleting an operator's configuration destroys work.

Tests cover shape recognition against five foreign shapes, removal alongside
untouched user servers and unrelated top-level keys, a foreign `openab-browser`
preserved verbatim, and the agent-file case where @github survives while
@openab-browser goes.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(acp): keep the 8 MiB frame allowance to tunnel results only

Raising MAX_FRAME_BYTES to 8 MiB for browser tool results also raised it for
every other inbound frame, so one connection could hold MAX_INFLIGHT_PROMPTS
(32) x 8 MiB of prompt text — the ~256 MiB worst case the review flagged.

Bound the raise to the traffic it was for. Browser results arrive as client
RESPONSES to our server-initiated `mcp/message` requests — id present, no
`method` — so responses keep the 8 MiB ceiling, while every method-bearing
frame (session/prompt included) is held to MAX_NON_TUNNEL_FRAME_BYTES, the
pre-existing 1 MiB. That is what removes the exposure: the worst case came
from prompts, which are method-bearing.

Note this is deliberately not a `method == "mcp/message"` test, even though
that is the obvious reading. `mcp/message` is only ever sent outbound; there is
no inbound frame carrying that method, so matching on it would cap the
screenshot responses at 1 MiB and break the case the raise exists for.

The 8 MiB check stays pre-parse and still closes the connection: an oversized
frame cannot be parsed back to its id, so no response can be fabricated for it.
The per-kind check runs after parsing, where the id is available — oversized
requests get ACP_OVERLOADED with their id, and oversized notifications are
dropped without a reply, since answering a notification is a protocol
violation.

The unbounded outbound channel is untouched and remains a documented follow-up
inherited from #1418 F6; this change bounds only what this PR added.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(mcp): authenticate the bridge connection, not the frame

The unix socket authenticated nothing. 0600 proves the peer shares our uid, but
says nothing about which session it belongs to, and the channel_id in each frame
is a value the caller picks — so any same-uid process could connect and drive
another live session's browser.

Derive the channel server-side instead. The shim already walked its own /proc
ancestry for OPENAB_BROWSER_CHANNEL; that logic was right but ran on the wrong
side, because a caller can always lie about its own answer. The server now takes
the peer pid from SO_PEERCRED and runs the same walk itself, so the peer cannot
choose. A connection whose channel cannot be established is refused outright
rather than given a default session.

Frames may still carry channel_id — the shim sends it — but it is only ever
compared against the authenticated value, never used to select a session; a
mismatch is dropped and logged.

The ancestry helpers move from the shim into openab-core, next to the server
that now authenticates with them, so there is one implementation rather than two
that can drift. The shim delegates to it and its frame value is advisory.

serve_browser_socket keeps its signature; serve_browser_socket_with_resolver
takes an injectable peer->channel mapping because a test binary's ancestry
carries no channel, so the real resolver would refuse every test connection.
The regression test proves a frame naming another session gets no reply at all
while the next legitimate frame is answered.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(mcp): revoke facade session tokens by token, not by channel

Session lifetimes overlap. `mint` replaces whatever token a channel holds, so a
replaced session's drop guard runs after its successor has already minted — and
the guard revoked by channel, which removed the live token. The new agent lost
facade access wit…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants