From 791221532228db4da503ccd7956ce0f4e454bbbd Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 12:05:39 +0300 Subject: [PATCH 1/8] feat: migrate from mark3labs/mcp-go to toolhive-core/mcpcompat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Swaps all github.com/mark3labs/mcp-go/{mcp,server,client,client/transport} imports to the go-sdk-backed compatibility shim in toolhive-core (github.com/stacklok/toolhive-core/mcpcompat/*). No call-site logic changes — the shim mirrors mcp-go's API. This moves ToolHive's MCP protocol handling onto the official modelcontextprotocol/go-sdk. Depends on stacklok/toolhive-core#150; the toolhive-core dependency is pinned to that branch commit and should be bumped to the released version once #150 merges. Co-Authored-By: Claude Opus 4.8 --- cmd/thv/app/mcp.go | 2 +- cmd/thv/app/mcp_call.go | 2 +- cmd/thv/app/mcp_call_test.go | 2 +- go.mod | 11 +++++----- go.sum | 20 +++++++++---------- pkg/authz/annotation_cache.go | 2 +- pkg/authz/annotation_cache_test.go | 2 +- pkg/authz/integration_test.go | 2 +- pkg/authz/middleware_test.go | 2 +- pkg/authz/response_filter.go | 2 +- pkg/authz/response_filter_test.go | 2 +- pkg/authz/tool_filter.go | 2 +- pkg/authz/tool_filter_test.go | 2 +- pkg/mcp/client/call.go | 2 +- pkg/mcp/client/client.go | 4 ++-- pkg/mcp/parser_integration_test.go | 6 +++--- pkg/script/executor.go | 2 +- pkg/script/internal/builtins/builtins.go | 2 +- pkg/script/internal/builtins/builtins_test.go | 2 +- pkg/script/internal/builtins/tools.go | 2 +- pkg/script/internal/conversions/result.go | 2 +- .../internal/conversions/result_test.go | 2 +- pkg/script/script.go | 2 +- pkg/script/script_test.go | 2 +- pkg/telemetry/middleware.go | 2 +- pkg/transport/bridge.go | 8 ++++---- ...mable_proxy_mcp_client_integration_test.go | 4 ++-- pkg/tui/inspector.go | 4 ++-- pkg/tui/inspector_test.go | 2 +- pkg/tui/model.go | 4 ++-- pkg/tui/tools.go | 4 ++-- pkg/tui/update.go | 4 ++-- pkg/tui/update_inspector.go | 2 +- pkg/tui/update_navigation.go | 2 +- pkg/tui/view_inspector.go | 2 +- .../auth_propagation_integration_test.go | 2 +- pkg/vmcp/client/client.go | 10 +++++----- pkg/vmcp/client/client_test.go | 6 +++--- pkg/vmcp/client/meta_integration_test.go | 4 ++-- pkg/vmcp/codemode/decorator.go | 2 +- pkg/vmcp/conversion/content.go | 2 +- pkg/vmcp/conversion/content_test.go | 2 +- pkg/vmcp/conversion/conversion_test.go | 2 +- pkg/vmcp/conversion/errors.go | 2 +- pkg/vmcp/conversion/meta.go | 2 +- pkg/vmcp/health/checker_test.go | 2 +- .../internal/tokencounter/counter.go | 2 +- .../internal/tokencounter/counter_test.go | 2 +- .../internal/toolstore/sqlite_store.go | 4 ++-- .../toolstore/sqlite_store_bench_test.go | 4 ++-- .../internal/toolstore/sqlite_store_test.go | 4 ++-- .../internal/types/mocks/mock_types.go | 4 ++-- pkg/vmcp/optimizer/internal/types/types.go | 4 ++-- pkg/vmcp/optimizer/optimizer.go | 4 ++-- pkg/vmcp/optimizer/optimizer_test.go | 4 ++-- pkg/vmcp/server/adapter/capability_adapter.go | 6 +++--- .../capability_adapter_annotations_test.go | 4 ++-- .../server/adapter/capability_adapter_test.go | 4 ++-- pkg/vmcp/server/adapter/handler_factory.go | 2 +- .../server/adapter/handler_factory_test.go | 2 +- .../adapter/mocks/mock_handler_factory.go | 2 +- pkg/vmcp/server/sdk_elicitation_adapter.go | 4 ++-- .../server/sdk_elicitation_adapter_test.go | 4 ++-- pkg/vmcp/server/serve.go | 4 ++-- pkg/vmcp/server/serve_handlers.go | 4 ++-- pkg/vmcp/server/serve_optimizer.go | 4 ++-- pkg/vmcp/server/serve_optimizer_test.go | 4 ++-- pkg/vmcp/server/serve_session_test.go | 4 ++-- pkg/vmcp/server/server.go | 4 ++-- .../session_management_integration_test.go | 4 ++-- pkg/vmcp/server/session_manager_interface.go | 2 +- pkg/vmcp/server/sessionmanager/factory.go | 4 ++-- .../horizontal_scaling_integration_test.go | 4 ++-- .../sessionmanager/optimizer_gate_test.go | 2 +- .../server/sessionmanager/session_manager.go | 2 +- .../server/sessionmanager/telemetry_test.go | 4 ++-- pkg/vmcp/server/testutil_test.go | 4 ++-- .../session/connector_integration_test.go | 4 ++-- .../session/internal/backend/mcp_session.go | 6 +++--- .../backend/mcp_session_capabilities_test.go | 6 +++--- .../mcp_session_header_forward_test.go | 2 +- .../mcp_session_identity_refresh_test.go | 2 +- pkg/vmcp/session/optimizerdec/decorator.go | 2 +- .../session/optimizerdec/decorator_test.go | 2 +- test/e2e/mcp_client_helpers.go | 6 +++--- test/e2e/network_isolation_test.go | 2 +- test/e2e/thv-operator/virtualmcp/helpers.go | 6 +++--- .../virtualmcp/mcpremoteproxy_scaling_test.go | 6 +++--- .../virtualmcp/mcpserver_scaling_test.go | 6 +++--- .../virtualmcp_aggregation_filtering_test.go | 2 +- .../virtualmcp_aggregation_overrides_test.go | 2 +- .../virtualmcp_auth_discovery_test.go | 6 +++--- .../virtualmcp/virtualmcp_codemode_test.go | 2 +- ...irtualmcp_composite_defaultresults_test.go | 2 +- .../virtualmcp_composite_hidden_tools_test.go | 2 +- .../virtualmcp_composite_parallel_test.go | 2 +- .../virtualmcp_composite_referenced_test.go | 2 +- .../virtualmcp_composite_sequential_test.go | 2 +- .../virtualmcp_conflict_resolution_test.go | 2 +- .../virtualmcp_discovered_mode_test.go | 4 ++-- .../virtualmcp_excludeall_global_test.go | 2 +- .../virtualmcp_external_auth_test.go | 2 +- .../virtualmcp_optimizer_composite_test.go | 2 +- .../virtualmcp_optimizer_multibackend_test.go | 2 +- .../virtualmcp/virtualmcp_optimizer_test.go | 2 +- .../virtualmcp_rate_limiting_test.go | 6 +++--- .../virtualmcp_redis_session_test.go | 6 +++--- .../virtualmcp_session_management_test.go | 6 +++--- .../virtualmcp/virtualmcp_toolconfig_test.go | 2 +- .../virtualmcp_yardstick_base_test.go | 2 +- .../virtualmcp/wait_for_tools_helpers.go | 6 +++--- test/e2e/vmcp_cli_features_test.go | 2 +- test/e2e/vmcp_optimizer_test.go | 2 +- test/integration/vmcp/helpers/backend.go | 6 +++--- test/integration/vmcp/helpers/helpers_test.go | 2 +- test/integration/vmcp/helpers/mcp_client.go | 6 +++--- .../integration/vmcp/vmcp_integration_test.go | 2 +- .../vmcp/vmcp_typing_integration_test.go | 2 +- 118 files changed, 202 insertions(+), 201 deletions(-) diff --git a/cmd/thv/app/mcp.go b/cmd/thv/app/mcp.go index 876938f413..eff9bacdc8 100644 --- a/cmd/thv/app/mcp.go +++ b/cmd/thv/app/mcp.go @@ -13,7 +13,7 @@ import ( "text/tabwriter" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/spf13/cobra" thclient "github.com/stacklok/toolhive/pkg/mcp/client" diff --git a/cmd/thv/app/mcp_call.go b/cmd/thv/app/mcp_call.go index 2932124844..9c00459b2f 100644 --- a/cmd/thv/app/mcp_call.go +++ b/cmd/thv/app/mcp_call.go @@ -12,7 +12,7 @@ import ( "os" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/spf13/cobra" thclient "github.com/stacklok/toolhive/pkg/mcp/client" diff --git a/cmd/thv/app/mcp_call_test.go b/cmd/thv/app/mcp_call_test.go index 489db112dc..0f18fe49c9 100644 --- a/cmd/thv/app/mcp_call_test.go +++ b/cmd/thv/app/mcp_call_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/go.mod b/go.mod index 82d46d714b..0e96038fe0 100644 --- a/go.mod +++ b/go.mod @@ -26,13 +26,13 @@ require ( github.com/go-jose/go-jose/v3 v3.0.5 github.com/go-jose/go-jose/v4 v4.1.4 github.com/gofrs/flock v0.13.0 - github.com/google/cel-go v0.28.1 + github.com/google/cel-go v0.29.0 github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.21.7 github.com/google/uuid v1.6.0 github.com/lestrrat-go/httprc/v3 v3.0.6 github.com/lestrrat-go/jwx/v3 v3.0.13 - github.com/mark3labs/mcp-go v0.55.1 + github.com/mark3labs/mcp-go v0.55.1 // indirect github.com/moby/moby/client v0.4.1 github.com/modelcontextprotocol/registry v1.7.9 github.com/oauth2-proxy/mockoidc v0.0.0-20240214162133-caebfff84d25 @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.26 + github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd @@ -89,8 +89,9 @@ require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31 // indirect github.com/go-openapi/runtime/server-middleware v0.30.0 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/modelcontextprotocol/go-sdk v1.6.1 // indirect github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect + github.com/segmentio/encoding v0.5.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect ) @@ -182,7 +183,7 @@ require ( github.com/google/btree v1.1.3 // indirect github.com/google/certificate-transparency-go v1.3.3 // indirect github.com/google/gnostic-models v0.7.0 // indirect - github.com/google/jsonschema-go v0.4.2 // indirect + github.com/google/jsonschema-go v0.4.3 // indirect github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect diff --git a/go.sum b/go.sum index 2af1a31543..06068e6af2 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,6 @@ github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 h1:lxmTCgmHE1G github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7/go.mod h1:GvWntX9qiTlOud0WkQ6ewFm0LPy5JUR1Xo0Ngbd1w6Y= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= -github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/docker/cli v29.6.0+incompatible h1:nw9himxMMZ7eIeherJNlKQq+acnlzGgHd+4uf10QRSc= github.com/docker/cli v29.6.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= @@ -365,8 +363,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/cel-go v0.28.1 h1:YWIwi77J4xIsYUwAF/iIuS6haffzIHS8yWI8glSbLWM= -github.com/google/cel-go v0.28.1/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= +github.com/google/cel-go v0.29.0 h1:fEG+Ja3YRwNOqnQxTyJwoByAUAvTuxUGiro/jhrm4F4= +github.com/google/cel-go v0.29.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= github.com/google/certificate-transparency-go v1.3.3 h1:hq/rSxztSkXN2tx/3jQqF6Xc0O565UQPdHrOWvZwybo= github.com/google/certificate-transparency-go v1.3.3/go.mod h1:iR17ZgSaXRzSa5qvjFl8TnVD5h8ky2JMVio+dzoKMgA= github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= @@ -380,8 +378,8 @@ github.com/google/go-containerregistry v0.21.7/go.mod h1:kjSbt7/zMsKLWfnHrIvKvhX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/jsonschema-go v0.4.2 h1:tmrUohrwoLZZS/P3x7ex0WAVknEkBZM46iALbcqoRA8= -github.com/google/jsonschema-go v0.4.2/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE= +github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0= +github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE= github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 h1:EwtI+Al+DeppwYX2oXJCETMO23COyaKGP6fHVpkpWpg= github.com/google/pprof v0.0.0-20260402051712-545e8a4df936/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -607,6 +605,8 @@ github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= +github.com/modelcontextprotocol/go-sdk v1.6.1 h1:0zOSupjKUxPKSocPT1Wtago+mUHU2/uZ4xSOY0FGReU= +github.com/modelcontextprotocol/go-sdk v1.6.1/go.mod h1:kzm3kzFL1/+AziGOE0nUs3gvPoNxMCvkxokMkuFapXQ= github.com/modelcontextprotocol/registry v1.7.9 h1:vpPfx2A2egjhm6YlbwfkX8NkR2N0S2eYmvYXI8bXaBs= github.com/modelcontextprotocol/registry v1.7.9/go.mod h1:y03zY98e+REsiCaj1sUKzXbk3qEp++Y3gzAnV83wrNs= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -718,8 +718,6 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= github.com/sassoftware/relic v7.2.1+incompatible h1:Pwyh1F3I0r4clFJXkSI8bOyJINGqpgjJU3DYAZeI05A= github.com/sassoftware/relic v7.2.1+incompatible/go.mod h1:CWfAxv73/iLZ17rbyhIEq3K9hs5w6FpNMdUT//qR+zk= github.com/sassoftware/relic/v7 v7.6.2 h1:rS44Lbv9G9eXsukknS4mSjIAuuX+lMq/FnStgmZlUv4= @@ -731,6 +729,8 @@ github.com/secure-systems-lab/go-securesystemslib v0.11.0 h1:iuCR9kcMFD4QurdKrGv github.com/secure-systems-lab/go-securesystemslib v0.11.0/go.mod h1:+PMOTjUGwHj2vcZ+TFKlb1tXRbrdWE1LYDT5i9JC80Q= github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0= +github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.26 h1:aWpwECt1A0Cq3ZL3rMG1mmibALcmVWg07oiNTqSESQk= -github.com/stacklok/toolhive-core v0.0.26/go.mod h1:w0CkwJEIwlyK9ht/zNfRxA5kY6J3dbJr8v2CSu7M1hE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e h1:U0qze2Zgu0w2lOUdEKr2KESRDHH++kAYiq2gp8WT6PQ= +github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e/go.mod h1:Iyec5nzAexdAwBkVHgaxvoKMC+ITVKloj1CWN1D0FQI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= diff --git a/pkg/authz/annotation_cache.go b/pkg/authz/annotation_cache.go index 1637e96b29..51b1aee947 100644 --- a/pkg/authz/annotation_cache.go +++ b/pkg/authz/annotation_cache.go @@ -6,7 +6,7 @@ package authz import ( "sync" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/authz/authorizers" ) diff --git a/pkg/authz/annotation_cache_test.go b/pkg/authz/annotation_cache_test.go index d4a4483d5c..1601000341 100644 --- a/pkg/authz/annotation_cache_test.go +++ b/pkg/authz/annotation_cache_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/authz/integration_test.go b/pkg/authz/integration_test.go index 79ca874820..c0f8f5ab53 100644 --- a/pkg/authz/integration_test.go +++ b/pkg/authz/integration_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" diff --git a/pkg/authz/middleware_test.go b/pkg/authz/middleware_test.go index 2c3a815561..118511b908 100644 --- a/pkg/authz/middleware_test.go +++ b/pkg/authz/middleware_test.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/authz/response_filter.go b/pkg/authz/response_filter.go index e00dceadf5..94e5cb82e0 100644 --- a/pkg/authz/response_filter.go +++ b/pkg/authz/response_filter.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "golang.org/x/exp/jsonrpc2" "github.com/stacklok/toolhive/pkg/authz/authorizers" diff --git a/pkg/authz/response_filter_test.go b/pkg/authz/response_filter_test.go index f36c70e772..0c1e75acb9 100644 --- a/pkg/authz/response_filter_test.go +++ b/pkg/authz/response_filter_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" diff --git a/pkg/authz/tool_filter.go b/pkg/authz/tool_filter.go index 0001801c69..5260a14b17 100644 --- a/pkg/authz/tool_filter.go +++ b/pkg/authz/tool_filter.go @@ -7,7 +7,7 @@ import ( "context" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/authz/authorizers" ) diff --git a/pkg/authz/tool_filter_test.go b/pkg/authz/tool_filter_test.go index 0043de1526..69ab0054d3 100644 --- a/pkg/authz/tool_filter_test.go +++ b/pkg/authz/tool_filter_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/mcp/client/call.go b/pkg/mcp/client/call.go index 84e050a696..d51c191b73 100644 --- a/pkg/mcp/client/call.go +++ b/pkg/mcp/client/call.go @@ -8,7 +8,7 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // CallTool connects to the MCP server at serverURL, performs the initialize diff --git a/pkg/mcp/client/client.go b/pkg/mcp/client/client.go index 34db99dd3e..80ce583cf9 100644 --- a/pkg/mcp/client/client.go +++ b/pkg/mcp/client/client.go @@ -16,8 +16,8 @@ import ( "net/url" "strings" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/transport/ssecommon" "github.com/stacklok/toolhive/pkg/transport/streamable" diff --git a/pkg/mcp/parser_integration_test.go b/pkg/mcp/parser_integration_test.go index 398dba5f20..c5ad3ead89 100644 --- a/pkg/mcp/parser_integration_test.go +++ b/pkg/mcp/parser_integration_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/script/executor.go b/pkg/script/executor.go index 0ebd9d8dbf..e269a9fc60 100644 --- a/pkg/script/executor.go +++ b/pkg/script/executor.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" "github.com/stacklok/toolhive/pkg/script/internal/builtins" diff --git a/pkg/script/internal/builtins/builtins.go b/pkg/script/internal/builtins/builtins.go index 3cd94e220f..0e13e0c26c 100644 --- a/pkg/script/internal/builtins/builtins.go +++ b/pkg/script/internal/builtins/builtins.go @@ -8,7 +8,7 @@ import ( "context" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" "github.com/stacklok/toolhive/pkg/script/internal/conversions" diff --git a/pkg/script/internal/builtins/builtins_test.go b/pkg/script/internal/builtins/builtins_test.go index 2068004c77..4b713a54d6 100644 --- a/pkg/script/internal/builtins/builtins_test.go +++ b/pkg/script/internal/builtins/builtins_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" "go.starlark.net/starlark" diff --git a/pkg/script/internal/builtins/tools.go b/pkg/script/internal/builtins/tools.go index 59766c2d1a..4644c14f72 100644 --- a/pkg/script/internal/builtins/tools.go +++ b/pkg/script/internal/builtins/tools.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" "github.com/stacklok/toolhive/pkg/script/internal/conversions" diff --git a/pkg/script/internal/conversions/result.go b/pkg/script/internal/conversions/result.go index 2af2951b8f..80717eb348 100644 --- a/pkg/script/internal/conversions/result.go +++ b/pkg/script/internal/conversions/result.go @@ -8,7 +8,7 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // ParseToolResult converts an mcp.CallToolResult into a Go value suitable diff --git a/pkg/script/internal/conversions/result_test.go b/pkg/script/internal/conversions/result_test.go index 5f534fe04c..877493966a 100644 --- a/pkg/script/internal/conversions/result_test.go +++ b/pkg/script/internal/conversions/result_test.go @@ -6,7 +6,7 @@ package conversions import ( "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" ) diff --git a/pkg/script/script.go b/pkg/script/script.go index dc1091310b..7696e652e0 100644 --- a/pkg/script/script.go +++ b/pkg/script/script.go @@ -9,7 +9,7 @@ package script import ( "context" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // DefaultStepLimit is the default maximum number of Starlark execution steps. diff --git a/pkg/script/script_test.go b/pkg/script/script_test.go index a9f65ec50b..d3ee521300 100644 --- a/pkg/script/script_test.go +++ b/pkg/script/script_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" ) diff --git a/pkg/telemetry/middleware.go b/pkg/telemetry/middleware.go index cc17e5f4db..db21e2901e 100644 --- a/pkg/telemetry/middleware.go +++ b/pkg/telemetry/middleware.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/pkg/transport/bridge.go b/pkg/transport/bridge.go index 796cd563c8..b5d337616f 100644 --- a/pkg/transport/bridge.go +++ b/pkg/transport/bridge.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/transport/types" "github.com/stacklok/toolhive/pkg/versions" diff --git a/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go b/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go index f085b12ad8..815daab9f0 100644 --- a/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go +++ b/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" diff --git a/pkg/tui/inspector.go b/pkg/tui/inspector.go index bb431866f5..62ca22e728 100644 --- a/pkg/tui/inspector.go +++ b/pkg/tui/inspector.go @@ -14,8 +14,8 @@ import ( "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/core" ) diff --git a/pkg/tui/inspector_test.go b/pkg/tui/inspector_test.go index 2bff458729..2443dd8e90 100644 --- a/pkg/tui/inspector_test.go +++ b/pkg/tui/inspector_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/charmbracelet/bubbles/textinput" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/tui/model.go b/pkg/tui/model.go index d1b1f2258b..dc59dfd84e 100644 --- a/pkg/tui/model.go +++ b/pkg/tui/model.go @@ -10,8 +10,8 @@ import ( "github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/viewport" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" regtypes "github.com/stacklok/toolhive-core/registry/types" "github.com/stacklok/toolhive/pkg/core" diff --git a/pkg/tui/tools.go b/pkg/tui/tools.go index e0e3c2fa06..895ef60bde 100644 --- a/pkg/tui/tools.go +++ b/pkg/tui/tools.go @@ -8,8 +8,8 @@ import ( "errors" tea "github.com/charmbracelet/bubbletea" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/core" thclient "github.com/stacklok/toolhive/pkg/mcp/client" diff --git a/pkg/tui/update.go b/pkg/tui/update.go index efbdd3d186..92ef16d7aa 100644 --- a/pkg/tui/update.go +++ b/pkg/tui/update.go @@ -9,8 +9,8 @@ import ( "time" tea "github.com/charmbracelet/bubbletea" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/core" "github.com/stacklok/toolhive/pkg/runner" diff --git a/pkg/tui/update_inspector.go b/pkg/tui/update_inspector.go index eb41e4298d..ee4b2d5117 100644 --- a/pkg/tui/update_inspector.go +++ b/pkg/tui/update_inspector.go @@ -9,7 +9,7 @@ import ( "github.com/atotto/clipboard" "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // handleInspectorKey handles key input when the inspector panel is active. diff --git a/pkg/tui/update_navigation.go b/pkg/tui/update_navigation.go index c8f4a6993e..896db9958f 100644 --- a/pkg/tui/update_navigation.go +++ b/pkg/tui/update_navigation.go @@ -9,7 +9,7 @@ import ( "github.com/atotto/clipboard" "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" - mcpclient "github.com/mark3labs/mcp-go/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive/pkg/core" "github.com/stacklok/toolhive/pkg/runner" diff --git a/pkg/tui/view_inspector.go b/pkg/tui/view_inspector.go index 5ddec4ab30..1bd60de48f 100644 --- a/pkg/tui/view_inspector.go +++ b/pkg/tui/view_inspector.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/charmbracelet/lipgloss" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/cmd/thv/app/ui" ) diff --git a/pkg/vmcp/client/auth_propagation_integration_test.go b/pkg/vmcp/client/auth_propagation_integration_test.go index 7844d1a8ae..bae7971e46 100644 --- a/pkg/vmcp/client/auth_propagation_integration_test.go +++ b/pkg/vmcp/client/auth_propagation_integration_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/client/client.go b/pkg/vmcp/client/client.go index 386418a343..5ef17f231a 100644 --- a/pkg/vmcp/client/client.go +++ b/pkg/vmcp/client/client.go @@ -4,7 +4,7 @@ // Package client provides MCP protocol client implementation for communicating with backend servers. // // This package implements the BackendClient interface defined in the vmcp package, -// using the mark3labs/mcp-go SDK for protocol communication. +// using the stacklok/toolhive-core/mcpcompat SDK for protocol communication. package client import ( @@ -21,9 +21,9 @@ import ( "syscall" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" @@ -100,7 +100,7 @@ func WithDialControl(control func(network, address string, c syscall.RawConn) er } } -// httpBackendClient implements vmcp.BackendClient using mark3labs/mcp-go HTTP client. +// httpBackendClient implements vmcp.BackendClient using stacklok/toolhive-core/mcpcompat HTTP client. // It supports streamable-HTTP and SSE transports for backend MCP servers. type httpBackendClient struct { // clientFactory creates MCP clients for backends. diff --git a/pkg/vmcp/client/client_test.go b/pkg/vmcp/client/client_test.go index f274f864c7..8275022754 100644 --- a/pkg/vmcp/client/client_test.go +++ b/pkg/vmcp/client/client_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - mcpserver "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" diff --git a/pkg/vmcp/client/meta_integration_test.go b/pkg/vmcp/client/meta_integration_test.go index 7c65d4d7f0..775de6f87a 100644 --- a/pkg/vmcp/client/meta_integration_test.go +++ b/pkg/vmcp/client/meta_integration_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/codemode/decorator.go b/pkg/vmcp/codemode/decorator.go index 4a643fd85d..d3f6a8cb96 100644 --- a/pkg/vmcp/codemode/decorator.go +++ b/pkg/vmcp/codemode/decorator.go @@ -10,7 +10,7 @@ import ( "log/slog" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/script" diff --git a/pkg/vmcp/conversion/content.go b/pkg/vmcp/conversion/content.go index a1a4382a5d..42ab186568 100644 --- a/pkg/vmcp/conversion/content.go +++ b/pkg/vmcp/conversion/content.go @@ -10,7 +10,7 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/conversion/content_test.go b/pkg/vmcp/conversion/content_test.go index b7d700de80..169c1c7686 100644 --- a/pkg/vmcp/conversion/content_test.go +++ b/pkg/vmcp/conversion/content_test.go @@ -6,7 +6,7 @@ package conversion import ( "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/conversion/conversion_test.go b/pkg/vmcp/conversion/conversion_test.go index 41044e47b5..49418530a4 100644 --- a/pkg/vmcp/conversion/conversion_test.go +++ b/pkg/vmcp/conversion/conversion_test.go @@ -6,7 +6,7 @@ package conversion_test import ( "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/conversion/errors.go b/pkg/vmcp/conversion/errors.go index 83058a514f..dc4ce6b54f 100644 --- a/pkg/vmcp/conversion/errors.go +++ b/pkg/vmcp/conversion/errors.go @@ -6,7 +6,7 @@ package conversion import ( "errors" - sdkmcp "github.com/mark3labs/mcp-go/mcp" + sdkmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" thvmcp "github.com/stacklok/toolhive/pkg/mcp" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/conversion/meta.go b/pkg/vmcp/conversion/meta.go index c7b6d03b0b..2264a1c02f 100644 --- a/pkg/vmcp/conversion/meta.go +++ b/pkg/vmcp/conversion/meta.go @@ -6,7 +6,7 @@ package conversion import ( "maps" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // FromMCPMeta converts MCP SDK meta to map[string]any for vmcp wrapper types. diff --git a/pkg/vmcp/health/checker_test.go b/pkg/vmcp/health/checker_test.go index 47d3881edc..ef1f7ac16a 100644 --- a/pkg/vmcp/health/checker_test.go +++ b/pkg/vmcp/health/checker_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/optimizer/internal/tokencounter/counter.go b/pkg/vmcp/optimizer/internal/tokencounter/counter.go index f0f6495f73..606414324b 100644 --- a/pkg/vmcp/optimizer/internal/tokencounter/counter.go +++ b/pkg/vmcp/optimizer/internal/tokencounter/counter.go @@ -7,7 +7,7 @@ package tokencounter import ( "encoding/json" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // Counter estimates the number of tokens a tool definition would consume diff --git a/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go b/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go index d3abd6cfb5..1280c8c652 100644 --- a/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go +++ b/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" ) diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go index a3c6f67b28..e0b7769498 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go @@ -19,8 +19,8 @@ import ( "sort" "strings" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "golang.org/x/sync/errgroup" _ "modernc.org/sqlite" // registers the "sqlite" database/sql driver diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go index 8e5bc2728b..354dfe385f 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go @@ -12,8 +12,8 @@ import ( "fmt" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/require" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go index 4894a45258..41d25e5a08 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/require" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" diff --git a/pkg/vmcp/optimizer/internal/types/mocks/mock_types.go b/pkg/vmcp/optimizer/internal/types/mocks/mock_types.go index 1a344ee73e..f9418bbe3c 100644 --- a/pkg/vmcp/optimizer/internal/types/mocks/mock_types.go +++ b/pkg/vmcp/optimizer/internal/types/mocks/mock_types.go @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - mcp "github.com/mark3labs/mcp-go/mcp" - server "github.com/mark3labs/mcp-go/server" + mcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + server "github.com/stacklok/toolhive-core/mcpcompat/server" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/vmcp/optimizer/internal/types/types.go b/pkg/vmcp/optimizer/internal/types/types.go index 9c54f5a92c..cb5d7d14cc 100644 --- a/pkg/vmcp/optimizer/internal/types/types.go +++ b/pkg/vmcp/optimizer/internal/types/types.go @@ -10,8 +10,8 @@ import ( "context" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" ) // ToolStore defines the interface for storing and searching tools. diff --git a/pkg/vmcp/optimizer/optimizer.go b/pkg/vmcp/optimizer/optimizer.go index 35389cf0f2..6d033f68a4 100644 --- a/pkg/vmcp/optimizer/optimizer.go +++ b/pkg/vmcp/optimizer/optimizer.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" httpval "github.com/stacklok/toolhive-core/validation/http" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/pkg/vmcp/optimizer/optimizer_test.go b/pkg/vmcp/optimizer/optimizer_test.go index 1c59228507..b80502704b 100644 --- a/pkg/vmcp/optimizer/optimizer_test.go +++ b/pkg/vmcp/optimizer/optimizer_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/adapter/capability_adapter.go b/pkg/vmcp/server/adapter/capability_adapter.go index d02b2d3c6c..3e3ebe71b8 100644 --- a/pkg/vmcp/server/adapter/capability_adapter.go +++ b/pkg/vmcp/server/adapter/capability_adapter.go @@ -8,8 +8,8 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" @@ -19,7 +19,7 @@ import ( // // This is the Anti-Corruption Layer between: // - Domain model (aggregator.AggregatedCapabilities) -// - External library (mark3labs/mcp-go SDK types) +// - External library (stacklok/toolhive-core/mcpcompat SDK types) // // The adapter: // 1. Converts aggregator types to SDK types diff --git a/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go b/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go index 1b85496f15..5b98b71756 100644 --- a/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go +++ b/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/adapter/capability_adapter_test.go b/pkg/vmcp/server/adapter/capability_adapter_test.go index 71e0bf13d9..93eab60fc6 100644 --- a/pkg/vmcp/server/adapter/capability_adapter_test.go +++ b/pkg/vmcp/server/adapter/capability_adapter_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/adapter/handler_factory.go b/pkg/vmcp/server/adapter/handler_factory.go index ace09654d4..c9ebc0b76e 100644 --- a/pkg/vmcp/server/adapter/handler_factory.go +++ b/pkg/vmcp/server/adapter/handler_factory.go @@ -13,7 +13,7 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" diff --git a/pkg/vmcp/server/adapter/handler_factory_test.go b/pkg/vmcp/server/adapter/handler_factory_test.go index f6a0b599c7..dae66015e7 100644 --- a/pkg/vmcp/server/adapter/handler_factory_test.go +++ b/pkg/vmcp/server/adapter/handler_factory_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/adapter/mocks/mock_handler_factory.go b/pkg/vmcp/server/adapter/mocks/mock_handler_factory.go index 5d516c2177..53862acf60 100644 --- a/pkg/vmcp/server/adapter/mocks/mock_handler_factory.go +++ b/pkg/vmcp/server/adapter/mocks/mock_handler_factory.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - mcp "github.com/mark3labs/mcp-go/mcp" + mcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" adapter "github.com/stacklok/toolhive/pkg/vmcp/server/adapter" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/vmcp/server/sdk_elicitation_adapter.go b/pkg/vmcp/server/sdk_elicitation_adapter.go index 3cf0eb7ebd..c5f5bdbd78 100644 --- a/pkg/vmcp/server/sdk_elicitation_adapter.go +++ b/pkg/vmcp/server/sdk_elicitation_adapter.go @@ -9,8 +9,8 @@ import ( "context" "maps" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/server/sdk_elicitation_adapter_test.go b/pkg/vmcp/server/sdk_elicitation_adapter_test.go index 8c28877593..6edd477d06 100644 --- a/pkg/vmcp/server/sdk_elicitation_adapter_test.go +++ b/pkg/vmcp/server/sdk_elicitation_adapter_test.go @@ -8,8 +8,8 @@ import ( "errors" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/server/serve.go b/pkg/vmcp/server/serve.go index 6fd16322c7..936cd2ec79 100644 --- a/pkg/vmcp/server/serve.go +++ b/pkg/vmcp/server/serve.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/audit" asrunner "github.com/stacklok/toolhive/pkg/authserver/runner" diff --git a/pkg/vmcp/server/serve_handlers.go b/pkg/vmcp/server/serve_handlers.go index 384cec96b5..4f0cfa9930 100644 --- a/pkg/vmcp/server/serve_handlers.go +++ b/pkg/vmcp/server/serve_handlers.go @@ -10,8 +10,8 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/audit" "github.com/stacklok/toolhive/pkg/auth" diff --git a/pkg/vmcp/server/serve_optimizer.go b/pkg/vmcp/server/serve_optimizer.go index f00ad34f5d..3dffc1334f 100644 --- a/pkg/vmcp/server/serve_optimizer.go +++ b/pkg/vmcp/server/serve_optimizer.go @@ -9,8 +9,8 @@ import ( "fmt" "log/slog" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/server/serve_optimizer_test.go b/pkg/vmcp/server/serve_optimizer_test.go index 1aa513e25e..a8c30bc080 100644 --- a/pkg/vmcp/server/serve_optimizer_test.go +++ b/pkg/vmcp/server/serve_optimizer_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/serve_session_test.go b/pkg/vmcp/server/serve_session_test.go index c66b7aab9a..d349158f67 100644 --- a/pkg/vmcp/server/serve_session_test.go +++ b/pkg/vmcp/server/serve_session_test.go @@ -16,8 +16,8 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/server.go b/pkg/vmcp/server/server.go index 8e1e5d3179..9f22227815 100644 --- a/pkg/vmcp/server/server.go +++ b/pkg/vmcp/server/server.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/server" tcredis "github.com/stacklok/toolhive-core/redis" "github.com/stacklok/toolhive/pkg/audit" @@ -265,7 +265,7 @@ type Server struct { // session manager; this is the resolved factory surfaced via Manager.OptimizerFactory. optimizerFactory func(context.Context, []server.ServerTool) (optimizer.Optimizer, error) - // MCP protocol server (mark3labs/mcp-go) + // MCP protocol server (stacklok/toolhive-core/mcpcompat) mcpServer *server.MCPServer // HTTP server for Streamable HTTP transport diff --git a/pkg/vmcp/server/session_management_integration_test.go b/pkg/vmcp/server/session_management_integration_test.go index 96f247f652..767188a4d3 100644 --- a/pkg/vmcp/server/session_management_integration_test.go +++ b/pkg/vmcp/server/session_management_integration_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - mcpmcp "github.com/mark3labs/mcp-go/mcp" - mcpsdk "github.com/mark3labs/mcp-go/server" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpsdk "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/session_manager_interface.go b/pkg/vmcp/server/session_manager_interface.go index 70c6ab8ebe..bb061fcf4b 100644 --- a/pkg/vmcp/server/session_manager_interface.go +++ b/pkg/vmcp/server/session_manager_interface.go @@ -6,7 +6,7 @@ package server import ( "context" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" vmcpsession "github.com/stacklok/toolhive/pkg/vmcp/session" sessiontypes "github.com/stacklok/toolhive/pkg/vmcp/session/types" diff --git a/pkg/vmcp/server/sessionmanager/factory.go b/pkg/vmcp/server/sessionmanager/factory.go index fb4bb159c7..b671a6970d 100644 --- a/pkg/vmcp/server/sessionmanager/factory.go +++ b/pkg/vmcp/server/sessionmanager/factory.go @@ -11,8 +11,8 @@ import ( "log/slog" "time" - "github.com/mark3labs/mcp-go/mcp" - mcpserver "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" diff --git a/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go b/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go index 102de1fd1e..6d2459a7f5 100644 --- a/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go +++ b/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/alicebob/miniredis/v2" - mcpmcp "github.com/mark3labs/mcp-go/mcp" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go b/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go index 25bf9c1c8d..91a16858f0 100644 --- a/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go +++ b/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/vmcp/server/sessionmanager/session_manager.go b/pkg/vmcp/server/sessionmanager/session_manager.go index 70687b3f9b..4158d21b5b 100644 --- a/pkg/vmcp/server/sessionmanager/session_manager.go +++ b/pkg/vmcp/server/sessionmanager/session_manager.go @@ -21,7 +21,7 @@ import ( "time" "github.com/google/uuid" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/cache" diff --git a/pkg/vmcp/server/sessionmanager/telemetry_test.go b/pkg/vmcp/server/sessionmanager/telemetry_test.go index d32acac96d..001fc4a814 100644 --- a/pkg/vmcp/server/sessionmanager/telemetry_test.go +++ b/pkg/vmcp/server/sessionmanager/telemetry_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "github.com/mark3labs/mcp-go/mcp" - mcpserver "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" sdkmetric "go.opentelemetry.io/otel/sdk/metric" diff --git a/pkg/vmcp/server/testutil_test.go b/pkg/vmcp/server/testutil_test.go index 9a29e20210..8f0dfa58a1 100644 --- a/pkg/vmcp/server/testutil_test.go +++ b/pkg/vmcp/server/testutil_test.go @@ -11,8 +11,8 @@ import ( "net/http/httptest" "testing" - mcpmcp "github.com/mark3labs/mcp-go/mcp" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" ) // startRealMCPBackend creates a real in-process MCP server over streamable-HTTP diff --git a/pkg/vmcp/session/connector_integration_test.go b/pkg/vmcp/session/connector_integration_test.go index c66b1bdeaf..f400b8c757 100644 --- a/pkg/vmcp/session/connector_integration_test.go +++ b/pkg/vmcp/session/connector_integration_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/google/uuid" - mcpmcp "github.com/mark3labs/mcp-go/mcp" - mcpserver "github.com/mark3labs/mcp-go/server" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/session/internal/backend/mcp_session.go b/pkg/vmcp/session/internal/backend/mcp_session.go index b8b5e3619a..cace439e10 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session.go +++ b/pkg/vmcp/session/internal/backend/mcp_session.go @@ -12,9 +12,9 @@ import ( "net/http" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - mcptransport "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/secrets" diff --git a/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go b/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go index f1c16f8e80..cc50e74f34 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go @@ -12,9 +12,9 @@ import ( "sync" "testing" - mcpclient "github.com/mark3labs/mcp-go/client" - mcptransport "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go b/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go index 9d58de9b76..bd8e9fd19d 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go b/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go index ac0e8236a6..15ce5439da 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/vmcp/session/optimizerdec/decorator.go b/pkg/vmcp/session/optimizerdec/decorator.go index b3e4454e88..3e0331932a 100644 --- a/pkg/vmcp/session/optimizerdec/decorator.go +++ b/pkg/vmcp/session/optimizerdec/decorator.go @@ -10,7 +10,7 @@ import ( "encoding/json" "fmt" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/session/optimizerdec/decorator_test.go b/pkg/vmcp/session/optimizerdec/decorator_test.go index 514c163df4..09fdfafbca 100644 --- a/pkg/vmcp/session/optimizerdec/decorator_test.go +++ b/pkg/vmcp/session/optimizerdec/decorator_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/test/e2e/mcp_client_helpers.go b/test/e2e/mcp_client_helpers.go index f08b8a2e10..fcdc07a0a7 100644 --- a/test/e2e/mcp_client_helpers.go +++ b/test/e2e/mcp_client_helpers.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" //nolint:staticcheck // Standard practice for Ginkgo . "github.com/onsi/gomega" //nolint:staticcheck // Standard practice for Gomega ) diff --git a/test/e2e/network_isolation_test.go b/test/e2e/network_isolation_test.go index 278a9c113d..45aeda4f35 100644 --- a/test/e2e/network_isolation_test.go +++ b/test/e2e/network_isolation_test.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/thv-operator/virtualmcp/helpers.go b/test/e2e/thv-operator/virtualmcp/helpers.go index 4f9f67420d..92af24a3e0 100644 --- a/test/e2e/thv-operator/virtualmcp/helpers.go +++ b/test/e2e/thv-operator/virtualmcp/helpers.go @@ -21,9 +21,9 @@ import ( "time" "github.com/go-logr/logr" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go b/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go index f226d99760..2d6d97f6f3 100644 --- a/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go +++ b/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go @@ -9,9 +9,9 @@ import ( "fmt" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go b/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go index 8d10d954ef..0999d69742 100644 --- a/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go +++ b/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go @@ -13,9 +13,9 @@ import ( "strings" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/redis/go-redis/v9" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go index a7ceca6611..c8b2948d4a 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go index 56cd88f0ec..8bee6e2279 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go index 42e851d8a8..5581cb19d3 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go @@ -12,9 +12,9 @@ import ( "strings" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go index 980fa5db84..eded788bc9 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go index 0d6de43cf0..3b3a448973 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go index c7eac4cc92..3104e34bb5 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go index 3f8ed12e73..df9240ceda 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go index 38c40e03fb..29e7624488 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go index 8dc05d4ce3..29548dcf0f 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go index 743ae9fb1b..a61bcb0c40 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go index b1b9e064b9..6fb7a64b45 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go index 22b191fe30..f704c098d9 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go index b727de8f04..93ddc07787 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go index 701502cc90..8d2934250a 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go index 78d7d59809..3f2f33c3f5 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go index 7772ed1f13..e13cf6bf7c 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go index 981d3fae5f..3fc1f1475c 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go @@ -12,9 +12,9 @@ import ( "strings" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go index 97f48641cb..f39b5d0be1 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go @@ -16,9 +16,9 @@ import ( "net/http" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go index 936d94be5d..5130f812b1 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go @@ -13,9 +13,9 @@ import ( "strings" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go index 41ba4a3856..95dface056 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go index d6121d6920..034ed7239e 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go b/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go index 9699e21fc2..21e4891d22 100644 --- a/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go +++ b/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go @@ -9,9 +9,9 @@ import ( "strings" "time" - mcpclient "github.com/mark3labs/mcp-go/client" - "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/test/e2e/vmcp_cli_features_test.go b/test/e2e/vmcp_cli_features_test.go index ea0c2348c7..6a246d6d13 100644 --- a/test/e2e/vmcp_cli_features_test.go +++ b/test/e2e/vmcp_cli_features_test.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v3" diff --git a/test/e2e/vmcp_optimizer_test.go b/test/e2e/vmcp_optimizer_test.go index e715c8413f..dfe0c42dfa 100644 --- a/test/e2e/vmcp_optimizer_test.go +++ b/test/e2e/vmcp_optimizer_test.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/integration/vmcp/helpers/backend.go b/test/integration/vmcp/helpers/backend.go index c5594b625b..bef9376419 100644 --- a/test/integration/vmcp/helpers/backend.go +++ b/test/integration/vmcp/helpers/backend.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/mark3labs/mcp-go/mcp" - "github.com/mark3labs/mcp-go/server" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" ) // BackendTool defines a tool for MCP backend servers. @@ -180,7 +180,7 @@ func WithCaptureHeaders() BackendServerOption { } } -// CreateBackendServer creates an MCP backend server using the mark3labs/mcp-go SDK. +// CreateBackendServer creates an MCP backend server using the stacklok/toolhive-core/mcpcompat SDK. // It returns an *httptest.Server ready to accept streamable-HTTP connections. // // The server automatically registers all provided tools with proper closure handling diff --git a/test/integration/vmcp/helpers/helpers_test.go b/test/integration/vmcp/helpers/helpers_test.go index 3d186c0ee5..5786e807b3 100644 --- a/test/integration/vmcp/helpers/helpers_test.go +++ b/test/integration/vmcp/helpers/helpers_test.go @@ -6,7 +6,7 @@ package helpers import ( "testing" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" ) diff --git a/test/integration/vmcp/helpers/mcp_client.go b/test/integration/vmcp/helpers/mcp_client.go index 75167cbdf6..48861c6953 100644 --- a/test/integration/vmcp/helpers/mcp_client.go +++ b/test/integration/vmcp/helpers/mcp_client.go @@ -10,9 +10,9 @@ import ( "sync" "testing" - "github.com/mark3labs/mcp-go/client" - mcptransport "github.com/mark3labs/mcp-go/client/transport" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/client" + mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/test/integration/vmcp/vmcp_integration_test.go b/test/integration/vmcp/vmcp_integration_test.go index e8b37a6da4..038cde9b9c 100644 --- a/test/integration/vmcp/vmcp_integration_test.go +++ b/test/integration/vmcp/vmcp_integration_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/test/integration/vmcp/vmcp_typing_integration_test.go b/test/integration/vmcp/vmcp_typing_integration_test.go index d973cf738a..530f54d47d 100644 --- a/test/integration/vmcp/vmcp_typing_integration_test.go +++ b/test/integration/vmcp/vmcp_typing_integration_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mark3labs/mcp-go/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" "github.com/stacklok/toolhive/pkg/vmcp" From 3289b17933071777694c8982353c850571842855 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 14:21:35 +0300 Subject: [PATCH 2/8] chore: bump toolhive-core shim + fix gci import grouping Bump github.com/stacklok/toolhive-core to the mcpcompat shim commit that closes the server/client compatibility gaps exercised by the vMCP and MCP test suites (pulls the required cel-go v0.29.1). Also fix gci import grouping in three files flagged by lint (toolhive-core shares the github.com/stacklok/toolhive prefix, so its imports group with toolhive's). Co-Authored-By: Claude Opus 4.8 --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/mcp/client/client.go | 1 - pkg/vmcp/server/adapter/capability_adapter.go | 1 - pkg/vmcp/session/optimizerdec/decorator.go | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 0e96038fe0..a7a806bcd2 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/go-jose/go-jose/v3 v3.0.5 github.com/go-jose/go-jose/v4 v4.1.4 github.com/gofrs/flock v0.13.0 - github.com/google/cel-go v0.29.0 + github.com/google/cel-go v0.29.1 github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.21.7 github.com/google/uuid v1.6.0 @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e + github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962 github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index 06068e6af2..69d7505fec 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/cel-go v0.29.0 h1:fEG+Ja3YRwNOqnQxTyJwoByAUAvTuxUGiro/jhrm4F4= -github.com/google/cel-go v0.29.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= +github.com/google/cel-go v0.29.1 h1:8Gx3S5HPop5XPOHtZI8vkaGk+DBW/nn9fkpNPbh5dBk= +github.com/google/cel-go v0.29.1/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= github.com/google/certificate-transparency-go v1.3.3 h1:hq/rSxztSkXN2tx/3jQqF6Xc0O565UQPdHrOWvZwybo= github.com/google/certificate-transparency-go v1.3.3/go.mod h1:iR17ZgSaXRzSa5qvjFl8TnVD5h8ky2JMVio+dzoKMgA= github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e h1:U0qze2Zgu0w2lOUdEKr2KESRDHH++kAYiq2gp8WT6PQ= -github.com/stacklok/toolhive-core v0.0.27-0.20260706081226-6b7da5c3241e/go.mod h1:Iyec5nzAexdAwBkVHgaxvoKMC+ITVKloj1CWN1D0FQI= +github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962 h1:6Bl5cWJz2ylJApWt0cDFq8NepgVC2lvOi/OxaMg8B9A= +github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= diff --git a/pkg/mcp/client/client.go b/pkg/mcp/client/client.go index 80ce583cf9..0ae9c77baf 100644 --- a/pkg/mcp/client/client.go +++ b/pkg/mcp/client/client.go @@ -18,7 +18,6 @@ import ( mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/transport/ssecommon" "github.com/stacklok/toolhive/pkg/transport/streamable" "github.com/stacklok/toolhive/pkg/transport/types" diff --git a/pkg/vmcp/server/adapter/capability_adapter.go b/pkg/vmcp/server/adapter/capability_adapter.go index 3e3ebe71b8..68463f9c06 100644 --- a/pkg/vmcp/server/adapter/capability_adapter.go +++ b/pkg/vmcp/server/adapter/capability_adapter.go @@ -10,7 +10,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" ) diff --git a/pkg/vmcp/session/optimizerdec/decorator.go b/pkg/vmcp/session/optimizerdec/decorator.go index 3e0331932a..5c096d956d 100644 --- a/pkg/vmcp/session/optimizerdec/decorator.go +++ b/pkg/vmcp/session/optimizerdec/decorator.go @@ -11,7 +11,6 @@ import ( "fmt" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" From 760fae5f6701d4e8e73b004390abfa2f2c1d58c4 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 14:33:24 +0300 Subject: [PATCH 3/8] style: fix gci import grouping after mcp-go->mcpcompat swap Co-Authored-By: Claude Opus 4.8 --- cmd/thv/app/mcp.go | 2 +- cmd/thv/app/mcp_call.go | 2 +- cmd/thv/app/mcp_call_test.go | 3 ++- pkg/authz/annotation_cache.go | 1 - pkg/authz/annotation_cache_test.go | 2 +- pkg/authz/integration_test.go | 2 +- pkg/authz/middleware_test.go | 2 +- pkg/authz/response_filter.go | 2 +- pkg/authz/response_filter_test.go | 2 +- pkg/authz/tool_filter.go | 1 - pkg/authz/tool_filter_test.go | 2 +- pkg/mcp/parser_integration_test.go | 5 +++-- pkg/script/executor.go | 2 +- pkg/script/internal/builtins/builtins.go | 2 +- pkg/script/internal/builtins/builtins_test.go | 2 +- pkg/script/internal/builtins/tools.go | 2 +- pkg/script/internal/conversions/result_test.go | 3 ++- pkg/script/script_test.go | 3 ++- pkg/telemetry/middleware.go | 2 +- pkg/transport/bridge.go | 1 - .../streamable_proxy_mcp_client_integration_test.go | 5 +++-- pkg/tui/inspector.go | 2 +- pkg/tui/inspector_test.go | 2 +- pkg/tui/model.go | 2 +- pkg/tui/tools.go | 2 +- pkg/tui/update.go | 2 +- pkg/tui/update_inspector.go | 1 + pkg/tui/update_navigation.go | 2 +- pkg/tui/view_inspector.go | 2 +- pkg/vmcp/client/auth_propagation_integration_test.go | 2 +- pkg/vmcp/client/client.go | 6 +++--- pkg/vmcp/client/client_test.go | 6 +++--- pkg/vmcp/client/meta_integration_test.go | 4 ++-- pkg/vmcp/codemode/decorator.go | 1 - pkg/vmcp/conversion/content.go | 1 - pkg/vmcp/conversion/content_test.go | 2 +- pkg/vmcp/conversion/conversion_test.go | 2 +- pkg/vmcp/conversion/errors.go | 1 - pkg/vmcp/health/checker_test.go | 2 +- pkg/vmcp/optimizer/internal/tokencounter/counter_test.go | 3 ++- pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go | 4 ++-- .../optimizer/internal/toolstore/sqlite_store_bench_test.go | 4 ++-- pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go | 4 ++-- pkg/vmcp/optimizer/optimizer.go | 1 - pkg/vmcp/optimizer/optimizer_test.go | 4 ++-- .../server/adapter/capability_adapter_annotations_test.go | 4 ++-- pkg/vmcp/server/adapter/capability_adapter_test.go | 4 ++-- pkg/vmcp/server/adapter/handler_factory.go | 1 - pkg/vmcp/server/adapter/handler_factory_test.go | 2 +- pkg/vmcp/server/sdk_elicitation_adapter.go | 1 - pkg/vmcp/server/sdk_elicitation_adapter_test.go | 4 ++-- pkg/vmcp/server/serve.go | 1 - pkg/vmcp/server/serve_handlers.go | 1 - pkg/vmcp/server/serve_optimizer.go | 1 - pkg/vmcp/server/serve_optimizer_test.go | 4 ++-- pkg/vmcp/server/serve_session_test.go | 4 ++-- pkg/vmcp/server/server.go | 1 - pkg/vmcp/server/session_management_integration_test.go | 4 ++-- pkg/vmcp/server/session_manager_interface.go | 1 - pkg/vmcp/server/sessionmanager/factory.go | 4 ++-- .../sessionmanager/horizontal_scaling_integration_test.go | 4 ++-- pkg/vmcp/server/sessionmanager/optimizer_gate_test.go | 2 +- pkg/vmcp/server/sessionmanager/session_manager.go | 2 +- pkg/vmcp/server/sessionmanager/telemetry_test.go | 4 ++-- pkg/vmcp/session/connector_integration_test.go | 4 ++-- pkg/vmcp/session/internal/backend/mcp_session.go | 1 - .../internal/backend/mcp_session_capabilities_test.go | 6 +++--- .../internal/backend/mcp_session_header_forward_test.go | 2 +- .../internal/backend/mcp_session_identity_refresh_test.go | 2 +- pkg/vmcp/session/optimizerdec/decorator_test.go | 2 +- test/e2e/mcp_client_helpers.go | 5 +++-- test/e2e/network_isolation_test.go | 2 +- test/e2e/thv-operator/virtualmcp/helpers.go | 6 +++--- .../thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go | 6 +++--- test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go | 6 +++--- .../virtualmcp/virtualmcp_aggregation_filtering_test.go | 2 +- .../virtualmcp/virtualmcp_aggregation_overrides_test.go | 2 +- .../virtualmcp/virtualmcp_auth_discovery_test.go | 6 +++--- .../e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go | 2 +- .../virtualmcp/virtualmcp_composite_defaultresults_test.go | 2 +- .../virtualmcp/virtualmcp_composite_hidden_tools_test.go | 2 +- .../virtualmcp/virtualmcp_composite_parallel_test.go | 2 +- .../virtualmcp/virtualmcp_composite_referenced_test.go | 2 +- .../virtualmcp/virtualmcp_composite_sequential_test.go | 2 +- .../virtualmcp/virtualmcp_conflict_resolution_test.go | 2 +- .../virtualmcp/virtualmcp_discovered_mode_test.go | 4 ++-- .../virtualmcp/virtualmcp_excludeall_global_test.go | 2 +- .../virtualmcp/virtualmcp_external_auth_test.go | 2 +- .../virtualmcp/virtualmcp_optimizer_composite_test.go | 2 +- .../virtualmcp/virtualmcp_optimizer_multibackend_test.go | 2 +- .../thv-operator/virtualmcp/virtualmcp_optimizer_test.go | 2 +- .../virtualmcp/virtualmcp_rate_limiting_test.go | 6 +++--- .../virtualmcp/virtualmcp_redis_session_test.go | 6 +++--- .../virtualmcp/virtualmcp_session_management_test.go | 6 +++--- .../thv-operator/virtualmcp/virtualmcp_toolconfig_test.go | 2 +- .../virtualmcp/virtualmcp_yardstick_base_test.go | 2 +- test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go | 5 +++-- test/e2e/vmcp_cli_features_test.go | 2 +- test/e2e/vmcp_optimizer_test.go | 2 +- test/integration/vmcp/helpers/helpers_test.go | 3 ++- test/integration/vmcp/helpers/mcp_client.go | 5 +++-- test/integration/vmcp/vmcp_integration_test.go | 2 +- test/integration/vmcp/vmcp_typing_integration_test.go | 2 +- 103 files changed, 139 insertions(+), 143 deletions(-) diff --git a/cmd/thv/app/mcp.go b/cmd/thv/app/mcp.go index eff9bacdc8..2606118ceb 100644 --- a/cmd/thv/app/mcp.go +++ b/cmd/thv/app/mcp.go @@ -13,9 +13,9 @@ import ( "text/tabwriter" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/spf13/cobra" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" thclient "github.com/stacklok/toolhive/pkg/mcp/client" "github.com/stacklok/toolhive/pkg/workloads" ) diff --git a/cmd/thv/app/mcp_call.go b/cmd/thv/app/mcp_call.go index 9c00459b2f..78deceb96b 100644 --- a/cmd/thv/app/mcp_call.go +++ b/cmd/thv/app/mcp_call.go @@ -12,9 +12,9 @@ import ( "os" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/spf13/cobra" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" thclient "github.com/stacklok/toolhive/pkg/mcp/client" ) diff --git a/cmd/thv/app/mcp_call_test.go b/cmd/thv/app/mcp_call_test.go index 0f18fe49c9..8f57e84454 100644 --- a/cmd/thv/app/mcp_call_test.go +++ b/cmd/thv/app/mcp_call_test.go @@ -9,9 +9,10 @@ import ( "strings" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) func TestReadToolArgs(t *testing.T) { diff --git a/pkg/authz/annotation_cache.go b/pkg/authz/annotation_cache.go index 51b1aee947..bda00e21e1 100644 --- a/pkg/authz/annotation_cache.go +++ b/pkg/authz/annotation_cache.go @@ -7,7 +7,6 @@ import ( "sync" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/authz/authorizers" ) diff --git a/pkg/authz/annotation_cache_test.go b/pkg/authz/annotation_cache_test.go index 1601000341..a8c9930358 100644 --- a/pkg/authz/annotation_cache_test.go +++ b/pkg/authz/annotation_cache_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/authz/authorizers" ) diff --git a/pkg/authz/integration_test.go b/pkg/authz/integration_test.go index c0f8f5ab53..217ee072b7 100644 --- a/pkg/authz/integration_test.go +++ b/pkg/authz/integration_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/authz/authorizers/cedar" mcpparser "github.com/stacklok/toolhive/pkg/mcp" diff --git a/pkg/authz/middleware_test.go b/pkg/authz/middleware_test.go index 118511b908..9e93943485 100644 --- a/pkg/authz/middleware_test.go +++ b/pkg/authz/middleware_test.go @@ -14,12 +14,12 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "golang.org/x/exp/jsonrpc2" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/authz/authorizers" "github.com/stacklok/toolhive/pkg/authz/authorizers/cedar" diff --git a/pkg/authz/response_filter.go b/pkg/authz/response_filter.go index 94e5cb82e0..461f91a132 100644 --- a/pkg/authz/response_filter.go +++ b/pkg/authz/response_filter.go @@ -13,9 +13,9 @@ import ( "net/http" "strings" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "golang.org/x/exp/jsonrpc2" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/authz/authorizers" "github.com/stacklok/toolhive/pkg/vmcp/optimizer" "github.com/stacklok/toolhive/pkg/vmcp/session/optimizerdec" diff --git a/pkg/authz/response_filter_test.go b/pkg/authz/response_filter_test.go index 0c1e75acb9..afac258c98 100644 --- a/pkg/authz/response_filter_test.go +++ b/pkg/authz/response_filter_test.go @@ -16,11 +16,11 @@ import ( "testing" "github.com/golang-jwt/jwt/v5" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/authz/authorizers/cedar" mcpparser "github.com/stacklok/toolhive/pkg/mcp" diff --git a/pkg/authz/tool_filter.go b/pkg/authz/tool_filter.go index 5260a14b17..44c736714e 100644 --- a/pkg/authz/tool_filter.go +++ b/pkg/authz/tool_filter.go @@ -8,7 +8,6 @@ import ( "log/slog" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/authz/authorizers" ) diff --git a/pkg/authz/tool_filter_test.go b/pkg/authz/tool_filter_test.go index 69ab0054d3..882cb9fd93 100644 --- a/pkg/authz/tool_filter_test.go +++ b/pkg/authz/tool_filter_test.go @@ -8,10 +8,10 @@ import ( "errors" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/authz/authorizers" "github.com/stacklok/toolhive/pkg/authz/authorizers/cedar" diff --git a/pkg/mcp/parser_integration_test.go b/pkg/mcp/parser_integration_test.go index c5ad3ead89..454a165fb1 100644 --- a/pkg/mcp/parser_integration_test.go +++ b/pkg/mcp/parser_integration_test.go @@ -10,11 +10,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) // TestParsingMiddlewareWithRealMCPClients tests the parsing middleware with real MCP clients and servers diff --git a/pkg/script/executor.go b/pkg/script/executor.go index e269a9fc60..74d6f77da9 100644 --- a/pkg/script/executor.go +++ b/pkg/script/executor.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/script/internal/builtins" "github.com/stacklok/toolhive/pkg/script/internal/conversions" "github.com/stacklok/toolhive/pkg/script/internal/core" diff --git a/pkg/script/internal/builtins/builtins.go b/pkg/script/internal/builtins/builtins.go index 0e13e0c26c..a7a2d655bf 100644 --- a/pkg/script/internal/builtins/builtins.go +++ b/pkg/script/internal/builtins/builtins.go @@ -8,9 +8,9 @@ import ( "context" "log/slog" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/script/internal/conversions" ) diff --git a/pkg/script/internal/builtins/builtins_test.go b/pkg/script/internal/builtins/builtins_test.go index 4b713a54d6..07417926e0 100644 --- a/pkg/script/internal/builtins/builtins_test.go +++ b/pkg/script/internal/builtins/builtins_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" "go.starlark.net/starlark" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/script/internal/core" ) diff --git a/pkg/script/internal/builtins/tools.go b/pkg/script/internal/builtins/tools.go index 4644c14f72..a990653741 100644 --- a/pkg/script/internal/builtins/tools.go +++ b/pkg/script/internal/builtins/tools.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.starlark.net/starlark" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/script/internal/conversions" ) diff --git a/pkg/script/internal/conversions/result_test.go b/pkg/script/internal/conversions/result_test.go index 877493966a..821e06f1bb 100644 --- a/pkg/script/internal/conversions/result_test.go +++ b/pkg/script/internal/conversions/result_test.go @@ -6,8 +6,9 @@ package conversions import ( "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" + + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) func TestParseToolResult(t *testing.T) { diff --git a/pkg/script/script_test.go b/pkg/script/script_test.go index d3ee521300..f92b761e7f 100644 --- a/pkg/script/script_test.go +++ b/pkg/script/script_test.go @@ -9,8 +9,9 @@ import ( "fmt" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" + + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) func TestExecutor(t *testing.T) { diff --git a/pkg/telemetry/middleware.go b/pkg/telemetry/middleware.go index db21e2901e..1b9f5eec6e 100644 --- a/pkg/telemetry/middleware.go +++ b/pkg/telemetry/middleware.go @@ -15,7 +15,6 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" @@ -23,6 +22,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpparser "github.com/stacklok/toolhive/pkg/mcp" "github.com/stacklok/toolhive/pkg/transport/types" ) diff --git a/pkg/transport/bridge.go b/pkg/transport/bridge.go index b5d337616f..6ba5ff6eea 100644 --- a/pkg/transport/bridge.go +++ b/pkg/transport/bridge.go @@ -15,7 +15,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/transport/types" "github.com/stacklok/toolhive/pkg/versions" ) diff --git a/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go b/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go index 815daab9f0..475ead6d05 100644 --- a/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go +++ b/pkg/transport/proxy/streamable/streamable_proxy_mcp_client_integration_test.go @@ -11,11 +11,12 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/jsonrpc2" + + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) const ( diff --git a/pkg/tui/inspector.go b/pkg/tui/inspector.go index 62ca22e728..2b4bc9ce03 100644 --- a/pkg/tui/inspector.go +++ b/pkg/tui/inspector.go @@ -14,9 +14,9 @@ import ( "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/core" ) diff --git a/pkg/tui/inspector_test.go b/pkg/tui/inspector_test.go index 2443dd8e90..a249a68406 100644 --- a/pkg/tui/inspector_test.go +++ b/pkg/tui/inspector_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/charmbracelet/bubbles/textinput" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/core" ) diff --git a/pkg/tui/model.go b/pkg/tui/model.go index dc59dfd84e..8318c9de55 100644 --- a/pkg/tui/model.go +++ b/pkg/tui/model.go @@ -10,9 +10,9 @@ import ( "github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/viewport" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - regtypes "github.com/stacklok/toolhive-core/registry/types" "github.com/stacklok/toolhive/pkg/core" "github.com/stacklok/toolhive/pkg/registry" diff --git a/pkg/tui/tools.go b/pkg/tui/tools.go index 895ef60bde..e28ba07fd2 100644 --- a/pkg/tui/tools.go +++ b/pkg/tui/tools.go @@ -8,9 +8,9 @@ import ( "errors" tea "github.com/charmbracelet/bubbletea" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/core" thclient "github.com/stacklok/toolhive/pkg/mcp/client" ) diff --git a/pkg/tui/update.go b/pkg/tui/update.go index 92ef16d7aa..c4614ebdb4 100644 --- a/pkg/tui/update.go +++ b/pkg/tui/update.go @@ -9,9 +9,9 @@ import ( "time" tea "github.com/charmbracelet/bubbletea" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/core" "github.com/stacklok/toolhive/pkg/runner" ) diff --git a/pkg/tui/update_inspector.go b/pkg/tui/update_inspector.go index ee4b2d5117..79997b87b5 100644 --- a/pkg/tui/update_inspector.go +++ b/pkg/tui/update_inspector.go @@ -9,6 +9,7 @@ import ( "github.com/atotto/clipboard" "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) diff --git a/pkg/tui/update_navigation.go b/pkg/tui/update_navigation.go index 896db9958f..4d07fa63ad 100644 --- a/pkg/tui/update_navigation.go +++ b/pkg/tui/update_navigation.go @@ -9,8 +9,8 @@ import ( "github.com/atotto/clipboard" "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive/pkg/core" "github.com/stacklok/toolhive/pkg/runner" types "github.com/stacklok/toolhive/pkg/transport/types" diff --git a/pkg/tui/view_inspector.go b/pkg/tui/view_inspector.go index 1bd60de48f..e883eda658 100644 --- a/pkg/tui/view_inspector.go +++ b/pkg/tui/view_inspector.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/charmbracelet/lipgloss" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/cmd/thv/app/ui" ) diff --git a/pkg/vmcp/client/auth_propagation_integration_test.go b/pkg/vmcp/client/auth_propagation_integration_test.go index bae7971e46..1a69d145ac 100644 --- a/pkg/vmcp/client/auth_propagation_integration_test.go +++ b/pkg/vmcp/client/auth_propagation_integration_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" vmcpauth "github.com/stacklok/toolhive/pkg/vmcp/auth" "github.com/stacklok/toolhive/pkg/vmcp/auth/strategies" diff --git a/pkg/vmcp/client/client.go b/pkg/vmcp/client/client.go index 5ef17f231a..1adc051493 100644 --- a/pkg/vmcp/client/client.go +++ b/pkg/vmcp/client/client.go @@ -21,12 +21,12 @@ import ( "syscall" "time" - "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/secrets" "github.com/stacklok/toolhive/pkg/versions" diff --git a/pkg/vmcp/client/client_test.go b/pkg/vmcp/client/client_test.go index 8275022754..fda9a3a9f8 100644 --- a/pkg/vmcp/client/client_test.go +++ b/pkg/vmcp/client/client_test.go @@ -28,9 +28,6 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" @@ -38,6 +35,9 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" pkgauth "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/auth" diff --git a/pkg/vmcp/client/meta_integration_test.go b/pkg/vmcp/client/meta_integration_test.go index 775de6f87a..e8659709b9 100644 --- a/pkg/vmcp/client/meta_integration_test.go +++ b/pkg/vmcp/client/meta_integration_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/auth" "github.com/stacklok/toolhive/pkg/vmcp/auth/strategies" diff --git a/pkg/vmcp/codemode/decorator.go b/pkg/vmcp/codemode/decorator.go index d3f6a8cb96..32127f54e1 100644 --- a/pkg/vmcp/codemode/decorator.go +++ b/pkg/vmcp/codemode/decorator.go @@ -11,7 +11,6 @@ import ( "time" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/script" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/conversion/content.go b/pkg/vmcp/conversion/content.go index 42ab186568..0c46fa36e5 100644 --- a/pkg/vmcp/conversion/content.go +++ b/pkg/vmcp/conversion/content.go @@ -11,7 +11,6 @@ import ( "log/slog" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/conversion/content_test.go b/pkg/vmcp/conversion/content_test.go index 169c1c7686..8e38921d9f 100644 --- a/pkg/vmcp/conversion/content_test.go +++ b/pkg/vmcp/conversion/content_test.go @@ -6,10 +6,10 @@ package conversion import ( "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/conversion/conversion_test.go b/pkg/vmcp/conversion/conversion_test.go index 49418530a4..3713ae8ce8 100644 --- a/pkg/vmcp/conversion/conversion_test.go +++ b/pkg/vmcp/conversion/conversion_test.go @@ -6,10 +6,10 @@ package conversion_test import ( "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" ) diff --git a/pkg/vmcp/conversion/errors.go b/pkg/vmcp/conversion/errors.go index dc4ce6b54f..0bf6a2ad63 100644 --- a/pkg/vmcp/conversion/errors.go +++ b/pkg/vmcp/conversion/errors.go @@ -7,7 +7,6 @@ import ( "errors" sdkmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" - thvmcp "github.com/stacklok/toolhive/pkg/mcp" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/health/checker_test.go b/pkg/vmcp/health/checker_test.go index ef1f7ac16a..49bd2b6453 100644 --- a/pkg/vmcp/health/checker_test.go +++ b/pkg/vmcp/health/checker_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive/pkg/vmcp" authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types" "github.com/stacklok/toolhive/pkg/vmcp/mocks" diff --git a/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go b/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go index 1280c8c652..9f720a03d5 100644 --- a/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go +++ b/pkg/vmcp/optimizer/internal/tokencounter/counter_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" + + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) func TestJSONByteDivisionCounter(t *testing.T) { diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go index e0b7769498..933efa5b4d 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store.go @@ -19,11 +19,11 @@ import ( "sort" "strings" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "golang.org/x/sync/errgroup" _ "modernc.org/sqlite" // registers the "sqlite" database/sql driver + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/similarity" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" ) diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go index 354dfe385f..c9853c9d0a 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_bench_test.go @@ -12,10 +12,10 @@ import ( "fmt" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" ) diff --git a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go index 41d25e5a08..3acc254192 100644 --- a/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go +++ b/pkg/vmcp/optimizer/internal/toolstore/sqlite_store_test.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" ) diff --git a/pkg/vmcp/optimizer/optimizer.go b/pkg/vmcp/optimizer/optimizer.go index 6d033f68a4..5c58b39bca 100644 --- a/pkg/vmcp/optimizer/optimizer.go +++ b/pkg/vmcp/optimizer/optimizer.go @@ -23,7 +23,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - httpval "github.com/stacklok/toolhive-core/validation/http" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/similarity" diff --git a/pkg/vmcp/optimizer/optimizer_test.go b/pkg/vmcp/optimizer/optimizer_test.go index b80502704b..2d862bb42e 100644 --- a/pkg/vmcp/optimizer/optimizer_test.go +++ b/pkg/vmcp/optimizer/optimizer_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/tokencounter" "github.com/stacklok/toolhive/pkg/vmcp/optimizer/internal/types" diff --git a/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go b/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go index 5b98b71756..263fcea5fc 100644 --- a/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go +++ b/pkg/vmcp/server/adapter/capability_adapter_annotations_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/server/adapter" "github.com/stacklok/toolhive/pkg/vmcp/server/adapter/mocks" diff --git a/pkg/vmcp/server/adapter/capability_adapter_test.go b/pkg/vmcp/server/adapter/capability_adapter_test.go index 93eab60fc6..4150e0239c 100644 --- a/pkg/vmcp/server/adapter/capability_adapter_test.go +++ b/pkg/vmcp/server/adapter/capability_adapter_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/server/adapter" "github.com/stacklok/toolhive/pkg/vmcp/server/adapter/mocks" diff --git a/pkg/vmcp/server/adapter/handler_factory.go b/pkg/vmcp/server/adapter/handler_factory.go index c9ebc0b76e..f8a3dfb7a5 100644 --- a/pkg/vmcp/server/adapter/handler_factory.go +++ b/pkg/vmcp/server/adapter/handler_factory.go @@ -14,7 +14,6 @@ import ( "log/slog" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" "github.com/stacklok/toolhive/pkg/vmcp/internal/compositetools" diff --git a/pkg/vmcp/server/adapter/handler_factory_test.go b/pkg/vmcp/server/adapter/handler_factory_test.go index dae66015e7..d2d36856fb 100644 --- a/pkg/vmcp/server/adapter/handler_factory_test.go +++ b/pkg/vmcp/server/adapter/handler_factory_test.go @@ -8,11 +8,11 @@ import ( "errors" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" vmcpmocks "github.com/stacklok/toolhive/pkg/vmcp/mocks" "github.com/stacklok/toolhive/pkg/vmcp/router" diff --git a/pkg/vmcp/server/sdk_elicitation_adapter.go b/pkg/vmcp/server/sdk_elicitation_adapter.go index c5f5bdbd78..b7b06c345b 100644 --- a/pkg/vmcp/server/sdk_elicitation_adapter.go +++ b/pkg/vmcp/server/sdk_elicitation_adapter.go @@ -11,7 +11,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/server/sdk_elicitation_adapter_test.go b/pkg/vmcp/server/sdk_elicitation_adapter_test.go index 6edd477d06..821fbfce7b 100644 --- a/pkg/vmcp/server/sdk_elicitation_adapter_test.go +++ b/pkg/vmcp/server/sdk_elicitation_adapter_test.go @@ -8,11 +8,11 @@ import ( "errors" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/server/serve.go b/pkg/vmcp/server/serve.go index 936cd2ec79..2e30582d24 100644 --- a/pkg/vmcp/server/serve.go +++ b/pkg/vmcp/server/serve.go @@ -11,7 +11,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/audit" asrunner "github.com/stacklok/toolhive/pkg/authserver/runner" "github.com/stacklok/toolhive/pkg/telemetry" diff --git a/pkg/vmcp/server/serve_handlers.go b/pkg/vmcp/server/serve_handlers.go index 4f0cfa9930..d8d4a2aacf 100644 --- a/pkg/vmcp/server/serve_handlers.go +++ b/pkg/vmcp/server/serve_handlers.go @@ -12,7 +12,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/audit" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/server/serve_optimizer.go b/pkg/vmcp/server/serve_optimizer.go index 3dffc1334f..0f5a6cae00 100644 --- a/pkg/vmcp/server/serve_optimizer.go +++ b/pkg/vmcp/server/serve_optimizer.go @@ -11,7 +11,6 @@ import ( "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive-core/mcpcompat/server" - "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/conversion" diff --git a/pkg/vmcp/server/serve_optimizer_test.go b/pkg/vmcp/server/serve_optimizer_test.go index a8c30bc080..50ecbf3376 100644 --- a/pkg/vmcp/server/serve_optimizer_test.go +++ b/pkg/vmcp/server/serve_optimizer_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/ratelimit" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/server/serve_session_test.go b/pkg/vmcp/server/serve_session_test.go index d349158f67..0d8973509b 100644 --- a/pkg/vmcp/server/serve_session_test.go +++ b/pkg/vmcp/server/serve_session_test.go @@ -16,12 +16,12 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/audit" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/ratelimit" diff --git a/pkg/vmcp/server/server.go b/pkg/vmcp/server/server.go index 9f22227815..c2ca3211c3 100644 --- a/pkg/vmcp/server/server.go +++ b/pkg/vmcp/server/server.go @@ -22,7 +22,6 @@ import ( "time" "github.com/stacklok/toolhive-core/mcpcompat/server" - tcredis "github.com/stacklok/toolhive-core/redis" "github.com/stacklok/toolhive/pkg/audit" "github.com/stacklok/toolhive/pkg/auth" diff --git a/pkg/vmcp/server/session_management_integration_test.go b/pkg/vmcp/server/session_management_integration_test.go index 767188a4d3..61779fbcf2 100644 --- a/pkg/vmcp/server/session_management_integration_test.go +++ b/pkg/vmcp/server/session_management_integration_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" - mcpsdk "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpsdk "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" transportsession "github.com/stacklok/toolhive/pkg/transport/session" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/server/session_manager_interface.go b/pkg/vmcp/server/session_manager_interface.go index bb061fcf4b..547b2e0873 100644 --- a/pkg/vmcp/server/session_manager_interface.go +++ b/pkg/vmcp/server/session_manager_interface.go @@ -7,7 +7,6 @@ import ( "context" mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" - vmcpsession "github.com/stacklok/toolhive/pkg/vmcp/session" sessiontypes "github.com/stacklok/toolhive/pkg/vmcp/session/types" ) diff --git a/pkg/vmcp/server/sessionmanager/factory.go b/pkg/vmcp/server/sessionmanager/factory.go index b671a6970d..38f1747e87 100644 --- a/pkg/vmcp/server/sessionmanager/factory.go +++ b/pkg/vmcp/server/sessionmanager/factory.go @@ -11,13 +11,13 @@ import ( "log/slog" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/telemetry" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go b/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go index 6d2459a7f5..961842b9b1 100644 --- a/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go +++ b/pkg/vmcp/server/sessionmanager/horizontal_scaling_integration_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/alicebob/miniredis/v2" - mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" tcredis "github.com/stacklok/toolhive-core/redis" "github.com/stacklok/toolhive/pkg/auth" transportsession "github.com/stacklok/toolhive/pkg/transport/session" diff --git a/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go b/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go index 91a16858f0..7b2bfacd18 100644 --- a/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go +++ b/pkg/vmcp/server/sessionmanager/optimizer_gate_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp/optimizer" ) diff --git a/pkg/vmcp/server/sessionmanager/session_manager.go b/pkg/vmcp/server/sessionmanager/session_manager.go index 4158d21b5b..5ab7b72444 100644 --- a/pkg/vmcp/server/sessionmanager/session_manager.go +++ b/pkg/vmcp/server/sessionmanager/session_manager.go @@ -21,8 +21,8 @@ import ( "time" "github.com/google/uuid" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/cache" transportsession "github.com/stacklok/toolhive/pkg/transport/session" diff --git a/pkg/vmcp/server/sessionmanager/telemetry_test.go b/pkg/vmcp/server/sessionmanager/telemetry_test.go index 001fc4a814..332b62d73c 100644 --- a/pkg/vmcp/server/sessionmanager/telemetry_test.go +++ b/pkg/vmcp/server/sessionmanager/telemetry_test.go @@ -8,14 +8,14 @@ import ( "fmt" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" tracenoop "go.opentelemetry.io/otel/trace/noop" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/vmcp/optimizer" ) diff --git a/pkg/vmcp/session/connector_integration_test.go b/pkg/vmcp/session/connector_integration_test.go index f400b8c757..d6548568f3 100644 --- a/pkg/vmcp/session/connector_integration_test.go +++ b/pkg/vmcp/session/connector_integration_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/google/uuid" - mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" - mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + mcpmcp "github.com/stacklok/toolhive-core/mcpcompat/mcp" + mcpserver "github.com/stacklok/toolhive-core/mcpcompat/server" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" vmcpauth "github.com/stacklok/toolhive/pkg/vmcp/auth" diff --git a/pkg/vmcp/session/internal/backend/mcp_session.go b/pkg/vmcp/session/internal/backend/mcp_session.go index cace439e10..bf9ae3320f 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session.go +++ b/pkg/vmcp/session/internal/backend/mcp_session.go @@ -15,7 +15,6 @@ import ( mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/secrets" "github.com/stacklok/toolhive/pkg/versions" diff --git a/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go b/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go index cc50e74f34..ffa9977b92 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_capabilities_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" ) diff --git a/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go b/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go index bd8e9fd19d..d9db8e6230 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_header_forward_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/secrets" "github.com/stacklok/toolhive/pkg/vmcp" vmcpauth "github.com/stacklok/toolhive/pkg/vmcp/auth" diff --git a/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go b/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go index 15ce5439da..0a0ee2904e 100644 --- a/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go +++ b/pkg/vmcp/session/internal/backend/mcp_session_identity_refresh_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" vmcpauth "github.com/stacklok/toolhive/pkg/vmcp/auth" diff --git a/pkg/vmcp/session/optimizerdec/decorator_test.go b/pkg/vmcp/session/optimizerdec/decorator_test.go index 09fdfafbca..9166bb554d 100644 --- a/pkg/vmcp/session/optimizerdec/decorator_test.go +++ b/pkg/vmcp/session/optimizerdec/decorator_test.go @@ -9,11 +9,11 @@ import ( "reflect" "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/auth" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/optimizer" diff --git a/test/e2e/mcp_client_helpers.go b/test/e2e/mcp_client_helpers.go index fcdc07a0a7..1b989e05e7 100644 --- a/test/e2e/mcp_client_helpers.go +++ b/test/e2e/mcp_client_helpers.go @@ -11,11 +11,12 @@ import ( "strings" "time" + . "github.com/onsi/ginkgo/v2" //nolint:staticcheck // Standard practice for Ginkgo + . "github.com/onsi/gomega" //nolint:staticcheck // Standard practice for Gomega + "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - . "github.com/onsi/ginkgo/v2" //nolint:staticcheck // Standard practice for Ginkgo - . "github.com/onsi/gomega" //nolint:staticcheck // Standard practice for Gomega ) // MCPClientHelper provides high-level MCP client operations for e2e tests diff --git a/test/e2e/network_isolation_test.go b/test/e2e/network_isolation_test.go index 45aeda4f35..7ea78487e5 100644 --- a/test/e2e/network_isolation_test.go +++ b/test/e2e/network_isolation_test.go @@ -15,10 +15,10 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/test/e2e" ) diff --git a/test/e2e/thv-operator/virtualmcp/helpers.go b/test/e2e/thv-operator/virtualmcp/helpers.go index 92af24a3e0..76c807eef8 100644 --- a/test/e2e/thv-operator/virtualmcp/helpers.go +++ b/test/e2e/thv-operator/virtualmcp/helpers.go @@ -21,9 +21,6 @@ import ( "time" "github.com/go-logr/logr" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" @@ -35,6 +32,9 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/test/e2e/images" "github.com/stacklok/toolhive/test/e2e/thv-operator/testutil" diff --git a/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go b/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go index 2d6d97f6f3..139587b817 100644 --- a/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go +++ b/test/e2e/thv-operator/virtualmcp/mcpremoteproxy_scaling_test.go @@ -9,9 +9,6 @@ import ( "fmt" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -20,6 +17,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" "github.com/stacklok/toolhive/test/e2e/images" diff --git a/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go b/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go index 0999d69742..4f1dbb5610 100644 --- a/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go +++ b/test/e2e/thv-operator/virtualmcp/mcpserver_scaling_test.go @@ -13,9 +13,6 @@ import ( "strings" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/redis/go-redis/v9" @@ -27,6 +24,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/test/e2e/images" "github.com/stacklok/toolhive/test/e2e/thv-operator/testutil" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go index c8b2948d4a..8da104d667 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_filtering_test.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go index 8bee6e2279..a49a887e03 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_aggregation_overrides_test.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go index 5581cb19d3..f0fc6a13c3 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go @@ -12,9 +12,6 @@ import ( "strings" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -24,6 +21,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go index eded788bc9..26933ab179 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_codemode_test.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go index 3b3a448973..d5d948f12c 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_defaultresults_test.go @@ -7,11 +7,11 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go index 3104e34bb5..b07b02595f 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_hidden_tools_test.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go index df9240ceda..5dc1f6fe96 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_parallel_test.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go index 29e7624488..1860e1f7aa 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_referenced_test.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go index 29548dcf0f..67e74e3729 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_composite_sequential_test.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go index a61bcb0c40..c2bb5fbd37 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_conflict_resolution_test.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcp "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go index 6fb7a64b45..b94c39110b 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_discovered_mode_test.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go index f704c098d9..04259511e1 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_excludeall_global_test.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go index 93ddc07787..ad0bd309bd 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_external_auth_test.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go index 8d2934250a..f3c6611da3 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_composite_test.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go index 3f2f33c3f5..15cc7a8903 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_multibackend_test.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcp "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go index e13cf6bf7c..8e0281da51 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" thvjson "github.com/stacklok/toolhive/pkg/json" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go index 3fc1f1475c..831512e16a 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_rate_limiting_test.go @@ -12,14 +12,14 @@ import ( "strings" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" "github.com/stacklok/toolhive/pkg/ratelimit" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go index f39b5d0be1..311b6efeef 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_redis_session_test.go @@ -16,9 +16,6 @@ import ( "net/http" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -27,6 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" "github.com/stacklok/toolhive/test/e2e/images" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go index 5130f812b1..38c219cdfa 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_session_management_test.go @@ -13,9 +13,6 @@ import ( "strings" "time" - mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" - "github.com/stacklok/toolhive-core/mcpcompat/client/transport" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" @@ -24,6 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" + "github.com/stacklok/toolhive-core/mcpcompat/client/transport" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go index 95dface056..33699557b3 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_toolconfig_test.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go b/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go index 034ed7239e..f17bb90e0b 100644 --- a/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go +++ b/test/e2e/thv-operator/virtualmcp/virtualmcp_yardstick_base_test.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1" "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1/v1beta1test" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go b/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go index 21e4891d22..7b612625a6 100644 --- a/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go +++ b/test/e2e/thv-operator/virtualmcp/wait_for_tools_helpers.go @@ -9,11 +9,12 @@ import ( "strings" "time" + "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" + mcpclient "github.com/stacklok/toolhive-core/mcpcompat/client" "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/onsi/ginkgo/v2" - "github.com/onsi/gomega" ) // WaitForExpectedTools creates MCP sessions with retry until the validateTools diff --git a/test/e2e/vmcp_cli_features_test.go b/test/e2e/vmcp_cli_features_test.go index 6a246d6d13..41dff597fb 100644 --- a/test/e2e/vmcp_cli_features_test.go +++ b/test/e2e/vmcp_cli_features_test.go @@ -16,11 +16,11 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v3" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" thvjson "github.com/stacklok/toolhive/pkg/json" "github.com/stacklok/toolhive/pkg/vmcp" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/e2e/vmcp_optimizer_test.go b/test/e2e/vmcp_optimizer_test.go index dfe0c42dfa..01fd2e46dd 100644 --- a/test/e2e/vmcp_optimizer_test.go +++ b/test/e2e/vmcp_optimizer_test.go @@ -27,10 +27,10 @@ import ( "strings" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" thvjson "github.com/stacklok/toolhive/pkg/json" vmcp "github.com/stacklok/toolhive/pkg/vmcp" vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config" diff --git a/test/integration/vmcp/helpers/helpers_test.go b/test/integration/vmcp/helpers/helpers_test.go index 5786e807b3..28c19b3bb3 100644 --- a/test/integration/vmcp/helpers/helpers_test.go +++ b/test/integration/vmcp/helpers/helpers_test.go @@ -6,8 +6,9 @@ package helpers import ( "testing" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" + + "github.com/stacklok/toolhive-core/mcpcompat/mcp" ) // TestGetToolNames tests the GetToolNames helper function. diff --git a/test/integration/vmcp/helpers/mcp_client.go b/test/integration/vmcp/helpers/mcp_client.go index 48861c6953..58ab42c7b3 100644 --- a/test/integration/vmcp/helpers/mcp_client.go +++ b/test/integration/vmcp/helpers/mcp_client.go @@ -10,11 +10,12 @@ import ( "sync" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/client" mcptransport "github.com/stacklok/toolhive-core/mcpcompat/client/transport" "github.com/stacklok/toolhive-core/mcpcompat/mcp" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) // MCPClient wraps the mark3labs MCP client with test-friendly methods. diff --git a/test/integration/vmcp/vmcp_integration_test.go b/test/integration/vmcp/vmcp_integration_test.go index 038cde9b9c..91e296b810 100644 --- a/test/integration/vmcp/vmcp_integration_test.go +++ b/test/integration/vmcp/vmcp_integration_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" thvjson "github.com/stacklok/toolhive/pkg/json" "github.com/stacklok/toolhive/pkg/telemetry" "github.com/stacklok/toolhive/pkg/vmcp" diff --git a/test/integration/vmcp/vmcp_typing_integration_test.go b/test/integration/vmcp/vmcp_typing_integration_test.go index 530f54d47d..f34abf635f 100644 --- a/test/integration/vmcp/vmcp_typing_integration_test.go +++ b/test/integration/vmcp/vmcp_typing_integration_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stretchr/testify/require" + "github.com/stacklok/toolhive-core/mcpcompat/mcp" "github.com/stacklok/toolhive/pkg/vmcp" "github.com/stacklok/toolhive/pkg/vmcp/composer" "github.com/stacklok/toolhive/test/integration/vmcp/helpers" From e77bd7ea22ec84e50924d9aeeb3e75cde5fb7cd2 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 16:30:34 +0300 Subject: [PATCH 4/8] chore: bump toolhive-core shim for cross-replica session support Picks up the mcpcompat server-side session rehydration and client-side resume that make Redis-shared sessions route across proxy replicas without re-initializing. Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a7a806bcd2..97e1525e2a 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962 + github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956 github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index 69d7505fec..0bcc1f5e11 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962 h1:6Bl5cWJz2ylJApWt0cDFq8NepgVC2lvOi/OxaMg8B9A= -github.com/stacklok/toolhive-core v0.0.27-0.20260706111924-8ff0d6d38962/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956 h1:oQhp3sE6MlhHIltBirOnKvZG/7e7rYRorgdYOCu79So= +github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= From 815c026d717ef78c6b7a52579aba7e7f03ac1ceb Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 16:46:41 +0300 Subject: [PATCH 5/8] chore: bump toolhive-core shim for _meta propagation fix Picks up the mcpcompat fix that preserves tools/call _meta across the client and server shims, restoring vMCP metadata propagation to backends. Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 97e1525e2a..6d7faf5488 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956 + github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index 0bcc1f5e11..0a19f78ccd 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956 h1:oQhp3sE6MlhHIltBirOnKvZG/7e7rYRorgdYOCu79So= -github.com/stacklok/toolhive-core v0.0.27-0.20260706132858-35fac0547956/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f h1:Q/yHx/Mi6lu7qzLkL4ClWt/S5ycEAKcUJ7T5Z+4gZxc= +github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= From 859c068fca45cde48d5c28444ade057ff2fc8608 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 17:04:57 +0300 Subject: [PATCH 6/8] chore: bump toolhive-core shim for cross-replica session eviction fix Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6d7faf5488..8e37403865 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f + github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index 0a19f78ccd..eddc952c3f 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f h1:Q/yHx/Mi6lu7qzLkL4ClWt/S5ycEAKcUJ7T5Z+4gZxc= -github.com/stacklok/toolhive-core v0.0.27-0.20260706134502-4d0d5ba65e1f/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de h1:VZf+tNqXHWSPtQS6z9ahI/Gwhg6NTBcwoQAJWBHaqz8= +github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= From 82010280bc358148c6fb0676c7291cee294f78f1 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 17:06:50 +0300 Subject: [PATCH 7/8] chore: bump toolhive-core shim for resume 404 -> ErrSessionTerminated Picks up the mcpcompat client fix that maps a 404 on a resumed session to transport.ErrSessionTerminated, so cross-replica lazy eviction is detected by errors.Is checks. Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8e37403865..c5d925dc39 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de + github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389 github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index eddc952c3f..c19b0fd5db 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de h1:VZf+tNqXHWSPtQS6z9ahI/Gwhg6NTBcwoQAJWBHaqz8= -github.com/stacklok/toolhive-core v0.0.27-0.20260706140336-a77de8a933de/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389 h1:urJuaL4PhhM7k/akK6aJSU+/KHjh6WljZIKmS4xVbow= +github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= From 200d32f5c722d4957622d1f3b4090b6c0338e0c5 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Mon, 6 Jul 2026 18:02:08 +0300 Subject: [PATCH 8/8] chore: bump toolhive-core shim for HTTP error body propagation Picks up the shim fix that re-attaches non-2xx HTTP response bodies to client errors, restoring the "Unauthorized" detail the HTTP PDP authz e2e test asserts. Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c5d925dc39..78e1eb2f2a 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/shirou/gopsutil/v4 v4.26.5 github.com/spf13/viper v1.21.0 github.com/stacklok/toolhive-catalog v0.20260706.0 - github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389 + github.com/stacklok/toolhive-core v0.0.27-0.20260706150044-bacd622b730e github.com/stretchr/testify v1.11.1 github.com/swaggo/swag/v2 v2.0.0-rc5 github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd diff --git a/go.sum b/go.sum index c19b0fd5db..92e8de446c 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stacklok/toolhive-catalog v0.20260706.0 h1:ZgEtTogdPjl2Tc/zamYExRH609HDJxS+EbxgdjmMH/w= github.com/stacklok/toolhive-catalog v0.20260706.0/go.mod h1:J+l8hyYSbIhLCe3IsBJuVpP1wQbsuUXRS5o+B9M0GpU= -github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389 h1:urJuaL4PhhM7k/akK6aJSU+/KHjh6WljZIKmS4xVbow= -github.com/stacklok/toolhive-core v0.0.27-0.20260706140528-bfd414777389/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= +github.com/stacklok/toolhive-core v0.0.27-0.20260706150044-bacd622b730e h1:PZPobhmYFZ9DNkvs1Eo0VAYYTbojysQGwcPfqWXeRkk= +github.com/stacklok/toolhive-core v0.0.27-0.20260706150044-bacd622b730e/go.mod h1:6eD8/OuZc1slegNtsev4iXTnRnPhMrEfHzM9hjYhehE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=