fix(server/emulator): normalize mocks once

Author: Deeven-Seru

internal/server/emulator.go

@@ -56,14 +56,24 @@ func loadEmulatorMocks(path string) (map[string][]emulatorMock, error) {
 	}
 
 	mocks := make(map[string][]emulatorMock)
-	for i, m := range file.Mocks {
+	for i := range file.Mocks {
+		m := &file.Mocks[i]
 		if m.ToolName == "" {
 			return nil, fmt.Errorf("invalid emulator mock at index %d: tool_name is required", i)
 		}
 		if m.Parameters == nil {
 			m.Parameters = map[string]any{}
 		}
-		mocks[m.ToolName] = append(mocks[m.ToolName], m)
+		normalized, err := normalizeJSONValue(m.Parameters)
+		if err != nil {
+			return nil, fmt.Errorf("failed to normalize parameters for mock at index %d: %w", i, err)
+		}
+		normalizedMap, ok := normalized.(map[string]any)
+		if !ok {
+			return nil, fmt.Errorf("failed to normalize parameters for mock at index %d: expected object parameters", i)
+		}
+		m.Parameters = normalizedMap
+		mocks[m.ToolName] = append(mocks[m.ToolName], *m)
 	}
 
 	return mocks, nil
@@ -93,37 +103,28 @@ func normalizeJSONValue(v any) (any, error) {
 	return normalized, nil
 }
 
-func (e emulatorTool) findMock(params parameters.ParamValues) (any, bool) {
-	in, err := normalizeJSONValue(params.AsMap())
-	if err != nil {
-		return nil, false
-	}
-	inMap, ok := in.(map[string]any)
-	if !ok {
-		return nil, false
-	}
-
+func (e emulatorTool) findMock(inMap map[string]any) (any, bool) {
 	for _, mock := range e.mocks {
-		expected, err := normalizeJSONValue(mock.Parameters)
-		if err != nil {
-			continue
-		}
-		expectedMap, ok := expected.(map[string]any)
-		if !ok {
-			continue
-		}
-		if reflect.DeepEqual(inMap, expectedMap) {
+		if reflect.DeepEqual(inMap, mock.Parameters) {
 			return mock.Response, true
 		}
 	}
 	return nil, false
 }
 
 func (e emulatorTool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
-	if response, found := e.findMock(params); found {
+	in, err := normalizeJSONValue(params.AsMap())
+	if err != nil {
+		return nil, util.NewAgentError("emulator mode: failed to normalize input parameters", err)
+	}
+	inMap, ok := in.(map[string]any)
+	if !ok {
+		return nil, util.NewAgentError("emulator mode: failed to normalize input parameters", nil)
+	}
+	if response, found := e.findMock(inMap); found {
 		return response, nil
 	}
-	return nil, util.NewAgentError(fmt.Sprintf("emulator mode: no mock matched for tool %q with parameters %v", e.name, params.AsMap()), nil)
+	return nil, util.NewAgentError(fmt.Sprintf("emulator mode: no mock matched for tool %q with parameters %v", e.name, inMap), nil)
 }
 
 func (e emulatorTool) EmbedParams(ctx context.Context, params parameters.ParamValues, embeddingModels map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {

internal/server/emulator_test.go

@@ -1,3 +1,17 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package server
 
 import (