diff --git a/internal/server/queryer.go b/internal/server/queryer.go
index cdeb2f8..734183c 100644
--- a/internal/server/queryer.go
+++ b/internal/server/queryer.go
@@ -96,27 +96,6 @@ func (q *queryer) resolveMutation(ctx context.Context, selection ast.SelectionSe
 	return
 }
 
-// func getSelectionSet(selections ast.SelectionSet, prefix string) []string {
-// 	var fields []string
-// 	for _, selection := range selections {
-// 		field, ok := selection.(*ast.Field)
-// 		if !ok {
-// 			continue
-// 		}
-// 		fullName := field.Name
-// 		if prefix != "" {
-// 			fullName = fmt.Sprintf("%s.%s", prefix, field.Name)
-// 		}
-// 		if len(field.SelectionSet) > 0 {
-// 			subFields := getSelectionSet(field.SelectionSet, fullName)
-// 			fields = append(fields, subFields...)
-// 		} else {
-// 			fields = append(fields, fullName)
-// 		}
-// 	}
-// 	return fields
-// }
-
 func (q *queryer) resolveQuery(ctx context.Context, selection ast.SelectionSet, res anyMap, vars map[string]interface{}) (err error) {
 	type mapEntry struct {
 		key string
@@ -184,414 +163,6 @@ func (q *queryer) resolveCall(ctx context.Context, op ast.Operation, field *ast.
 	return q.registry.Get().Marshal(msg, field)
 }
 
-// func (q *queryer) pbEncode(in *desc.MessageDescriptor, field *ast.Field, vars map[string]interface{}) (protoadapt.MessageV1, error) {
-// 	inputMsg := dynamic.NewMessage(in)
-// 	inArg := field.Arguments.ForName("in")
-// 	if inArg == nil {
-// 		return inputMsg, nil
-// 	}
-
-// 	var anyObj *desc.MessageDescriptor
-// 	if generator.IsAny(in) {
-// 		if len(inArg.Value.Children) == 0 {
-// 			return nil, errors.New("no '__typename' provided")
-// 		}
-// 		typename := inArg.Value.Children.ForName("__typename")
-// 		if typename == nil {
-// 			return nil, errors.New("no '__typename' provided")
-// 		}
-
-// 		vv, err := typename.Value(vars)
-// 		if err != nil {
-// 			return nil, errors.New("no '__typename' provided")
-// 		}
-// 		vvv, ok := vv.(string)
-// 		if !ok {
-// 			return nil, errors.New("no '__typename' provided")
-// 		}
-
-// 		obj := q.registry.Get().FindObjectByName(vvv)
-// 		if obj == nil {
-// 			return nil, errors.New("__typename should be a valid typename")
-// 		}
-// 		anyObj = obj
-// 		inputMsg = dynamic.NewMessage(anyObj)
-// 	}
-
-// 	for _, arg := range inArg.Value.Children {
-// 		val, err := arg.Value.Value(vars)
-// 		if err != nil {
-// 			return nil, err
-// 		}
-// 		if arg.Name == "__typename" {
-// 			continue
-// 		}
-
-// 		var reqDesc *desc.FieldDescriptor
-// 		if anyObj != nil {
-// 			reqDesc = q.registry.Get().FindFieldByName(anyObj, arg.Name)
-// 		} else {
-// 			reqDesc = q.registry.Get().FindFieldByName(in, arg.Name)
-// 		}
-
-// 		if val, err = q.pbValue(val, reqDesc); err != nil {
-// 			return nil, err
-// 		}
-
-// 		if reqDesc.IsRepeated() && reflect.TypeOf(val).Kind() != reflect.Slice {
-// 			inputMsg.AddRepeatedField(reqDesc, val)
-// 		} else {
-// 			inputMsg.SetField(reqDesc, val)
-// 		}
-// 	}
-
-// 	// set fieldmask based on the selection set
-// 	for _, v := range inputMsg.GetKnownFields() {
-// 		if v.GetMessageType() != nil && v.UnwrapField().Message().FullName() == "google.protobuf.FieldMask" {
-// 			fm := &fieldmaskpb.FieldMask{
-// 				Paths: getSelectionSet(field.SelectionSet, ""),
-// 			}
-// 			inputMsg.SetField(v, fm)
-// 		}
-// 	}
-
-// 	if anyObj != nil {
-// 		return marshalAny(inputMsg)
-// 	}
-// 	return inputMsg, nil
-// }
-
-// func (q *queryer) pbValue(val interface{}, reqDesc *desc.FieldDescriptor) (_ interface{}, err error) {
-// 	msgDesc := reqDesc.GetMessageType()
-
-// 	switch v := val.(type) {
-// 	case float64:
-// 		if reqDesc.GetType() == descriptorpb.FieldDescriptorProto_TYPE_FLOAT {
-// 			return float32(v), nil
-// 		}
-// 	case int64:
-// 		switch reqDesc.GetType() {
-// 		case descriptorpb.FieldDescriptorProto_TYPE_INT32,
-// 			descriptorpb.FieldDescriptorProto_TYPE_SINT32,
-// 			descriptorpb.FieldDescriptorProto_TYPE_SFIXED32:
-// 			return int32(v), nil
-
-// 		case descriptorpb.FieldDescriptorProto_TYPE_UINT32,
-// 			descriptorpb.FieldDescriptorProto_TYPE_FIXED32:
-// 			return uint32(v), nil
-
-// 		case descriptorpb.FieldDescriptorProto_TYPE_UINT64,
-// 			descriptorpb.FieldDescriptorProto_TYPE_FIXED64:
-// 			return uint64(v), nil
-// 		case descriptorpb.FieldDescriptorProto_TYPE_FLOAT:
-// 			return float32(v), nil
-// 		case descriptorpb.FieldDescriptorProto_TYPE_DOUBLE:
-// 			return float64(v), nil
-// 		}
-// 	case string:
-// 		switch reqDesc.GetType() {
-// 		case descriptorpb.FieldDescriptorProto_TYPE_ENUM:
-// 			// TODO predefine this
-// 			enumDesc := reqDesc.GetEnumType()
-// 			values := map[string]int32{}
-// 			for _, v := range enumDesc.GetValues() {
-// 				values[v.GetName()] = v.GetNumber()
-// 			}
-// 			return values[v], nil
-// 		case descriptorpb.FieldDescriptorProto_TYPE_BYTES:
-// 			bytes, err := base64.StdEncoding.DecodeString(v)
-// 			if err != nil {
-// 				return nil, fmt.Errorf("bytes should be a base64 encoded string")
-// 			}
-// 			return bytes, nil
-// 		}
-// 	case []interface{}:
-// 		v2 := make([]interface{}, len(v))
-// 		for i, vv := range v {
-// 			v2[i], err = q.pbValue(vv, reqDesc)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 		}
-// 		return v2, nil
-// 	case map[string]interface{}:
-// 		var anyTypeDescriptor *desc.MessageDescriptor
-// 		var vvv string
-// 		var ok bool
-// 		for kk, vv := range v {
-// 			if kk == "__typename" {
-// 				vvv, ok = vv.(string)
-// 				if !ok {
-// 					return nil, errors.New("'__typename' must be a string")
-// 				}
-// 				delete(v, "__typename")
-// 				break
-// 			}
-// 		}
-// 		var msg *dynamic.Message
-// 		protoDesc := msgDesc
-// 		if generator.IsAny(protoDesc) {
-// 			anyTypeDescriptor = q.registry.Get().FindObjectByName(vvv)
-// 			if anyTypeDescriptor == nil {
-// 				return nil, errors.New("'__typename' must be a valid INPUT_OBJECT")
-// 			}
-// 			msg = dynamic.NewMessage(anyTypeDescriptor)
-// 		} else {
-// 			msg = dynamic.NewMessage(protoDesc)
-// 		}
-// 		oneofValidate := map[*desc.OneOfDescriptor]struct{}{}
-// 		for kk, vv := range v {
-
-// 			if anyTypeDescriptor != nil {
-// 				msgDesc = anyTypeDescriptor
-// 			}
-// 			// plugType := q.pm.inputs[msgDesc]
-// 			// fieldDesc := q.pm.fields[q.p.FieldBack(plugType.DescriptorProto, kk)]
-// 			fieldDesc := q.registry.Get().FindFieldByName(msgDesc, kk)
-// 			oneof := fieldDesc.GetOneOf()
-// 			if oneof != nil {
-// 				_, ok := oneofValidate[oneof]
-// 				if ok {
-// 					return nil, fmt.Errorf("field with name %q on Object %q can't be set", kk, msgDesc.GetName())
-// 				}
-// 				oneofValidate[oneof] = struct{}{}
-// 			}
-
-// 			vv2, err := q.pbValue(vv, fieldDesc)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 			msg.SetField(fieldDesc, vv2)
-// 		}
-// 		if anyTypeDescriptor != nil {
-// 			return marshalAny(msg)
-// 		}
-// 		return msg, nil
-// 	}
-
-// 	return val, nil
-// }
-
-// func (q *queryer) pbDecodeOneofField(desc *desc.MessageDescriptor, dynamicMsg *dynamic.Message, selection ast.SelectionSet) (oneof anyMap, err error) {
-// 	oneof = anyMap{}
-// 	for _, f := range selection {
-// 		out, ok := f.(*ast.Field)
-// 		if !ok {
-// 			continue
-// 		}
-// 		if out.Name == "__typename" {
-// 			oneof[nameOrAlias(out)] = out.ObjectDefinition.Name
-// 			continue
-// 		}
-
-// 		fieldDesc := q.registry.Get().FindUnionFieldByMessageFQNAndName(desc.GetFullyQualifiedName(), out.Name)
-// 		protoVal := dynamicMsg.GetField(fieldDesc)
-// 		oneof[nameOrAlias(out)], err = q.gqlValue(protoVal, fieldDesc.GetMessageType(), fieldDesc.GetEnumType(), out)
-// 		if err != nil {
-// 			return nil, err
-// 		}
-// 	}
-// 	return oneof, nil
-// }
-
-// func (q *queryer) pbDecode(field *ast.Field, msg protoadapt.MessageV1) (res interface{}, err error) {
-// 	switch dynamicMsg := msg.(type) {
-// 	case *dynamic.Message:
-// 		return q.gqlValue(dynamicMsg, dynamicMsg.GetMessageDescriptor(), nil, field)
-// 	case *anypb.Any:
-// 		return q.gqlValue(dynamicMsg, nil, nil, field)
-// 	default:
-// 		return nil, fmt.Errorf("expected proto message of type *dynamic.Message or *anypb.Any but received: %T", msg)
-// 	}
-// }
-
-// // FIXME take care of recursive calls
-// func (q *queryer) gqlValue(val interface{}, msgDesc *desc.MessageDescriptor, enumDesc *desc.EnumDescriptor, field *ast.Field) (_ interface{}, err error) {
-// 	switch v := val.(type) {
-// 	case int32:
-// 		// int32 enum
-// 		if enumDesc != nil {
-// 			values := map[int32]string{}
-// 			for _, v := range enumDesc.GetValues() {
-// 				values[v.GetNumber()] = v.GetName()
-// 			}
-
-// 			return values[v], nil
-// 		}
-
-// 	case map[interface{}]interface{}:
-// 		res := make([]interface{}, len(v))
-// 		i := 0
-// 		for kk, vv := range v {
-// 			vals := anyMap{}
-// 			for _, f := range field.SelectionSet {
-// 				out, ok := f.(*ast.Field)
-// 				if !ok {
-// 					continue
-// 				}
-// 				switch out.Name {
-// 				case "value":
-// 					valueField := msgDesc.FindFieldByName("value")
-// 					if vals[nameOrAlias(out)], err = q.gqlValue(vv, valueField.GetMessageType(), valueField.GetEnumType(), out); err != nil {
-// 						return nil, err
-// 					}
-// 				case "key":
-// 					vals[nameOrAlias(out)] = kk
-// 				case "__typename":
-// 					vals[nameOrAlias(out)] = out.ObjectDefinition.Name
-// 				}
-// 			}
-
-// 			res[i] = vals
-// 			i++
-// 		}
-// 		return res, nil
-
-// 	case []interface{}:
-// 		v2 := make([]interface{}, len(v))
-// 		for i, vv := range v {
-// 			v2[i], err = q.gqlValue(vv, msgDesc, enumDesc, field)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 		}
-// 		return v2, nil
-
-// 	case *dynamic.Message:
-// 		if v == nil {
-// 			return nil, nil
-// 		}
-// 		fields := v.GetKnownFields()
-// 		vals := make(map[string]interface{}, len(fields))
-// 		// gqlFields := map[string]string{}
-// 		for _, s := range field.SelectionSet {
-// 			out, ok := s.(*ast.Field)
-// 			if !ok {
-// 				continue
-// 			}
-
-// 			if out.Name == "__typename" {
-// 				vals[nameOrAlias(out)] = out.ObjectDefinition.Name
-// 				continue
-// 			}
-
-// 			descMsg := v.GetMessageDescriptor()
-// 			fieldDesc := q.registry.Get().FindFieldByName(descMsg, out.Name)
-// 			if fieldDesc == nil {
-// 				vals[nameOrAlias(out)], err = q.pbDecodeOneofField(descMsg, v, out.SelectionSet)
-// 				if err != nil {
-// 					return nil, err
-// 				}
-// 				continue
-// 			}
-
-// 			vals[nameOrAlias(out)], err = q.gqlValue(v.GetField(fieldDesc), fieldDesc.GetMessageType(), fieldDesc.GetEnumType(), out)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 		}
-// 		return vals, nil
-// 	case *anypb.Any:
-// 		vals, err := q.anyMessageToMap(v)
-// 		if err != nil {
-// 			return nil, err
-// 		}
-// 		return vals, nil
-
-// 	case []byte:
-// 		return base64.StdEncoding.EncodeToString(v), nil
-// 	}
-
-// 	return val, nil
-// }
-
-// func (q *queryer) anyMessageToMap(v *anypb.Any) (map[string]interface{}, error) {
-// 	fqn := string(v.MessageName())
-
-// 	grpcType, definition := q.registry.Get().FindObjectByFullyQualifiedName(fqn)
-// 	outputMsg := dynamic.NewMessage(grpcType)
-// 	if err := outputMsg.Unmarshal(v.Value); err != nil {
-// 		return nil, err
-// 	}
-// 	return q.protoMessageToMap(outputMsg, definition)
-// }
-
-// func (q *queryer) protoMessageToMap(outputMsg *dynamic.Message, definition *ast.Definition) (map[string]interface{}, error) {
-// 	fields := outputMsg.GetKnownFields()
-// 	vals := make(map[string]interface{}, len(fields))
-// 	vals["__typename"] = definition.Name
-// 	for _, field := range fields {
-// 		fieldDef := q.registry.Get().FindGraphqlFieldByProtoField(definition, field.GetName())
-// 		// the field is probably invalid or ignored
-// 		if fieldDef == nil {
-// 			continue
-// 			// return nil, fmt.Errorf("proto field %q doesn't have a graphql counterpart on type %q", field.GetName(), definition.Name)
-// 		}
-// 		val := outputMsg.GetField(field)
-// 		switch vv := val.(type) {
-// 		case int32:
-// 			if field.GetEnumType() != nil {
-// 				values := map[int32]string{}
-// 				for _, v := range field.GetEnumType().GetValues() {
-// 					values[v.GetNumber()] = v.GetName()
-// 				}
-
-// 				vals[fieldDef.Name] = values[vv]
-// 			}
-
-// 		case *dynamic.Message:
-// 			_, definition := q.registry.Get().FindObjectByFullyQualifiedName(vv.GetMessageDescriptor().GetFullyQualifiedName())
-// 			val, err := q.protoMessageToMap(vv, definition)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 			vals[fieldDef.Name] = val
-// 		case *anypb.Any:
-// 			val, err := q.anyMessageToMap(vv)
-// 			if err != nil {
-// 				return nil, err
-// 			}
-// 			vals[fieldDef.Name] = val
-// 		case []interface{}:
-// 			var arrayVals []interface{}
-// 			for _, val := range vv {
-// 				switch vv := val.(type) {
-// 				case int32:
-// 					if field.GetEnumType() != nil {
-// 						values := map[int32]string{}
-// 						for _, v := range field.GetEnumType().GetValues() {
-// 							values[v.GetNumber()] = v.GetName()
-// 						}
-
-// 						arrayVals = append(arrayVals, values[vv])
-// 					}
-
-// 				case *dynamic.Message:
-// 					_, definition := q.registry.Get().FindObjectByFullyQualifiedName(vv.GetMessageDescriptor().GetFullyQualifiedName())
-// 					val, err := q.protoMessageToMap(vv, definition)
-// 					if err != nil {
-// 						return nil, err
-// 					}
-// 					arrayVals = append(arrayVals, val)
-// 				case *anypb.Any:
-// 					val, err := q.anyMessageToMap(vv)
-// 					if err != nil {
-// 						return nil, err
-// 					}
-// 					arrayVals = append(arrayVals, val)
-// 				default:
-// 					arrayVals = append(arrayVals, vv)
-// 				}
-// 			}
-
-// 			vals[fieldDef.Name] = arrayVals
-// 		default:
-// 			vals[fieldDef.Name] = vv
-// 		}
-// 	}
-// 	return vals, nil
-// }
-
 func nameOrAlias(field *ast.Field) string {
 	if field.Alias != "" {
 		return field.Alias
@@ -599,12 +170,3 @@ func nameOrAlias(field *ast.Field) string {
 
 	return field.Name
 }
-
-// func marshalAny(inputMsg *dynamic.Message) (*anypb.Any, error) {
-// 	b, err := proto.Marshal(protoadapt.MessageV2Of(inputMsg))
-// 	if err != nil {
-// 		return nil, err
-// 	}
-
-// 	return &anypb.Any{TypeUrl: "type.googleapis.com/" + string(inputMsg.GetMessageDescriptor().Unwrap().FullName()), Value: b}, nil
-// }
diff --git a/pkg/protographql/schema.go b/pkg/protographql/schema.go
index 9b8d91e..9f69770 100644
--- a/pkg/protographql/schema.go
+++ b/pkg/protographql/schema.go
@@ -22,6 +22,7 @@ type SchemaDescriptor struct {
 	Types2MessageDesc map[string]protoreflect.MessageDescriptor
 	MethodsByName     map[ast.Operation]map[string]protoreflect.MethodDescriptor
 	ProtoTypes        *protoregistry.Types
+	HaveFieldMask     map[protoreflect.MessageDescriptor]struct{}
 }
 
 func New() *SchemaDescriptor {
@@ -43,6 +44,7 @@ func New() *SchemaDescriptor {
 		},
 		Types:             make(map[string]*ast.Definition),
 		Types2MessageDesc: make(map[string]protoreflect.MessageDescriptor),
+		HaveFieldMask:     make(map[protoreflect.MessageDescriptor]struct{}),
 		MethodsByName: map[ast.Operation]map[string]protoreflect.MethodDescriptor{
 			ast.Mutation:     make(map[string]protoreflect.MethodDescriptor),
 			ast.Query:        make(map[string]protoreflect.MethodDescriptor),
@@ -312,6 +314,14 @@ func (schema *SchemaDescriptor) RegisterFileDescriptor(generateUnboundMethods bo
 		if err := schema.ProtoTypes.RegisterMessage(dynamicpb.NewMessageType(msg)); err != nil {
 			return fmt.Errorf("register message %q: %w", msg.FullName(), err)
 		}
+
+		for j := 0; j < msg.Fields().Len(); j++ {
+			field := msg.Fields().Get(j)
+			if field.Message() != nil && field.Message().FullName() == "google.protobuf.FieldMask" {
+				schema.HaveFieldMask[msg] = struct{}{}
+				break
+			}
+		}
 	}
 
 	for i := 0; i < file.Services().Len(); i++ {
diff --git a/pkg/protographql/unmarshal.go b/pkg/protographql/unmarshal.go
index 300ddc5..afc34a2 100644
--- a/pkg/protographql/unmarshal.go
+++ b/pkg/protographql/unmarshal.go
@@ -95,13 +95,15 @@ func (ins *SchemaDescriptor) Unmarshal(desc protoreflect.MessageDescriptor, fiel
 		return nil, fmt.Errorf("argument 'in' is not an object")
 	}
 
-	// 处理 FieldMask 字段
-	for i := desc.Fields().Len() - 1; i >= 0; i-- {
-		fieldDescriptor := desc.Fields().Get(i)
-		if fieldDescriptor.Message() != nil && fieldDescriptor.Message().FullName() == "google.protobuf.FieldMask" {
-			fieldMask := &fieldmaskpb.FieldMask{Paths: getSelectionSet(field.SelectionSet, "")}
-			dynamicMessage.Set(fieldDescriptor, protoreflect.ValueOfMessage(fieldMask.ProtoReflect()))
-			break
+	if _, ok := ins.HaveFieldMask[desc]; ok {
+		// 处理 FieldMask 字段
+		for i := desc.Fields().Len() - 1; i >= 0; i-- {
+			fieldDescriptor := desc.Fields().Get(i)
+			if fieldDescriptor.Message() != nil && fieldDescriptor.Message().FullName() == "google.protobuf.FieldMask" {
+				fieldMask := &fieldmaskpb.FieldMask{Paths: getSelectionSet(field.SelectionSet, "")}
+				dynamicMessage.Set(fieldDescriptor, protoreflect.ValueOfMessage(fieldMask.ProtoReflect()))
+				break
+			}
 		}
 	}