fix: incorrect field resolver path

v2/pkg/engine/datasource/grpc_datasource/compiler.go

@@ -600,10 +600,10 @@ func (p *RPCCompiler) buildProtoMessageWithContext(inputMessage Message, rpcMess
 	contextList := p.newEmptyListMessageByName(rootMessage, contextSchemaField.Name)
 	contextData := p.resolveContextData(context[0], contextRPCField) // TODO handle multiple contexts (resolver requires another resolver)
 
-	for _, data := range contextData {
+	for _, contextElement := range contextData {
 		val := contextList.NewElement()
 		valMsg := val.Message()
-		for fieldName, value := range data {
+		for fieldName, value := range contextElement {
 			if err := p.setMessageValue(valMsg, fieldName, value); err != nil {
 				return nil, err
 			}
@@ -676,7 +676,6 @@ func (p *RPCCompiler) resolveContextDataForPath(message protoref.Message, path a
 	}
 
 	return p.resolveDataForPath(msg.Message(), path)
-
 }
 
 // resolveListDataForPath resolves the data for a given path in a list message.
@@ -696,13 +695,14 @@ func (p *RPCCompiler) resolveListDataForPath(message protoref.List, fd protoref.
 
 			for _, val := range values {
 				if list, isList := val.Interface().(protoref.List); isList {
-					values := p.resolveListDataForPath(list, fd, path)
+					values := p.resolveListDataForPath(list, fd, path[1:])
 					result = append(result, values...)
 					continue
+				} else {
+					result = append(result, val)
 				}
 			}
 
-			result = append(result, values...)
 		default:
 			result = append(result, item)
 		}

v2/pkg/engine/datasource/grpc_datasource/execution_plan.go

@@ -907,8 +907,15 @@ func (r *rpcPlanningContext) setResolvedField(walker *astvisitor.Walker, fieldDe
 	}
 
 	for _, contextFieldRef := range contextFields {
-		contextFieldName := r.definition.FieldDefinitionNameBytes(contextFieldRef)
-		resolvedPath := fieldPath.WithFieldNameItem(contextFieldName)
+		fieldName, ok := r.mapping.FindFieldMapping(
+			walker.EnclosingTypeDefinition.NameString(r.definition),
+			r.definition.FieldDefinitionNameString(contextFieldRef),
+		)
+		if !ok {
+			return fmt.Errorf("field mapping not found for field %s", r.definition.FieldDefinitionNameString(contextFieldRef))
+		}
+
+		resolvedPath := fieldPath.WithFieldNameItem(unsafebytes.StringToBytes(fieldName))
 
 		resolvedField.contextFields = append(resolvedField.contextFields, contextField{
 			fieldRef:    contextFieldRef,