Skip to content

fix(chrome-extension-native-host): halt unauthorized origins and forward guardianId#24192

Merged
noanflaherty merged 2 commits into
noanflaherty/host-browser-proxy-phase-2from
phase-2-fixes/pr-2-native-host-p1-fixes
Apr 8, 2026
Merged

fix(chrome-extension-native-host): halt unauthorized origins and forward guardianId#24192
noanflaherty merged 2 commits into
noanflaherty/host-browser-proxy-phase-2from
phase-2-fixes/pr-2-native-host-p1-fixes

Conversation

@noanflaherty
Copy link
Copy Markdown
Contributor

@noanflaherty noanflaherty commented Apr 8, 2026

Summary

  • Makes writeFrameAndExit synchronously terminate the process so unauthorized origins cannot fall through to the stdin listener
  • Adds explicit return in the unauthorized branch as defense-in-depth
  • Forwards guardianId from /v1/browser-extension-pair through the native messaging token_response frame, fixing Codex P1 where bootstrapLocalToken rejected frames missing the field
  • Adds subprocess tests for unauthorized halt, guardianId forwarding, and missing-guardianId rejection
  • Extends existing e2e test to assert guardianId presence

Addresses gaps 2 and 3 from PR #24159 self-review.


Open with Devin

@noanflaherty noanflaherty merged commit 660afc5 into noanflaherty/host-browser-proxy-phase-2 Apr 8, 2026
12 checks passed
@noanflaherty noanflaherty deleted the phase-2-fixes/pr-2-native-host-p1-fixes branch April 8, 2026 00:59
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d9e5eae783

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +158 to +162
process.stdout.write(encodeFrame(payload));
} catch {
// ignore — exit code is the authoritative signal
}
process.exit(exitCode);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Wait for stdout flush before exiting native host

writeFrameAndExit now calls process.exit() immediately after process.stdout.write(...), which can drop or truncate the native-messaging frame on pipe-backed stdout (the normal Chrome host transport on macOS/Linux) whenever the pipe is buffered/backpressured. In that case the extension sees a disconnect instead of the expected token_response/error, so bootstrap can fail intermittently even though the helper exits. Because every success and error path funnels through this function, this regression affects the core pairing flow, not just the unauthorized-origin branch.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

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

Devin Review found 2 potential issues.

View 3 additional findings in Devin Review.

Open in Devin Review

Comment on lines +140 to +147
* Earlier versions of this helper used the callback form of
* `process.stdout.write()` to defer `process.exit()` until the buffer had
* been handed off, but that introduced a subtle bug: the function had to
* return a forever-pending Promise to satisfy the `never` return type,
* meaning callers that awaited it would yield control of the event loop
* before the process terminated. In the unauthorized-origin path that
* meant the stdin listener could be installed and start handling frames
* before the helper actually exited.
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.

🔴 Comment narrates refactoring history instead of describing current intent

The JSDoc for writeFrameAndExit at lines 140–147 says "Earlier versions of this helper used the callback form of process.stdout.write()…" — this narrates the implementation history of removed code. clients/AGENTS.md:407 requires: "Comments and docstrings must describe the code's intent and behavior, not its refactoring history." The design rationale can be conveyed without referencing past versions (e.g., "Using the callback form of process.stdout.write() would introduce a hazard: …").

Suggested change
* Earlier versions of this helper used the callback form of
* `process.stdout.write()` to defer `process.exit()` until the buffer had
* been handed off, but that introduced a subtle bug: the function had to
* return a forever-pending Promise to satisfy the `never` return type,
* meaning callers that awaited it would yield control of the event loop
* before the process terminated. In the unauthorized-origin path that
* meant the stdin listener could be installed and start handling frames
* before the helper actually exited.
* Using the callback form of `process.stdout.write()` to defer
* `process.exit()` would introduce a hazard: the function would need to
* return a forever-pending Promise to satisfy the `never` return type,
* meaning callers that `await` it would yield control of the event loop
* before the process terminated. In the unauthorized-origin path that
* would let the stdin listener be installed and start handling frames
* before the helper actually exited.
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

