stacklok / toolhive / 30355557706

70%

Build Type

push

github

Committed by web-flow

Commit Message

Resolve aggregator conflicts for resources, templates and prompts (#6075)

* Resolve resource, template, and prompt conflicts

The vMCP aggregator resolved name conflicts for tools only; resources,
resource templates and prompts were plain-appended across backends, so
duplicate identities appeared in the aggregated lists undiagnosed while
MergeCapabilities' URI/name-keyed routing tables silently collapsed each
duplicate to a nondeterministically-chosen backend for reads.

Resolve the remaining three types with per-type policies. Prompt names
are names: prompts/get already translates the advertised name back to
the backend's own via GetBackendCapabilityName, so colliding prompts
are losslessly renamed to {backendID}_{name} for every collider.
Resource URIs and template strings are locators the client passes back
verbatim (reads, subscriptions, completion refs, embedded resource
links), so they are never rewritten: a duplicate is advertised once,
owned by the first backend in sorted-backend-ID order, and later
copies are dropped with a warning. Backends are iterated in sorted-ID
order and MergeCapabilities gains first-wins guards, so collision
outcomes and routing are deterministic across runs.

The Modern paginator keeps its collision-safe cursor even though
aggregated keys are now unique: it is generic and must not depend on a
caller invariant. Tools resolution is unchanged.

Closes #6060

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GvBj7nNWqDQ3rKYNeY6aam

* Prefix all vMCP prompts with their backend ID

Review of #6075 found that collision-only prompt renaming made the
advertised name depend on group membership, and the advertised name is
what Cedar authorizes on (Prompt::"<advertised name>"): an unrelated
backend joining with the same prompt name detached existing permit and
forbid policies, the forbid case failing open. Rename every prompt
unconditionally instead, honouring con... (continued)

Coverage Stats

186 of 198 new or added lines in 5 files covered. (93.94%)

5 existing lines in 2 files now uncovered.

81547 of 116799 relevant lines covered (69.82%)

97.37 hits per line