Skip to content

fix: route dashboard MCP and OAuth paths to Control - #502

Merged
agent-relay-code[bot] merged 6 commits into
mainfrom
fix/ingress-mcp-oauth-routes
Nov 20, 2026
Merged

agent-relay-code[bot] merged 6 commits into
mainfrom
fix/ingress-mcp-oauth-routes

Conversation

@miyaontherelay

@miyaontherelay miyaontherelay commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Fixes #499

Dashboard-origin MCP and OAuth requests fall through to the dashboard's HTML catch-all. Route the seven missing prefixes to Control before / on the leaf, GKE, EKS script, chart-rendered EKS and Azure edges:

  • /mcp, /cloud/mcp
  • /.well-known/oauth-protected-resource
  • /.well-known/oauth-authorization-server
  • /.well-known/openid-configuration
  • /cloud/.well-known, /cloud/oauth

Confirmed the list against the pinned Control 0.5.24 image's recorded source, edad6432b07ac9997fb7af9c29999b52c81e0c5a, in src/mcp/routes.ts, src/mcp/oauth/routes.ts and src/mcp/oauth/protocol.ts. The requested list matches. Token, registration and revocation already route through /cloud/api.

The leaf and GKE charts share relay-webapp.controlPaths; app-prefixed paths derive from the parent of runtime.apiBasePath. A root /api base omits the broad /.well-known route. Only the three named root discovery prefixes are claimed, leaving ACME available. Other hosts are unchanged. Kind's supplemental Ingress remains /api only because its leaf dashboard Ingress supplies all seven new paths.

GKE renders 11 dashboard Prefix paths in split-host mode, 12 in single-host mode, reusing the existing API Service and BackendConfig (timeoutSec: 3600). This is below the documented URL-map path matcher limit. Rendering proves the desired Ingress; no live URL map was inspected. EKS with Chief enabled emits Exact paths followed by ordered wildcards, retaining Chief precedence.

Integration with #513: #513 merged first. This PR merges origin/main at 422cbb19 and expands the new eksIngress.controlPaths default to the script's ten-path list. The values.yaml default is mirrored by a compatibility helper used through dig when saved values lack the key or set it to null. An explicitly empty list stays empty; equivalence tests keep the normal and fallback defaults aligned. README and EKS values comments describe the new default. Equivalence tests cover the expanded default and explicitly pinned two- and three-path legacy lists. Every MCP/OAuth prefix fits a controlPaths entry on the existing dashboard host and Control backend. No other host/backend is needed, and installs with explicit lists keep them. PR #474 must reconcile its chart version if it merges later.

Bumps relay-webapp 0.2.7 → 0.2.8 and agent-relay 0.7.66 → 0.7.67, with the dependency lock, current requirements/release row, generated requirements doc and route golden hashes aligned. Keeps sessions-pipeline 0.8.52 and all image pins from main. The branch was merged with main; published history was preserved.

Validation used CI-pinned Helm v4.3.1+gc0d08d0, with PATH=/tmp/infra-499/darwin-arm64:/tmp/infra-499/venv/bin:$PATH.

Command Result
bash scripts/ci/charts.sh static relay-webapp agent-relay PASS: lint, deterministic renders, schema validation and route drift contract, including the enabled EKS profile
bash ci/agent-relay/render.sh PASS: subdomain goldens and GCP proof render contract
python3 ci/agent-relay/test_ingress_routes.py -v PASS: 5 tests checking all seven prefixes and the dashboard catch-all across leaf split/single/custom/root base, GKE split/single, EKS script and EKS chart with Chief/Flows combinations, Azure; API BackendConfig binding checked
python3 ci/agent-relay/test_eks_alb_ingress.py -v PASS: 14 tests; missing/null defaults and explicitly empty lists included; real script/chart annotations and spec deep-equal across the option matrix and refusals; expanded default, ordered overrides and pinned legacy lists checked
PATH=/tmp/infra-499/helm3/darwin-arm64:/tmp/infra-499/venv/bin:$PATH python3 ci/agent-relay/test_eks_alb_ingress.py -v PASS: the same 14 tests on Helm v3.19.0+g3d8990f
bash scripts/selfhost/tests/eks-alb-ingress-test.sh PASS: 2 script/Azure tests
python3 -m unittest discover -s ci/agent-relay/kind -p test_stack.py PASS: 11 offline tests
python3 ci/agent-relay/test_control_webapp_names.py PASS: 13 tests
node ci/self-hosted-requirements/registry.mjs render / check PASS: 203 entries, 28 profiles; existing published-tag status warnings
bash ci/agent-relay/subdomain-golden.sh update PASS: intentional route golden updates retained
bash scripts/ci/version-bump.sh PASS: agent-relay 0.7.67 and relay-webapp 0.2.8
helm lint --strict charts/relay-webapp -f charts/relay-webapp/ci/default-values.yaml PASS
helm lint --strict charts/agent-relay -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/eks-ingress-values.yaml PASS
shellcheck -S warning scripts/selfhost/eks-alb-ingress.sh scripts/selfhost/tests/eks-alb-ingress-test.sh scripts/selfhost/tests/run-tests.sh PASS
shellcheck -S warning scripts/ci/charts.sh ci/agent-relay/render.sh scripts/selfhost/eks-alb-ingress.sh scripts/selfhost/tests/eks-alb-ingress-test.sh scripts/selfhost/tests/run-tests.sh FAIL on existing SC2011/SC2207/SC2178/SC2128 in charts.sh and SC2043 in render.sh; unchanged warning sites
yamllint -d '{extends: relaxed, rules: {line-length: disable}}' charts/relay-webapp/Chart.yaml charts/relay-webapp/values.yaml charts/agent-relay/Chart.yaml charts/agent-relay/Chart.lock charts/agent-relay/values.yaml charts/agent-relay/values-eks.yaml docs/azure-install/ingress.yaml self-hosted/requirements.yaml PASS
helm template ci charts/relay-webapp -n ci --no-hooks -f charts/relay-webapp/ci/default-values.yaml --show-only templates/ingress.yaml PASS; output passed the same yamllint configuration with formatting warnings only
helm template proof charts/agent-relay -n agent-relay --no-hooks -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/gcp-proof-values.yaml --show-only templates/gke-ingress.yaml PASS; output passed the same yamllint configuration with a trailing empty-line warning
helm template proof charts/agent-relay -n agent-relay --no-hooks -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/eks-ingress-values.yaml --show-only templates/eks-alb-ingress.yaml PASS; output passed the same yamllint configuration with a trailing empty-line warning