Comment on lines +7 to +16
* The previous `writeFrameAndExit` returned a forever-pending Promise
* after queuing the write, which meant `await`-ing it yielded the
* event loop and let the stdin listener run before the helper
* actually exited.
*
* - **Gap 3**: the helper must surface the `guardianId` field returned
* by `/v1/browser-extension-pair` in its `token_response` frame.
* Earlier versions destructured only `{ token, expiresAt }` and
* silently dropped the field, causing `bootstrapLocalToken()` on the
* consumer side to reject the frame as malformed.
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.

🔴 Test module docstring narrates refactoring history of removed code

The file-level docstring at lines 7–16 uses historical narrative to describe the bugs: "The previous writeFrameAndExit returned a forever-pending Promise…" (line 7–10) and "Earlier versions destructured only { token, expiresAt } and silently dropped the field…" (lines 14–16). clients/AGENTS.md:407 requires: "Comments and docstrings must describe the code's intent and behavior, not its refactoring history." These should be rephrased as current invariants the tests enforce, e.g., "writeFrameAndExit must terminate synchronously to prevent…" and "the helper must include guardianId in the token_response frame…".

Suggested change
* The previous `writeFrameAndExit` returned a forever-pending Promise
* after queuing the write, which meant `await`-ing it yielded the
* event loop and let the stdin listener run before the helper
* actually exited.
*
* - **Gap 3**: the helper must surface the `guardianId` field returned
* by `/v1/browser-extension-pair` in its `token_response` frame.
* Earlier versions destructured only `{ token, expiresAt }` and
* silently dropped the field, causing `bootstrapLocalToken()` on the
* consumer side to reject the frame as malformed.
* - **Gap 2**: the unauthorized-origin branch must terminate the
* process synchronously and never POST `/v1/browser-extension-pair`.
* If `writeFrameAndExit` yields the event loop (e.g. via a
* never-resolving Promise), callers that `await` it would let the
* stdin listener run before the helper actually exits.
*
* - **Gap 3**: the helper must surface the `guardianId` field returned
* by `/v1/browser-extension-pair` in its `token_response` frame.
* If the field is not forwarded, `bootstrapLocalToken()` on the
* consumer side rejects the frame as malformed.
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

noanflaherty added a commit that referenced this pull request Apr 8, 2026
* chore: regenerate openapi.yaml for version 0.6.2 bump

