Skip to content

Fix broker precedence for relay MCP injection#260

Merged
khaliqgant merged 3 commits into
mainfrom
fix/relay-mcp-broker-precedence
Jul 14, 2026
Merged

Fix broker precedence for relay MCP injection#260
khaliqgant merged 3 commits into
mainfrom
fix/relay-mcp-broker-precedence

Conversation

@khaliqgant

@khaliqgant khaliqgant commented Jul 14, 2026

Copy link
Copy Markdown
Member

Summary

  • make broker-only relay MCP resolution prefer BROKER_BINARY_PATH
  • keep trimmed AGENT_RELAY_BIN as the legacy broker fallback
  • treat empty and whitespace-only overrides as unset

Why

Pear workers now separate the native broker path from the external Agent Relay cloud CLI. The runtime builds mcp-args --register for the broker binary, but previously selected AGENT_RELAY_BIN first. When both variables were present, it could invoke the cloud CLI for a broker-only command.

Red-first coverage

Before implementation, the new regression test failed with:

  • actual: /opt/agent-relay
  • expected: /opt/agent-relay-broker

The test file now proves:

  • explicit broker plus external CLI selects the broker
  • whitespace-only Agent Relay override is unset
  • legacy Agent Relay broker-only override still resolves

Validation

  • real pnpm install --frozen-lockfile
  • pnpm -r build — green
  • pnpm run lint — green
  • pnpm run typecheck — green
  • pnpm --filter @agentworkforce/runtime test — 103/103 green
  • git diff --check — green

Repository-wide pnpm run test was also attempted. The runtime and other completed packages were green, but the pre-existing @agentworkforce/cli local-personas suite failed 34 unrelated cascade tests against the current origin/main content on this macOS host. This PR does not touch CLI persona loading; hosted CI remains the authoritative full-suite gate.

Review in cubic

@coderabbitai

coderabbitai Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

@khaliqgant, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 22 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 0e78f8f5-6475-49b0-9a53-0156f1d0738b

📥 Commits

Reviewing files that changed from the base of the PR and between c868ac1 and 5903a15.

📒 Files selected for processing (2)
  • packages/runtime/src/relay-mcp.test.ts
  • packages/runtime/src/relay-mcp.ts
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/relay-mcp-broker-precedence

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Code Review

This pull request updates resolveAgentRelayBrokerBinary to prioritize the BROKER_BINARY_PATH environment variable over AGENT_RELAY_BIN and introduces unit tests to verify this behavior. Feedback on the tests suggests avoiding hardcoded fallback values that could cause environment-dependent failures, recommending instead to assert against the result of calling the function with an empty environment.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread packages/runtime/src/relay-mcp.test.ts

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

Copy link
Copy Markdown

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: d5fc4d8064

ℹ️ 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 thread packages/runtime/src/relay-mcp.test.ts Outdated

@cubic-dev-ai cubic-dev-ai 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.

All reported issues were addressed across 1 file (changes from recent commits).

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment thread packages/runtime/src/relay-mcp.test.ts Outdated
@khaliqgant khaliqgant merged commit 6c82f4a into main Jul 14, 2026
3 checks passed
@khaliqgant khaliqgant deleted the fix/relay-mcp-broker-precedence branch July 14, 2026 08:12
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