Go SDK: Add ExecutionHandler (#22)
This change adds an ExecutionHandler hook to the Go chain orchestrator, allowing direct callers to wrap each interceptor/invoke RPC call. The handler can inspect and modify invoke params before execution, inspect results after execution, override the effective mode per-invocation, or short-circuit execution entirely. The change is fully backwards-compatible and requires no SEP/protocol modifications. --------- Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
23d889254b
commit
77a8464b33
1 changed files with 234 additions and 12 deletions
|
|
@ -25,6 +25,24 @@ type ChainEntry struct {
|
|||
Server *mcp.ClientSession
|
||||
}
|
||||
|
||||
// Directive carries per-invocation decisions from an ExecutionHandler
|
||||
// back to the chain. nil fields mean "use descriptor default".
|
||||
type Directive struct {
|
||||
Mode *interceptors.Mode // nil = use descriptor's static mode
|
||||
}
|
||||
|
||||
// ExecutionHandler wraps each interceptor/invoke RPC call in the chain.
|
||||
// It receives the interceptor entry, the invoke params that will be sent,
|
||||
// and a next function that performs the actual RPC. The handler can modify
|
||||
// params before calling next, inspect/modify results after, control the
|
||||
// effective mode via Directive, or short-circuit by not calling next.
|
||||
type ExecutionHandler func(
|
||||
ctx context.Context,
|
||||
entry ChainEntry,
|
||||
params *interceptors.InvokeParams,
|
||||
next func(ctx context.Context, params *interceptors.InvokeParams) (interceptors.InvokeResult, error),
|
||||
) (interceptors.InvokeResult, *Directive, error)
|
||||
|
||||
// Chain is the SEP-compliant interceptor chain orchestrator. It holds
|
||||
// ChainEntry objects (interceptor descriptors + MCP server connections),
|
||||
// discovers interceptors via interceptors/list, and invokes them via
|
||||
|
|
@ -33,6 +51,7 @@ type Chain struct {
|
|||
mu sync.Mutex
|
||||
entries []ChainEntry
|
||||
logger *slog.Logger
|
||||
handler ExecutionHandler
|
||||
}
|
||||
|
||||
// ChainOption configures a Chain.
|
||||
|
|
@ -46,6 +65,17 @@ func WithChainLogger(l *slog.Logger) ChainOption {
|
|||
}
|
||||
}
|
||||
|
||||
// WithExecutionHandler sets the ExecutionHandler for the chain.
|
||||
// When set, every interceptor/invoke call is routed through the handler,
|
||||
// which can modify invoke params, inspect results, and override the
|
||||
// effective mode. If not set, the chain uses the interceptor descriptor's
|
||||
// static mode.
|
||||
func WithExecutionHandler(h ExecutionHandler) ChainOption {
|
||||
return func(c *Chain) {
|
||||
c.handler = h
|
||||
}
|
||||
}
|
||||
|
||||
// NewChain creates a new Chain with optional configuration.
|
||||
func NewChain(opts ...ChainOption) *Chain {
|
||||
c := &Chain{}
|
||||
|
|
@ -288,7 +318,7 @@ func (c *Chain) recordValidation(entry ChainEntry, result invokeOutcome, cr *Exe
|
|||
|
||||
// Tally validation summary and check for abort in a single pass.
|
||||
if result.result.Validation != nil {
|
||||
shouldAbort := entry.Interceptor.Mode != interceptors.ModeAudit && !result.result.Validation.Valid
|
||||
shouldAbort := result.mode != interceptors.ModeAudit && !result.result.Validation.Valid
|
||||
aborted := false
|
||||
for _, msg := range result.result.Validation.Messages {
|
||||
switch msg.Severity {
|
||||
|
|
@ -368,7 +398,7 @@ func (c *Chain) runMutators(
|
|||
cr.Results = append(cr.Results, result.result)
|
||||
|
||||
// For audit-mode mutators, don't apply the mutated payload.
|
||||
if m.Interceptor.Mode == interceptors.ModeAudit {
|
||||
if result.mode == interceptors.ModeAudit {
|
||||
continue
|
||||
}
|
||||
|
||||
|
|
@ -384,14 +414,18 @@ func (c *Chain) runMutators(
|
|||
}
|
||||
}
|
||||
|
||||
// invokeOutcome wraps the result of a single interceptor/invoke call.
|
||||
// invokeOutcome wraps the result of a single interceptor/invoke call
|
||||
// along with the resolved effective mode.
|
||||
type invokeOutcome struct {
|
||||
result interceptors.InvokeResult
|
||||
mode interceptors.Mode // effective mode (from handler directive or descriptor)
|
||||
err error
|
||||
}
|
||||
|
||||
// callInvoke calls interceptor/invoke on the appropriate server for
|
||||
// a single chain entry.
|
||||
// a single chain entry. When an ExecutionHandler is set, the RPC is
|
||||
// routed through the handler which may modify params and override
|
||||
// the effective mode.
|
||||
func (c *Chain) callInvoke(
|
||||
ctx context.Context,
|
||||
params *ExecutionParams,
|
||||
|
|
@ -404,18 +438,36 @@ func (c *Chain) callInvoke(
|
|||
Payload: params.Payload,
|
||||
Context: params.Context,
|
||||
}
|
||||
|
||||
// Apply per-interceptor config if provided.
|
||||
if cfg, ok := params.Config[entry.Interceptor.Name]; ok {
|
||||
invokeParams.Config = cfg
|
||||
}
|
||||
|
||||
var result interceptors.InvokeResult
|
||||
err := entry.Server.CallCustom(ctx, interceptors.MethodInvoke, invokeParams, &result)
|
||||
if err != nil {
|
||||
return invokeOutcome{err: err}
|
||||
next := func(ctx context.Context, p *interceptors.InvokeParams) (interceptors.InvokeResult, error) {
|
||||
var result interceptors.InvokeResult
|
||||
err := entry.Server.CallCustom(ctx, interceptors.MethodInvoke, p, &result)
|
||||
return result, err
|
||||
}
|
||||
return invokeOutcome{result: result}
|
||||
|
||||
if c.handler != nil {
|
||||
result, directive, err := c.handler(ctx, entry, invokeParams, next)
|
||||
if err != nil {
|
||||
return invokeOutcome{mode: entry.Interceptor.Mode, err: err}
|
||||
}
|
||||
return invokeOutcome{result: result, mode: resolveMode(entry, directive)}
|
||||
}
|
||||
|
||||
result, err := next(ctx, invokeParams)
|
||||
if err != nil {
|
||||
return invokeOutcome{mode: entry.Interceptor.Mode, err: err}
|
||||
}
|
||||
return invokeOutcome{result: result, mode: entry.Interceptor.Mode}
|
||||
}
|
||||
|
||||
func resolveMode(entry ChainEntry, d *Directive) interceptors.Mode {
|
||||
if d != nil && d.Mode != nil {
|
||||
return *d.Mode
|
||||
}
|
||||
return entry.Interceptor.Mode
|
||||
}
|
||||
|
||||
// timeoutResult sets the chain result to timeout status.
|
||||
|
|
|
|||
Loading…
Reference in a new issue