Go SDK: Align hooks with SEP (#23)

The SEP spec and C# SDK use hooks (plural, JSON array) but the Go SDK
had hook (singular, single object). This meant the wire formats were
incompatible — Go would send `{"hook": {...}}` while everything else
expects `{"hooks": [...]}`.

Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
Ukjae Jeong 2026-06-16 15:49:49 +01:00 • committed by GitHub
commit 23d889254b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 110 additions and 92 deletions

View file

@ -27,7 +27,7 @@ func (e *Extension) handleList(_ context.Context, req *mcp.ServerRequest[*interc
all := e.getInterceptors()
infos := make([]interceptors.InterceptorInfo, 0, len(all))
for _, ri := range all {
if event != "" && !slices.Contains(ri.GetMetadata().Hook.Events, event) {
if event != "" && !hooksContainEvent(ri.GetMetadata().Hooks, event) {
continue
}
infos = append(infos, interceptors.InfoFromInterceptor(ri))
@ -105,3 +105,12 @@ func (e *Extension) handleInvoke(ctx context.Context, req *mcp.ServerRequest[*in
return result, nil
}
func hooksContainEvent(hooks []interceptors.Hook, event string) bool {
for _, h := range hooks {
if slices.Contains(h.Events, event) {
return true
}
}
return false
}

View file

@ -42,10 +42,10 @@ func TestListWithEventFilter(t *testing.T) {
promptsValidator := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "prompts-v",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventPromptsGet},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -112,10 +112,10 @@ func TestInvokeValidatorRejects(t *testing.T) {
rejectAll := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "reject-all",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -155,10 +155,10 @@ func TestInvokeMutator(t *testing.T) {
mutator := &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: "add-field",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
@ -231,10 +231,10 @@ func TestInvokeTimeout(t *testing.T) {
slowValidator := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "slow-v",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {

View file

@ -181,8 +181,10 @@ func (e *Extension) enrichInitResult(result mcp.Result) (mcp.Result, error) {
all := e.getInterceptors()
supportedEvents := map[string]bool{}
for _, ri := range all {
for _, ev := range ri.GetMetadata().Hook.Events {
supportedEvents[ev] = true
for _, h := range ri.GetMetadata().Hooks {
for _, ev := range h.Events {
supportedEvents[ev] = true
}
}
}

View file

@ -86,10 +86,10 @@ func TestServer_ValidatorWarnDoesNotBlock(t *testing.T) {
warnValidator := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "warn-only",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -117,10 +117,10 @@ func TestServer_ValidationFailurePreventsM(t *testing.T) {
spy := &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: "spy-mutator",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.MutationResult, error) {
@ -141,10 +141,10 @@ func TestServer_ValidatorTimeoutAbortsChain(t *testing.T) {
slowValidator := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "slow-validator",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -172,10 +172,10 @@ func TestServer_MutatorTimeoutAbortsChain(t *testing.T) {
slowMutator := &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: "m2-slow",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
PriorityHint: interceptors.NewPriority(20),
},
@ -208,10 +208,10 @@ func TestServer_MutatorFailOpenContinuesChain(t *testing.T) {
failOpenMutator := &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: "m2-failopen",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
FailOpen: true,
PriorityHint: interceptors.NewPriority(20),
@ -248,10 +248,10 @@ func TestServer_ResponseMutatorSeesMutatedParams(t *testing.T) {
reqMutator := &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: "inject-marker",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
@ -309,10 +309,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
reqV1 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "req-v1-tool-check",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -343,10 +343,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
reqV2 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "req-v2-args-check",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -381,10 +381,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
reqV3 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "req-v3-warn",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -405,10 +405,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
return &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: name,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
PriorityHint: interceptors.NewPriority(priority),
},
@ -454,10 +454,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
return &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: name,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
PriorityHint: interceptors.NewPriority(priority),
},
@ -496,10 +496,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
respV1 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "resp-v1-has-content",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -530,10 +530,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
respV2 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "resp-v2-sees-mutation",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -566,10 +566,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
respV3 := &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "resp-v3-info",
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseResponse,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {

View file

@ -190,10 +190,10 @@ func prefixMutator(name, tag string, phase interceptors.InterceptionPhase, prior
return &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: name,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: phase,
},
}},
Mode: mode,
PriorityHint: interceptors.NewPriority(priority),
},
@ -225,10 +225,10 @@ func failMutator(name string, phase interceptors.InterceptionPhase, priority int
return &interceptors.Mutator{
Metadata: interceptors.Metadata{
Name: name,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: phase,
},
}},
Mode: interceptors.ModeEnforce,
PriorityHint: interceptors.NewPriority(priority),
},
@ -243,10 +243,10 @@ func blockToolValidator(toolName string) *interceptors.Validator {
return &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: "block-" + toolName,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
@ -278,10 +278,10 @@ func allowAllValidator(name string) *interceptors.Validator {
return &interceptors.Validator{
Metadata: interceptors.Metadata{
Name: name,
Hook: interceptors.Hook{
Hooks: []interceptors.Hook{{
Events: []string{interceptors.EventToolsCall},
Phase: interceptors.PhaseRequest,
},
}},
Mode: interceptors.ModeEnforce,
},
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {