diff --git a/gen/go/notifications/v1/notifications.pb.go b/gen/go/notifications/v1/notifications.pb.go
index 3e08a6f..08d90cf 100644
--- a/gen/go/notifications/v1/notifications.pb.go
+++ b/gen/go/notifications/v1/notifications.pb.go
@@ -134,6 +134,74 @@ func (Priority) EnumDescriptor() ([]byte, []int) {
 	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{1}
 }
 
+// NotificationCategory groups notifications for routing and template selection.
+type NotificationCategory int32
+
+const (
+	NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED      NotificationCategory = 0
+	NotificationCategory_NOTIFICATION_CATEGORY_APPROVAL_REQUEST NotificationCategory = 1
+	NotificationCategory_NOTIFICATION_CATEGORY_BUDGET_ALERT     NotificationCategory = 2
+	NotificationCategory_NOTIFICATION_CATEGORY_PII_DETECTION    NotificationCategory = 3
+	NotificationCategory_NOTIFICATION_CATEGORY_INCIDENT         NotificationCategory = 4
+	NotificationCategory_NOTIFICATION_CATEGORY_REPORT           NotificationCategory = 5
+	NotificationCategory_NOTIFICATION_CATEGORY_INTEGRATION      NotificationCategory = 6
+	NotificationCategory_NOTIFICATION_CATEGORY_DIGEST           NotificationCategory = 7
+	NotificationCategory_NOTIFICATION_CATEGORY_GENERAL          NotificationCategory = 8
+)
+
+// Enum value maps for NotificationCategory.
+var (
+	NotificationCategory_name = map[int32]string{
+		0: "NOTIFICATION_CATEGORY_UNSPECIFIED",
+		1: "NOTIFICATION_CATEGORY_APPROVAL_REQUEST",
+		2: "NOTIFICATION_CATEGORY_BUDGET_ALERT",
+		3: "NOTIFICATION_CATEGORY_PII_DETECTION",
+		4: "NOTIFICATION_CATEGORY_INCIDENT",
+		5: "NOTIFICATION_CATEGORY_REPORT",
+		6: "NOTIFICATION_CATEGORY_INTEGRATION",
+		7: "NOTIFICATION_CATEGORY_DIGEST",
+		8: "NOTIFICATION_CATEGORY_GENERAL",
+	}
+	NotificationCategory_value = map[string]int32{
+		"NOTIFICATION_CATEGORY_UNSPECIFIED":      0,
+		"NOTIFICATION_CATEGORY_APPROVAL_REQUEST": 1,
+		"NOTIFICATION_CATEGORY_BUDGET_ALERT":     2,
+		"NOTIFICATION_CATEGORY_PII_DETECTION":    3,
+		"NOTIFICATION_CATEGORY_INCIDENT":         4,
+		"NOTIFICATION_CATEGORY_REPORT":           5,
+		"NOTIFICATION_CATEGORY_INTEGRATION":      6,
+		"NOTIFICATION_CATEGORY_DIGEST":           7,
+		"NOTIFICATION_CATEGORY_GENERAL":          8,
+	}
+)
+
+func (x NotificationCategory) Enum() *NotificationCategory {
+	p := new(NotificationCategory)
+	*p = x
+	return p
+}
+
+func (x NotificationCategory) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (NotificationCategory) Descriptor() protoreflect.EnumDescriptor {
+	return file_notifications_v1_notifications_proto_enumTypes[2].Descriptor()
+}
+
+func (NotificationCategory) Type() protoreflect.EnumType {
+	return &file_notifications_v1_notifications_proto_enumTypes[2]
+}
+
+func (x NotificationCategory) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use NotificationCategory.Descriptor instead.
+func (NotificationCategory) EnumDescriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{2}
+}
+
 // DeliveryStatus describes the delivery state of a notification.
 type DeliveryStatus int32
 
@@ -177,11 +245,11 @@ func (x DeliveryStatus) String() string {
 }
 
 func (DeliveryStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_notifications_v1_notifications_proto_enumTypes[2].Descriptor()
+	return file_notifications_v1_notifications_proto_enumTypes[3].Descriptor()
 }
 
 func (DeliveryStatus) Type() protoreflect.EnumType {
-	return &file_notifications_v1_notifications_proto_enumTypes[2]
+	return &file_notifications_v1_notifications_proto_enumTypes[3]
 }
 
 func (x DeliveryStatus) Number() protoreflect.EnumNumber {
@@ -190,7 +258,7 @@ func (x DeliveryStatus) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use DeliveryStatus.Descriptor instead.
 func (DeliveryStatus) EnumDescriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{2}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{3}
 }
 
 // Notification is the canonical notification record.
@@ -207,6 +275,8 @@ type Notification struct {
 	DeliveryStatus DeliveryStatus         `protobuf:"varint,9,opt,name=delivery_status,json=deliveryStatus,proto3,enum=notifications.v1.DeliveryStatus" json:"delivery_status,omitempty"`
 	SentAt         *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=sent_at,json=sentAt,proto3" json:"sent_at,omitempty"`
 	DeliveredAt    *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=delivered_at,json=deliveredAt,proto3" json:"delivered_at,omitempty"`
+	Category       NotificationCategory   `protobuf:"varint,12,opt,name=category,proto3,enum=notifications.v1.NotificationCategory" json:"category,omitempty"`
+	TemplateName   string                 `protobuf:"bytes,13,opt,name=template_name,json=templateName,proto3" json:"template_name,omitempty"`
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
 }