The main-branch release commit (#24108) bumped assistant/package.json to
0.6.2 but did not regenerate the openapi spec. Regenerate it on the feature
branch so CI's OpenAPI Spec Check passes for Phase 2 PRs.

* fix(daemon): backport host-browser-proxy defensive guards to host-bash/file/cu proxies (#24115)

* docs(browser): document chrome.debugger infobar decision (#24106)

* feat(clients/macos): decode host_browser_request and host_browser_cancel messages (#24113)

* feat(clients/macos): decode host_browser_request and host_browser_cancel messages

* fix: type HostBrowserRequest.timeoutSeconds as Double?

Matches the daemon's number-typed wire contract and mirrors
HostBashRequest.timeoutSeconds, so fractional timeouts like 0.01s don't
throw a type-mismatch and drop the whole host_browser_request event.

* feat(browser-session): add BrowserSessionManager scaffold with extension backend stub (#24110)

* feat(browser-session): add BrowserSessionManager scaffold with extension backend stub

* test(browser-session): import public API via index.ts to satisfy knip

Updates manager.test.ts to consume BrowserSessionManager, createExtensionBackend,
and types through the public ../index.js entry point instead of deep-importing
../manager.js and ../backends/extension.js. This keeps knip happy during the
scaffold phase: index.ts becomes a transitively-reachable entry point from
src/**/__tests__/**/*.ts before any production module consumes it.

* fix(browser-session): enforce session existence in BrowserSessionManager.send

Throws when the caller passes a sessionId that doesn't exist or has
been disposed. Still advisory for single-backend Phase 2, but makes
disposeSession() an actual enforcement boundary so commands can't run
against stale ids once Phase 4 adds multi-backend routing.

* feat(chrome-extension): add standalone CDP proxy module (#24112)

* feat(chrome-extension): add standalone CDP proxy module

* fix(chrome-extension): inject runtime.lastError and thread sessionId through CDP proxy

- Add runtime.lastError to ChromeDebuggerApi so mocked tests can surface errors
- Fold frame.sessionId into sendCommand params for flat-session routing
- Extract sessionId from event params when building CdpEventFrame
- Document flat-session handling in the module docstring

* fix(chrome-extension): route flat-session sessionId through DebuggerSession target

Chrome 125+ debugger.sendCommand takes sessionId on the target argument
(DebuggerSession), not inside commandParams. Switch back to passing
sessionId on the target. Same change on the onEvent listener — read
sessionId from 'source' rather than params, since flat-session events
surface it on the source.

Also clean up the module docstring to drop PR-level narrative per
clients/AGENTS.md's comment quality rule.

* fix(chrome-extension): bind defaultChromeDebuggerApi methods to chrome.debugger

Returning methods from a Proxy via Reflect.get without binding causes
'Illegal invocation' at runtime because Chrome's native bindings check
this against the original chrome.debugger object. Replace the Proxy with
a plain object whose methods are explicitly bound.

* feat(chrome-extension-native-host): add native messaging helper scaffold (#24114)

* feat(chrome-extension-native-host): add native messaging helper scaffold

* fix(chrome-extension-native-host): robust port discovery, JSON error handling, and assistant terminology

- Add --assistant-port CLI arg so Chrome-spawned helpers can be pointed
  at a non-default port when the lockfile isn't present
- Surface malformed stdin JSON as a protocol-level error frame instead
  of a silent crash
- Rename user-facing 'daemon' to 'assistant' in error messages per
  AGENTS.md terminology rule

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(chrome-extension-native-host): finish daemon→assistant rename in client prose, vars, and smoke test

- README section header and prose use 'assistant' (per root AGENTS.md §139)
- DEFAULT_DAEMON_PORT → DEFAULT_ASSISTANT_PORT, resolveDaemonPort → resolveAssistantPort (per clients/AGENTS.md §403-404)
- Smoke test example uses dynamic import() instead of require() since the package is ESM

* fix(chrome-extension-native-host): flush stdout before exiting

Wait for process.stdout.write callback to fire before calling
process.exit(), so the native-messaging frame actually reaches Chrome
on pipe-backed stdout before the process terminates. Without this,
Chrome can see a disconnect instead of the intended token_response
or error frame under backpressure or larger payloads.

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat(chrome-extension): add cloud OAuth sign-in skeleton (#24117)

* feat(chrome-extension): add cloud OAuth sign-in skeleton

* fix(chrome-extension): run OAuth sign-in from service worker and validate guardianId

- Popup now sends a message to the background worker to initiate cloud
  sign-in instead of running launchWebAuthFlow directly. This avoids
  the MV3 popup teardown race where the awaited OAuth promise never
  resolves if the popup blurs during the auth window.
- Add guardianId type check to getStoredToken so malformed stored
  tokens can't leak 'Signed in as guardian:undefined' into the popup UI.

* feat(channels): add chrome-extension interface id and per-capability host proxy gating (#24111)

* feat(channels): add chrome-extension interface id and per-capability host proxy gating

* fix(channels): keep hostBrowserProxy available for non-interactive chrome-extension interfaces

updateClient/drain-queue paths used !isInteractive as a proxy for
hasNoClient, which incorrectly marks the chrome-extension's
hostBrowserProxy unavailable immediately after construction.
Decouple the flags: chrome-extension is non-interactive (no prompter
UI) but still has a connected client for host_browser_request events.

- conversation-routes.ts: derive hasNoClient as !(isInteractive || supportsHostProxy(sourceInterface, 'host_browser'))
- server.ts persistAndProcessMessage: same pattern so queued sends don't lose availability
- conversation-process.ts drain queue: add restore path via new Conversation.restoreBrowserProxyAvailability() helper
- conversation.ts: add restoreBrowserProxyAvailability() that re-enables only the browser proxy (gated on hasNoClient)
- channels/types.ts: clarify supportsHostProxy no-arg JSDoc to call out the desktop-only semantics
- conversation-confirmation-signals.test.ts: cover the new restore helper

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(channels): targeted hostBrowserProxy enable without relaxing hasNoClient

Cycle 1 derived hasNoClient as !(isInteractive || supportsHostProxy(id, 'host_browser')) to
keep the chrome-extension's browser proxy available. That inadvertently made tool gating treat
the conversation as fully interactive (isInteractive derives from !ctx.hasNoClient), enabling
host_bash/host_file tools that chrome-extension can't service.

Revert to the literal hasNoClient = !isInteractive and instead call a targeted
restoreBrowserProxyAvailability() after updateClient. The helper now enables the browser
proxy regardless of hasNoClient so the single-proxy chrome-extension turn works without
leaking host_bash/host_file tool availability.

Part of JARVIS-1175

* fix(channels): drop 'historically' from JSDoc and tighten chrome-extension else-if in server.ts

- assistant/AGENTS.md: comments describe current state, not history
- server.ts: scope the non-interactive host-browser restore branch to interfaces that
  specifically only support host_browser (not macos, which hits the interactive branch)

* test: add restoreBrowserProxyAvailability to Conversation mocks

Two test files use object-literal mocks for Conversation that need the
new method so they don't throw TypeError at the new call site in
handleSendMessage.

* fix(routes): optional-chain restoreBrowserProxyAvailability for test mocks

* test: allowlist chrome-extension-native-host in gateway-only guard

The native messaging helper intentionally POSTs to the local daemon's
/v1/browser-extension-pair endpoint on 127.0.0.1 to mint capability
tokens for the extension; it's a bootstrap path that cannot and should
not go through the gateway. Add it to the guard-test allowlist.

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat(runtime): route host_browser_request to connected chrome-extension clients (#24129)

* feat(runtime): route host_browser_request to connected chrome-extension clients

* fix(runtime): gateway guardianId plumbing + queue-drain-safe chrome-extension sender

- handleBrowserRelayUpgrade now looks for x-guardian-id header/query param as a
  fallback when the JWT sub is a service token (gateway-forwarded case)
- Conversation exposes hostBrowserSenderOverride so restoreBrowserProxyAvailability
  preserves the registry-routed sender on drain-queue restores instead of clobbering
  it with the SSE hub sender

* feat(chrome-extension): dispatch host_browser_request frames via CDP proxy behind feature flag (#24125)

* feat(chrome-extension): dispatch host_browser_request frames via CDP proxy behind feature flag

* fix(chrome-extension): use camelCase wire format, tolerate re-attach, guard postResult catch

- Match daemon's actual host_browser_request envelope shape (requestId, cdpMethod,
  cdpParams, cdpSessionId — only timeout_seconds stays snake_case)
- POST /v1/host-browser-result with camelCase keys to match the runtime schema
- Track attached CDP targets and skip re-attach; dispose clears the set
- Wrap postResult calls inside the catch handler so a secondary failure is logged
  instead of becoming an unhandled rejection

* fix(chrome-extension): invalidate attachedTargets cache on debugger detach

Subscribe to CdpProxy.onDetach in the dispatcher and remove the
corresponding key from the attached-targets cache when Chrome notifies
us of a detach (tab close, navigation, infobar cancel, external
takeover). Without this, the cache held a stale entry forever and
subsequent commands skipped the re-attach, causing permanent CDP
failures.

* feat(runtime): add /v1/browser-extension-pair capability token endpoint (#24130)

* feat(runtime): add /v1/browser-extension-pair capability token endpoint

* fix(runtime): align pair endpoint with native helper contract + move secret out of workspace

- Accept extensionOrigin (preferred) and origin (legacy) in request body
- Return expiresAt as ISO 8601 string instead of numeric ms, matching what the
  chrome-extension-native-host helper validates
- Move capabilityTokenSecret out of workspace/data into protected storage alongside
  the actor-token-signing-key per AGENTS.md workspace-isolation rule
- Fix isLoopbackHostHeader to correctly parse IPv6 bracket notation

* fix(runtime): align pair allowlist with native helper + reject malformed bracketed Host headers

- ALLOWED_EXTENSION_ORIGINS now matches the chrome-extension-native-host
  placeholder so the dev pair flow works end-to-end
- parseHostHeader rejects inputs like '[::1]attacker.com' where content
  after the closing bracket is not an optional ':port'

* feat(installer): write Chrome native messaging host manifest on macOS install (#24128)

* feat(installer): write Chrome native messaging host manifest on macOS install

* fix(build): parenthesize native-host staleness check

Bash || and && are equal-precedence left-to-right, so the unparenthesized
condition incorrectly required bun.lock to also be newer for a package.json
update to trigger a rebuild. Group the bun.lock subexpression explicitly.

* fix(installer): conform InstallError to LocalizedError so localizedDescription is useful

* feat(chrome-extension): bootstrap self-hosted capability token via native messaging (#24142)

* feat(chrome-extension): bootstrap self-hosted capability token via native messaging

* fix(chrome-extension): nativeMessaging permission, disconnect race, persistence fallback, popup->worker delegation

- Add nativeMessaging permission to manifest so Chrome actually allows
  chrome.runtime.connectNative('com.vellum.daemon')
- Set settled=true synchronously on token_response so a fast onDisconnect
  can't win the race and reject a valid pairing
- On chrome.storage.local.set failure, log and resolve with the in-memory
  token instead of discarding it (single-session fallback)
- Move the pair flow into the service worker via chrome.runtime.sendMessage
  so the popup teardown can't kill the awaited promise mid-flight

* feat(chrome-extension): connect to cloud gateway browser-relay WebSocket (#24143)

* feat(chrome-extension): connect to cloud gateway browser-relay WebSocket

* fix(chrome-extension): surface missing-token connect failures and ignore stale socket close events

- Worker now returns an actionable error when the selected relay mode has
  no usable token (cloud not signed in, self-hosted not paired)
- RelayConnection's close listener ignores events from superseded sockets
  so a setMode mid-flight does not nuke the new socket reference

* test(host-browser): e2e smoke test for self-hosted native-messaging capability bootstrap (#24154)

* test(host-browser): e2e smoke test for cloud-hosted host_browser_request round-trip (#24153)

* test(host-browser): e2e smoke test for cloud-hosted host_browser_request round-trip

* test(host-browser): exercise actual timeout path and clarify mock WS header support

- Disconnected test renamed/restructured to use a never-resolving CDP handler
  plus a short timeout_seconds, so the proxy's setTimeout path is actually
  covered
- Removed/implemented extraHandshakeHeaders on the mock fixture so the
  advertised API matches reality

* test(cdp-proxy): add unit tests and fix sync targetToDebuggee throw (#24187)

* fix(chrome-extension): evict attached-target cache on CDP send failure (#24188)

* test(host-browser-e2e): rewrite header and convert test.skip to test.todo (#24190)

* test(host-bash-proxy): use bun:test fake timers for timeout regression test (#24189)

* fix(chrome-extension): popup pairing reply + relay-aware host_browser result POST (#24194)

* fix(chrome-extension-native-host): halt unauthorized origins and forward guardianId (#24192)

* fix(daemon): gate host tools by per-capability supportsHostProxy (#24195)

* chore(chrome-extension): typecheck worker.ts + popup.ts and use "assistant" terminology (#24199)

* fix(chrome-extension): popup connect handler honors selected relay mode (#24225)

* chore(chrome-extension): extend bun:test ambient shim with common symbols (#24226)

* fix(daemon): preserve host_browser for chrome-extension in per-capability tool gate (#24224)

* fix(chrome-extension): read live relay mode per request + defensive worker cleanups (#24227)

* chore(chrome-extension): remove stale cdp-proxy declarations and outdated comment (#24228)

* chore(chrome-extension-native-host): split writeFrameAndExit + rewrite history-narrating docstrings (#24229)

* chore(chrome-extension): tighten bun:test shim so only test.todo has optional callback (#24234)

* chore(daemon): rewrite host-tool gating test comment in forward-looking voice (#24233)

* chore(chrome-extension): dedupe RelayConnection.mode accessor (keep getCurrentMode) (#24235)

* fix(chrome-extension): worker reads live relay mode from storage on connect (#24236)

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant