refactor mcp response logging into shared helper

Agent-Logs-Url: https://github.com/github/gh-aw-mcpg/sessions/019072d6-0f6b-49f5-a866-73c69fbf0832

Co-authored-by: lpcox <[email protected]>

Author: Copilot

internal/mcp/connection.go

@@ -444,6 +444,17 @@ func logInboundRPCResponse(serverID string, payload []byte, err error, shouldAtt
 	}
 }
 
+// logInboundRPCResponseFromResult marshals a response payload, logs the inbound response, and
+// returns the original result and error unchanged.
+func logInboundRPCResponseFromResult(serverID string, result *Response, err error, shouldAttachTags bool, snapshot *AgentTagsSnapshot) (*Response, error) {
+	var responsePayload []byte
+	if result != nil {
+		responsePayload, _ = json.Marshal(result)
+	}
+	logInboundRPCResponse(serverID, responsePayload, err, shouldAttachTags, snapshot)
+	return result, err
+}
+
 // SendRequest sends a JSON-RPC request and waits for the response
 // The serverID parameter is used for logging to associate the request with a backend server
 func (c *Connection) SendRequest(method string, params interface{}) (*Response, error) {
@@ -481,14 +492,7 @@ func (c *Connection) SendRequestWithServerID(ctx context.Context, method string,
 		result, err = c.callSDKMethod(method, params)
 	}
 
-	// Log the response from backend server
-	var responsePayload []byte
-	if result != nil {
-		responsePayload, _ = json.Marshal(result)
-	}
-	logInboundRPCResponse(serverID, responsePayload, err, shouldAttachAgentTags, snapshot)
-
-	return result, err
+	return logInboundRPCResponseFromResult(serverID, result, err, shouldAttachAgentTags, snapshot)
 }
 
 // callSDKMethod calls the appropriate SDK method based on the method name

internal/mcp/connection_logging_test.go

@@ -0,0 +1,33 @@
+package mcp
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLogInboundRPCResponseFromResult_ReturnsResultAndError(t *testing.T) {
+	assert := assert.New(t)
+
+	expectedErr := errors.New("expected error")
+	expectedResult := &Response{
+		JSONRPC: "2.0",
+		ID:      1,
+		Result:  []byte(`{"ok":true}`),
+	}
+
+	result, err := logInboundRPCResponseFromResult("test-server", expectedResult, expectedErr, false, nil)
+
+	assert.Same(expectedResult, result)
+	assert.ErrorIs(err, expectedErr)
+}
+
+func TestLogInboundRPCResponseFromResult_AllowsNilResult(t *testing.T) {
+	assert := assert.New(t)
+
+	result, err := logInboundRPCResponseFromResult("test-server", nil, nil, false, nil)
+
+	assert.Nil(result)
+	assert.NoError(err)
+}