@@ -318,6 +388,20 @@ func (x *Notification) GetDeliveredAt() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *Notification) GetCategory() NotificationCategory {
+	if x != nil {
+		return x.Category
+	}
+	return NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED
+}
+
+func (x *Notification) GetTemplateName() string {
+	if x != nil {
+		return x.TemplateName
+	}
+	return ""
+}
+
 // EscalationRule defines automatic escalation when a notification is unacknowledged.
 type EscalationRule struct {
 	state                        protoimpl.MessageState `protogen:"open.v1"`
@@ -373,15 +457,16 @@ func (x *EscalationRule) GetEscalateToChannel() DeliveryChannel {
 
 // NotificationPreferences stores a user's notification settings.
 type NotificationPreferences struct {
-	state           protoimpl.MessageState `protogen:"open.v1"`
-	UserId          string                 `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
-	WorkspaceId     string                 `protobuf:"bytes,2,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
-	DefaultChannel  DeliveryChannel        `protobuf:"varint,3,opt,name=default_channel,json=defaultChannel,proto3,enum=notifications.v1.DeliveryChannel" json:"default_channel,omitempty"`
-	QuietHoursStart string                 `protobuf:"bytes,4,opt,name=quiet_hours_start,json=quietHoursStart,proto3" json:"quiet_hours_start,omitempty"`
-	QuietHoursEnd   string                 `protobuf:"bytes,5,opt,name=quiet_hours_end,json=quietHoursEnd,proto3" json:"quiet_hours_end,omitempty"`
-	EscalationRules []*EscalationRule      `protobuf:"bytes,6,rep,name=escalation_rules,json=escalationRules,proto3" json:"escalation_rules,omitempty"`
-	unknownFields   protoimpl.UnknownFields
-	sizeCache       protoimpl.SizeCache
+	state            protoimpl.MessageState       `protogen:"open.v1"`
+	UserId           string                       `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	WorkspaceId      string                       `protobuf:"bytes,2,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
+	DefaultChannel   DeliveryChannel              `protobuf:"varint,3,opt,name=default_channel,json=defaultChannel,proto3,enum=notifications.v1.DeliveryChannel" json:"default_channel,omitempty"`
+	QuietHoursStart  string                       `protobuf:"bytes,4,opt,name=quiet_hours_start,json=quietHoursStart,proto3" json:"quiet_hours_start,omitempty"`
+	QuietHoursEnd    string                       `protobuf:"bytes,5,opt,name=quiet_hours_end,json=quietHoursEnd,proto3" json:"quiet_hours_end,omitempty"`
+	EscalationRules  []*EscalationRule            `protobuf:"bytes,6,rep,name=escalation_rules,json=escalationRules,proto3" json:"escalation_rules,omitempty"`
+	CategoryChannels []*CategoryChannelPreference `protobuf:"bytes,7,rep,name=category_channels,json=categoryChannels,proto3" json:"category_channels,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *NotificationPreferences) Reset() {
@@ -456,24 +541,204 @@ func (x *NotificationPreferences) GetEscalationRules() []*EscalationRule {
 	return nil
 }
 
+func (x *NotificationPreferences) GetCategoryChannels() []*CategoryChannelPreference {
+	if x != nil {
+		return x.CategoryChannels
+	}
+	return nil
+}
+
+// CategoryChannelPreference overrides delivery routing for a specific category.
+type CategoryChannelPreference struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Category      NotificationCategory   `protobuf:"varint,1,opt,name=category,proto3,enum=notifications.v1.NotificationCategory" json:"category,omitempty"`
+	Channel       DeliveryChannel        `protobuf:"varint,2,opt,name=channel,proto3,enum=notifications.v1.DeliveryChannel" json:"channel,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CategoryChannelPreference) Reset() {
+	*x = CategoryChannelPreference{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CategoryChannelPreference) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CategoryChannelPreference) ProtoMessage() {}
+
+func (x *CategoryChannelPreference) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[3]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CategoryChannelPreference.ProtoReflect.Descriptor instead.
+func (*CategoryChannelPreference) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *CategoryChannelPreference) GetCategory() NotificationCategory {
+	if x != nil {
+		return x.Category
+	}
+	return NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED
+}
+
+func (x *CategoryChannelPreference) GetChannel() DeliveryChannel {
+	if x != nil {
+		return x.Channel
+	}
+	return DeliveryChannel_DELIVERY_CHANNEL_UNSPECIFIED
+}
+
+// NotificationTemplate defines a reusable notification subject/body template.
+type NotificationTemplate struct {
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	Id                string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	WorkspaceId       string                 `protobuf:"bytes,2,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
+	Name              string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Category          NotificationCategory   `protobuf:"varint,4,opt,name=category,proto3,enum=notifications.v1.NotificationCategory" json:"category,omitempty"`
+	Channel           DeliveryChannel        `protobuf:"varint,5,opt,name=channel,proto3,enum=notifications.v1.DeliveryChannel" json:"channel,omitempty"`
+	SubjectTemplate   string                 `protobuf:"bytes,6,opt,name=subject_template,json=subjectTemplate,proto3" json:"subject_template,omitempty"`
+	BodyTemplate      string                 `protobuf:"bytes,7,opt,name=body_template,json=bodyTemplate,proto3" json:"body_template,omitempty"`
+	RequiredVariables []string               `protobuf:"bytes,8,rep,name=required_variables,json=requiredVariables,proto3" json:"required_variables,omitempty"`
+	BuiltIn           bool                   `protobuf:"varint,9,opt,name=built_in,json=builtIn,proto3" json:"built_in,omitempty"`
+	UpdatedAt         *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
+}
+
+func (x *NotificationTemplate) Reset() {
+	*x = NotificationTemplate{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *NotificationTemplate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NotificationTemplate) ProtoMessage() {}
+
+func (x *NotificationTemplate) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[4]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NotificationTemplate.ProtoReflect.Descriptor instead.
+func (*NotificationTemplate) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *NotificationTemplate) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *NotificationTemplate) GetWorkspaceId() string {
+	if x != nil {
+		return x.WorkspaceId
+	}
+	return ""
+}
+
+func (x *NotificationTemplate) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *NotificationTemplate) GetCategory() NotificationCategory {
+	if x != nil {
+		return x.Category
+	}
+	return NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED
+}
+
+func (x *NotificationTemplate) GetChannel() DeliveryChannel {
+	if x != nil {
+		return x.Channel
+	}
+	return DeliveryChannel_DELIVERY_CHANNEL_UNSPECIFIED
+}
+
+func (x *NotificationTemplate) GetSubjectTemplate() string {
+	if x != nil {
+		return x.SubjectTemplate
+	}
+	return ""
+}
+
+func (x *NotificationTemplate) GetBodyTemplate() string {
+	if x != nil {
+		return x.BodyTemplate
+	}
+	return ""
+}
+
+func (x *NotificationTemplate) GetRequiredVariables() []string {
+	if x != nil {
+		return x.RequiredVariables
+	}
+	return nil
+}
+
+func (x *NotificationTemplate) GetBuiltIn() bool {
+	if x != nil {
+		return x.BuiltIn
+	}
+	return false
+}
+
+func (x *NotificationTemplate) GetUpdatedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return nil
+}
+
 type SendRequest struct {
 	state       protoimpl.MessageState `protogen:"open.v1"`
 	WorkspaceId string                 `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
 	RecipientId string                 `protobuf:"bytes,2,opt,name=recipient_id,json=recipientId,proto3" json:"recipient_id,omitempty"`
 	// If channel is unspecified, the notifications service may resolve it from
 	// the recipient's preferences before falling back to a safe default.
-	Channel       DeliveryChannel `protobuf:"varint,3,opt,name=channel,proto3,enum=notifications.v1.DeliveryChannel" json:"channel,omitempty"`
-	Priority      Priority        `protobuf:"varint,4,opt,name=priority,proto3,enum=notifications.v1.Priority" json:"priority,omitempty"`
-	Subject       string          `protobuf:"bytes,5,opt,name=subject,proto3" json:"subject,omitempty"`
-	Body          string          `protobuf:"bytes,6,opt,name=body,proto3" json:"body,omitempty"`
-	MetadataJson  string          `protobuf:"bytes,7,opt,name=metadata_json,json=metadataJson,proto3" json:"metadata_json,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	Channel               DeliveryChannel      `protobuf:"varint,3,opt,name=channel,proto3,enum=notifications.v1.DeliveryChannel" json:"channel,omitempty"`
+	Priority              Priority             `protobuf:"varint,4,opt,name=priority,proto3,enum=notifications.v1.Priority" json:"priority,omitempty"`
+	Subject               string               `protobuf:"bytes,5,opt,name=subject,proto3" json:"subject,omitempty"`
+	Body                  string               `protobuf:"bytes,6,opt,name=body,proto3" json:"body,omitempty"`
+	MetadataJson          string               `protobuf:"bytes,7,opt,name=metadata_json,json=metadataJson,proto3" json:"metadata_json,omitempty"`
+	Category              NotificationCategory `protobuf:"varint,8,opt,name=category,proto3,enum=notifications.v1.NotificationCategory" json:"category,omitempty"`
+	TemplateName          string               `protobuf:"bytes,9,opt,name=template_name,json=templateName,proto3" json:"template_name,omitempty"`
+	TemplateVariablesJson string               `protobuf:"bytes,10,opt,name=template_variables_json,json=templateVariablesJson,proto3" json:"template_variables_json,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *SendRequest) Reset() {
 	*x = SendRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[3]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -485,7 +750,7 @@ func (x *SendRequest) String() string {
 func (*SendRequest) ProtoMessage() {}
 
 func (x *SendRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[3]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -498,7 +763,7 @@ func (x *SendRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendRequest.ProtoReflect.Descriptor instead.
 func (*SendRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{3}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *SendRequest) GetWorkspaceId() string {
@@ -550,6 +815,27 @@ func (x *SendRequest) GetMetadataJson() string {
 	return ""
 }
 
+func (x *SendRequest) GetCategory() NotificationCategory {
+	if x != nil {
+		return x.Category
+	}
+	return NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED
+}
+
+func (x *SendRequest) GetTemplateName() string {
+	if x != nil {
+		return x.TemplateName
+	}
+	return ""
+}
+
+func (x *SendRequest) GetTemplateVariablesJson() string {
+	if x != nil {
+		return x.TemplateVariablesJson
+	}
+	return ""
+}
+
 type SendResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Notification  *Notification          `protobuf:"bytes,1,opt,name=notification,proto3" json:"notification,omitempty"`
@@ -559,7 +845,7 @@ type SendResponse struct {
 
 func (x *SendResponse) Reset() {
 	*x = SendResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[4]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -571,7 +857,7 @@ func (x *SendResponse) String() string {
 func (*SendResponse) ProtoMessage() {}
 
 func (x *SendResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[4]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -584,7 +870,7 @@ func (x *SendResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendResponse.ProtoReflect.Descriptor instead.
 func (*SendResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{4}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *SendResponse) GetNotification() *Notification {
@@ -603,7 +889,7 @@ type SendBatchRequest struct {
 
 func (x *SendBatchRequest) Reset() {
 	*x = SendBatchRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[5]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -615,7 +901,7 @@ func (x *SendBatchRequest) String() string {
 func (*SendBatchRequest) ProtoMessage() {}
 
 func (x *SendBatchRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[5]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -628,7 +914,7 @@ func (x *SendBatchRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendBatchRequest.ProtoReflect.Descriptor instead.
 func (*SendBatchRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{5}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *SendBatchRequest) GetNotifications() []*SendRequest {
@@ -648,7 +934,7 @@ type SendBatchResponse struct {
 
 func (x *SendBatchResponse) Reset() {
 	*x = SendBatchResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[6]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -660,7 +946,7 @@ func (x *SendBatchResponse) String() string {
 func (*SendBatchResponse) ProtoMessage() {}
 
 func (x *SendBatchResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[6]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -673,7 +959,7 @@ func (x *SendBatchResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendBatchResponse.ProtoReflect.Descriptor instead.
 func (*SendBatchResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{6}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *SendBatchResponse) GetNotifications() []*Notification {
@@ -700,7 +986,7 @@ type GetPreferencesRequest struct {
 
 func (x *GetPreferencesRequest) Reset() {
 	*x = GetPreferencesRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[7]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -712,7 +998,7 @@ func (x *GetPreferencesRequest) String() string {
 func (*GetPreferencesRequest) ProtoMessage() {}
 
 func (x *GetPreferencesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[7]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -725,7 +1011,7 @@ func (x *GetPreferencesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetPreferencesRequest.ProtoReflect.Descriptor instead.
 func (*GetPreferencesRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{7}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GetPreferencesRequest) GetUserId() string {
@@ -751,7 +1037,7 @@ type GetPreferencesResponse struct {
 
 func (x *GetPreferencesResponse) Reset() {
 	*x = GetPreferencesResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[8]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -763,7 +1049,7 @@ func (x *GetPreferencesResponse) String() string {
 func (*GetPreferencesResponse) ProtoMessage() {}
 
 func (x *GetPreferencesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[8]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -776,7 +1062,7 @@ func (x *GetPreferencesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetPreferencesResponse.ProtoReflect.Descriptor instead.
 func (*GetPreferencesResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{8}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GetPreferencesResponse) GetPreferences() *NotificationPreferences {
@@ -795,7 +1081,7 @@ type SetPreferencesRequest struct {
 
 func (x *SetPreferencesRequest) Reset() {
 	*x = SetPreferencesRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[9]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -807,7 +1093,7 @@ func (x *SetPreferencesRequest) String() string {
 func (*SetPreferencesRequest) ProtoMessage() {}
 
 func (x *SetPreferencesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[9]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -820,7 +1106,7 @@ func (x *SetPreferencesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SetPreferencesRequest.ProtoReflect.Descriptor instead.
 func (*SetPreferencesRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{9}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *SetPreferencesRequest) GetPreferences() *NotificationPreferences {
@@ -839,7 +1125,7 @@ type SetPreferencesResponse struct {
 
 func (x *SetPreferencesResponse) Reset() {
 	*x = SetPreferencesResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[10]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -851,7 +1137,7 @@ func (x *SetPreferencesResponse) String() string {
 func (*SetPreferencesResponse) ProtoMessage() {}
 
 func (x *SetPreferencesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[10]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -864,7 +1150,7 @@ func (x *SetPreferencesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SetPreferencesResponse.ProtoReflect.Descriptor instead.
 func (*SetPreferencesResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{10}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *SetPreferencesResponse) GetPreferences() *NotificationPreferences {
@@ -886,7 +1172,7 @@ type ListHistoryRequest struct {
 
 func (x *ListHistoryRequest) Reset() {
 	*x = ListHistoryRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[11]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -898,7 +1184,7 @@ func (x *ListHistoryRequest) String() string {
 func (*ListHistoryRequest) ProtoMessage() {}
 
 func (x *ListHistoryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[11]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -911,7 +1197,7 @@ func (x *ListHistoryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListHistoryRequest.ProtoReflect.Descriptor instead.
 func (*ListHistoryRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{11}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *ListHistoryRequest) GetWorkspaceId() string {
@@ -952,7 +1238,7 @@ type ListHistoryResponse struct {
 
 func (x *ListHistoryResponse) Reset() {
 	*x = ListHistoryResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[12]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -964,7 +1250,7 @@ func (x *ListHistoryResponse) String() string {
 func (*ListHistoryResponse) ProtoMessage() {}
 
 func (x *ListHistoryResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[12]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -977,7 +1263,7 @@ func (x *ListHistoryResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListHistoryResponse.ProtoReflect.Descriptor instead.
 func (*ListHistoryResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{12}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *ListHistoryResponse) GetNotifications() []*Notification {
@@ -1005,7 +1291,7 @@ type RegisterChannelRequest struct {
 
 func (x *RegisterChannelRequest) Reset() {
 	*x = RegisterChannelRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[13]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1017,7 +1303,7 @@ func (x *RegisterChannelRequest) String() string {
 func (*RegisterChannelRequest) ProtoMessage() {}
 
 func (x *RegisterChannelRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[13]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1030,7 +1316,7 @@ func (x *RegisterChannelRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegisterChannelRequest.ProtoReflect.Descriptor instead.
 func (*RegisterChannelRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{13}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *RegisterChannelRequest) GetWorkspaceId() string {
@@ -1063,7 +1349,7 @@ type RegisterChannelResponse struct {
 
 func (x *RegisterChannelResponse) Reset() {
 	*x = RegisterChannelResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[14]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1075,7 +1361,7 @@ func (x *RegisterChannelResponse) String() string {
 func (*RegisterChannelResponse) ProtoMessage() {}
 
 func (x *RegisterChannelResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[14]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1088,7 +1374,7 @@ func (x *RegisterChannelResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegisterChannelResponse.ProtoReflect.Descriptor instead.
 func (*RegisterChannelResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{14}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *RegisterChannelResponse) GetSuccess() bool {
@@ -1107,7 +1393,7 @@ type GetDeliveryStatusRequest struct {
 
 func (x *GetDeliveryStatusRequest) Reset() {
 	*x = GetDeliveryStatusRequest{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[15]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1119,7 +1405,7 @@ func (x *GetDeliveryStatusRequest) String() string {
 func (*GetDeliveryStatusRequest) ProtoMessage() {}
 
 func (x *GetDeliveryStatusRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[15]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1132,7 +1418,7 @@ func (x *GetDeliveryStatusRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetDeliveryStatusRequest.ProtoReflect.Descriptor instead.
 func (*GetDeliveryStatusRequest) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{15}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *GetDeliveryStatusRequest) GetNotificationId() string {
@@ -1153,7 +1439,7 @@ type GetDeliveryStatusResponse struct {
 
 func (x *GetDeliveryStatusResponse) Reset() {
 	*x = GetDeliveryStatusResponse{}
-	mi := &file_notifications_v1_notifications_proto_msgTypes[16]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1165,7 +1451,7 @@ func (x *GetDeliveryStatusResponse) String() string {
 func (*GetDeliveryStatusResponse) ProtoMessage() {}
 
 func (x *GetDeliveryStatusResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_notifications_v1_notifications_proto_msgTypes[16]
+	mi := &file_notifications_v1_notifications_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1178,7 +1464,7 @@ func (x *GetDeliveryStatusResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetDeliveryStatusResponse.ProtoReflect.Descriptor instead.
 func (*GetDeliveryStatusResponse) Descriptor() ([]byte, []int) {
-	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{16}
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *GetDeliveryStatusResponse) GetStatus() DeliveryStatus {
@@ -1202,11 +1488,211 @@ func (x *GetDeliveryStatusResponse) GetErrorMessage() string {
 	return ""
 }
 
+type UpsertTemplateRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Template      *NotificationTemplate  `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpsertTemplateRequest) Reset() {
+	*x = UpsertTemplateRequest{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpsertTemplateRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpsertTemplateRequest) ProtoMessage() {}
+
+func (x *UpsertTemplateRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[19]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpsertTemplateRequest.ProtoReflect.Descriptor instead.
+func (*UpsertTemplateRequest) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *UpsertTemplateRequest) GetTemplate() *NotificationTemplate {
+	if x != nil {
+		return x.Template
+	}
+	return nil
+}
+
+type UpsertTemplateResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Template      *NotificationTemplate  `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpsertTemplateResponse) Reset() {
+	*x = UpsertTemplateResponse{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpsertTemplateResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpsertTemplateResponse) ProtoMessage() {}
+
+func (x *UpsertTemplateResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[20]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpsertTemplateResponse.ProtoReflect.Descriptor instead.
+func (*UpsertTemplateResponse) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *UpsertTemplateResponse) GetTemplate() *NotificationTemplate {
+	if x != nil {
+		return x.Template
+	}
+	return nil
+}
+
+type ListTemplatesRequest struct {
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	WorkspaceId    string                 `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
+	Category       NotificationCategory   `protobuf:"varint,2,opt,name=category,proto3,enum=notifications.v1.NotificationCategory" json:"category,omitempty"`
+	Channel        DeliveryChannel        `protobuf:"varint,3,opt,name=channel,proto3,enum=notifications.v1.DeliveryChannel" json:"channel,omitempty"`
+	IncludeBuiltIn bool                   `protobuf:"varint,4,opt,name=include_built_in,json=includeBuiltIn,proto3" json:"include_built_in,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
+}
+
+func (x *ListTemplatesRequest) Reset() {
+	*x = ListTemplatesRequest{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListTemplatesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListTemplatesRequest) ProtoMessage() {}
+
+func (x *ListTemplatesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[21]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListTemplatesRequest.ProtoReflect.Descriptor instead.
+func (*ListTemplatesRequest) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *ListTemplatesRequest) GetWorkspaceId() string {
+	if x != nil {
+		return x.WorkspaceId
+	}
+	return ""
+}
+
+func (x *ListTemplatesRequest) GetCategory() NotificationCategory {
+	if x != nil {
+		return x.Category
+	}
+	return NotificationCategory_NOTIFICATION_CATEGORY_UNSPECIFIED
+}
+
+func (x *ListTemplatesRequest) GetChannel() DeliveryChannel {
+	if x != nil {
+		return x.Channel
+	}
+	return DeliveryChannel_DELIVERY_CHANNEL_UNSPECIFIED
+}
+
+func (x *ListTemplatesRequest) GetIncludeBuiltIn() bool {
+	if x != nil {
+		return x.IncludeBuiltIn
+	}
+	return false
+}
+
+type ListTemplatesResponse struct {
+	state         protoimpl.MessageState  `protogen:"open.v1"`
+	Templates     []*NotificationTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ListTemplatesResponse) Reset() {
+	*x = ListTemplatesResponse{}
+	mi := &file_notifications_v1_notifications_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListTemplatesResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListTemplatesResponse) ProtoMessage() {}
+
+func (x *ListTemplatesResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_notifications_v1_notifications_proto_msgTypes[22]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListTemplatesResponse.ProtoReflect.Descriptor instead.
+func (*ListTemplatesResponse) Descriptor() ([]byte, []int) {
+	return file_notifications_v1_notifications_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *ListTemplatesResponse) GetTemplates() []*NotificationTemplate {
+	if x != nil {
+		return x.Templates
+	}
+	return nil
+}
+
 var File_notifications_v1_notifications_proto protoreflect.FileDescriptor
 
 const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\n" +
-	"$notifications/v1/notifications.proto\x12\x10notifications.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xeb\x03\n" +
+	"$notifications/v1/notifications.proto\x12\x10notifications.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xd4\x04\n" +
 	"\fNotification\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12!\n" +
 	"\fworkspace_id\x18\x02 \x01(\tR\vworkspaceId\x12!\n" +
@@ -1219,17 +1705,36 @@ const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\x0fdelivery_status\x18\t \x01(\x0e2 .notifications.v1.DeliveryStatusR\x0edeliveryStatus\x123\n" +
 	"\asent_at\x18\n" +
 	" \x01(\v2\x1a.google.protobuf.TimestampR\x06sentAt\x12=\n" +
-	"\fdelivered_at\x18\v \x01(\v2\x1a.google.protobuf.TimestampR\vdeliveredAt\"\xaa\x01\n" +
+	"\fdelivered_at\x18\v \x01(\v2\x1a.google.protobuf.TimestampR\vdeliveredAt\x12B\n" +
+	"\bcategory\x18\f \x01(\x0e2&.notifications.v1.NotificationCategoryR\bcategory\x12#\n" +
+	"\rtemplate_name\x18\r \x01(\tR\ftemplateName\"\xaa\x01\n" +
 	"\x0eEscalationRule\x12E\n" +
 	"\x1fif_unacknowledged_after_seconds\x18\x01 \x01(\x05R\x1cifUnacknowledgedAfterSeconds\x12Q\n" +
-	"\x13escalate_to_channel\x18\x02 \x01(\x0e2!.notifications.v1.DeliveryChannelR\x11escalateToChannel\"\xc2\x02\n" +
+	"\x13escalate_to_channel\x18\x02 \x01(\x0e2!.notifications.v1.DeliveryChannelR\x11escalateToChannel\"\x9c\x03\n" +
 	"\x17NotificationPreferences\x12\x17\n" +
 	"\auser_id\x18\x01 \x01(\tR\x06userId\x12!\n" +
 	"\fworkspace_id\x18\x02 \x01(\tR\vworkspaceId\x12J\n" +
 	"\x0fdefault_channel\x18\x03 \x01(\x0e2!.notifications.v1.DeliveryChannelR\x0edefaultChannel\x12*\n" +
 	"\x11quiet_hours_start\x18\x04 \x01(\tR\x0fquietHoursStart\x12&\n" +
 	"\x0fquiet_hours_end\x18\x05 \x01(\tR\rquietHoursEnd\x12K\n" +
-	"\x10escalation_rules\x18\x06 \x03(\v2 .notifications.v1.EscalationRuleR\x0fescalationRules\"\x9b\x02\n" +
+	"\x10escalation_rules\x18\x06 \x03(\v2 .notifications.v1.EscalationRuleR\x0fescalationRules\x12X\n" +
+	"\x11category_channels\x18\a \x03(\v2+.notifications.v1.CategoryChannelPreferenceR\x10categoryChannels\"\x9c\x01\n" +
+	"\x19CategoryChannelPreference\x12B\n" +
+	"\bcategory\x18\x01 \x01(\x0e2&.notifications.v1.NotificationCategoryR\bcategory\x12;\n" +
+	"\achannel\x18\x02 \x01(\x0e2!.notifications.v1.DeliveryChannelR\achannel\"\xb3\x03\n" +
+	"\x14NotificationTemplate\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12!\n" +
+	"\fworkspace_id\x18\x02 \x01(\tR\vworkspaceId\x12\x12\n" +
+	"\x04name\x18\x03 \x01(\tR\x04name\x12B\n" +
+	"\bcategory\x18\x04 \x01(\x0e2&.notifications.v1.NotificationCategoryR\bcategory\x12;\n" +
+	"\achannel\x18\x05 \x01(\x0e2!.notifications.v1.DeliveryChannelR\achannel\x12)\n" +
+	"\x10subject_template\x18\x06 \x01(\tR\x0fsubjectTemplate\x12#\n" +
+	"\rbody_template\x18\a \x01(\tR\fbodyTemplate\x12-\n" +
+	"\x12required_variables\x18\b \x03(\tR\x11requiredVariables\x12\x19\n" +
+	"\bbuilt_in\x18\t \x01(\bR\abuiltIn\x129\n" +
+	"\n" +
+	"updated_at\x18\n" +
+	" \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\"\xbc\x03\n" +
 	"\vSendRequest\x12!\n" +
 	"\fworkspace_id\x18\x01 \x01(\tR\vworkspaceId\x12!\n" +
 	"\frecipient_id\x18\x02 \x01(\tR\vrecipientId\x12;\n" +
@@ -1237,7 +1742,11 @@ const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\bpriority\x18\x04 \x01(\x0e2\x1a.notifications.v1.PriorityR\bpriority\x12\x18\n" +
 	"\asubject\x18\x05 \x01(\tR\asubject\x12\x12\n" +
 	"\x04body\x18\x06 \x01(\tR\x04body\x12#\n" +
-	"\rmetadata_json\x18\a \x01(\tR\fmetadataJson\"R\n" +
+	"\rmetadata_json\x18\a \x01(\tR\fmetadataJson\x12B\n" +
+	"\bcategory\x18\b \x01(\x0e2&.notifications.v1.NotificationCategoryR\bcategory\x12#\n" +
+	"\rtemplate_name\x18\t \x01(\tR\ftemplateName\x126\n" +
+	"\x17template_variables_json\x18\n" +
+	" \x01(\tR\x15templateVariablesJson\"R\n" +
 	"\fSendResponse\x12B\n" +
 	"\fnotification\x18\x01 \x01(\v2\x1e.notifications.v1.NotificationR\fnotification\"W\n" +
 	"\x10SendBatchRequest\x12C\n" +
@@ -1276,7 +1785,18 @@ const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\x19GetDeliveryStatusResponse\x128\n" +
 	"\x06status\x18\x01 \x01(\x0e2 .notifications.v1.DeliveryStatusR\x06status\x12B\n" +
 	"\x0flast_updated_at\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\rlastUpdatedAt\x12#\n" +
-	"\rerror_message\x18\x03 \x01(\tR\ferrorMessage*\xa6\x01\n" +
+	"\rerror_message\x18\x03 \x01(\tR\ferrorMessage\"[\n" +
+	"\x15UpsertTemplateRequest\x12B\n" +
+	"\btemplate\x18\x01 \x01(\v2&.notifications.v1.NotificationTemplateR\btemplate\"\\\n" +
+	"\x16UpsertTemplateResponse\x12B\n" +
+	"\btemplate\x18\x01 \x01(\v2&.notifications.v1.NotificationTemplateR\btemplate\"\xe4\x01\n" +
+	"\x14ListTemplatesRequest\x12!\n" +
+	"\fworkspace_id\x18\x01 \x01(\tR\vworkspaceId\x12B\n" +
+	"\bcategory\x18\x02 \x01(\x0e2&.notifications.v1.NotificationCategoryR\bcategory\x12;\n" +
+	"\achannel\x18\x03 \x01(\x0e2!.notifications.v1.DeliveryChannelR\achannel\x12(\n" +
+	"\x10include_built_in\x18\x04 \x01(\bR\x0eincludeBuiltIn\"]\n" +
+	"\x15ListTemplatesResponse\x12D\n" +
+	"\ttemplates\x18\x01 \x03(\v2&.notifications.v1.NotificationTemplateR\ttemplates*\xa6\x01\n" +
 	"\x0fDeliveryChannel\x12 \n" +
 	"\x1cDELIVERY_CHANNEL_UNSPECIFIED\x10\x00\x12\x1a\n" +
 	"\x16DELIVERY_CHANNEL_SLACK\x10\x01\x12\x1a\n" +
@@ -1288,14 +1808,24 @@ const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\fPRIORITY_LOW\x10\x01\x12\x13\n" +
 	"\x0fPRIORITY_NORMAL\x10\x02\x12\x11\n" +
 	"\rPRIORITY_HIGH\x10\x03\x12\x13\n" +
-	"\x0fPRIORITY_URGENT\x10\x04*\xc0\x01\n" +
+	"\x0fPRIORITY_URGENT\x10\x04*\xec\x02\n" +
+	"\x14NotificationCategory\x12%\n" +
+	"!NOTIFICATION_CATEGORY_UNSPECIFIED\x10\x00\x12*\n" +
+	"&NOTIFICATION_CATEGORY_APPROVAL_REQUEST\x10\x01\x12&\n" +
+	"\"NOTIFICATION_CATEGORY_BUDGET_ALERT\x10\x02\x12'\n" +
+	"#NOTIFICATION_CATEGORY_PII_DETECTION\x10\x03\x12\"\n" +
+	"\x1eNOTIFICATION_CATEGORY_INCIDENT\x10\x04\x12 \n" +
+	"\x1cNOTIFICATION_CATEGORY_REPORT\x10\x05\x12%\n" +
+	"!NOTIFICATION_CATEGORY_INTEGRATION\x10\x06\x12 \n" +
+	"\x1cNOTIFICATION_CATEGORY_DIGEST\x10\a\x12!\n" +
+	"\x1dNOTIFICATION_CATEGORY_GENERAL\x10\b*\xc0\x01\n" +
 	"\x0eDeliveryStatus\x12\x1f\n" +
 	"\x1bDELIVERY_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n" +
 	"\x17DELIVERY_STATUS_PENDING\x10\x01\x12\x18\n" +
 	"\x14DELIVERY_STATUS_SENT\x10\x02\x12\x1d\n" +
 	"\x19DELIVERY_STATUS_DELIVERED\x10\x03\x12\x1a\n" +
 	"\x16DELIVERY_STATUS_FAILED\x10\x04\x12\x1b\n" +
-	"\x17DELIVERY_STATUS_BOUNCED\x10\x052\xae\x05\n" +
+	"\x17DELIVERY_STATUS_BOUNCED\x10\x052\xf5\x06\n" +
 	"\x13NotificationService\x12E\n" +
 	"\x04Send\x12\x1d.notifications.v1.SendRequest\x1a\x1e.notifications.v1.SendResponse\x12T\n" +
 	"\tSendBatch\x12\".notifications.v1.SendBatchRequest\x1a#.notifications.v1.SendBatchResponse\x12c\n" +
@@ -1303,7 +1833,9 @@ const file_notifications_v1_notifications_proto_rawDesc = "" +
 	"\x0eSetPreferences\x12'.notifications.v1.SetPreferencesRequest\x1a(.notifications.v1.SetPreferencesResponse\x12Z\n" +
 	"\vListHistory\x12$.notifications.v1.ListHistoryRequest\x1a%.notifications.v1.ListHistoryResponse\x12f\n" +
 	"\x0fRegisterChannel\x12(.notifications.v1.RegisterChannelRequest\x1a).notifications.v1.RegisterChannelResponse\x12l\n" +
-	"\x11GetDeliveryStatus\x12*.notifications.v1.GetDeliveryStatusRequest\x1a+.notifications.v1.GetDeliveryStatusResponseBBZ@github.com/evalops/proto/gen/go/notifications/v1;notificationsv1b\x06proto3"
+	"\x11GetDeliveryStatus\x12*.notifications.v1.GetDeliveryStatusRequest\x1a+.notifications.v1.GetDeliveryStatusResponse\x12c\n" +
+	"\x0eUpsertTemplate\x12'.notifications.v1.UpsertTemplateRequest\x1a(.notifications.v1.UpsertTemplateResponse\x12`\n" +
+	"\rListTemplates\x12&.notifications.v1.ListTemplatesRequest\x1a'.notifications.v1.ListTemplatesResponseBBZ@github.com/evalops/proto/gen/go/notifications/v1;notificationsv1b\x06proto3"
 
 var (
 	file_notifications_v1_notifications_proto_rawDescOnce sync.Once
@@ -1317,73 +1849,97 @@ func file_notifications_v1_notifications_proto_rawDescGZIP() []byte {
 	return file_notifications_v1_notifications_proto_rawDescData
 }
 
-var file_notifications_v1_notifications_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_notifications_v1_notifications_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_notifications_v1_notifications_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_notifications_v1_notifications_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_notifications_v1_notifications_proto_goTypes = []any{
 	(DeliveryChannel)(0),              // 0: notifications.v1.DeliveryChannel
 	(Priority)(0),                     // 1: notifications.v1.Priority
-	(DeliveryStatus)(0),               // 2: notifications.v1.DeliveryStatus
-	(*Notification)(nil),              // 3: notifications.v1.Notification
-	(*EscalationRule)(nil),            // 4: notifications.v1.EscalationRule
-	(*NotificationPreferences)(nil),   // 5: notifications.v1.NotificationPreferences
-	(*SendRequest)(nil),               // 6: notifications.v1.SendRequest
-	(*SendResponse)(nil),              // 7: notifications.v1.SendResponse
-	(*SendBatchRequest)(nil),          // 8: notifications.v1.SendBatchRequest
-	(*SendBatchResponse)(nil),         // 9: notifications.v1.SendBatchResponse
-	(*GetPreferencesRequest)(nil),     // 10: notifications.v1.GetPreferencesRequest
-	(*GetPreferencesResponse)(nil),    // 11: notifications.v1.GetPreferencesResponse
-	(*SetPreferencesRequest)(nil),     // 12: notifications.v1.SetPreferencesRequest
-	(*SetPreferencesResponse)(nil),    // 13: notifications.v1.SetPreferencesResponse
-	(*ListHistoryRequest)(nil),        // 14: notifications.v1.ListHistoryRequest
-	(*ListHistoryResponse)(nil),       // 15: notifications.v1.ListHistoryResponse
-	(*RegisterChannelRequest)(nil),    // 16: notifications.v1.RegisterChannelRequest
-	(*RegisterChannelResponse)(nil),   // 17: notifications.v1.RegisterChannelResponse
-	(*GetDeliveryStatusRequest)(nil),  // 18: notifications.v1.GetDeliveryStatusRequest
-	(*GetDeliveryStatusResponse)(nil), // 19: notifications.v1.GetDeliveryStatusResponse
-	nil,                               // 20: notifications.v1.RegisterChannelRequest.ConfigEntry
-	(*timestamppb.Timestamp)(nil),     // 21: google.protobuf.Timestamp
+	(NotificationCategory)(0),         // 2: notifications.v1.NotificationCategory
+	(DeliveryStatus)(0),               // 3: notifications.v1.DeliveryStatus
+	(*Notification)(nil),              // 4: notifications.v1.Notification
+	(*EscalationRule)(nil),            // 5: notifications.v1.EscalationRule
+	(*NotificationPreferences)(nil),   // 6: notifications.v1.NotificationPreferences
+	(*CategoryChannelPreference)(nil), // 7: notifications.v1.CategoryChannelPreference
+	(*NotificationTemplate)(nil),      // 8: notifications.v1.NotificationTemplate
+	(*SendRequest)(nil),               // 9: notifications.v1.SendRequest
+	(*SendResponse)(nil),              // 10: notifications.v1.SendResponse
+	(*SendBatchRequest)(nil),          // 11: notifications.v1.SendBatchRequest
+	(*SendBatchResponse)(nil),         // 12: notifications.v1.SendBatchResponse
+	(*GetPreferencesRequest)(nil),     // 13: notifications.v1.GetPreferencesRequest
+	(*GetPreferencesResponse)(nil),    // 14: notifications.v1.GetPreferencesResponse
+	(*SetPreferencesRequest)(nil),     // 15: notifications.v1.SetPreferencesRequest
+	(*SetPreferencesResponse)(nil),    // 16: notifications.v1.SetPreferencesResponse
+	(*ListHistoryRequest)(nil),        // 17: notifications.v1.ListHistoryRequest
+	(*ListHistoryResponse)(nil),       // 18: notifications.v1.ListHistoryResponse
+	(*RegisterChannelRequest)(nil),    // 19: notifications.v1.RegisterChannelRequest
+	(*RegisterChannelResponse)(nil),   // 20: notifications.v1.RegisterChannelResponse
+	(*GetDeliveryStatusRequest)(nil),  // 21: notifications.v1.GetDeliveryStatusRequest
+	(*GetDeliveryStatusResponse)(nil), // 22: notifications.v1.GetDeliveryStatusResponse
+	(*UpsertTemplateRequest)(nil),     // 23: notifications.v1.UpsertTemplateRequest
+	(*UpsertTemplateResponse)(nil),    // 24: notifications.v1.UpsertTemplateResponse
+	(*ListTemplatesRequest)(nil),      // 25: notifications.v1.ListTemplatesRequest
+	(*ListTemplatesResponse)(nil),     // 26: notifications.v1.ListTemplatesResponse
+	nil,                               // 27: notifications.v1.RegisterChannelRequest.ConfigEntry
+	(*timestamppb.Timestamp)(nil),     // 28: google.protobuf.Timestamp
 }
 var file_notifications_v1_notifications_proto_depIdxs = []int32{
 	0,  // 0: notifications.v1.Notification.channel:type_name -> notifications.v1.DeliveryChannel
 	1,  // 1: notifications.v1.Notification.priority:type_name -> notifications.v1.Priority
-	2,  // 2: notifications.v1.Notification.delivery_status:type_name -> notifications.v1.DeliveryStatus
-	21, // 3: notifications.v1.Notification.sent_at:type_name -> google.protobuf.Timestamp
-	21, // 4: notifications.v1.Notification.delivered_at:type_name -> google.protobuf.Timestamp
-	0,  // 5: notifications.v1.EscalationRule.escalate_to_channel:type_name -> notifications.v1.DeliveryChannel
-	0,  // 6: notifications.v1.NotificationPreferences.default_channel:type_name -> notifications.v1.DeliveryChannel
-	4,  // 7: notifications.v1.NotificationPreferences.escalation_rules:type_name -> notifications.v1.EscalationRule
-	0,  // 8: notifications.v1.SendRequest.channel:type_name -> notifications.v1.DeliveryChannel
-	1,  // 9: notifications.v1.SendRequest.priority:type_name -> notifications.v1.Priority
-	3,  // 10: notifications.v1.SendResponse.notification:type_name -> notifications.v1.Notification
-	6,  // 11: notifications.v1.SendBatchRequest.notifications:type_name -> notifications.v1.SendRequest
-	3,  // 12: notifications.v1.SendBatchResponse.notifications:type_name -> notifications.v1.Notification
-	5,  // 13: notifications.v1.GetPreferencesResponse.preferences:type_name -> notifications.v1.NotificationPreferences
-	5,  // 14: notifications.v1.SetPreferencesRequest.preferences:type_name -> notifications.v1.NotificationPreferences
-	5,  // 15: notifications.v1.SetPreferencesResponse.preferences:type_name -> notifications.v1.NotificationPreferences
-	3,  // 16: notifications.v1.ListHistoryResponse.notifications:type_name -> notifications.v1.Notification
-	0,  // 17: notifications.v1.RegisterChannelRequest.channel:type_name -> notifications.v1.DeliveryChannel
-	20, // 18: notifications.v1.RegisterChannelRequest.config:type_name -> notifications.v1.RegisterChannelRequest.ConfigEntry
-	2,  // 19: notifications.v1.GetDeliveryStatusResponse.status:type_name -> notifications.v1.DeliveryStatus
-	21, // 20: notifications.v1.GetDeliveryStatusResponse.last_updated_at:type_name -> google.protobuf.Timestamp
-	6,  // 21: notifications.v1.NotificationService.Send:input_type -> notifications.v1.SendRequest
-	8,  // 22: notifications.v1.NotificationService.SendBatch:input_type -> notifications.v1.SendBatchRequest
-	10, // 23: notifications.v1.NotificationService.GetPreferences:input_type -> notifications.v1.GetPreferencesRequest
-	12, // 24: notifications.v1.NotificationService.SetPreferences:input_type -> notifications.v1.SetPreferencesRequest
-	14, // 25: notifications.v1.NotificationService.ListHistory:input_type -> notifications.v1.ListHistoryRequest
-	16, // 26: notifications.v1.NotificationService.RegisterChannel:input_type -> notifications.v1.RegisterChannelRequest
-	18, // 27: notifications.v1.NotificationService.GetDeliveryStatus:input_type -> notifications.v1.GetDeliveryStatusRequest
-	7,  // 28: notifications.v1.NotificationService.Send:output_type -> notifications.v1.SendResponse
-	9,  // 29: notifications.v1.NotificationService.SendBatch:output_type -> notifications.v1.SendBatchResponse
-	11, // 30: notifications.v1.NotificationService.GetPreferences:output_type -> notifications.v1.GetPreferencesResponse
-	13, // 31: notifications.v1.NotificationService.SetPreferences:output_type -> notifications.v1.SetPreferencesResponse
-	15, // 32: notifications.v1.NotificationService.ListHistory:output_type -> notifications.v1.ListHistoryResponse
-	17, // 33: notifications.v1.NotificationService.RegisterChannel:output_type -> notifications.v1.RegisterChannelResponse
-	19, // 34: notifications.v1.NotificationService.GetDeliveryStatus:output_type -> notifications.v1.GetDeliveryStatusResponse
-	28, // [28:35] is the sub-list for method output_type
-	21, // [21:28] is the sub-list for method input_type
-	21, // [21:21] is the sub-list for extension type_name
-	21, // [21:21] is the sub-list for extension extendee
-	0,  // [0:21] is the sub-list for field type_name
+	3,  // 2: notifications.v1.Notification.delivery_status:type_name -> notifications.v1.DeliveryStatus
+	28, // 3: notifications.v1.Notification.sent_at:type_name -> google.protobuf.Timestamp
+	28, // 4: notifications.v1.Notification.delivered_at:type_name -> google.protobuf.Timestamp
+	2,  // 5: notifications.v1.Notification.category:type_name -> notifications.v1.NotificationCategory
+	0,  // 6: notifications.v1.EscalationRule.escalate_to_channel:type_name -> notifications.v1.DeliveryChannel
+	0,  // 7: notifications.v1.NotificationPreferences.default_channel:type_name -> notifications.v1.DeliveryChannel
+	5,  // 8: notifications.v1.NotificationPreferences.escalation_rules:type_name -> notifications.v1.EscalationRule
+	7,  // 9: notifications.v1.NotificationPreferences.category_channels:type_name -> notifications.v1.CategoryChannelPreference
+	2,  // 10: notifications.v1.CategoryChannelPreference.category:type_name -> notifications.v1.NotificationCategory
+	0,  // 11: notifications.v1.CategoryChannelPreference.channel:type_name -> notifications.v1.DeliveryChannel
+	2,  // 12: notifications.v1.NotificationTemplate.category:type_name -> notifications.v1.NotificationCategory
+	0,  // 13: notifications.v1.NotificationTemplate.channel:type_name -> notifications.v1.DeliveryChannel
+	28, // 14: notifications.v1.NotificationTemplate.updated_at:type_name -> google.protobuf.Timestamp
+	0,  // 15: notifications.v1.SendRequest.channel:type_name -> notifications.v1.DeliveryChannel
+	1,  // 16: notifications.v1.SendRequest.priority:type_name -> notifications.v1.Priority
+	2,  // 17: notifications.v1.SendRequest.category:type_name -> notifications.v1.NotificationCategory
+	4,  // 18: notifications.v1.SendResponse.notification:type_name -> notifications.v1.Notification
+	9,  // 19: notifications.v1.SendBatchRequest.notifications:type_name -> notifications.v1.SendRequest
+	4,  // 20: notifications.v1.SendBatchResponse.notifications:type_name -> notifications.v1.Notification
+	6,  // 21: notifications.v1.GetPreferencesResponse.preferences:type_name -> notifications.v1.NotificationPreferences
+	6,  // 22: notifications.v1.SetPreferencesRequest.preferences:type_name -> notifications.v1.NotificationPreferences
+	6,  // 23: notifications.v1.SetPreferencesResponse.preferences:type_name -> notifications.v1.NotificationPreferences
+	4,  // 24: notifications.v1.ListHistoryResponse.notifications:type_name -> notifications.v1.Notification
+	0,  // 25: notifications.v1.RegisterChannelRequest.channel:type_name -> notifications.v1.DeliveryChannel
+	27, // 26: notifications.v1.RegisterChannelRequest.config:type_name -> notifications.v1.RegisterChannelRequest.ConfigEntry
+	3,  // 27: notifications.v1.GetDeliveryStatusResponse.status:type_name -> notifications.v1.DeliveryStatus
+	28, // 28: notifications.v1.GetDeliveryStatusResponse.last_updated_at:type_name -> google.protobuf.Timestamp
+	8,  // 29: notifications.v1.UpsertTemplateRequest.template:type_name -> notifications.v1.NotificationTemplate
+	8,  // 30: notifications.v1.UpsertTemplateResponse.template:type_name -> notifications.v1.NotificationTemplate
+	2,  // 31: notifications.v1.ListTemplatesRequest.category:type_name -> notifications.v1.NotificationCategory
+	0,  // 32: notifications.v1.ListTemplatesRequest.channel:type_name -> notifications.v1.DeliveryChannel
+	8,  // 33: notifications.v1.ListTemplatesResponse.templates:type_name -> notifications.v1.NotificationTemplate
+	9,  // 34: notifications.v1.NotificationService.Send:input_type -> notifications.v1.SendRequest
+	11, // 35: notifications.v1.NotificationService.SendBatch:input_type -> notifications.v1.SendBatchRequest
+	13, // 36: notifications.v1.NotificationService.GetPreferences:input_type -> notifications.v1.GetPreferencesRequest
+	15, // 37: notifications.v1.NotificationService.SetPreferences:input_type -> notifications.v1.SetPreferencesRequest
+	17, // 38: notifications.v1.NotificationService.ListHistory:input_type -> notifications.v1.ListHistoryRequest
+	19, // 39: notifications.v1.NotificationService.RegisterChannel:input_type -> notifications.v1.RegisterChannelRequest
+	21, // 40: notifications.v1.NotificationService.GetDeliveryStatus:input_type -> notifications.v1.GetDeliveryStatusRequest
+	23, // 41: notifications.v1.NotificationService.UpsertTemplate:input_type -> notifications.v1.UpsertTemplateRequest
+	25, // 42: notifications.v1.NotificationService.ListTemplates:input_type -> notifications.v1.ListTemplatesRequest
+	10, // 43: notifications.v1.NotificationService.Send:output_type -> notifications.v1.SendResponse
+	12, // 44: notifications.v1.NotificationService.SendBatch:output_type -> notifications.v1.SendBatchResponse
+	14, // 45: notifications.v1.NotificationService.GetPreferences:output_type -> notifications.v1.GetPreferencesResponse
+	16, // 46: notifications.v1.NotificationService.SetPreferences:output_type -> notifications.v1.SetPreferencesResponse
+	18, // 47: notifications.v1.NotificationService.ListHistory:output_type -> notifications.v1.ListHistoryResponse
+	20, // 48: notifications.v1.NotificationService.RegisterChannel:output_type -> notifications.v1.RegisterChannelResponse
+	22, // 49: notifications.v1.NotificationService.GetDeliveryStatus:output_type -> notifications.v1.GetDeliveryStatusResponse
+	24, // 50: notifications.v1.NotificationService.UpsertTemplate:output_type -> notifications.v1.UpsertTemplateResponse
+	26, // 51: notifications.v1.NotificationService.ListTemplates:output_type -> notifications.v1.ListTemplatesResponse
+	43, // [43:52] is the sub-list for method output_type
+	34, // [34:43] is the sub-list for method input_type
+	34, // [34:34] is the sub-list for extension type_name
+	34, // [34:34] is the sub-list for extension extendee
+	0,  // [0:34] is the sub-list for field type_name
 }
 
 func init() { file_notifications_v1_notifications_proto_init() }
@@ -1396,8 +1952,8 @@ func file_notifications_v1_notifications_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_notifications_v1_notifications_proto_rawDesc), len(file_notifications_v1_notifications_proto_rawDesc)),
-			NumEnums:      3,
-			NumMessages:   18,
+			NumEnums:      4,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/go/notifications/v1/notificationsv1connect/notifications.connect.go b/gen/go/notifications/v1/notificationsv1connect/notifications.connect.go
index a6caad3..b040616 100644
--- a/gen/go/notifications/v1/notificationsv1connect/notifications.connect.go
+++ b/gen/go/notifications/v1/notificationsv1connect/notifications.connect.go
@@ -54,6 +54,12 @@ const (
 	// NotificationServiceGetDeliveryStatusProcedure is the fully-qualified name of the
 	// NotificationService's GetDeliveryStatus RPC.
 	NotificationServiceGetDeliveryStatusProcedure = "/notifications.v1.NotificationService/GetDeliveryStatus"
+	// NotificationServiceUpsertTemplateProcedure is the fully-qualified name of the
+	// NotificationService's UpsertTemplate RPC.
+	NotificationServiceUpsertTemplateProcedure = "/notifications.v1.NotificationService/UpsertTemplate"
+	// NotificationServiceListTemplatesProcedure is the fully-qualified name of the
+	// NotificationService's ListTemplates RPC.
+	NotificationServiceListTemplatesProcedure = "/notifications.v1.NotificationService/ListTemplates"
 )
 
 // NotificationServiceClient is a client for the notifications.v1.NotificationService service.
@@ -65,6 +71,8 @@ type NotificationServiceClient interface {
 	ListHistory(context.Context, *connect.Request[v1.ListHistoryRequest]) (*connect.Response[v1.ListHistoryResponse], error)
 	RegisterChannel(context.Context, *connect.Request[v1.RegisterChannelRequest]) (*connect.Response[v1.RegisterChannelResponse], error)
 	GetDeliveryStatus(context.Context, *connect.Request[v1.GetDeliveryStatusRequest]) (*connect.Response[v1.GetDeliveryStatusResponse], error)
+	UpsertTemplate(context.Context, *connect.Request[v1.UpsertTemplateRequest]) (*connect.Response[v1.UpsertTemplateResponse], error)
+	ListTemplates(context.Context, *connect.Request[v1.ListTemplatesRequest]) (*connect.Response[v1.ListTemplatesResponse], error)
 }
 
 // NewNotificationServiceClient constructs a client for the notifications.v1.NotificationService
@@ -120,6 +128,18 @@ func NewNotificationServiceClient(httpClient connect.HTTPClient, baseURL string,
 			connect.WithSchema(notificationServiceMethods.ByName("GetDeliveryStatus")),
 			connect.WithClientOptions(opts...),
 		),
+		upsertTemplate: connect.NewClient[v1.UpsertTemplateRequest, v1.UpsertTemplateResponse](
+			httpClient,
+			baseURL+NotificationServiceUpsertTemplateProcedure,
+			connect.WithSchema(notificationServiceMethods.ByName("UpsertTemplate")),
+			connect.WithClientOptions(opts...),
+		),
+		listTemplates: connect.NewClient[v1.ListTemplatesRequest, v1.ListTemplatesResponse](
+			httpClient,
+			baseURL+NotificationServiceListTemplatesProcedure,
+			connect.WithSchema(notificationServiceMethods.ByName("ListTemplates")),
+			connect.WithClientOptions(opts...),
+		),
 	}
 }
 
@@ -132,6 +152,8 @@ type notificationServiceClient struct {
 	listHistory       *connect.Client[v1.ListHistoryRequest, v1.ListHistoryResponse]
 	registerChannel   *connect.Client[v1.RegisterChannelRequest, v1.RegisterChannelResponse]
 	getDeliveryStatus *connect.Client[v1.GetDeliveryStatusRequest, v1.GetDeliveryStatusResponse]
+	upsertTemplate    *connect.Client[v1.UpsertTemplateRequest, v1.UpsertTemplateResponse]
+	listTemplates     *connect.Client[v1.ListTemplatesRequest, v1.ListTemplatesResponse]
 }
 
 // Send calls notifications.v1.NotificationService.Send.
@@ -169,6 +191,16 @@ func (c *notificationServiceClient) GetDeliveryStatus(ctx context.Context, req *
 	return c.getDeliveryStatus.CallUnary(ctx, req)
 }
 
+// UpsertTemplate calls notifications.v1.NotificationService.UpsertTemplate.
+func (c *notificationServiceClient) UpsertTemplate(ctx context.Context, req *connect.Request[v1.UpsertTemplateRequest]) (*connect.Response[v1.UpsertTemplateResponse], error) {
+	return c.upsertTemplate.CallUnary(ctx, req)
+}
+
+// ListTemplates calls notifications.v1.NotificationService.ListTemplates.
+func (c *notificationServiceClient) ListTemplates(ctx context.Context, req *connect.Request[v1.ListTemplatesRequest]) (*connect.Response[v1.ListTemplatesResponse], error) {
+	return c.listTemplates.CallUnary(ctx, req)
+}
+
 // NotificationServiceHandler is an implementation of the notifications.v1.NotificationService
 // service.
 type NotificationServiceHandler interface {
@@ -179,6 +211,8 @@ type NotificationServiceHandler interface {
 	ListHistory(context.Context, *connect.Request[v1.ListHistoryRequest]) (*connect.Response[v1.ListHistoryResponse], error)
 	RegisterChannel(context.Context, *connect.Request[v1.RegisterChannelRequest]) (*connect.Response[v1.RegisterChannelResponse], error)
 	GetDeliveryStatus(context.Context, *connect.Request[v1.GetDeliveryStatusRequest]) (*connect.Response[v1.GetDeliveryStatusResponse], error)
+	UpsertTemplate(context.Context, *connect.Request[v1.UpsertTemplateRequest]) (*connect.Response[v1.UpsertTemplateResponse], error)
+	ListTemplates(context.Context, *connect.Request[v1.ListTemplatesRequest]) (*connect.Response[v1.ListTemplatesResponse], error)
 }
 
 // NewNotificationServiceHandler builds an HTTP handler from the service implementation. It returns
@@ -230,6 +264,18 @@ func NewNotificationServiceHandler(svc NotificationServiceHandler, opts ...conne
 		connect.WithSchema(notificationServiceMethods.ByName("GetDeliveryStatus")),
 		connect.WithHandlerOptions(opts...),
 	)
+	notificationServiceUpsertTemplateHandler := connect.NewUnaryHandler(
+		NotificationServiceUpsertTemplateProcedure,
+		svc.UpsertTemplate,
+		connect.WithSchema(notificationServiceMethods.ByName("UpsertTemplate")),
+		connect.WithHandlerOptions(opts...),
+	)
+	notificationServiceListTemplatesHandler := connect.NewUnaryHandler(
+		NotificationServiceListTemplatesProcedure,
+		svc.ListTemplates,
+		connect.WithSchema(notificationServiceMethods.ByName("ListTemplates")),
+		connect.WithHandlerOptions(opts...),
+	)
 	return "/notifications.v1.NotificationService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case NotificationServiceSendProcedure:
@@ -246,6 +292,10 @@ func NewNotificationServiceHandler(svc NotificationServiceHandler, opts ...conne
 			notificationServiceRegisterChannelHandler.ServeHTTP(w, r)
 		case NotificationServiceGetDeliveryStatusProcedure:
 			notificationServiceGetDeliveryStatusHandler.ServeHTTP(w, r)
+		case NotificationServiceUpsertTemplateProcedure:
+			notificationServiceUpsertTemplateHandler.ServeHTTP(w, r)
+		case NotificationServiceListTemplatesProcedure:
+			notificationServiceListTemplatesHandler.ServeHTTP(w, r)
 		default:
 			http.NotFound(w, r)
 		}
@@ -282,3 +332,11 @@ func (UnimplementedNotificationServiceHandler) RegisterChannel(context.Context,
 func (UnimplementedNotificationServiceHandler) GetDeliveryStatus(context.Context, *connect.Request[v1.GetDeliveryStatusRequest]) (*connect.Response[v1.GetDeliveryStatusResponse], error) {
 	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("notifications.v1.NotificationService.GetDeliveryStatus is not implemented"))
 }
+
+func (UnimplementedNotificationServiceHandler) UpsertTemplate(context.Context, *connect.Request[v1.UpsertTemplateRequest]) (*connect.Response[v1.UpsertTemplateResponse], error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("notifications.v1.NotificationService.UpsertTemplate is not implemented"))
+}
+
+func (UnimplementedNotificationServiceHandler) ListTemplates(context.Context, *connect.Request[v1.ListTemplatesRequest]) (*connect.Response[v1.ListTemplatesResponse], error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("notifications.v1.NotificationService.ListTemplates is not implemented"))
+}
diff --git a/gen/python/notifications/v1/notifications_pb2.py b/gen/python/notifications/v1/notifications_pb2.py
index fa33133..b82d221 100644
--- a/gen/python/notifications/v1/notifications_pb2.py
+++ b/gen/python/notifications/v1/notifications_pb2.py
@@ -25,7 +25,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$notifications/v1/notifications.proto\x12\x10notifications.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xeb\x03\n\x0cNotification\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x03 \x01(\tR\x0brecipientId\x12;\n\x07\x63hannel\x18\x04 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12\x36\n\x08priority\x18\x05 \x01(\x0e\x32\x1a.notifications.v1.PriorityR\x08priority\x12\x18\n\x07subject\x18\x06 \x01(\tR\x07subject\x12\x12\n\x04\x62ody\x18\x07 \x01(\tR\x04\x62ody\x12#\n\rmetadata_json\x18\x08 \x01(\tR\x0cmetadataJson\x12I\n\x0f\x64\x65livery_status\x18\t \x01(\x0e\x32 .notifications.v1.DeliveryStatusR\x0e\x64\x65liveryStatus\x12\x33\n\x07sent_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x06sentAt\x12=\n\x0c\x64\x65livered_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0b\x64\x65liveredAt\"\xaa\x01\n\x0e\x45scalationRule\x12\x45\n\x1fif_unacknowledged_after_seconds\x18\x01 \x01(\x05R\x1cifUnacknowledgedAfterSeconds\x12Q\n\x13\x65scalate_to_channel\x18\x02 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x11\x65scalateToChannel\"\xc2\x02\n\x17NotificationPreferences\x12\x17\n\x07user_id\x18\x01 \x01(\tR\x06userId\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\x12J\n\x0f\x64\x65\x66\x61ult_channel\x18\x03 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x0e\x64\x65\x66\x61ultChannel\x12*\n\x11quiet_hours_start\x18\x04 \x01(\tR\x0fquietHoursStart\x12&\n\x0fquiet_hours_end\x18\x05 \x01(\tR\rquietHoursEnd\x12K\n\x10\x65scalation_rules\x18\x06 \x03(\x0b\x32 .notifications.v1.EscalationRuleR\x0f\x65scalationRules\"\x9b\x02\n\x0bSendRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x02 \x01(\tR\x0brecipientId\x12;\n\x07\x63hannel\x18\x03 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12\x36\n\x08priority\x18\x04 \x01(\x0e\x32\x1a.notifications.v1.PriorityR\x08priority\x12\x18\n\x07subject\x18\x05 \x01(\tR\x07subject\x12\x12\n\x04\x62ody\x18\x06 \x01(\tR\x04\x62ody\x12#\n\rmetadata_json\x18\x07 \x01(\tR\x0cmetadataJson\"R\n\x0cSendResponse\x12\x42\n\x0cnotification\x18\x01 \x01(\x0b\x32\x1e.notifications.v1.NotificationR\x0cnotification\"W\n\x10SendBatchRequest\x12\x43\n\rnotifications\x18\x01 \x03(\x0b\x32\x1d.notifications.v1.SendRequestR\rnotifications\"|\n\x11SendBatchResponse\x12\x44\n\rnotifications\x18\x01 \x03(\x0b\x32\x1e.notifications.v1.NotificationR\rnotifications\x12!\n\x0c\x66\x61iled_count\x18\x02 \x01(\x05R\x0b\x66\x61iledCount\"S\n\x15GetPreferencesRequest\x12\x17\n\x07user_id\x18\x01 \x01(\tR\x06userId\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\"e\n\x16GetPreferencesResponse\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"d\n\x15SetPreferencesRequest\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"e\n\x16SetPreferencesResponse\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"\x88\x01\n\x12ListHistoryRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x02 \x01(\tR\x0brecipientId\x12\x14\n\x05limit\x18\x03 \x01(\x05R\x05limit\x12\x16\n\x06offset\x18\x04 \x01(\x05R\x06offset\"q\n\x13ListHistoryResponse\x12\x44\n\rnotifications\x18\x01 \x03(\x0b\x32\x1e.notifications.v1.NotificationR\rnotifications\x12\x14\n\x05total\x18\x02 \x01(\x05R\x05total\"\x81\x02\n\x16RegisterChannelRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12;\n\x07\x63hannel\x18\x02 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12L\n\x06\x63onfig\x18\x03 \x03(\x0b\x32\x34.notifications.v1.RegisterChannelRequest.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"3\n\x17RegisterChannelResponse\x12\x18\n\x07success\x18\x01 \x01(\x08R\x07success\"C\n\x18GetDeliveryStatusRequest\x12\'\n\x0fnotification_id\x18\x01 \x01(\tR\x0enotificationId\"\xbe\x01\n\x19GetDeliveryStatusResponse\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .notifications.v1.DeliveryStatusR\x06status\x12\x42\n\x0flast_updated_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\rlastUpdatedAt\x12#\n\rerror_message\x18\x03 \x01(\tR\x0c\x65rrorMessage*\xa6\x01\n\x0f\x44\x65liveryChannel\x12 \n\x1c\x44\x45LIVERY_CHANNEL_UNSPECIFIED\x10\x00\x12\x1a\n\x16\x44\x45LIVERY_CHANNEL_SLACK\x10\x01\x12\x1a\n\x16\x44\x45LIVERY_CHANNEL_EMAIL\x10\x02\x12\x1c\n\x18\x44\x45LIVERY_CHANNEL_WEBHOOK\x10\x03\x12\x1b\n\x17\x44\x45LIVERY_CHANNEL_IN_APP\x10\x04*s\n\x08Priority\x12\x18\n\x14PRIORITY_UNSPECIFIED\x10\x00\x12\x10\n\x0cPRIORITY_LOW\x10\x01\x12\x13\n\x0fPRIORITY_NORMAL\x10\x02\x12\x11\n\rPRIORITY_HIGH\x10\x03\x12\x13\n\x0fPRIORITY_URGENT\x10\x04*\xc0\x01\n\x0e\x44\x65liveryStatus\x12\x1f\n\x1b\x44\x45LIVERY_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x44\x45LIVERY_STATUS_PENDING\x10\x01\x12\x18\n\x14\x44\x45LIVERY_STATUS_SENT\x10\x02\x12\x1d\n\x19\x44\x45LIVERY_STATUS_DELIVERED\x10\x03\x12\x1a\n\x16\x44\x45LIVERY_STATUS_FAILED\x10\x04\x12\x1b\n\x17\x44\x45LIVERY_STATUS_BOUNCED\x10\x05\x32\xae\x05\n\x13NotificationService\x12\x45\n\x04Send\x12\x1d.notifications.v1.SendRequest\x1a\x1e.notifications.v1.SendResponse\x12T\n\tSendBatch\x12\".notifications.v1.SendBatchRequest\x1a#.notifications.v1.SendBatchResponse\x12\x63\n\x0eGetPreferences\x12\'.notifications.v1.GetPreferencesRequest\x1a(.notifications.v1.GetPreferencesResponse\x12\x63\n\x0eSetPreferences\x12\'.notifications.v1.SetPreferencesRequest\x1a(.notifications.v1.SetPreferencesResponse\x12Z\n\x0bListHistory\x12$.notifications.v1.ListHistoryRequest\x1a%.notifications.v1.ListHistoryResponse\x12\x66\n\x0fRegisterChannel\x12(.notifications.v1.RegisterChannelRequest\x1a).notifications.v1.RegisterChannelResponse\x12l\n\x11GetDeliveryStatus\x12*.notifications.v1.GetDeliveryStatusRequest\x1a+.notifications.v1.GetDeliveryStatusResponseBBZ@github.com/evalops/proto/gen/go/notifications/v1;notificationsv1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$notifications/v1/notifications.proto\x12\x10notifications.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xd4\x04\n\x0cNotification\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x03 \x01(\tR\x0brecipientId\x12;\n\x07\x63hannel\x18\x04 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12\x36\n\x08priority\x18\x05 \x01(\x0e\x32\x1a.notifications.v1.PriorityR\x08priority\x12\x18\n\x07subject\x18\x06 \x01(\tR\x07subject\x12\x12\n\x04\x62ody\x18\x07 \x01(\tR\x04\x62ody\x12#\n\rmetadata_json\x18\x08 \x01(\tR\x0cmetadataJson\x12I\n\x0f\x64\x65livery_status\x18\t \x01(\x0e\x32 .notifications.v1.DeliveryStatusR\x0e\x64\x65liveryStatus\x12\x33\n\x07sent_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x06sentAt\x12=\n\x0c\x64\x65livered_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0b\x64\x65liveredAt\x12\x42\n\x08\x63\x61tegory\x18\x0c \x01(\x0e\x32&.notifications.v1.NotificationCategoryR\x08\x63\x61tegory\x12#\n\rtemplate_name\x18\r \x01(\tR\x0ctemplateName\"\xaa\x01\n\x0e\x45scalationRule\x12\x45\n\x1fif_unacknowledged_after_seconds\x18\x01 \x01(\x05R\x1cifUnacknowledgedAfterSeconds\x12Q\n\x13\x65scalate_to_channel\x18\x02 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x11\x65scalateToChannel\"\x9c\x03\n\x17NotificationPreferences\x12\x17\n\x07user_id\x18\x01 \x01(\tR\x06userId\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\x12J\n\x0f\x64\x65\x66\x61ult_channel\x18\x03 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x0e\x64\x65\x66\x61ultChannel\x12*\n\x11quiet_hours_start\x18\x04 \x01(\tR\x0fquietHoursStart\x12&\n\x0fquiet_hours_end\x18\x05 \x01(\tR\rquietHoursEnd\x12K\n\x10\x65scalation_rules\x18\x06 \x03(\x0b\x32 .notifications.v1.EscalationRuleR\x0f\x65scalationRules\x12X\n\x11\x63\x61tegory_channels\x18\x07 \x03(\x0b\x32+.notifications.v1.CategoryChannelPreferenceR\x10\x63\x61tegoryChannels\"\x9c\x01\n\x19\x43\x61tegoryChannelPreference\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32&.notifications.v1.NotificationCategoryR\x08\x63\x61tegory\x12;\n\x07\x63hannel\x18\x02 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\"\xb3\x03\n\x14NotificationTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x42\n\x08\x63\x61tegory\x18\x04 \x01(\x0e\x32&.notifications.v1.NotificationCategoryR\x08\x63\x61tegory\x12;\n\x07\x63hannel\x18\x05 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12)\n\x10subject_template\x18\x06 \x01(\tR\x0fsubjectTemplate\x12#\n\rbody_template\x18\x07 \x01(\tR\x0c\x62odyTemplate\x12-\n\x12required_variables\x18\x08 \x03(\tR\x11requiredVariables\x12\x19\n\x08\x62uilt_in\x18\t \x01(\x08R\x07\x62uiltIn\x12\x39\n\nupdated_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\"\xbc\x03\n\x0bSendRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x02 \x01(\tR\x0brecipientId\x12;\n\x07\x63hannel\x18\x03 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12\x36\n\x08priority\x18\x04 \x01(\x0e\x32\x1a.notifications.v1.PriorityR\x08priority\x12\x18\n\x07subject\x18\x05 \x01(\tR\x07subject\x12\x12\n\x04\x62ody\x18\x06 \x01(\tR\x04\x62ody\x12#\n\rmetadata_json\x18\x07 \x01(\tR\x0cmetadataJson\x12\x42\n\x08\x63\x61tegory\x18\x08 \x01(\x0e\x32&.notifications.v1.NotificationCategoryR\x08\x63\x61tegory\x12#\n\rtemplate_name\x18\t \x01(\tR\x0ctemplateName\x12\x36\n\x17template_variables_json\x18\n \x01(\tR\x15templateVariablesJson\"R\n\x0cSendResponse\x12\x42\n\x0cnotification\x18\x01 \x01(\x0b\x32\x1e.notifications.v1.NotificationR\x0cnotification\"W\n\x10SendBatchRequest\x12\x43\n\rnotifications\x18\x01 \x03(\x0b\x32\x1d.notifications.v1.SendRequestR\rnotifications\"|\n\x11SendBatchResponse\x12\x44\n\rnotifications\x18\x01 \x03(\x0b\x32\x1e.notifications.v1.NotificationR\rnotifications\x12!\n\x0c\x66\x61iled_count\x18\x02 \x01(\x05R\x0b\x66\x61iledCount\"S\n\x15GetPreferencesRequest\x12\x17\n\x07user_id\x18\x01 \x01(\tR\x06userId\x12!\n\x0cworkspace_id\x18\x02 \x01(\tR\x0bworkspaceId\"e\n\x16GetPreferencesResponse\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"d\n\x15SetPreferencesRequest\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"e\n\x16SetPreferencesResponse\x12K\n\x0bpreferences\x18\x01 \x01(\x0b\x32).notifications.v1.NotificationPreferencesR\x0bpreferences\"\x88\x01\n\x12ListHistoryRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12!\n\x0crecipient_id\x18\x02 \x01(\tR\x0brecipientId\x12\x14\n\x05limit\x18\x03 \x01(\x05R\x05limit\x12\x16\n\x06offset\x18\x04 \x01(\x05R\x06offset\"q\n\x13ListHistoryResponse\x12\x44\n\rnotifications\x18\x01 \x03(\x0b\x32\x1e.notifications.v1.NotificationR\rnotifications\x12\x14\n\x05total\x18\x02 \x01(\x05R\x05total\"\x81\x02\n\x16RegisterChannelRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12;\n\x07\x63hannel\x18\x02 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12L\n\x06\x63onfig\x18\x03 \x03(\x0b\x32\x34.notifications.v1.RegisterChannelRequest.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"3\n\x17RegisterChannelResponse\x12\x18\n\x07success\x18\x01 \x01(\x08R\x07success\"C\n\x18GetDeliveryStatusRequest\x12\'\n\x0fnotification_id\x18\x01 \x01(\tR\x0enotificationId\"\xbe\x01\n\x19GetDeliveryStatusResponse\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .notifications.v1.DeliveryStatusR\x06status\x12\x42\n\x0flast_updated_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\rlastUpdatedAt\x12#\n\rerror_message\x18\x03 \x01(\tR\x0c\x65rrorMessage\"[\n\x15UpsertTemplateRequest\x12\x42\n\x08template\x18\x01 \x01(\x0b\x32&.notifications.v1.NotificationTemplateR\x08template\"\\\n\x16UpsertTemplateResponse\x12\x42\n\x08template\x18\x01 \x01(\x0b\x32&.notifications.v1.NotificationTemplateR\x08template\"\xe4\x01\n\x14ListTemplatesRequest\x12!\n\x0cworkspace_id\x18\x01 \x01(\tR\x0bworkspaceId\x12\x42\n\x08\x63\x61tegory\x18\x02 \x01(\x0e\x32&.notifications.v1.NotificationCategoryR\x08\x63\x61tegory\x12;\n\x07\x63hannel\x18\x03 \x01(\x0e\x32!.notifications.v1.DeliveryChannelR\x07\x63hannel\x12(\n\x10include_built_in\x18\x04 \x01(\x08R\x0eincludeBuiltIn\"]\n\x15ListTemplatesResponse\x12\x44\n\ttemplates\x18\x01 \x03(\x0b\x32&.notifications.v1.NotificationTemplateR\ttemplates*\xa6\x01\n\x0f\x44\x65liveryChannel\x12 \n\x1c\x44\x45LIVERY_CHANNEL_UNSPECIFIED\x10\x00\x12\x1a\n\x16\x44\x45LIVERY_CHANNEL_SLACK\x10\x01\x12\x1a\n\x16\x44\x45LIVERY_CHANNEL_EMAIL\x10\x02\x12\x1c\n\x18\x44\x45LIVERY_CHANNEL_WEBHOOK\x10\x03\x12\x1b\n\x17\x44\x45LIVERY_CHANNEL_IN_APP\x10\x04*s\n\x08Priority\x12\x18\n\x14PRIORITY_UNSPECIFIED\x10\x00\x12\x10\n\x0cPRIORITY_LOW\x10\x01\x12\x13\n\x0fPRIORITY_NORMAL\x10\x02\x12\x11\n\rPRIORITY_HIGH\x10\x03\x12\x13\n\x0fPRIORITY_URGENT\x10\x04*\xec\x02\n\x14NotificationCategory\x12%\n!NOTIFICATION_CATEGORY_UNSPECIFIED\x10\x00\x12*\n&NOTIFICATION_CATEGORY_APPROVAL_REQUEST\x10\x01\x12&\n\"NOTIFICATION_CATEGORY_BUDGET_ALERT\x10\x02\x12\'\n#NOTIFICATION_CATEGORY_PII_DETECTION\x10\x03\x12\"\n\x1eNOTIFICATION_CATEGORY_INCIDENT\x10\x04\x12 \n\x1cNOTIFICATION_CATEGORY_REPORT\x10\x05\x12%\n!NOTIFICATION_CATEGORY_INTEGRATION\x10\x06\x12 \n\x1cNOTIFICATION_CATEGORY_DIGEST\x10\x07\x12!\n\x1dNOTIFICATION_CATEGORY_GENERAL\x10\x08*\xc0\x01\n\x0e\x44\x65liveryStatus\x12\x1f\n\x1b\x44\x45LIVERY_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x44\x45LIVERY_STATUS_PENDING\x10\x01\x12\x18\n\x14\x44\x45LIVERY_STATUS_SENT\x10\x02\x12\x1d\n\x19\x44\x45LIVERY_STATUS_DELIVERED\x10\x03\x12\x1a\n\x16\x44\x45LIVERY_STATUS_FAILED\x10\x04\x12\x1b\n\x17\x44\x45LIVERY_STATUS_BOUNCED\x10\x05\x32\xf5\x06\n\x13NotificationService\x12\x45\n\x04Send\x12\x1d.notifications.v1.SendRequest\x1a\x1e.notifications.v1.SendResponse\x12T\n\tSendBatch\x12\".notifications.v1.SendBatchRequest\x1a#.notifications.v1.SendBatchResponse\x12\x63\n\x0eGetPreferences\x12\'.notifications.v1.GetPreferencesRequest\x1a(.notifications.v1.GetPreferencesResponse\x12\x63\n\x0eSetPreferences\x12\'.notifications.v1.SetPreferencesRequest\x1a(.notifications.v1.SetPreferencesResponse\x12Z\n\x0bListHistory\x12$.notifications.v1.ListHistoryRequest\x1a%.notifications.v1.ListHistoryResponse\x12\x66\n\x0fRegisterChannel\x12(.notifications.v1.RegisterChannelRequest\x1a).notifications.v1.RegisterChannelResponse\x12l\n\x11GetDeliveryStatus\x12*.notifications.v1.GetDeliveryStatusRequest\x1a+.notifications.v1.GetDeliveryStatusResponse\x12\x63\n\x0eUpsertTemplate\x12\'.notifications.v1.UpsertTemplateRequest\x1a(.notifications.v1.UpsertTemplateResponse\x12`\n\rListTemplates\x12&.notifications.v1.ListTemplatesRequest\x1a\'.notifications.v1.ListTemplatesResponseBBZ@github.com/evalops/proto/gen/go/notifications/v1;notificationsv1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -35,48 +35,62 @@
   _globals['DESCRIPTOR']._serialized_options = b'Z@github.com/evalops/proto/gen/go/notifications/v1;notificationsv1'
   _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._loaded_options = None
   _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._serialized_options = b'8\001'
-  _globals['_DELIVERYCHANNEL']._serialized_start=2891
-  _globals['_DELIVERYCHANNEL']._serialized_end=3057
-  _globals['_PRIORITY']._serialized_start=3059
-  _globals['_PRIORITY']._serialized_end=3174
-  _globals['_DELIVERYSTATUS']._serialized_start=3177
-  _globals['_DELIVERYSTATUS']._serialized_end=3369
+  _globals['_DELIVERYCHANNEL']._serialized_start=4357
+  _globals['_DELIVERYCHANNEL']._serialized_end=4523
+  _globals['_PRIORITY']._serialized_start=4525
+  _globals['_PRIORITY']._serialized_end=4640
+  _globals['_NOTIFICATIONCATEGORY']._serialized_start=4643
+  _globals['_NOTIFICATIONCATEGORY']._serialized_end=5007
+  _globals['_DELIVERYSTATUS']._serialized_start=5010
+  _globals['_DELIVERYSTATUS']._serialized_end=5202
   _globals['_NOTIFICATION']._serialized_start=92
-  _globals['_NOTIFICATION']._serialized_end=583
-  _globals['_ESCALATIONRULE']._serialized_start=586
-  _globals['_ESCALATIONRULE']._serialized_end=756
-  _globals['_NOTIFICATIONPREFERENCES']._serialized_start=759
-  _globals['_NOTIFICATIONPREFERENCES']._serialized_end=1081
-  _globals['_SENDREQUEST']._serialized_start=1084
-  _globals['_SENDREQUEST']._serialized_end=1367
-  _globals['_SENDRESPONSE']._serialized_start=1369
-  _globals['_SENDRESPONSE']._serialized_end=1451
-  _globals['_SENDBATCHREQUEST']._serialized_start=1453
-  _globals['_SENDBATCHREQUEST']._serialized_end=1540
-  _globals['_SENDBATCHRESPONSE']._serialized_start=1542
-  _globals['_SENDBATCHRESPONSE']._serialized_end=1666
-  _globals['_GETPREFERENCESREQUEST']._serialized_start=1668
-  _globals['_GETPREFERENCESREQUEST']._serialized_end=1751
-  _globals['_GETPREFERENCESRESPONSE']._serialized_start=1753
-  _globals['_GETPREFERENCESRESPONSE']._serialized_end=1854
-  _globals['_SETPREFERENCESREQUEST']._serialized_start=1856
-  _globals['_SETPREFERENCESREQUEST']._serialized_end=1956
-  _globals['_SETPREFERENCESRESPONSE']._serialized_start=1958
-  _globals['_SETPREFERENCESRESPONSE']._serialized_end=2059
-  _globals['_LISTHISTORYREQUEST']._serialized_start=2062
-  _globals['_LISTHISTORYREQUEST']._serialized_end=2198
-  _globals['_LISTHISTORYRESPONSE']._serialized_start=2200
-  _globals['_LISTHISTORYRESPONSE']._serialized_end=2313
-  _globals['_REGISTERCHANNELREQUEST']._serialized_start=2316
-  _globals['_REGISTERCHANNELREQUEST']._serialized_end=2573
-  _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._serialized_start=2516
-  _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._serialized_end=2573
-  _globals['_REGISTERCHANNELRESPONSE']._serialized_start=2575
-  _globals['_REGISTERCHANNELRESPONSE']._serialized_end=2626
-  _globals['_GETDELIVERYSTATUSREQUEST']._serialized_start=2628
-  _globals['_GETDELIVERYSTATUSREQUEST']._serialized_end=2695
-  _globals['_GETDELIVERYSTATUSRESPONSE']._serialized_start=2698
-  _globals['_GETDELIVERYSTATUSRESPONSE']._serialized_end=2888
-  _globals['_NOTIFICATIONSERVICE']._serialized_start=3372
-  _globals['_NOTIFICATIONSERVICE']._serialized_end=4058
+  _globals['_NOTIFICATION']._serialized_end=688
+  _globals['_ESCALATIONRULE']._serialized_start=691
+  _globals['_ESCALATIONRULE']._serialized_end=861
+  _globals['_NOTIFICATIONPREFERENCES']._serialized_start=864
+  _globals['_NOTIFICATIONPREFERENCES']._serialized_end=1276
+  _globals['_CATEGORYCHANNELPREFERENCE']._serialized_start=1279
+  _globals['_CATEGORYCHANNELPREFERENCE']._serialized_end=1435
+  _globals['_NOTIFICATIONTEMPLATE']._serialized_start=1438
+  _globals['_NOTIFICATIONTEMPLATE']._serialized_end=1873
+  _globals['_SENDREQUEST']._serialized_start=1876
+  _globals['_SENDREQUEST']._serialized_end=2320
+  _globals['_SENDRESPONSE']._serialized_start=2322
+  _globals['_SENDRESPONSE']._serialized_end=2404
+  _globals['_SENDBATCHREQUEST']._serialized_start=2406
+  _globals['_SENDBATCHREQUEST']._serialized_end=2493
+  _globals['_SENDBATCHRESPONSE']._serialized_start=2495
+  _globals['_SENDBATCHRESPONSE']._serialized_end=2619
+  _globals['_GETPREFERENCESREQUEST']._serialized_start=2621
+  _globals['_GETPREFERENCESREQUEST']._serialized_end=2704
+  _globals['_GETPREFERENCESRESPONSE']._serialized_start=2706
+  _globals['_GETPREFERENCESRESPONSE']._serialized_end=2807
+  _globals['_SETPREFERENCESREQUEST']._serialized_start=2809
+  _globals['_SETPREFERENCESREQUEST']._serialized_end=2909
+  _globals['_SETPREFERENCESRESPONSE']._serialized_start=2911
+  _globals['_SETPREFERENCESRESPONSE']._serialized_end=3012
+  _globals['_LISTHISTORYREQUEST']._serialized_start=3015
+  _globals['_LISTHISTORYREQUEST']._serialized_end=3151
+  _globals['_LISTHISTORYRESPONSE']._serialized_start=3153
+  _globals['_LISTHISTORYRESPONSE']._serialized_end=3266
+  _globals['_REGISTERCHANNELREQUEST']._serialized_start=3269
+  _globals['_REGISTERCHANNELREQUEST']._serialized_end=3526
+  _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._serialized_start=3469
+  _globals['_REGISTERCHANNELREQUEST_CONFIGENTRY']._serialized_end=3526
+  _globals['_REGISTERCHANNELRESPONSE']._serialized_start=3528
+  _globals['_REGISTERCHANNELRESPONSE']._serialized_end=3579
+  _globals['_GETDELIVERYSTATUSREQUEST']._serialized_start=3581
+  _globals['_GETDELIVERYSTATUSREQUEST']._serialized_end=3648
+  _globals['_GETDELIVERYSTATUSRESPONSE']._serialized_start=3651
+  _globals['_GETDELIVERYSTATUSRESPONSE']._serialized_end=3841
+  _globals['_UPSERTTEMPLATEREQUEST']._serialized_start=3843
+  _globals['_UPSERTTEMPLATEREQUEST']._serialized_end=3934
+  _globals['_UPSERTTEMPLATERESPONSE']._serialized_start=3936
+  _globals['_UPSERTTEMPLATERESPONSE']._serialized_end=4028
+  _globals['_LISTTEMPLATESREQUEST']._serialized_start=4031
+  _globals['_LISTTEMPLATESREQUEST']._serialized_end=4259
+  _globals['_LISTTEMPLATESRESPONSE']._serialized_start=4261
+  _globals['_LISTTEMPLATESRESPONSE']._serialized_end=4354
+  _globals['_NOTIFICATIONSERVICE']._serialized_start=5205
+  _globals['_NOTIFICATIONSERVICE']._serialized_end=6090
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/ts/notifications/v1/notifications_connect.ts b/gen/ts/notifications/v1/notifications_connect.ts
index f06cfd8..5bbbd0c 100644
--- a/gen/ts/notifications/v1/notifications_connect.ts
+++ b/gen/ts/notifications/v1/notifications_connect.ts
@@ -3,7 +3,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { GetDeliveryStatusRequest, GetDeliveryStatusResponse, GetPreferencesRequest, GetPreferencesResponse, ListHistoryRequest, ListHistoryResponse, RegisterChannelRequest, RegisterChannelResponse, SendBatchRequest, SendBatchResponse, SendRequest, SendResponse, SetPreferencesRequest, SetPreferencesResponse } from "./notifications_pb.js";
+import { GetDeliveryStatusRequest, GetDeliveryStatusResponse, GetPreferencesRequest, GetPreferencesResponse, ListHistoryRequest, ListHistoryResponse, ListTemplatesRequest, ListTemplatesResponse, RegisterChannelRequest, RegisterChannelResponse, SendBatchRequest, SendBatchResponse, SendRequest, SendResponse, SetPreferencesRequest, SetPreferencesResponse, UpsertTemplateRequest, UpsertTemplateResponse } from "./notifications_pb.js";
 import { MethodKind } from "@bufbuild/protobuf";
 
 /**
@@ -77,6 +77,24 @@ export const NotificationService = {
       O: GetDeliveryStatusResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * @generated from rpc notifications.v1.NotificationService.UpsertTemplate
+     */
+    upsertTemplate: {
+      name: "UpsertTemplate",
+      I: UpsertTemplateRequest,
+      O: UpsertTemplateResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc notifications.v1.NotificationService.ListTemplates
+     */
+    listTemplates: {
+      name: "ListTemplates",
+      I: ListTemplatesRequest,
+      O: ListTemplatesResponse,
+      kind: MethodKind.Unary,
+    },
   }
 } as const;
 
diff --git a/gen/ts/notifications/v1/notifications_pb.ts b/gen/ts/notifications/v1/notifications_pb.ts
index 23d0e1f..02971fe 100644
--- a/gen/ts/notifications/v1/notifications_pb.ts
+++ b/gen/ts/notifications/v1/notifications_pb.ts
@@ -12,7 +12,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file notifications/v1/notifications.proto.
  */
 export const file_notifications_v1_notifications: GenFile = /*@__PURE__*/
-  fileDesc("CiRub3RpZmljYXRpb25zL3YxL25vdGlmaWNhdGlvbnMucHJvdG8SEG5vdGlmaWNhdGlvbnMudjEi+AIKDE5vdGlmaWNhdGlvbhIKCgJpZBgBIAEoCRIUCgx3b3Jrc3BhY2VfaWQYAiABKAkSFAoMcmVjaXBpZW50X2lkGAMgASgJEjIKB2NoYW5uZWwYBCABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIsCghwcmlvcml0eRgFIAEoDjIaLm5vdGlmaWNhdGlvbnMudjEuUHJpb3JpdHkSDwoHc3ViamVjdBgGIAEoCRIMCgRib2R5GAcgASgJEhUKDW1ldGFkYXRhX2pzb24YCCABKAkSOQoPZGVsaXZlcnlfc3RhdHVzGAkgASgOMiAubm90aWZpY2F0aW9ucy52MS5EZWxpdmVyeVN0YXR1cxIrCgdzZW50X2F0GAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIwCgxkZWxpdmVyZWRfYXQYCyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wInkKDkVzY2FsYXRpb25SdWxlEicKH2lmX3VuYWNrbm93bGVkZ2VkX2FmdGVyX3NlY29uZHMYASABKAUSPgoTZXNjYWxhdGVfdG9fY2hhbm5lbBgCIAEoDjIhLm5vdGlmaWNhdGlvbnMudjEuRGVsaXZlcnlDaGFubmVsIuwBChdOb3RpZmljYXRpb25QcmVmZXJlbmNlcxIPCgd1c2VyX2lkGAEgASgJEhQKDHdvcmtzcGFjZV9pZBgCIAEoCRI6Cg9kZWZhdWx0X2NoYW5uZWwYAyABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIZChFxdWlldF9ob3Vyc19zdGFydBgEIAEoCRIXCg9xdWlldF9ob3Vyc19lbmQYBSABKAkSOgoQZXNjYWxhdGlvbl9ydWxlcxgGIAMoCzIgLm5vdGlmaWNhdGlvbnMudjEuRXNjYWxhdGlvblJ1bGUi0QEKC1NlbmRSZXF1ZXN0EhQKDHdvcmtzcGFjZV9pZBgBIAEoCRIUCgxyZWNpcGllbnRfaWQYAiABKAkSMgoHY2hhbm5lbBgDIAEoDjIhLm5vdGlmaWNhdGlvbnMudjEuRGVsaXZlcnlDaGFubmVsEiwKCHByaW9yaXR5GAQgASgOMhoubm90aWZpY2F0aW9ucy52MS5Qcmlvcml0eRIPCgdzdWJqZWN0GAUgASgJEgwKBGJvZHkYBiABKAkSFQoNbWV0YWRhdGFfanNvbhgHIAEoCSJECgxTZW5kUmVzcG9uc2USNAoMbm90aWZpY2F0aW9uGAEgASgLMh4ubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb24iSAoQU2VuZEJhdGNoUmVxdWVzdBI0Cg1ub3RpZmljYXRpb25zGAEgAygLMh0ubm90aWZpY2F0aW9ucy52MS5TZW5kUmVxdWVzdCJgChFTZW5kQmF0Y2hSZXNwb25zZRI1Cg1ub3RpZmljYXRpb25zGAEgAygLMh4ubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb24SFAoMZmFpbGVkX2NvdW50GAIgASgFIj4KFUdldFByZWZlcmVuY2VzUmVxdWVzdBIPCgd1c2VyX2lkGAEgASgJEhQKDHdvcmtzcGFjZV9pZBgCIAEoCSJYChZHZXRQcmVmZXJlbmNlc1Jlc3BvbnNlEj4KC3ByZWZlcmVuY2VzGAEgASgLMikubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25QcmVmZXJlbmNlcyJXChVTZXRQcmVmZXJlbmNlc1JlcXVlc3QSPgoLcHJlZmVyZW5jZXMYASABKAsyKS5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvblByZWZlcmVuY2VzIlgKFlNldFByZWZlcmVuY2VzUmVzcG9uc2USPgoLcHJlZmVyZW5jZXMYASABKAsyKS5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvblByZWZlcmVuY2VzIl8KEkxpc3RIaXN0b3J5UmVxdWVzdBIUCgx3b3Jrc3BhY2VfaWQYASABKAkSFAoMcmVjaXBpZW50X2lkGAIgASgJEg0KBWxpbWl0GAMgASgFEg4KBm9mZnNldBgEIAEoBSJbChNMaXN0SGlzdG9yeVJlc3BvbnNlEjUKDW5vdGlmaWNhdGlvbnMYASADKAsyHi5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvbhINCgV0b3RhbBgCIAEoBSLXAQoWUmVnaXN0ZXJDaGFubmVsUmVxdWVzdBIUCgx3b3Jrc3BhY2VfaWQYASABKAkSMgoHY2hhbm5lbBgCIAEoDjIhLm5vdGlmaWNhdGlvbnMudjEuRGVsaXZlcnlDaGFubmVsEkQKBmNvbmZpZxgDIAMoCzI0Lm5vdGlmaWNhdGlvbnMudjEuUmVnaXN0ZXJDaGFubmVsUmVxdWVzdC5Db25maWdFbnRyeRotCgtDb25maWdFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBIioKF1JlZ2lzdGVyQ2hhbm5lbFJlc3BvbnNlEg8KB3N1Y2Nlc3MYASABKAgiMwoYR2V0RGVsaXZlcnlTdGF0dXNSZXF1ZXN0EhcKD25vdGlmaWNhdGlvbl9pZBgBIAEoCSKZAQoZR2V0RGVsaXZlcnlTdGF0dXNSZXNwb25zZRIwCgZzdGF0dXMYASABKA4yIC5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5U3RhdHVzEjMKD2xhc3RfdXBkYXRlZF9hdBgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASFQoNZXJyb3JfbWVzc2FnZRgDIAEoCSqmAQoPRGVsaXZlcnlDaGFubmVsEiAKHERFTElWRVJZX0NIQU5ORUxfVU5TUEVDSUZJRUQQABIaChZERUxJVkVSWV9DSEFOTkVMX1NMQUNLEAESGgoWREVMSVZFUllfQ0hBTk5FTF9FTUFJTBACEhwKGERFTElWRVJZX0NIQU5ORUxfV0VCSE9PSxADEhsKF0RFTElWRVJZX0NIQU5ORUxfSU5fQVBQEAQqcwoIUHJpb3JpdHkSGAoUUFJJT1JJVFlfVU5TUEVDSUZJRUQQABIQCgxQUklPUklUWV9MT1cQARITCg9QUklPUklUWV9OT1JNQUwQAhIRCg1QUklPUklUWV9ISUdIEAMSEwoPUFJJT1JJVFlfVVJHRU5UEAQqwAEKDkRlbGl2ZXJ5U3RhdHVzEh8KG0RFTElWRVJZX1NUQVRVU19VTlNQRUNJRklFRBAAEhsKF0RFTElWRVJZX1NUQVRVU19QRU5ESU5HEAESGAoUREVMSVZFUllfU1RBVFVTX1NFTlQQAhIdChlERUxJVkVSWV9TVEFUVVNfREVMSVZFUkVEEAMSGgoWREVMSVZFUllfU1RBVFVTX0ZBSUxFRBAEEhsKF0RFTElWRVJZX1NUQVRVU19CT1VOQ0VEEAUyrgUKE05vdGlmaWNhdGlvblNlcnZpY2USRQoEU2VuZBIdLm5vdGlmaWNhdGlvbnMudjEuU2VuZFJlcXVlc3QaHi5ub3RpZmljYXRpb25zLnYxLlNlbmRSZXNwb25zZRJUCglTZW5kQmF0Y2gSIi5ub3RpZmljYXRpb25zLnYxLlNlbmRCYXRjaFJlcXVlc3QaIy5ub3RpZmljYXRpb25zLnYxLlNlbmRCYXRjaFJlc3BvbnNlEmMKDkdldFByZWZlcmVuY2VzEicubm90aWZpY2F0aW9ucy52MS5HZXRQcmVmZXJlbmNlc1JlcXVlc3QaKC5ub3RpZmljYXRpb25zLnYxLkdldFByZWZlcmVuY2VzUmVzcG9uc2USYwoOU2V0UHJlZmVyZW5jZXMSJy5ub3RpZmljYXRpb25zLnYxLlNldFByZWZlcmVuY2VzUmVxdWVzdBooLm5vdGlmaWNhdGlvbnMudjEuU2V0UHJlZmVyZW5jZXNSZXNwb25zZRJaCgtMaXN0SGlzdG9yeRIkLm5vdGlmaWNhdGlvbnMudjEuTGlzdEhpc3RvcnlSZXF1ZXN0GiUubm90aWZpY2F0aW9ucy52MS5MaXN0SGlzdG9yeVJlc3BvbnNlEmYKD1JlZ2lzdGVyQ2hhbm5lbBIoLm5vdGlmaWNhdGlvbnMudjEuUmVnaXN0ZXJDaGFubmVsUmVxdWVzdBopLm5vdGlmaWNhdGlvbnMudjEuUmVnaXN0ZXJDaGFubmVsUmVzcG9uc2USbAoRR2V0RGVsaXZlcnlTdGF0dXMSKi5ub3RpZmljYXRpb25zLnYxLkdldERlbGl2ZXJ5U3RhdHVzUmVxdWVzdBorLm5vdGlmaWNhdGlvbnMudjEuR2V0RGVsaXZlcnlTdGF0dXNSZXNwb25zZUJCWkBnaXRodWIuY29tL2V2YWxvcHMvcHJvdG8vZ2VuL2dvL25vdGlmaWNhdGlvbnMvdjE7bm90aWZpY2F0aW9uc3YxYgZwcm90bzM", [file_google_protobuf_timestamp]);
+  fileDesc("CiRub3RpZmljYXRpb25zL3YxL25vdGlmaWNhdGlvbnMucHJvdG8SEG5vdGlmaWNhdGlvbnMudjEiyQMKDE5vdGlmaWNhdGlvbhIKCgJpZBgBIAEoCRIUCgx3b3Jrc3BhY2VfaWQYAiABKAkSFAoMcmVjaXBpZW50X2lkGAMgASgJEjIKB2NoYW5uZWwYBCABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIsCghwcmlvcml0eRgFIAEoDjIaLm5vdGlmaWNhdGlvbnMudjEuUHJpb3JpdHkSDwoHc3ViamVjdBgGIAEoCRIMCgRib2R5GAcgASgJEhUKDW1ldGFkYXRhX2pzb24YCCABKAkSOQoPZGVsaXZlcnlfc3RhdHVzGAkgASgOMiAubm90aWZpY2F0aW9ucy52MS5EZWxpdmVyeVN0YXR1cxIrCgdzZW50X2F0GAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIwCgxkZWxpdmVyZWRfYXQYCyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjgKCGNhdGVnb3J5GAwgASgOMiYubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25DYXRlZ29yeRIVCg10ZW1wbGF0ZV9uYW1lGA0gASgJInkKDkVzY2FsYXRpb25SdWxlEicKH2lmX3VuYWNrbm93bGVkZ2VkX2FmdGVyX3NlY29uZHMYASABKAUSPgoTZXNjYWxhdGVfdG9fY2hhbm5lbBgCIAEoDjIhLm5vdGlmaWNhdGlvbnMudjEuRGVsaXZlcnlDaGFubmVsIrQCChdOb3RpZmljYXRpb25QcmVmZXJlbmNlcxIPCgd1c2VyX2lkGAEgASgJEhQKDHdvcmtzcGFjZV9pZBgCIAEoCRI6Cg9kZWZhdWx0X2NoYW5uZWwYAyABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIZChFxdWlldF9ob3Vyc19zdGFydBgEIAEoCRIXCg9xdWlldF9ob3Vyc19lbmQYBSABKAkSOgoQZXNjYWxhdGlvbl9ydWxlcxgGIAMoCzIgLm5vdGlmaWNhdGlvbnMudjEuRXNjYWxhdGlvblJ1bGUSRgoRY2F0ZWdvcnlfY2hhbm5lbHMYByADKAsyKy5ub3RpZmljYXRpb25zLnYxLkNhdGVnb3J5Q2hhbm5lbFByZWZlcmVuY2UiiQEKGUNhdGVnb3J5Q2hhbm5lbFByZWZlcmVuY2USOAoIY2F0ZWdvcnkYASABKA4yJi5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvbkNhdGVnb3J5EjIKB2NoYW5uZWwYAiABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbCLDAgoUTm90aWZpY2F0aW9uVGVtcGxhdGUSCgoCaWQYASABKAkSFAoMd29ya3NwYWNlX2lkGAIgASgJEgwKBG5hbWUYAyABKAkSOAoIY2F0ZWdvcnkYBCABKA4yJi5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvbkNhdGVnb3J5EjIKB2NoYW5uZWwYBSABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIYChBzdWJqZWN0X3RlbXBsYXRlGAYgASgJEhUKDWJvZHlfdGVtcGxhdGUYByABKAkSGgoScmVxdWlyZWRfdmFyaWFibGVzGAggAygJEhAKCGJ1aWx0X2luGAkgASgIEi4KCnVwZGF0ZWRfYXQYCiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wIsMCCgtTZW5kUmVxdWVzdBIUCgx3b3Jrc3BhY2VfaWQYASABKAkSFAoMcmVjaXBpZW50X2lkGAIgASgJEjIKB2NoYW5uZWwYAyABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBIsCghwcmlvcml0eRgEIAEoDjIaLm5vdGlmaWNhdGlvbnMudjEuUHJpb3JpdHkSDwoHc3ViamVjdBgFIAEoCRIMCgRib2R5GAYgASgJEhUKDW1ldGFkYXRhX2pzb24YByABKAkSOAoIY2F0ZWdvcnkYCCABKA4yJi5ub3RpZmljYXRpb25zLnYxLk5vdGlmaWNhdGlvbkNhdGVnb3J5EhUKDXRlbXBsYXRlX25hbWUYCSABKAkSHwoXdGVtcGxhdGVfdmFyaWFibGVzX2pzb24YCiABKAkiRAoMU2VuZFJlc3BvbnNlEjQKDG5vdGlmaWNhdGlvbhgBIAEoCzIeLm5vdGlmaWNhdGlvbnMudjEuTm90aWZpY2F0aW9uIkgKEFNlbmRCYXRjaFJlcXVlc3QSNAoNbm90aWZpY2F0aW9ucxgBIAMoCzIdLm5vdGlmaWNhdGlvbnMudjEuU2VuZFJlcXVlc3QiYAoRU2VuZEJhdGNoUmVzcG9uc2USNQoNbm90aWZpY2F0aW9ucxgBIAMoCzIeLm5vdGlmaWNhdGlvbnMudjEuTm90aWZpY2F0aW9uEhQKDGZhaWxlZF9jb3VudBgCIAEoBSI+ChVHZXRQcmVmZXJlbmNlc1JlcXVlc3QSDwoHdXNlcl9pZBgBIAEoCRIUCgx3b3Jrc3BhY2VfaWQYAiABKAkiWAoWR2V0UHJlZmVyZW5jZXNSZXNwb25zZRI+CgtwcmVmZXJlbmNlcxgBIAEoCzIpLm5vdGlmaWNhdGlvbnMudjEuTm90aWZpY2F0aW9uUHJlZmVyZW5jZXMiVwoVU2V0UHJlZmVyZW5jZXNSZXF1ZXN0Ej4KC3ByZWZlcmVuY2VzGAEgASgLMikubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25QcmVmZXJlbmNlcyJYChZTZXRQcmVmZXJlbmNlc1Jlc3BvbnNlEj4KC3ByZWZlcmVuY2VzGAEgASgLMikubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25QcmVmZXJlbmNlcyJfChJMaXN0SGlzdG9yeVJlcXVlc3QSFAoMd29ya3NwYWNlX2lkGAEgASgJEhQKDHJlY2lwaWVudF9pZBgCIAEoCRINCgVsaW1pdBgDIAEoBRIOCgZvZmZzZXQYBCABKAUiWwoTTGlzdEhpc3RvcnlSZXNwb25zZRI1Cg1ub3RpZmljYXRpb25zGAEgAygLMh4ubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb24SDQoFdG90YWwYAiABKAUi1wEKFlJlZ2lzdGVyQ2hhbm5lbFJlcXVlc3QSFAoMd29ya3NwYWNlX2lkGAEgASgJEjIKB2NoYW5uZWwYAiABKA4yIS5ub3RpZmljYXRpb25zLnYxLkRlbGl2ZXJ5Q2hhbm5lbBJECgZjb25maWcYAyADKAsyNC5ub3RpZmljYXRpb25zLnYxLlJlZ2lzdGVyQ2hhbm5lbFJlcXVlc3QuQ29uZmlnRW50cnkaLQoLQ29uZmlnRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASIqChdSZWdpc3RlckNoYW5uZWxSZXNwb25zZRIPCgdzdWNjZXNzGAEgASgIIjMKGEdldERlbGl2ZXJ5U3RhdHVzUmVxdWVzdBIXCg9ub3RpZmljYXRpb25faWQYASABKAkimQEKGUdldERlbGl2ZXJ5U3RhdHVzUmVzcG9uc2USMAoGc3RhdHVzGAEgASgOMiAubm90aWZpY2F0aW9ucy52MS5EZWxpdmVyeVN0YXR1cxIzCg9sYXN0X3VwZGF0ZWRfYXQYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhUKDWVycm9yX21lc3NhZ2UYAyABKAkiUQoVVXBzZXJ0VGVtcGxhdGVSZXF1ZXN0EjgKCHRlbXBsYXRlGAEgASgLMiYubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25UZW1wbGF0ZSJSChZVcHNlcnRUZW1wbGF0ZVJlc3BvbnNlEjgKCHRlbXBsYXRlGAEgASgLMiYubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25UZW1wbGF0ZSK0AQoUTGlzdFRlbXBsYXRlc1JlcXVlc3QSFAoMd29ya3NwYWNlX2lkGAEgASgJEjgKCGNhdGVnb3J5GAIgASgOMiYubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25DYXRlZ29yeRIyCgdjaGFubmVsGAMgASgOMiEubm90aWZpY2F0aW9ucy52MS5EZWxpdmVyeUNoYW5uZWwSGAoQaW5jbHVkZV9idWlsdF9pbhgEIAEoCCJSChVMaXN0VGVtcGxhdGVzUmVzcG9uc2USOQoJdGVtcGxhdGVzGAEgAygLMiYubm90aWZpY2F0aW9ucy52MS5Ob3RpZmljYXRpb25UZW1wbGF0ZSqmAQoPRGVsaXZlcnlDaGFubmVsEiAKHERFTElWRVJZX0NIQU5ORUxfVU5TUEVDSUZJRUQQABIaChZERUxJVkVSWV9DSEFOTkVMX1NMQUNLEAESGgoWREVMSVZFUllfQ0hBTk5FTF9FTUFJTBACEhwKGERFTElWRVJZX0NIQU5ORUxfV0VCSE9PSxADEhsKF0RFTElWRVJZX0NIQU5ORUxfSU5fQVBQEAQqcwoIUHJpb3JpdHkSGAoUUFJJT1JJVFlfVU5TUEVDSUZJRUQQABIQCgxQUklPUklUWV9MT1cQARITCg9QUklPUklUWV9OT1JNQUwQAhIRCg1QUklPUklUWV9ISUdIEAMSEwoPUFJJT1JJVFlfVVJHRU5UEAQq7AIKFE5vdGlmaWNhdGlvbkNhdGVnb3J5EiUKIU5PVElGSUNBVElPTl9DQVRFR09SWV9VTlNQRUNJRklFRBAAEioKJk5PVElGSUNBVElPTl9DQVRFR09SWV9BUFBST1ZBTF9SRVFVRVNUEAESJgoiTk9USUZJQ0FUSU9OX0NBVEVHT1JZX0JVREdFVF9BTEVSVBACEicKI05PVElGSUNBVElPTl9DQVRFR09SWV9QSUlfREVURUNUSU9OEAMSIgoeTk9USUZJQ0FUSU9OX0NBVEVHT1JZX0lOQ0lERU5UEAQSIAocTk9USUZJQ0FUSU9OX0NBVEVHT1JZX1JFUE9SVBAFEiUKIU5PVElGSUNBVElPTl9DQVRFR09SWV9JTlRFR1JBVElPThAGEiAKHE5PVElGSUNBVElPTl9DQVRFR09SWV9ESUdFU1QQBxIhCh1OT1RJRklDQVRJT05fQ0FURUdPUllfR0VORVJBTBAIKsABCg5EZWxpdmVyeVN0YXR1cxIfChtERUxJVkVSWV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdERUxJVkVSWV9TVEFUVVNfUEVORElORxABEhgKFERFTElWRVJZX1NUQVRVU19TRU5UEAISHQoZREVMSVZFUllfU1RBVFVTX0RFTElWRVJFRBADEhoKFkRFTElWRVJZX1NUQVRVU19GQUlMRUQQBBIbChdERUxJVkVSWV9TVEFUVVNfQk9VTkNFRBAFMvUGChNOb3RpZmljYXRpb25TZXJ2aWNlEkUKBFNlbmQSHS5ub3RpZmljYXRpb25zLnYxLlNlbmRSZXF1ZXN0Gh4ubm90aWZpY2F0aW9ucy52MS5TZW5kUmVzcG9uc2USVAoJU2VuZEJhdGNoEiIubm90aWZpY2F0aW9ucy52MS5TZW5kQmF0Y2hSZXF1ZXN0GiMubm90aWZpY2F0aW9ucy52MS5TZW5kQmF0Y2hSZXNwb25zZRJjCg5HZXRQcmVmZXJlbmNlcxInLm5vdGlmaWNhdGlvbnMudjEuR2V0UHJlZmVyZW5jZXNSZXF1ZXN0Gigubm90aWZpY2F0aW9ucy52MS5HZXRQcmVmZXJlbmNlc1Jlc3BvbnNlEmMKDlNldFByZWZlcmVuY2VzEicubm90aWZpY2F0aW9ucy52MS5TZXRQcmVmZXJlbmNlc1JlcXVlc3QaKC5ub3RpZmljYXRpb25zLnYxLlNldFByZWZlcmVuY2VzUmVzcG9uc2USWgoLTGlzdEhpc3RvcnkSJC5ub3RpZmljYXRpb25zLnYxLkxpc3RIaXN0b3J5UmVxdWVzdBolLm5vdGlmaWNhdGlvbnMudjEuTGlzdEhpc3RvcnlSZXNwb25zZRJmCg9SZWdpc3RlckNoYW5uZWwSKC5ub3RpZmljYXRpb25zLnYxLlJlZ2lzdGVyQ2hhbm5lbFJlcXVlc3QaKS5ub3RpZmljYXRpb25zLnYxLlJlZ2lzdGVyQ2hhbm5lbFJlc3BvbnNlEmwKEUdldERlbGl2ZXJ5U3RhdHVzEioubm90aWZpY2F0aW9ucy52MS5HZXREZWxpdmVyeVN0YXR1c1JlcXVlc3QaKy5ub3RpZmljYXRpb25zLnYxLkdldERlbGl2ZXJ5U3RhdHVzUmVzcG9uc2USYwoOVXBzZXJ0VGVtcGxhdGUSJy5ub3RpZmljYXRpb25zLnYxLlVwc2VydFRlbXBsYXRlUmVxdWVzdBooLm5vdGlmaWNhdGlvbnMudjEuVXBzZXJ0VGVtcGxhdGVSZXNwb25zZRJgCg1MaXN0VGVtcGxhdGVzEiYubm90aWZpY2F0aW9ucy52MS5MaXN0VGVtcGxhdGVzUmVxdWVzdBonLm5vdGlmaWNhdGlvbnMudjEuTGlzdFRlbXBsYXRlc1Jlc3BvbnNlQkJaQGdpdGh1Yi5jb20vZXZhbG9wcy9wcm90by9nZW4vZ28vbm90aWZpY2F0aW9ucy92MTtub3RpZmljYXRpb25zdjFiBnByb3RvMw", [file_google_protobuf_timestamp]);
 
 /**
  * Notification is the canonical notification record.
@@ -74,6 +74,16 @@ export type Notification = Message<"notifications.v1.Notification"> & {
    * @generated from field: google.protobuf.Timestamp delivered_at = 11;
    */
   deliveredAt?: Timestamp;
+
+  /**
+   * @generated from field: notifications.v1.NotificationCategory category = 12;
+   */
+  category: NotificationCategory;
+
+  /**
+   * @generated from field: string template_name = 13;
+   */
+  templateName: string;
 };
 
 /**
@@ -142,6 +152,11 @@ export type NotificationPreferences = Message<"notifications.v1.NotificationPref
    * @generated from field: repeated notifications.v1.EscalationRule escalation_rules = 6;
    */
   escalationRules: EscalationRule[];
+
+  /**
+   * @generated from field: repeated notifications.v1.CategoryChannelPreference category_channels = 7;
+   */
+  categoryChannels: CategoryChannelPreference[];
 };
 
 /**
@@ -151,6 +166,94 @@ export type NotificationPreferences = Message<"notifications.v1.NotificationPref
 export const NotificationPreferencesSchema: GenMessage<NotificationPreferences> = /*@__PURE__*/
   messageDesc(file_notifications_v1_notifications, 2);
 
+/**
+ * CategoryChannelPreference overrides delivery routing for a specific category.
+ *
+ * @generated from message notifications.v1.CategoryChannelPreference
+ */
+export type CategoryChannelPreference = Message<"notifications.v1.CategoryChannelPreference"> & {
+  /**
+   * @generated from field: notifications.v1.NotificationCategory category = 1;
+   */
+  category: NotificationCategory;
+
+  /**
+   * @generated from field: notifications.v1.DeliveryChannel channel = 2;
+   */
+  channel: DeliveryChannel;
+};
+
+/**
+ * Describes the message notifications.v1.CategoryChannelPreference.
+ * Use `create(CategoryChannelPreferenceSchema)` to create a new message.
+ */
+export const CategoryChannelPreferenceSchema: GenMessage<CategoryChannelPreference> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 3);
+
+/**
+ * NotificationTemplate defines a reusable notification subject/body template.
+ *
+ * @generated from message notifications.v1.NotificationTemplate
+ */
+export type NotificationTemplate = Message<"notifications.v1.NotificationTemplate"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+
+  /**
+   * @generated from field: string workspace_id = 2;
+   */
+  workspaceId: string;
+
+  /**
+   * @generated from field: string name = 3;
+   */
+  name: string;
+
+  /**
+   * @generated from field: notifications.v1.NotificationCategory category = 4;
+   */
+  category: NotificationCategory;
+
+  /**
+   * @generated from field: notifications.v1.DeliveryChannel channel = 5;
+   */
+  channel: DeliveryChannel;
+
+  /**
+   * @generated from field: string subject_template = 6;
+   */
+  subjectTemplate: string;
+
+  /**
+   * @generated from field: string body_template = 7;
+   */
+  bodyTemplate: string;
+
+  /**
+   * @generated from field: repeated string required_variables = 8;
+   */
+  requiredVariables: string[];
+
+  /**
+   * @generated from field: bool built_in = 9;
+   */
+  builtIn: boolean;
+
+  /**
+   * @generated from field: google.protobuf.Timestamp updated_at = 10;
+   */
+  updatedAt?: Timestamp;
+};
+
+/**
+ * Describes the message notifications.v1.NotificationTemplate.
+ * Use `create(NotificationTemplateSchema)` to create a new message.
+ */
+export const NotificationTemplateSchema: GenMessage<NotificationTemplate> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 4);
+
 /**
  * @generated from message notifications.v1.SendRequest
  */
@@ -192,6 +295,21 @@ export type SendRequest = Message<"notifications.v1.SendRequest"> & {
    * @generated from field: string metadata_json = 7;
    */
   metadataJson: string;
+
+  /**
+   * @generated from field: notifications.v1.NotificationCategory category = 8;
+   */
+  category: NotificationCategory;
+
+  /**
+   * @generated from field: string template_name = 9;
+   */
+  templateName: string;
+
+  /**
+   * @generated from field: string template_variables_json = 10;
+   */
+  templateVariablesJson: string;
 };
 
 /**
@@ -199,7 +317,7 @@ export type SendRequest = Message<"notifications.v1.SendRequest"> & {
  * Use `create(SendRequestSchema)` to create a new message.
  */
 export const SendRequestSchema: GenMessage<SendRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 3);
+  messageDesc(file_notifications_v1_notifications, 5);
 
 /**
  * @generated from message notifications.v1.SendResponse
@@ -216,7 +334,7 @@ export type SendResponse = Message<"notifications.v1.SendResponse"> & {
  * Use `create(SendResponseSchema)` to create a new message.
  */
 export const SendResponseSchema: GenMessage<SendResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 4);
+  messageDesc(file_notifications_v1_notifications, 6);
 
 /**
  * @generated from message notifications.v1.SendBatchRequest
@@ -233,7 +351,7 @@ export type SendBatchRequest = Message<"notifications.v1.SendBatchRequest"> & {
  * Use `create(SendBatchRequestSchema)` to create a new message.
  */
 export const SendBatchRequestSchema: GenMessage<SendBatchRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 5);
+  messageDesc(file_notifications_v1_notifications, 7);
 
 /**
  * @generated from message notifications.v1.SendBatchResponse
@@ -255,7 +373,7 @@ export type SendBatchResponse = Message<"notifications.v1.SendBatchResponse"> &
  * Use `create(SendBatchResponseSchema)` to create a new message.
  */
 export const SendBatchResponseSchema: GenMessage<SendBatchResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 6);
+  messageDesc(file_notifications_v1_notifications, 8);
 
 /**
  * @generated from message notifications.v1.GetPreferencesRequest
@@ -277,7 +395,7 @@ export type GetPreferencesRequest = Message<"notifications.v1.GetPreferencesRequ
  * Use `create(GetPreferencesRequestSchema)` to create a new message.
  */
 export const GetPreferencesRequestSchema: GenMessage<GetPreferencesRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 7);
+  messageDesc(file_notifications_v1_notifications, 9);
 
 /**
  * @generated from message notifications.v1.GetPreferencesResponse
@@ -294,7 +412,7 @@ export type GetPreferencesResponse = Message<"notifications.v1.GetPreferencesRes
  * Use `create(GetPreferencesResponseSchema)` to create a new message.
  */
 export const GetPreferencesResponseSchema: GenMessage<GetPreferencesResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 8);
+  messageDesc(file_notifications_v1_notifications, 10);
 
 /**
  * @generated from message notifications.v1.SetPreferencesRequest
@@ -311,7 +429,7 @@ export type SetPreferencesRequest = Message<"notifications.v1.SetPreferencesRequ
  * Use `create(SetPreferencesRequestSchema)` to create a new message.
  */
 export const SetPreferencesRequestSchema: GenMessage<SetPreferencesRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 9);
+  messageDesc(file_notifications_v1_notifications, 11);
 
 /**
  * @generated from message notifications.v1.SetPreferencesResponse
@@ -328,7 +446,7 @@ export type SetPreferencesResponse = Message<"notifications.v1.SetPreferencesRes
  * Use `create(SetPreferencesResponseSchema)` to create a new message.
  */
 export const SetPreferencesResponseSchema: GenMessage<SetPreferencesResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 10);
+  messageDesc(file_notifications_v1_notifications, 12);
 
 /**
  * @generated from message notifications.v1.ListHistoryRequest
@@ -360,7 +478,7 @@ export type ListHistoryRequest = Message<"notifications.v1.ListHistoryRequest">
  * Use `create(ListHistoryRequestSchema)` to create a new message.
  */
 export const ListHistoryRequestSchema: GenMessage<ListHistoryRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 11);
+  messageDesc(file_notifications_v1_notifications, 13);
 
 /**
  * @generated from message notifications.v1.ListHistoryResponse
@@ -382,7 +500,7 @@ export type ListHistoryResponse = Message<"notifications.v1.ListHistoryResponse"
  * Use `create(ListHistoryResponseSchema)` to create a new message.
  */
 export const ListHistoryResponseSchema: GenMessage<ListHistoryResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 12);
+  messageDesc(file_notifications_v1_notifications, 14);
 
 /**
  * @generated from message notifications.v1.RegisterChannelRequest
@@ -409,7 +527,7 @@ export type RegisterChannelRequest = Message<"notifications.v1.RegisterChannelRe
  * Use `create(RegisterChannelRequestSchema)` to create a new message.
  */
 export const RegisterChannelRequestSchema: GenMessage<RegisterChannelRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 13);
+  messageDesc(file_notifications_v1_notifications, 15);
 
 /**
  * @generated from message notifications.v1.RegisterChannelResponse
@@ -426,7 +544,7 @@ export type RegisterChannelResponse = Message<"notifications.v1.RegisterChannelR
  * Use `create(RegisterChannelResponseSchema)` to create a new message.
  */
 export const RegisterChannelResponseSchema: GenMessage<RegisterChannelResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 14);
+  messageDesc(file_notifications_v1_notifications, 16);
 
 /**
  * @generated from message notifications.v1.GetDeliveryStatusRequest
@@ -443,7 +561,7 @@ export type GetDeliveryStatusRequest = Message<"notifications.v1.GetDeliveryStat
  * Use `create(GetDeliveryStatusRequestSchema)` to create a new message.
  */
 export const GetDeliveryStatusRequestSchema: GenMessage<GetDeliveryStatusRequest> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 15);
+  messageDesc(file_notifications_v1_notifications, 17);
 
 /**
  * @generated from message notifications.v1.GetDeliveryStatusResponse
@@ -470,7 +588,90 @@ export type GetDeliveryStatusResponse = Message<"notifications.v1.GetDeliverySta
  * Use `create(GetDeliveryStatusResponseSchema)` to create a new message.
  */
 export const GetDeliveryStatusResponseSchema: GenMessage<GetDeliveryStatusResponse> = /*@__PURE__*/
-  messageDesc(file_notifications_v1_notifications, 16);
+  messageDesc(file_notifications_v1_notifications, 18);
+
+/**
+ * @generated from message notifications.v1.UpsertTemplateRequest
+ */
+export type UpsertTemplateRequest = Message<"notifications.v1.UpsertTemplateRequest"> & {
+  /**
+   * @generated from field: notifications.v1.NotificationTemplate template = 1;
+   */
+  template?: NotificationTemplate;
+};
+
+/**
+ * Describes the message notifications.v1.UpsertTemplateRequest.
+ * Use `create(UpsertTemplateRequestSchema)` to create a new message.
+ */
+export const UpsertTemplateRequestSchema: GenMessage<UpsertTemplateRequest> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 19);
+
+/**
+ * @generated from message notifications.v1.UpsertTemplateResponse
+ */
+export type UpsertTemplateResponse = Message<"notifications.v1.UpsertTemplateResponse"> & {
+  /**
+   * @generated from field: notifications.v1.NotificationTemplate template = 1;
+   */
+  template?: NotificationTemplate;
+};
+
+/**
+ * Describes the message notifications.v1.UpsertTemplateResponse.
+ * Use `create(UpsertTemplateResponseSchema)` to create a new message.
+ */
+export const UpsertTemplateResponseSchema: GenMessage<UpsertTemplateResponse> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 20);
+
+/**
+ * @generated from message notifications.v1.ListTemplatesRequest
+ */
+export type ListTemplatesRequest = Message<"notifications.v1.ListTemplatesRequest"> & {
+  /**
+   * @generated from field: string workspace_id = 1;
+   */
+  workspaceId: string;
+
+  /**
+   * @generated from field: notifications.v1.NotificationCategory category = 2;
+   */
+  category: NotificationCategory;
+
+  /**
+   * @generated from field: notifications.v1.DeliveryChannel channel = 3;
+   */
+  channel: DeliveryChannel;
+
+  /**
+   * @generated from field: bool include_built_in = 4;
+   */
+  includeBuiltIn: boolean;
+};
+
+/**
+ * Describes the message notifications.v1.ListTemplatesRequest.
+ * Use `create(ListTemplatesRequestSchema)` to create a new message.
+ */
+export const ListTemplatesRequestSchema: GenMessage<ListTemplatesRequest> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 21);
+
+/**
+ * @generated from message notifications.v1.ListTemplatesResponse
+ */
+export type ListTemplatesResponse = Message<"notifications.v1.ListTemplatesResponse"> & {
+  /**
+   * @generated from field: repeated notifications.v1.NotificationTemplate templates = 1;
+   */
+  templates: NotificationTemplate[];
+};
+
+/**
+ * Describes the message notifications.v1.ListTemplatesResponse.
+ * Use `create(ListTemplatesResponseSchema)` to create a new message.
+ */
+export const ListTemplatesResponseSchema: GenMessage<ListTemplatesResponse> = /*@__PURE__*/
+  messageDesc(file_notifications_v1_notifications, 22);
 
 /**
  * DeliveryChannel identifies the notification delivery channel.
@@ -548,6 +749,64 @@ export enum Priority {
 export const PrioritySchema: GenEnum<Priority> = /*@__PURE__*/
   enumDesc(file_notifications_v1_notifications, 1);
 
+/**
+ * NotificationCategory groups notifications for routing and template selection.
+ *
+ * @generated from enum notifications.v1.NotificationCategory
+ */
+export enum NotificationCategory {
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_UNSPECIFIED = 0;
+   */
+  UNSPECIFIED = 0,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_APPROVAL_REQUEST = 1;
+   */
+  APPROVAL_REQUEST = 1,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_BUDGET_ALERT = 2;
+   */
+  BUDGET_ALERT = 2,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_PII_DETECTION = 3;
+   */
+  PII_DETECTION = 3,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_INCIDENT = 4;
+   */
+  INCIDENT = 4,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_REPORT = 5;
+   */
+  REPORT = 5,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_INTEGRATION = 6;
+   */
+  INTEGRATION = 6,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_DIGEST = 7;
+   */
+  DIGEST = 7,
+
+  /**
+   * @generated from enum value: NOTIFICATION_CATEGORY_GENERAL = 8;
+   */
+  GENERAL = 8,
+}
+
+/**
+ * Describes the enum notifications.v1.NotificationCategory.
+ */
+export const NotificationCategorySchema: GenEnum<NotificationCategory> = /*@__PURE__*/
+  enumDesc(file_notifications_v1_notifications, 2);
+
 /**
  * DeliveryStatus describes the delivery state of a notification.
  *
@@ -589,7 +848,7 @@ export enum DeliveryStatus {
  * Describes the enum notifications.v1.DeliveryStatus.
  */
 export const DeliveryStatusSchema: GenEnum<DeliveryStatus> = /*@__PURE__*/
-  enumDesc(file_notifications_v1_notifications, 2);
+  enumDesc(file_notifications_v1_notifications, 3);
 
 /**
  * NotificationService manages delivery of notifications across channels.
@@ -653,6 +912,22 @@ export const NotificationService: GenService<{
     input: typeof GetDeliveryStatusRequestSchema;
     output: typeof GetDeliveryStatusResponseSchema;
   },
+  /**
+   * @generated from rpc notifications.v1.NotificationService.UpsertTemplate
+   */
+  upsertTemplate: {
+    methodKind: "unary";
+    input: typeof UpsertTemplateRequestSchema;
+    output: typeof UpsertTemplateResponseSchema;
+  },
+  /**
+   * @generated from rpc notifications.v1.NotificationService.ListTemplates
+   */
+  listTemplates: {
+    methodKind: "unary";
+    input: typeof ListTemplatesRequestSchema;
+    output: typeof ListTemplatesResponseSchema;
+  },
 }> = /*@__PURE__*/
   serviceDesc(file_notifications_v1_notifications, 0);
 
diff --git a/proto/notifications/v1/notifications.proto b/proto/notifications/v1/notifications.proto
index d59bd2e..0d5e55d 100644
--- a/proto/notifications/v1/notifications.proto
+++ b/proto/notifications/v1/notifications.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package notifications.v1;
 
-option go_package = "github.com/evalops/proto/gen/go/notifications/v1;notificationsv1";
-
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/evalops/proto/gen/go/notifications/v1;notificationsv1";
+
 // NotificationService manages delivery of notifications across channels.
 service NotificationService {
   rpc Send(SendRequest) returns (SendResponse);
@@ -15,6 +15,8 @@ service NotificationService {
   rpc ListHistory(ListHistoryRequest) returns (ListHistoryResponse);
   rpc RegisterChannel(RegisterChannelRequest) returns (RegisterChannelResponse);
   rpc GetDeliveryStatus(GetDeliveryStatusRequest) returns (GetDeliveryStatusResponse);
+  rpc UpsertTemplate(UpsertTemplateRequest) returns (UpsertTemplateResponse);
+  rpc ListTemplates(ListTemplatesRequest) returns (ListTemplatesResponse);
 }
 
 // DeliveryChannel identifies the notification delivery channel.
@@ -35,6 +37,19 @@ enum Priority {
   PRIORITY_URGENT = 4;
 }
 
+// NotificationCategory groups notifications for routing and template selection.
+enum NotificationCategory {
+  NOTIFICATION_CATEGORY_UNSPECIFIED = 0;
+  NOTIFICATION_CATEGORY_APPROVAL_REQUEST = 1;
+  NOTIFICATION_CATEGORY_BUDGET_ALERT = 2;
+  NOTIFICATION_CATEGORY_PII_DETECTION = 3;
+  NOTIFICATION_CATEGORY_INCIDENT = 4;
+  NOTIFICATION_CATEGORY_REPORT = 5;
+  NOTIFICATION_CATEGORY_INTEGRATION = 6;
+  NOTIFICATION_CATEGORY_DIGEST = 7;
+  NOTIFICATION_CATEGORY_GENERAL = 8;
+}
+
 // DeliveryStatus describes the delivery state of a notification.
 enum DeliveryStatus {
   DELIVERY_STATUS_UNSPECIFIED = 0;
@@ -58,6 +73,8 @@ message Notification {
   DeliveryStatus delivery_status = 9;
   google.protobuf.Timestamp sent_at = 10;
   google.protobuf.Timestamp delivered_at = 11;
+  NotificationCategory category = 12;
+  string template_name = 13;
 }
 
 // EscalationRule defines automatic escalation when a notification is unacknowledged.
@@ -74,6 +91,27 @@ message NotificationPreferences {
   string quiet_hours_start = 4;
   string quiet_hours_end = 5;
   repeated EscalationRule escalation_rules = 6;
+  repeated CategoryChannelPreference category_channels = 7;
+}
+
+// CategoryChannelPreference overrides delivery routing for a specific category.
+message CategoryChannelPreference {
+  NotificationCategory category = 1;
+  DeliveryChannel channel = 2;
+}
+
+// NotificationTemplate defines a reusable notification subject/body template.
+message NotificationTemplate {
+  string id = 1;
+  string workspace_id = 2;
+  string name = 3;
+  NotificationCategory category = 4;
+  DeliveryChannel channel = 5;
+  string subject_template = 6;
+  string body_template = 7;
+  repeated string required_variables = 8;
+  bool built_in = 9;
+  google.protobuf.Timestamp updated_at = 10;
 }
 
 message SendRequest {
@@ -86,6 +124,9 @@ message SendRequest {
   string subject = 5;
   string body = 6;
   string metadata_json = 7;
+  NotificationCategory category = 8;
+  string template_name = 9;
+  string template_variables_json = 10;
 }
 
 message SendResponse {
@@ -149,3 +190,22 @@ message GetDeliveryStatusResponse {
   google.protobuf.Timestamp last_updated_at = 2;
   string error_message = 3;
 }
+
+message UpsertTemplateRequest {
+  NotificationTemplate template = 1;
+}
+
+message UpsertTemplateResponse {
+  NotificationTemplate template = 1;
+}
+
+message ListTemplatesRequest {
+  string workspace_id = 1;
+  NotificationCategory category = 2;
+  DeliveryChannel channel = 3;
+  bool include_built_in = 4;
+}
+
+message ListTemplatesResponse {
+  repeated NotificationTemplate templates = 1;
+}