From ce393acb951e15d0c766deab4e06c3cb0e8dfc8f Mon Sep 17 00:00:00 2001
From: Guglielmo Colombo <guglielmoc@google.com>
Date: Fri, 10 Jul 2026 11:26:29 +0200
Subject: [PATCH] mcp: do not ApplyDefault when `res.Content==nil` (#1069)

Fixes #1062
---
 mcp/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcp/server.go b/mcp/server.go
index c59f793..bc58fd1 100644
--- a/mcp/server.go
+++ b/mcp/server.go
@@ -1671,7 +1671,7 @@ func (ss *ServerSession) Elicit(ctx context.Context, params *ElicitParams) (*Eli
 		return nil, err
 	}
 
-	if res.Action != "accept" {
+	if res.Action != "accept" || res.Content == nil {
 		return res, nil
 	}