The EKS equivalence matrix covers defaults; history off/read-only; ingest explicitly on/off; a separate read API; Flows; Chief; Flows + Chief + read-only; overridden Service names/ports, name, class and namespace; a release without the backend components; explicit default and legacy path lists; malformed paths and invalid options.

Previous-head GitHub checks at 44f72809b2b112721ce54e0f3c5ad5cd672006d1: all six CI jobs passed (static, Kind, release gate, agent checks, Relaycast smoke, search worker-role Kind); Greptile and cubic passed, CodeRabbit skipped. Greptile reported no new actionable findings.

Compatibility follow-up at b5bae7ab507a5a22111d9b15c842f90081d00fec: reproduced the null-key failure, restored fallback defaults, and passed the EKS suite on Helm 3 and CI-pinned Helm 4, both chart scripts, the five-test route suite and YAML lint on the rendered null-key Ingress. Version 0.7.67 and golden hashes are unchanged. CI is rerunning for this head.

The two original Greptile findings are fixed and their threads resolved: root discovery scope and inherited EKS fixture settings. The relevant self-host ingress tests pass. A previous optional full self-host suite attempt encountered macOS stat -c incompatibility, then stalled in an unrelated mocked upgrade test with GNU stat; it was stopped. No full-suite PASS is claimed or rerun for this merge.

No cluster, cloud, install, upgrade, release or tag operations were performed. Live Kind HTTP behavior, controller reconciliation and a real MCP client browser sign-in remain unproven; CI runs the Kind stack test. Keep merge-train:hold pending the required approval.

🤖 Generated with Claude Code

Agent Relay and others added 2 commits November 19, 2026 16:37
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@miyaontherelay miyaontherelay added the merge-train:hold Do not merge without Khaliq's direct OK label Nov 19, 2026
@coderabbitai

coderabbitai Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

Important

  • Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: fae625e0-8634-4213-b820-b6162374cc9b
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

@greptile-apps

greptile-apps Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The reviewed changes appear safe to merge.

Summary

Routes dashboard MCP and OAuth requests to Control across the leaf, GKE, EKS and Azure edges.

  • Dashboard-host MCP and OAuth requests reach Control across the supported ingress setups.

Reviews (5) · Last reviewed commit: "fix: retain EKS control paths defaults f..." · Reviewed by Greptile

Comment thread ci/agent-relay/test_ingress_routes.py Resolved
Agent Relay and others added 4 commits November 19, 2026 16:44
Co-Authored-By: Claude <noreply@anthropic.com>
main took agent-relay 0.7.63 for sessions-pipeline 0.8.52, so this change
moves to the next version. The registry gets a new current entry
agent-relay-0.7.64 (0.7.63 plus relay-webapp 0.2.8) and 0.7.63 becomes
planned. Chart.lock, the generated requirements doc and the subdomain
golden hashes are regenerated; against main only the six GCP profiles
and relay-webapp move, which is the ingress route change.

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@agent-relay-code agent-relay-code Bot removed the merge-train:hold Do not merge without Khaliq's direct OK label Nov 20, 2026
@agent-relay-code
agent-relay-code Bot merged commit c43b0d1 into main Nov 20, 2026
9 checks passed
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.

Self-hosted ingress sends MCP and OAuth discovery paths to the dashboard instead of relay-control

1 participant