diff --git a/gen/example/helloworld/v1/example.pb.go b/gen/example/helloworld/v1/example.pb.go
index 7bc459b9..d2fbb084 100644
--- a/gen/example/helloworld/v1/example.pb.go
+++ b/gen/example/helloworld/v1/example.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/helloworld/v1/example.proto
 
@@ -230,7 +230,7 @@ func file_example_helloworld_v1_example_proto_rawDescGZIP() []byte {
 }
 
 var file_example_helloworld_v1_example_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_example_helloworld_v1_example_proto_goTypes = []interface{}{
+var file_example_helloworld_v1_example_proto_goTypes = []any{
 	(*HelloRequest)(nil),   // 0: example.helloworld.v1.HelloRequest
 	(*HelloResponse)(nil),  // 1: example.helloworld.v1.HelloResponse
 	(*GoodbyeRequest)(nil), // 2: example.helloworld.v1.GoodbyeRequest
@@ -254,7 +254,7 @@ func file_example_helloworld_v1_example_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_helloworld_v1_example_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_helloworld_v1_example_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*HelloRequest); i {
 			case 0:
 				return &v.state
@@ -266,7 +266,7 @@ func file_example_helloworld_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_helloworld_v1_example_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_example_helloworld_v1_example_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*HelloResponse); i {
 			case 0:
 				return &v.state
@@ -278,7 +278,7 @@ func file_example_helloworld_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_helloworld_v1_example_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_example_helloworld_v1_example_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*GoodbyeRequest); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/helloworld/v1/example_temporal.pb.go b/gen/example/helloworld/v1/example_temporal.pb.go
index 9c681274..3500aacc 100644
--- a/gen/example/helloworld/v1/example_temporal.pb.go
+++ b/gen/example/helloworld/v1/example_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go b/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go
index c61878dc..67f3c8e4 100644
--- a/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go
+++ b/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/mutex/v1/mutex.pb.go b/gen/example/mutex/v1/mutex.pb.go
index 64f58cc1..ed4a9957 100644
--- a/gen/example/mutex/v1/mutex.pb.go
+++ b/gen/example/mutex/v1/mutex.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/mutex/v1/mutex.proto
 
@@ -374,7 +374,7 @@ func file_example_mutex_v1_mutex_proto_rawDescGZIP() []byte {
 }
 
 var file_example_mutex_v1_mutex_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_example_mutex_v1_mutex_proto_goTypes = []interface{}{
+var file_example_mutex_v1_mutex_proto_goTypes = []any{
 	(*MutexInput)(nil),                   // 0: example.mutex.v1.MutexInput
 	(*AcquireLockInput)(nil),             // 1: example.mutex.v1.AcquireLockInput
 	(*LockAcquiredInput)(nil),            // 2: example.mutex.v1.LockAcquiredInput
@@ -409,7 +409,7 @@ func file_example_mutex_v1_mutex_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_mutex_v1_mutex_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_mutex_v1_mutex_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MutexInput); i {
 			case 0:
 				return &v.state
@@ -421,7 +421,7 @@ func file_example_mutex_v1_mutex_proto_init() {
 				return nil
 			}
 		}
-		file_example_mutex_v1_mutex_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_example_mutex_v1_mutex_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*AcquireLockInput); i {
 			case 0:
 				return &v.state
@@ -433,7 +433,7 @@ func file_example_mutex_v1_mutex_proto_init() {
 				return nil
 			}
 		}
-		file_example_mutex_v1_mutex_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_example_mutex_v1_mutex_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*LockAcquiredInput); i {
 			case 0:
 				return &v.state
@@ -445,7 +445,7 @@ func file_example_mutex_v1_mutex_proto_init() {
 				return nil
 			}
 		}
-		file_example_mutex_v1_mutex_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_example_mutex_v1_mutex_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*ReleaseLockInput); i {
 			case 0:
 				return &v.state
@@ -457,7 +457,7 @@ func file_example_mutex_v1_mutex_proto_init() {
 				return nil
 			}
 		}
-		file_example_mutex_v1_mutex_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_example_mutex_v1_mutex_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*SampleWorkflowWithMutexInput); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/mutex/v1/mutex_temporal.pb.go b/gen/example/mutex/v1/mutex_temporal.pb.go
index 9938e3b7..3b4c5b8e 100644
--- a/gen/example/mutex/v1/mutex_temporal.pb.go
+++ b/gen/example/mutex/v1/mutex_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go b/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go
index e1765f04..66ffae16 100644
--- a/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go
+++ b/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/searchattributes/v1/searchattributes.pb.go b/gen/example/searchattributes/v1/searchattributes.pb.go
index 32e09930..693643ab 100644
--- a/gen/example/searchattributes/v1/searchattributes.pb.go
+++ b/gen/example/searchattributes/v1/searchattributes.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/searchattributes/v1/searchattributes.proto
 
@@ -207,7 +207,7 @@ func file_example_searchattributes_v1_searchattributes_proto_rawDescGZIP() []byt
 }
 
 var file_example_searchattributes_v1_searchattributes_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_example_searchattributes_v1_searchattributes_proto_goTypes = []interface{}{
+var file_example_searchattributes_v1_searchattributes_proto_goTypes = []any{
 	(*SearchAttributesInput)(nil), // 0: example.searchattributes.v1.SearchAttributesInput
 	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 	(*emptypb.Empty)(nil),         // 2: google.protobuf.Empty
@@ -229,7 +229,7 @@ func file_example_searchattributes_v1_searchattributes_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_searchattributes_v1_searchattributes_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_searchattributes_v1_searchattributes_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*SearchAttributesInput); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/searchattributes/v1/searchattributes_temporal.pb.go b/gen/example/searchattributes/v1/searchattributes_temporal.pb.go
index 877c6f1c..f213eb96 100644
--- a/gen/example/searchattributes/v1/searchattributes_temporal.pb.go
+++ b/gen/example/searchattributes/v1/searchattributes_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go b/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go
index 50af8693..589408b1 100644
--- a/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go
+++ b/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/updatabletimer/v1/updatabletimer.pb.go b/gen/example/updatabletimer/v1/updatabletimer.pb.go
index 560f9ca7..903f870b 100644
--- a/gen/example/updatabletimer/v1/updatabletimer.pb.go
+++ b/gen/example/updatabletimer/v1/updatabletimer.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/updatabletimer/v1/updatabletimer.proto
 
@@ -266,7 +266,7 @@ func file_example_updatabletimer_v1_updatabletimer_proto_rawDescGZIP() []byte {
 }
 
 var file_example_updatabletimer_v1_updatabletimer_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_example_updatabletimer_v1_updatabletimer_proto_goTypes = []interface{}{
+var file_example_updatabletimer_v1_updatabletimer_proto_goTypes = []any{
 	(*GetWakeUpTimeOutput)(nil),   // 0: example.updatabletimer.v1.GetWakeUpTimeOutput
 	(*UpdatableTimerInput)(nil),   // 1: example.updatabletimer.v1.UpdatableTimerInput
 	(*UpdateWakeUpTimeInput)(nil), // 2: example.updatabletimer.v1.UpdateWakeUpTimeInput
@@ -296,7 +296,7 @@ func file_example_updatabletimer_v1_updatabletimer_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GetWakeUpTimeOutput); i {
 			case 0:
 				return &v.state
@@ -308,7 +308,7 @@ func file_example_updatabletimer_v1_updatabletimer_proto_init() {
 				return nil
 			}
 		}
-		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdatableTimerInput); i {
 			case 0:
 				return &v.state
@@ -320,7 +320,7 @@ func file_example_updatabletimer_v1_updatabletimer_proto_init() {
 				return nil
 			}
 		}
-		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_example_updatabletimer_v1_updatabletimer_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateWakeUpTimeInput); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go b/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go
index 5c3a43e5..b6b985fc 100644
--- a/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go
+++ b/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go b/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go
index f794885a..130ed013 100644
--- a/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go
+++ b/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/example/v1/example.pb.go b/gen/example/v1/example.pb.go
index 130117bf..f0724a0f 100644
--- a/gen/example/v1/example.pb.go
+++ b/gen/example/v1/example.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/v1/example.proto
 
@@ -479,7 +479,7 @@ func file_example_v1_example_proto_rawDescGZIP() []byte {
 
 var file_example_v1_example_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_example_v1_example_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_example_v1_example_proto_goTypes = []interface{}{
+var file_example_v1_example_proto_goTypes = []any{
 	(Foo_Status)(0),                // 0: example.v1.Foo.Status
 	(*CreateFooRequest)(nil),       // 1: example.v1.CreateFooRequest
 	(*CreateFooResponse)(nil),      // 2: example.v1.CreateFooResponse
@@ -516,7 +516,7 @@ func file_example_v1_example_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_v1_example_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateFooRequest); i {
 			case 0:
 				return &v.state
@@ -528,7 +528,7 @@ func file_example_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_v1_example_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateFooResponse); i {
 			case 0:
 				return &v.state
@@ -540,7 +540,7 @@ func file_example_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_v1_example_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Foo); i {
 			case 0:
 				return &v.state
@@ -552,7 +552,7 @@ func file_example_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_v1_example_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*GetFooProgressResponse); i {
 			case 0:
 				return &v.state
@@ -564,7 +564,7 @@ func file_example_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_v1_example_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*NotifyRequest); i {
 			case 0:
 				return &v.state
@@ -576,7 +576,7 @@ func file_example_v1_example_proto_init() {
 				return nil
 			}
 		}
-		file_example_v1_example_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_example_v1_example_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*SetFooProgressRequest); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/v1/example_temporal.pb.go b/gen/example/v1/example_temporal.pb.go
index 86595a3b..af4247a1 100644
--- a/gen/example/v1/example_temporal.pb.go
+++ b/gen/example/v1/example_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -22,7 +22,6 @@ import (
 	v2 "github.com/urfave/cli/v2"
 	enumsv1 "go.temporal.io/api/enums/v1"
 	serviceerror "go.temporal.io/api/serviceerror"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -287,8 +286,8 @@ func (c *exampleClient) UpdateFooProgress(ctx context.Context, workflowID string
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -307,14 +306,14 @@ func (c *exampleClient) UpdateFooProgressAsync(ctx context.Context, workflowID s
 		o = NewUpdateFooProgressOptions()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -601,23 +600,23 @@ func (h *updateFooProgressHandle) Get(ctx context.Context) (*GetFooProgressRespo
 
 // UpdateFooProgressOptions provides configuration for a example.v1.Example.UpdateFooProgress update operation
 type UpdateFooProgressOptions struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewUpdateFooProgressOptions initializes a new UpdateFooProgressOptions value
 func NewUpdateFooProgressOptions() *UpdateFooProgressOptions {
-	return &UpdateFooProgressOptions{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &UpdateFooProgressOptions{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *SetFooProgressRequest) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *SetFooProgressRequest) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -638,8 +637,8 @@ func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *S
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
 	}
 	return opts, nil
 }
@@ -650,14 +649,14 @@ func (o *UpdateFooProgressOptions) WithUpdateID(id string) *UpdateFooProgressOpt
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *UpdateFooProgressOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *UpdateFooProgressOptions {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *UpdateFooProgressOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *UpdateFooProgressOptions {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *UpdateFooProgressOptions) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *UpdateFooProgressOptions {
+func (o *UpdateFooProgressOptions) WithWaitPolicy(policy client.WorkflowUpdateStage) *UpdateFooProgressOptions {
 	o.waitPolicy = policy
 	return o
 }
@@ -1397,7 +1396,7 @@ func (c *TestExampleClient) UpdateFooProgress(ctx context.Context, workflowID st
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -1440,7 +1439,7 @@ var _ UpdateFooProgressHandle = &testUpdateFooProgressHandle{}
 type testUpdateFooProgressHandle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *SetFooProgressRequest
 	runID      string
 	workflowID string
diff --git a/gen/example/v1/examplev1xns/example_xns_temporal.pb.go b/gen/example/v1/examplev1xns/example_xns_temporal.pb.go
index 229ba093..ce979c25 100644
--- a/gen/example/v1/examplev1xns/example_xns_temporal.pb.go
+++ b/gen/example/v1/examplev1xns/example_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -19,7 +19,6 @@ import (
 	xns "github.com/cludden/protoc-gen-go-temporal/pkg/xns"
 	uuid "github.com/google/uuid"
 	enumsv1 "go.temporal.io/api/enums/v1"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -730,7 +729,7 @@ func SetFooProgressAsync(ctx workflow.Context, workflowID string, runID string,
 type UpdateFooProgressUpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewUpdateFooProgressUpdateOptions initializes a new UpdateFooProgressUpdateOptions value
@@ -751,7 +750,7 @@ func (opts *UpdateFooProgressUpdateOptions) WithHeartbeatInterval(d time.Duratio
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *UpdateFooProgressUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *UpdateFooProgressUpdateOptions {
+func (opts *UpdateFooProgressUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *UpdateFooProgressUpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -851,7 +850,7 @@ func UpdateFooProgressAsync(ctx workflow.Context, workflowID string, runID strin
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -1212,9 +1211,7 @@ func (a *exampleActivities) UpdateFooProgress(ctx context.Context, input *xnsv1.
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.UpdateFooProgressAsync(
diff --git a/gen/example/xns/v1/xns.pb.go b/gen/example/xns/v1/xns.pb.go
index c48d43d8..6eba1fd2 100644
--- a/gen/example/xns/v1/xns.pb.go
+++ b/gen/example/xns/v1/xns.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: example/xns/v1/xns.proto
 
@@ -600,7 +600,7 @@ func file_example_xns_v1_xns_proto_rawDescGZIP() []byte {
 
 var file_example_xns_v1_xns_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_example_xns_v1_xns_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_example_xns_v1_xns_proto_goTypes = []interface{}{
+var file_example_xns_v1_xns_proto_goTypes = []any{
 	(Foo_Status)(0),                // 0: example.xns.v1.Foo.Status
 	(*CreateFooRequest)(nil),       // 1: example.xns.v1.CreateFooRequest
 	(*CreateFooResponse)(nil),      // 2: example.xns.v1.CreateFooResponse
@@ -642,7 +642,7 @@ func file_example_xns_v1_xns_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_example_xns_v1_xns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateFooRequest); i {
 			case 0:
 				return &v.state
@@ -654,7 +654,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateFooResponse); i {
 			case 0:
 				return &v.state
@@ -666,7 +666,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Foo); i {
 			case 0:
 				return &v.state
@@ -678,7 +678,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*GetFooProgressResponse); i {
 			case 0:
 				return &v.state
@@ -690,7 +690,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*NotifyRequest); i {
 			case 0:
 				return &v.state
@@ -702,7 +702,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*ProvisionFooRequest); i {
 			case 0:
 				return &v.state
@@ -714,7 +714,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*ProvisionFooResponse); i {
 			case 0:
 				return &v.state
@@ -726,7 +726,7 @@ func file_example_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_example_xns_v1_xns_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_example_xns_v1_xns_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SetFooProgressRequest); i {
 			case 0:
 				return &v.state
diff --git a/gen/example/xns/v1/xns_temporal.pb.go b/gen/example/xns/v1/xns_temporal.pb.go
index 2a9ab4c6..7a76a78b 100644
--- a/gen/example/xns/v1/xns_temporal.pb.go
+++ b/gen/example/xns/v1/xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -22,7 +22,6 @@ import (
 	v2 "github.com/urfave/cli/v2"
 	enumsv1 "go.temporal.io/api/enums/v1"
 	serviceerror "go.temporal.io/api/serviceerror"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -1234,8 +1233,8 @@ func (c *exampleClient) UpdateFooProgress(ctx context.Context, workflowID string
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -1254,14 +1253,14 @@ func (c *exampleClient) UpdateFooProgressAsync(ctx context.Context, workflowID s
 		o = NewUpdateFooProgressOptions()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -1548,23 +1547,23 @@ func (h *updateFooProgressHandle) Get(ctx context.Context) (*GetFooProgressRespo
 
 // UpdateFooProgressOptions provides configuration for a example.xns.v1.Example.UpdateFooProgress update operation
 type UpdateFooProgressOptions struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewUpdateFooProgressOptions initializes a new UpdateFooProgressOptions value
 func NewUpdateFooProgressOptions() *UpdateFooProgressOptions {
-	return &UpdateFooProgressOptions{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &UpdateFooProgressOptions{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *SetFooProgressRequest) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *SetFooProgressRequest) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -1585,8 +1584,8 @@ func (o *UpdateFooProgressOptions) Build(workflowID string, runID string, req *S
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
 	}
 	return opts, nil
 }
@@ -1597,14 +1596,14 @@ func (o *UpdateFooProgressOptions) WithUpdateID(id string) *UpdateFooProgressOpt
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *UpdateFooProgressOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *UpdateFooProgressOptions {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *UpdateFooProgressOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *UpdateFooProgressOptions {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *UpdateFooProgressOptions) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *UpdateFooProgressOptions {
+func (o *UpdateFooProgressOptions) WithWaitPolicy(policy client.WorkflowUpdateStage) *UpdateFooProgressOptions {
 	o.waitPolicy = policy
 	return o
 }
@@ -2344,7 +2343,7 @@ func (c *TestExampleClient) UpdateFooProgress(ctx context.Context, workflowID st
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.UpdateFooProgressAsync(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -2387,7 +2386,7 @@ var _ UpdateFooProgressHandle = &testUpdateFooProgressHandle{}
 type testUpdateFooProgressHandle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *SetFooProgressRequest
 	runID      string
 	workflowID string
diff --git a/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go b/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go
index 18178b8b..55df3683 100644
--- a/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go
+++ b/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -19,7 +19,6 @@ import (
 	xns "github.com/cludden/protoc-gen-go-temporal/pkg/xns"
 	uuid "github.com/google/uuid"
 	enumsv1 "go.temporal.io/api/enums/v1"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -1123,7 +1122,7 @@ func SetFooProgressAsync(ctx workflow.Context, workflowID string, runID string,
 type UpdateFooProgressUpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewUpdateFooProgressUpdateOptions initializes a new UpdateFooProgressUpdateOptions value
@@ -1144,7 +1143,7 @@ func (opts *UpdateFooProgressUpdateOptions) WithHeartbeatInterval(d time.Duratio
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *UpdateFooProgressUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *UpdateFooProgressUpdateOptions {
+func (opts *UpdateFooProgressUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *UpdateFooProgressUpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -1244,7 +1243,7 @@ func UpdateFooProgressAsync(ctx workflow.Context, workflowID string, runID strin
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -1605,9 +1604,7 @@ func (a *exampleActivities) UpdateFooProgress(ctx context.Context, input *xnsv1.
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.UpdateFooProgressAsync(
diff --git a/gen/patch/go.pb.go b/gen/patch/go.pb.go
index 5e9d367f..5b8129ea 100644
--- a/gen/patch/go.pb.go
+++ b/gen/patch/go.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: patch/go.proto
 
@@ -412,7 +412,7 @@ func file_patch_go_proto_rawDescGZIP() []byte {
 }
 
 var file_patch_go_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_patch_go_proto_goTypes = []interface{}{
+var file_patch_go_proto_goTypes = []any{
 	(*Options)(nil),                       // 0: go.Options
 	(*LintOptions)(nil),                   // 1: go.LintOptions
 	(*descriptorpb.MessageOptions)(nil),   // 2: google.protobuf.MessageOptions
@@ -448,7 +448,7 @@ func file_patch_go_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_patch_go_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_patch_go_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Options); i {
 			case 0:
 				return &v.state
@@ -460,7 +460,7 @@ func file_patch_go_proto_init() {
 				return nil
 			}
 		}
-		file_patch_go_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_patch_go_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*LintOptions); i {
 			case 0:
 				return &v.state
diff --git a/gen/temporal/v1/temporal.pb.go b/gen/temporal/v1/temporal.pb.go
index 478b0c5e..dce212ae 100644
--- a/gen/temporal/v1/temporal.pb.go
+++ b/gen/temporal/v1/temporal.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: temporal/v1/temporal.proto
 
@@ -923,6 +923,8 @@ type UpdateOptions struct {
 	// Include validation hook
 	Validate bool `protobuf:"varint,2,opt,name=validate,proto3" json:"validate,omitempty"`
 	// Default wait policy if not specified
+	WaitForStage WaitPolicy `protobuf:"varint,7,opt,name=wait_for_stage,json=waitForStage,proto3,enum=temporal.v1.WaitPolicy" json:"wait_for_stage,omitempty"`
+	// Deprecated: Marked as deprecated in temporal/v1/temporal.proto.
 	WaitPolicy WaitPolicy `protobuf:"varint,3,opt,name=wait_policy,json=waitPolicy,proto3,enum=temporal.v1.WaitPolicy" json:"wait_policy,omitempty"`
 	// XNS can be used to configure default activity options for xns workflow executions
 	Xns *XNSActivityOptions `protobuf:"bytes,5,opt,name=xns,proto3" json:"xns,omitempty"`
@@ -988,6 +990,14 @@ func (x *UpdateOptions) GetValidate() bool {
 	return false
 }
 
+func (x *UpdateOptions) GetWaitForStage() WaitPolicy {
+	if x != nil {
+		return x.WaitForStage
+	}
+	return WaitPolicy_WAIT_POLICY_UNSPECIFIED
+}
+
+// Deprecated: Marked as deprecated in temporal/v1/temporal.proto.
 func (x *UpdateOptions) GetWaitPolicy() WaitPolicy {
 	if x != nil {
 		return x.WaitPolicy
@@ -1712,7 +1722,7 @@ var file_temporal_v1_temporal_proto_rawDesc = []byte{
 	0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x12, 0x2c, 0x0a,
 	0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
 	0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x74,
-	0x63, 0x68, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x22, 0xea, 0x01, 0x0a, 0x0d,
+	0x63, 0x68, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x22, 0xad, 0x02, 0x0a, 0x0d,
 	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x0e, 0x0a,
 	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
@@ -1720,221 +1730,225 @@ var file_temporal_v1_temporal_proto_rawDesc = []byte{
 	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31,
 	0x2e, 0x50, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12,
 	0x1a, 0x0a, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x12, 0x38, 0x0a, 0x0b, 0x77,
-	0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x17, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0a, 0x77, 0x61, 0x69, 0x74, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31,
-	0x2e, 0x58, 0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x22, 0x9b, 0x09, 0x0a, 0x0f, 0x57, 0x6f, 0x72,
-	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x05, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74, 0x65, 0x6d, 0x70,
-	0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71,
-	0x75, 0x65, 0x72, 0x79, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x18, 0x02,
+	0x08, 0x52, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x0e, 0x77,
+	0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76,
+	0x31, 0x2e, 0x57, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0c, 0x77, 0x61,
+	0x69, 0x74, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x67, 0x65, 0x12, 0x3c, 0x0a, 0x0b, 0x77, 0x61,
+	0x69, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x17, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61,
+	0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x77, 0x61,
+	0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c,
+	0x2e, 0x76, 0x31, 0x2e, 0x58, 0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x22, 0x9b, 0x09, 0x0a, 0x0f,
+	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x11,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x38, 0x0a,
+	0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74,
+	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61,
+	0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72,
+	0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x52, 0x06, 0x73, 0x69,
+	0x67, 0x6e, 0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x03,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e,
 	0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x52, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61,
-	0x6c, 0x12, 0x3b, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x46,
-	0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x42, 0x0a, 0x0f, 0x69, 0x64, 0x5f, 0x72, 0x65, 0x75,
-	0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x44,
-	0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0d, 0x69, 0x64, 0x52,
-	0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x20, 0x0a, 0x09, 0x6e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18,
-	0x01, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x4e, 0x0a, 0x13,
-	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70,
-	0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c,
-	0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x11, 0x70, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x2c, 0x0a, 0x07,
-	0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e,
-	0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x3b, 0x0a, 0x0c, 0x72, 0x65,
-	0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x18, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52,
-	0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72,
-	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
+	0x6e, 0x73, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x12, 0x46, 0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x54, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x12, 0x2b, 0x0a, 0x11, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x61, 0x74,
-	0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
-	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73,
-	0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x71, 0x75, 0x65, 0x75, 0x65, 0x18, 0x0b,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x51, 0x75, 0x65, 0x75, 0x65, 0x12,
-	0x3c, 0x0a, 0x0c, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x32, 0x0a,
-	0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x77, 0x61,
-	0x69, 0x74, 0x46, 0x6f, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
-	0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x58, 0x4e, 0x53,
-	0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x03, 0x78, 0x6e, 0x73, 0x1a, 0x4c, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x65, 0x66, 0x12,
-	0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74,
-	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x58, 0x4e, 0x53, 0x41, 0x63,
-	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78,
-	0x6e, 0x73, 0x1a, 0x63, 0x0a, 0x06, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12, 0x10, 0x0a, 0x03,
-	0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x65, 0x66, 0x12, 0x14,
-	0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73,
-	0x74, 0x61, 0x72, 0x74, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69,
+	0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x42, 0x0a, 0x0f, 0x69, 0x64, 0x5f,
+	0x72, 0x65, 0x75, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31,
+	0x2e, 0x49, 0x44, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0d,
+	0x69, 0x64, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x20, 0x0a,
+	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
+	0x4e, 0x0a, 0x13, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x74,
+	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x11, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
+	0x2c, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50,
+	0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x3b, 0x0a,
+	0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76,
+	0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72,
+	0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x72, 0x75,
+	0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x54,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x2b, 0x0a, 0x11, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68,
+	0x5f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x10, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75,
+	0x74, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x71, 0x75, 0x65, 0x75,
+	0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x51, 0x75, 0x65,
+	0x75, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
+	0x75, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x12, 0x32, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x63, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x13, 0x77, 0x61, 0x69, 0x74, 0x46, 0x6f, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e,
 	0x58, 0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x1a, 0x4d, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x72, 0x65, 0x66, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x58,
-	0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x22, 0xe2, 0x04, 0x0a, 0x12, 0x58, 0x4e, 0x53, 0x41, 0x63,
-	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x71, 0x75, 0x65, 0x75, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x51, 0x75, 0x65, 0x75, 0x65,
-	0x12, 0x54, 0x0a, 0x19, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f,
-	0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x16,
-	0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x54, 0x6f, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x54, 0x0a, 0x19, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75,
-	0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x16, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x54, 0x6f,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4e, 0x0a, 0x16,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
+	0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x1a, 0x4c, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72,
+	0x65, 0x66, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x58, 0x4e,
+	0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x03, 0x78, 0x6e, 0x73, 0x1a, 0x63, 0x0a, 0x06, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12,
+	0x10, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x65,
+	0x66, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e,
+	0x76, 0x31, 0x2e, 0x58, 0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x1a, 0x4d, 0x0a, 0x06, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x72, 0x65, 0x66, 0x12, 0x31, 0x0a, 0x03, 0x78, 0x6e, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76,
+	0x31, 0x2e, 0x58, 0x4e, 0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x78, 0x6e, 0x73, 0x22, 0xe2, 0x04, 0x0a, 0x12, 0x58, 0x4e,
+	0x53, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x71, 0x75, 0x65,
+	0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x51, 0x75,
+	0x65, 0x75, 0x65, 0x12, 0x54, 0x0a, 0x19, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x5f,
+	0x74, 0x6f, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x16, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x54, 0x6f, 0x43, 0x6c, 0x6f,
+	0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x54, 0x0a, 0x19, 0x73, 0x63, 0x68,
+	0x65, 0x64, 0x75, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x6f,
-	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x48, 0x0a, 0x12,
-	0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76,
-	0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x11, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x46, 0x0a, 0x11, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62,
-	0x65, 0x61, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x68, 0x65,
-	0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3b,
-	0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e,
-	0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b,
-	0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e, 0x0a, 0x13, 0x70,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f,
-	0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f,
-	0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x11, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74,
-	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2a, 0x3f, 0x0a, 0x0a, 0x43,
-	0x4c, 0x49, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4c, 0x49,
-	0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x4c, 0x42, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x4c, 0x49, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55,
-	0x52, 0x45, 0x5f, 0x45, 0x4e, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10, 0x01, 0x2a, 0x83, 0x02, 0x0a,
-	0x0d, 0x49, 0x44, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x28,
-	0x0a, 0x24, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45,
-	0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x2c, 0x0a, 0x28, 0x57, 0x4f, 0x52, 0x4b,
-	0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f,
-	0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49,
-	0x43, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x38, 0x0a, 0x34, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c,
-	0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
-	0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41,
-	0x54, 0x45, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02,
-	0x12, 0x2d, 0x0a, 0x29, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f,
-	0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x4a,
-	0x45, 0x43, 0x54, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x10, 0x03, 0x12,
-	0x31, 0x0a, 0x2d, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52,
-	0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d,
-	0x49, 0x4e, 0x41, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47,
-	0x10, 0x04, 0x2a, 0xa4, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f,
-	0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x41, 0x52, 0x45,
-	0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x21, 0x0a,
-	0x1d, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f,
-	0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x10, 0x01,
-	0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45,
-	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x42, 0x41, 0x4e, 0x44, 0x4f, 0x4e, 0x10,
-	0x02, 0x12, 0x26, 0x0a, 0x22, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53,
-	0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54,
-	0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x10, 0x03, 0x2a, 0x78, 0x0a, 0x0a, 0x57, 0x61, 0x69,
-	0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1b, 0x0a, 0x17, 0x57, 0x41, 0x49, 0x54, 0x5f,
-	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c,
-	0x49, 0x43, 0x59, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x18,
-	0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x43,
-	0x43, 0x45, 0x50, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x57, 0x41, 0x49, 0x54,
-	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45,
-	0x44, 0x10, 0x03, 0x3a, 0x5a, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1f,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x16, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
+	0x65, 0x54, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
+	0x4e, 0x0a, 0x16, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 0x6f, 0x73,
+	0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x54, 0x6f, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
+	0x48, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x5f, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61,
+	0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x46, 0x0a, 0x11, 0x68, 0x65, 0x61,
+	0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x10, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x12, 0x3b, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72,
+	0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e,
+	0x0a, 0x13, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x70,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x74, 0x65,
+	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74,
+	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x11, 0x70, 0x61, 0x72,
+	0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2a, 0x3f,
+	0x0a, 0x0a, 0x43, 0x4c, 0x49, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x14,
+	0x43, 0x4c, 0x49, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x41,
+	0x4c, 0x42, 0x45, 0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x4c, 0x49, 0x5f, 0x46, 0x45,
+	0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x45, 0x4e, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10, 0x01, 0x2a,
+	0x83, 0x02, 0x0a, 0x0d, 0x49, 0x44, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x12, 0x28, 0x0a, 0x24, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44,
+	0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e,
+	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x2c, 0x0a, 0x28, 0x57,
+	0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45,
+	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55,
+	0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x38, 0x0a, 0x34, 0x57, 0x4f, 0x52,
+	0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50,
+	0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c,
+	0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x5f, 0x4f, 0x4e, 0x4c,
+	0x59, 0x10, 0x02, 0x12, 0x2d, 0x0a, 0x29, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f,
+	0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
+	0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45,
+	0x10, 0x03, 0x12, 0x31, 0x0a, 0x2d, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49,
+	0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54,
+	0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x52, 0x55, 0x4e, 0x4e,
+	0x49, 0x4e, 0x47, 0x10, 0x04, 0x2a, 0xa4, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74,
+	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x23, 0x0a, 0x1f, 0x50,
+	0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
+	0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x21, 0x0a, 0x1d, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45,
+	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54,
+	0x45, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c,
+	0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x42, 0x41, 0x4e, 0x44,
+	0x4f, 0x4e, 0x10, 0x02, 0x12, 0x26, 0x0a, 0x22, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43,
+	0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x51, 0x55,
+	0x45, 0x53, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x10, 0x03, 0x2a, 0x78, 0x0a, 0x0a,
+	0x57, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1b, 0x0a, 0x17, 0x57, 0x41,
+	0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f,
+	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10,
+	0x01, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59,
+	0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x57,
+	0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c,
+	0x45, 0x54, 0x45, 0x44, 0x10, 0x03, 0x3a, 0x5a, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0xc1, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70,
+	0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x88,
+	0x01, 0x01, 0x3a, 0x4e, 0x0a, 0x03, 0x63, 0x6c, 0x69, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc2, 0x38, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e,
+	0x43, 0x4c, 0x49, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x63, 0x6c, 0x69, 0x88,
+	0x01, 0x01, 0x3a, 0x5c, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x1e,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xc1, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61,
-	0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x88, 0x01, 0x01, 0x3a,
-	0x4e, 0x0a, 0x03, 0x63, 0x6c, 0x69, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc2, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x4c, 0x49,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x03, 0x63, 0x6c, 0x69, 0x88, 0x01, 0x01, 0x3a,
-	0x5c, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x1e, 0x2e, 0x67, 0x6f,
+	0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc2,
+	0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c,
+	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01,
+	0x3a, 0x59, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x1e, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc2, 0x38, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31,
-	0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x3a, 0x59, 0x0a,
-	0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc6, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
-	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x63, 0x6f,
-	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x88, 0x01, 0x01, 0x3a, 0x53, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0xc3, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f,
-	0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a,
-	0x06, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67,
-	0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x06, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12,
-	0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xc5, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61,
-	0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5c, 0x0a,
-	0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc1, 0x38, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x08,
-	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x88, 0x01, 0x01, 0x42, 0xb3, 0x01, 0x0a, 0x0f,
-	0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x42,
-	0x0d, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6c, 0x75,
-	0x64, 0x64, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
-	0x67, 0x6f, 0x2d, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f,
-	0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x65, 0x6d, 0x70,
-	0x6f, 0x72, 0x61, 0x6c, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x54,
-	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0b, 0x54, 0x65, 0x6d,
-	0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x17, 0x54, 0x65, 0x6d, 0x70, 0x6f,
-	0x72, 0x61, 0x6c, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x0c, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x3a, 0x3a, 0x56,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc6, 0x38, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31,
+	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x88, 0x01, 0x01, 0x3a, 0x53, 0x0a, 0x05, 0x71,
+	0x75, 0x65, 0x72, 0x79, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc3, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x74, 0x65,
+	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x88, 0x01, 0x01,
+	0x3a, 0x56, 0x0a, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74,
+	0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0x38, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e,
+	0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x06, 0x73,
+	0x69, 0x67, 0x6e, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0xc5, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70,
+	0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x88, 0x01, 0x01,
+	0x3a, 0x5c, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x1e, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc1, 0x38, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76,
+	0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x88, 0x01, 0x01, 0x42, 0xb3,
+	0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e,
+	0x76, 0x31, 0x42, 0x0d, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x63, 0x6c, 0x75, 0x64, 0x64, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67,
+	0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x67,
+	0x65, 0x6e, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x76, 0x31, 0x3b, 0x74,
+	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa,
+	0x02, 0x0b, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0b,
+	0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x17, 0x54, 0x65,
+	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c,
+	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1951,7 +1965,7 @@ func file_temporal_v1_temporal_proto_rawDescGZIP() []byte {
 
 var file_temporal_v1_temporal_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
 var file_temporal_v1_temporal_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
-var file_temporal_v1_temporal_proto_goTypes = []interface{}{
+var file_temporal_v1_temporal_proto_goTypes = []any{
 	(CLIFeature)(0),                     // 0: temporal.v1.CLIFeature
 	(IDReusePolicy)(0),                  // 1: temporal.v1.IDReusePolicy
 	(ParentClosePolicy)(0),              // 2: temporal.v1.ParentClosePolicy
@@ -1992,50 +2006,51 @@ var file_temporal_v1_temporal_proto_depIdxs = []int32{
 	16, // 12: temporal.v1.SignalOptions.xns:type_name -> temporal.v1.XNSActivityOptions
 	9,  // 13: temporal.v1.SignalOptions.patches:type_name -> temporal.v1.Patch
 	9,  // 14: temporal.v1.UpdateOptions.patches:type_name -> temporal.v1.Patch
-	3,  // 15: temporal.v1.UpdateOptions.wait_policy:type_name -> temporal.v1.WaitPolicy
-	16, // 16: temporal.v1.UpdateOptions.xns:type_name -> temporal.v1.XNSActivityOptions
-	17, // 17: temporal.v1.WorkflowOptions.query:type_name -> temporal.v1.WorkflowOptions.Query
-	18, // 18: temporal.v1.WorkflowOptions.signal:type_name -> temporal.v1.WorkflowOptions.Signal
-	19, // 19: temporal.v1.WorkflowOptions.update:type_name -> temporal.v1.WorkflowOptions.Update
-	20, // 20: temporal.v1.WorkflowOptions.execution_timeout:type_name -> google.protobuf.Duration
-	1,  // 21: temporal.v1.WorkflowOptions.id_reuse_policy:type_name -> temporal.v1.IDReusePolicy
-	2,  // 22: temporal.v1.WorkflowOptions.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
-	9,  // 23: temporal.v1.WorkflowOptions.patches:type_name -> temporal.v1.Patch
-	11, // 24: temporal.v1.WorkflowOptions.retry_policy:type_name -> temporal.v1.RetryPolicy
-	20, // 25: temporal.v1.WorkflowOptions.run_timeout:type_name -> google.protobuf.Duration
-	20, // 26: temporal.v1.WorkflowOptions.task_timeout:type_name -> google.protobuf.Duration
-	16, // 27: temporal.v1.WorkflowOptions.xns:type_name -> temporal.v1.XNSActivityOptions
-	20, // 28: temporal.v1.XNSActivityOptions.schedule_to_close_timeout:type_name -> google.protobuf.Duration
-	20, // 29: temporal.v1.XNSActivityOptions.schedule_to_start_timeout:type_name -> google.protobuf.Duration
-	20, // 30: temporal.v1.XNSActivityOptions.start_to_close_timeout:type_name -> google.protobuf.Duration
-	20, // 31: temporal.v1.XNSActivityOptions.heartbeat_interval:type_name -> google.protobuf.Duration
-	20, // 32: temporal.v1.XNSActivityOptions.heartbeat_timeout:type_name -> google.protobuf.Duration
-	11, // 33: temporal.v1.XNSActivityOptions.retry_policy:type_name -> temporal.v1.RetryPolicy
-	2,  // 34: temporal.v1.XNSActivityOptions.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
-	16, // 35: temporal.v1.WorkflowOptions.Query.xns:type_name -> temporal.v1.XNSActivityOptions
-	16, // 36: temporal.v1.WorkflowOptions.Signal.xns:type_name -> temporal.v1.XNSActivityOptions
-	16, // 37: temporal.v1.WorkflowOptions.Update.xns:type_name -> temporal.v1.XNSActivityOptions
-	21, // 38: temporal.v1.service:extendee -> google.protobuf.ServiceOptions
-	21, // 39: temporal.v1.cli:extendee -> google.protobuf.ServiceOptions
-	22, // 40: temporal.v1.activity:extendee -> google.protobuf.MethodOptions
-	22, // 41: temporal.v1.command:extendee -> google.protobuf.MethodOptions
-	22, // 42: temporal.v1.query:extendee -> google.protobuf.MethodOptions
-	22, // 43: temporal.v1.signal:extendee -> google.protobuf.MethodOptions
-	22, // 44: temporal.v1.update:extendee -> google.protobuf.MethodOptions
-	22, // 45: temporal.v1.workflow:extendee -> google.protobuf.MethodOptions
-	12, // 46: temporal.v1.service:type_name -> temporal.v1.ServiceOptions
-	7,  // 47: temporal.v1.cli:type_name -> temporal.v1.CLIOptions
-	6,  // 48: temporal.v1.activity:type_name -> temporal.v1.ActivityOptions
-	8,  // 49: temporal.v1.command:type_name -> temporal.v1.CommandOptions
-	10, // 50: temporal.v1.query:type_name -> temporal.v1.QueryOptions
-	13, // 51: temporal.v1.signal:type_name -> temporal.v1.SignalOptions
-	14, // 52: temporal.v1.update:type_name -> temporal.v1.UpdateOptions
-	15, // 53: temporal.v1.workflow:type_name -> temporal.v1.WorkflowOptions
-	54, // [54:54] is the sub-list for method output_type
-	54, // [54:54] is the sub-list for method input_type
-	46, // [46:54] is the sub-list for extension type_name
-	38, // [38:46] is the sub-list for extension extendee
-	0,  // [0:38] is the sub-list for field type_name
+	3,  // 15: temporal.v1.UpdateOptions.wait_for_stage:type_name -> temporal.v1.WaitPolicy
+	3,  // 16: temporal.v1.UpdateOptions.wait_policy:type_name -> temporal.v1.WaitPolicy
+	16, // 17: temporal.v1.UpdateOptions.xns:type_name -> temporal.v1.XNSActivityOptions
+	17, // 18: temporal.v1.WorkflowOptions.query:type_name -> temporal.v1.WorkflowOptions.Query
+	18, // 19: temporal.v1.WorkflowOptions.signal:type_name -> temporal.v1.WorkflowOptions.Signal
+	19, // 20: temporal.v1.WorkflowOptions.update:type_name -> temporal.v1.WorkflowOptions.Update
+	20, // 21: temporal.v1.WorkflowOptions.execution_timeout:type_name -> google.protobuf.Duration
+	1,  // 22: temporal.v1.WorkflowOptions.id_reuse_policy:type_name -> temporal.v1.IDReusePolicy
+	2,  // 23: temporal.v1.WorkflowOptions.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
+	9,  // 24: temporal.v1.WorkflowOptions.patches:type_name -> temporal.v1.Patch
+	11, // 25: temporal.v1.WorkflowOptions.retry_policy:type_name -> temporal.v1.RetryPolicy
+	20, // 26: temporal.v1.WorkflowOptions.run_timeout:type_name -> google.protobuf.Duration
+	20, // 27: temporal.v1.WorkflowOptions.task_timeout:type_name -> google.protobuf.Duration
+	16, // 28: temporal.v1.WorkflowOptions.xns:type_name -> temporal.v1.XNSActivityOptions
+	20, // 29: temporal.v1.XNSActivityOptions.schedule_to_close_timeout:type_name -> google.protobuf.Duration
+	20, // 30: temporal.v1.XNSActivityOptions.schedule_to_start_timeout:type_name -> google.protobuf.Duration
+	20, // 31: temporal.v1.XNSActivityOptions.start_to_close_timeout:type_name -> google.protobuf.Duration
+	20, // 32: temporal.v1.XNSActivityOptions.heartbeat_interval:type_name -> google.protobuf.Duration
+	20, // 33: temporal.v1.XNSActivityOptions.heartbeat_timeout:type_name -> google.protobuf.Duration
+	11, // 34: temporal.v1.XNSActivityOptions.retry_policy:type_name -> temporal.v1.RetryPolicy
+	2,  // 35: temporal.v1.XNSActivityOptions.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
+	16, // 36: temporal.v1.WorkflowOptions.Query.xns:type_name -> temporal.v1.XNSActivityOptions
+	16, // 37: temporal.v1.WorkflowOptions.Signal.xns:type_name -> temporal.v1.XNSActivityOptions
+	16, // 38: temporal.v1.WorkflowOptions.Update.xns:type_name -> temporal.v1.XNSActivityOptions
+	21, // 39: temporal.v1.service:extendee -> google.protobuf.ServiceOptions
+	21, // 40: temporal.v1.cli:extendee -> google.protobuf.ServiceOptions
+	22, // 41: temporal.v1.activity:extendee -> google.protobuf.MethodOptions
+	22, // 42: temporal.v1.command:extendee -> google.protobuf.MethodOptions
+	22, // 43: temporal.v1.query:extendee -> google.protobuf.MethodOptions
+	22, // 44: temporal.v1.signal:extendee -> google.protobuf.MethodOptions
+	22, // 45: temporal.v1.update:extendee -> google.protobuf.MethodOptions
+	22, // 46: temporal.v1.workflow:extendee -> google.protobuf.MethodOptions
+	12, // 47: temporal.v1.service:type_name -> temporal.v1.ServiceOptions
+	7,  // 48: temporal.v1.cli:type_name -> temporal.v1.CLIOptions
+	6,  // 49: temporal.v1.activity:type_name -> temporal.v1.ActivityOptions
+	8,  // 50: temporal.v1.command:type_name -> temporal.v1.CommandOptions
+	10, // 51: temporal.v1.query:type_name -> temporal.v1.QueryOptions
+	13, // 52: temporal.v1.signal:type_name -> temporal.v1.SignalOptions
+	14, // 53: temporal.v1.update:type_name -> temporal.v1.UpdateOptions
+	15, // 54: temporal.v1.workflow:type_name -> temporal.v1.WorkflowOptions
+	55, // [55:55] is the sub-list for method output_type
+	55, // [55:55] is the sub-list for method input_type
+	47, // [47:55] is the sub-list for extension type_name
+	39, // [39:47] is the sub-list for extension extendee
+	0,  // [0:39] is the sub-list for field type_name
 }
 
 func init() { file_temporal_v1_temporal_proto_init() }
@@ -2044,7 +2059,7 @@ func file_temporal_v1_temporal_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_temporal_v1_temporal_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ActivityOptions); i {
 			case 0:
 				return &v.state
@@ -2056,7 +2071,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*CLIOptions); i {
 			case 0:
 				return &v.state
@@ -2068,7 +2083,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*CommandOptions); i {
 			case 0:
 				return &v.state
@@ -2080,7 +2095,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*Patch); i {
 			case 0:
 				return &v.state
@@ -2092,7 +2107,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryOptions); i {
 			case 0:
 				return &v.state
@@ -2104,7 +2119,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*RetryPolicy); i {
 			case 0:
 				return &v.state
@@ -2116,7 +2131,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*ServiceOptions); i {
 			case 0:
 				return &v.state
@@ -2128,7 +2143,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SignalOptions); i {
 			case 0:
 				return &v.state
@@ -2140,7 +2155,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateOptions); i {
 			case 0:
 				return &v.state
@@ -2152,7 +2167,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowOptions); i {
 			case 0:
 				return &v.state
@@ -2164,7 +2179,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*XNSActivityOptions); i {
 			case 0:
 				return &v.state
@@ -2176,7 +2191,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowOptions_Query); i {
 			case 0:
 				return &v.state
@@ -2188,7 +2203,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowOptions_Signal); i {
 			case 0:
 				return &v.state
@@ -2200,7 +2215,7 @@ func file_temporal_v1_temporal_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_v1_temporal_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_v1_temporal_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowOptions_Update); i {
 			case 0:
 				return &v.state
diff --git a/gen/temporal/xns/v1/xns.pb.go b/gen/temporal/xns/v1/xns.pb.go
index 9f6426e9..0675aab2 100644
--- a/gen/temporal/xns/v1/xns.pb.go
+++ b/gen/temporal/xns/v1/xns.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: temporal/xns/v1/xns.proto
 
@@ -625,11 +625,13 @@ type UpdateWorkflowWithOptionsRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UpdateId            string     `protobuf:"bytes,1,opt,name=update_id,json=updateId,proto3" json:"update_id,omitempty"`
-	WorkflowId          string     `protobuf:"bytes,2,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"`
-	RunId               string     `protobuf:"bytes,3,opt,name=run_id,json=runId,proto3" json:"run_id,omitempty"`
-	FirstExecutionRunId string     `protobuf:"bytes,4,opt,name=first_execution_run_id,json=firstExecutionRunId,proto3" json:"first_execution_run_id,omitempty"`
-	WaitPolicy          WaitPolicy `protobuf:"varint,5,opt,name=wait_policy,json=waitPolicy,proto3,enum=temporal.xns.v1.WaitPolicy" json:"wait_policy,omitempty"`
+	UpdateId            string `protobuf:"bytes,1,opt,name=update_id,json=updateId,proto3" json:"update_id,omitempty"`
+	WorkflowId          string `protobuf:"bytes,2,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"`
+	RunId               string `protobuf:"bytes,3,opt,name=run_id,json=runId,proto3" json:"run_id,omitempty"`
+	FirstExecutionRunId string `protobuf:"bytes,4,opt,name=first_execution_run_id,json=firstExecutionRunId,proto3" json:"first_execution_run_id,omitempty"`
+	// Deprecated: Marked as deprecated in temporal/xns/v1/xns.proto.
+	WaitPolicy   WaitPolicy `protobuf:"varint,5,opt,name=wait_policy,json=waitPolicy,proto3,enum=temporal.xns.v1.WaitPolicy" json:"wait_policy,omitempty"`
+	WaitForStage WaitPolicy `protobuf:"varint,6,opt,name=wait_for_stage,json=waitForStage,proto3,enum=temporal.xns.v1.WaitPolicy" json:"wait_for_stage,omitempty"`
 }
 
 func (x *UpdateWorkflowWithOptionsRequest) Reset() {
@@ -692,6 +694,7 @@ func (x *UpdateWorkflowWithOptionsRequest) GetFirstExecutionRunId() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in temporal/xns/v1/xns.proto.
 func (x *UpdateWorkflowWithOptionsRequest) GetWaitPolicy() WaitPolicy {
 	if x != nil {
 		return x.WaitPolicy
@@ -699,6 +702,13 @@ func (x *UpdateWorkflowWithOptionsRequest) GetWaitPolicy() WaitPolicy {
 	return WaitPolicy_WAIT_POLICY_UNSPECIFIED
 }
 
+func (x *UpdateWorkflowWithOptionsRequest) GetWaitForStage() WaitPolicy {
+	if x != nil {
+		return x.WaitForStage
+	}
+	return WaitPolicy_WAIT_POLICY_UNSPECIFIED
+}
+
 // WorkflowRequest can be used to configure xns workflow activities
 type WorkflowRequest struct {
 	state         protoimpl.MessageState
@@ -903,7 +913,7 @@ var file_temporal_xns_v1_xns_proto_rawDesc = []byte{
 	0x73, 0x12, 0x2e, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x22, 0xea, 0x01, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b,
+	0x74, 0x22, 0xb1, 0x02, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b,
 	0x66, 0x6c, 0x6f, 0x77, 0x57, 0x69, 0x74, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
 	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x70, 0x64, 0x61, 0x74,
@@ -914,82 +924,86 @@ var file_temporal_xns_v1_xns_proto_rawDesc = []byte{
 	0x69, 0x72, 0x73, 0x74, 0x5f, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72,
 	0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x66, 0x69, 0x72,
 	0x73, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6e, 0x49, 0x64,
-	0x12, 0x3c, 0x0a, 0x0b, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
+	0x12, 0x40, 0x0a, 0x0b, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
 	0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c,
 	0x2e, 0x78, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x0a, 0x77, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x82,
-	0x03, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x48, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x5f,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x68, 0x65, 0x61, 0x72, 0x74,
-	0x62, 0x65, 0x61, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x5b, 0x0a, 0x16,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x74,
-	0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x78, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53,
-	0x74, 0x61, 0x72, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x14, 0x73, 0x74, 0x61, 0x72, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
-	0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x74,
-	0x61, 0x63, 0x68, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x65, 0x74,
-	0x61, 0x63, 0x68, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x73, 0x69, 0x67,
-	0x6e, 0x61, 0x6c, 0x12, 0x4e, 0x0a, 0x13, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c,
-	0x6f, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x52, 0x11, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x2a, 0x83, 0x02, 0x0a, 0x0d, 0x49, 0x44, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x28, 0x0a, 0x24, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f,
-	0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
-	0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
-	0x2c, 0x0a, 0x28, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52,
-	0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f,
-	0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x38, 0x0a,
-	0x34, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55,
-	0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f,
-	0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44,
-	0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x2d, 0x0a, 0x29, 0x57, 0x4f, 0x52, 0x4b, 0x46,
-	0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c,
-	0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49,
-	0x43, 0x41, 0x54, 0x45, 0x10, 0x03, 0x12, 0x31, 0x0a, 0x2d, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c,
+	0x63, 0x79, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x77, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x12, 0x41, 0x0a, 0x0e, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x73,
+	0x74, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x6d,
+	0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x78, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x69,
+	0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0c, 0x77, 0x61, 0x69, 0x74, 0x46, 0x6f, 0x72,
+	0x53, 0x74, 0x61, 0x67, 0x65, 0x22, 0x82, 0x03, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x12, 0x68, 0x65, 0x61,
+	0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x11, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x76, 0x61, 0x6c, 0x12, 0x5b, 0x0a, 0x16, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x6f, 0x72,
+	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x78,
+	0x6e, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x14, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x2e, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x08, 0x64, 0x65, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x06,
+	0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
+	0x6e, 0x79, 0x52, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12, 0x4e, 0x0a, 0x13, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72,
+	0x61, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73,
+	0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x11, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43,
+	0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2a, 0x83, 0x02, 0x0a, 0x0d, 0x49,
+	0x44, 0x52, 0x65, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x28, 0x0a, 0x24,
+	0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53,
+	0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x2c, 0x0a, 0x28, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c,
 	0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
-	0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f,
-	0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x2a, 0xa4, 0x01, 0x0a, 0x11, 0x50, 0x61,
-	0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x23, 0x0a, 0x1f, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f,
-	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x21, 0x0a, 0x1d, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43,
-	0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d,
-	0x49, 0x4e, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x41, 0x52, 0x45, 0x4e,
-	0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41,
-	0x42, 0x41, 0x4e, 0x44, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x26, 0x0a, 0x22, 0x50, 0x41, 0x52, 0x45,
-	0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
-	0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x10, 0x03,
-	0x2a, 0x78, 0x0a, 0x0a, 0x57, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1b,
-	0x0a, 0x17, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x57,
-	0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x54,
-	0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f,
-	0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12,
-	0x19, 0x0a, 0x15, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43,
-	0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x03, 0x42, 0xc2, 0x01, 0x0a, 0x13, 0x63,
-	0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x78, 0x6e, 0x73, 0x2e,
-	0x76, 0x31, 0x42, 0x08, 0x58, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6c, 0x75, 0x64, 0x64,
-	0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f,
-	0x2d, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x74, 0x65,
-	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x78, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x78, 0x6e,
-	0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x0f, 0x54, 0x65, 0x6d, 0x70,
-	0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x58, 0x6e, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x54, 0x65,
-	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x58, 0x6e, 0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b,
-	0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x58, 0x6e, 0x73, 0x5c, 0x56, 0x31, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x54, 0x65,
-	0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x3a, 0x3a, 0x58, 0x6e, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x43, 0x59, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41,
+	0x54, 0x45, 0x10, 0x01, 0x12, 0x38, 0x0a, 0x34, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57,
+	0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59,
+	0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45,
+	0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x2d,
+	0x0a, 0x29, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45,
+	0x55, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43,
+	0x54, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x10, 0x03, 0x12, 0x31, 0x0a,
+	0x2d, 0x57, 0x4f, 0x52, 0x4b, 0x46, 0x4c, 0x4f, 0x57, 0x5f, 0x49, 0x44, 0x5f, 0x52, 0x45, 0x55,
+	0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e,
+	0x41, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x04,
+	0x2a, 0xa4, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54,
+	0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e,
+	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x21, 0x0a, 0x1d, 0x50,
+	0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
+	0x43, 0x59, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x1f,
+	0x0a, 0x1b, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f, 0x50,
+	0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x42, 0x41, 0x4e, 0x44, 0x4f, 0x4e, 0x10, 0x02, 0x12,
+	0x26, 0x0a, 0x22, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x5f,
+	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x43,
+	0x41, 0x4e, 0x43, 0x45, 0x4c, 0x10, 0x03, 0x2a, 0x78, 0x0a, 0x0a, 0x57, 0x61, 0x69, 0x74, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1b, 0x0a, 0x17, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f,
+	0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
+	0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
+	0x59, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14,
+	0x57, 0x41, 0x49, 0x54, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x41, 0x43, 0x43, 0x45,
+	0x50, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x50,
+	0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10,
+	0x03, 0x42, 0xc2, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72,
+	0x61, 0x6c, 0x2e, 0x78, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x58, 0x6e, 0x73, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x63, 0x6c, 0x75, 0x64, 0x64, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c,
+	0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x78, 0x6e,
+	0x73, 0x2f, 0x76, 0x31, 0x3b, 0x78, 0x6e, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58,
+	0xaa, 0x02, 0x0f, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2e, 0x58, 0x6e, 0x73, 0x2e,
+	0x56, 0x31, 0xca, 0x02, 0x0f, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c, 0x58, 0x6e,
+	0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x5c,
+	0x58, 0x6e, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x11, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x6c, 0x3a, 0x3a, 0x58,
+	0x6e, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1006,7 +1020,7 @@ func file_temporal_xns_v1_xns_proto_rawDescGZIP() []byte {
 
 var file_temporal_xns_v1_xns_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_temporal_xns_v1_xns_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_temporal_xns_v1_xns_proto_goTypes = []interface{}{
+var file_temporal_xns_v1_xns_proto_goTypes = []any{
 	(IDReusePolicy)(0),                       // 0: temporal.xns.v1.IDReusePolicy
 	(ParentClosePolicy)(0),                   // 1: temporal.xns.v1.ParentClosePolicy
 	(WaitPolicy)(0),                          // 2: temporal.xns.v1.WaitPolicy
@@ -1041,16 +1055,17 @@ var file_temporal_xns_v1_xns_proto_depIdxs = []int32{
 	8,  // 15: temporal.xns.v1.UpdateRequest.update_workflow_options:type_name -> temporal.xns.v1.UpdateWorkflowWithOptionsRequest
 	10, // 16: temporal.xns.v1.UpdateRequest.request:type_name -> google.protobuf.Any
 	2,  // 17: temporal.xns.v1.UpdateWorkflowWithOptionsRequest.wait_policy:type_name -> temporal.xns.v1.WaitPolicy
-	11, // 18: temporal.xns.v1.WorkflowRequest.heartbeat_interval:type_name -> google.protobuf.Duration
-	6,  // 19: temporal.xns.v1.WorkflowRequest.start_workflow_options:type_name -> temporal.xns.v1.StartWorkflowOptions
-	10, // 20: temporal.xns.v1.WorkflowRequest.request:type_name -> google.protobuf.Any
-	10, // 21: temporal.xns.v1.WorkflowRequest.signal:type_name -> google.protobuf.Any
-	13, // 22: temporal.xns.v1.WorkflowRequest.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
-	23, // [23:23] is the sub-list for method output_type
-	23, // [23:23] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	2,  // 18: temporal.xns.v1.UpdateWorkflowWithOptionsRequest.wait_for_stage:type_name -> temporal.xns.v1.WaitPolicy
+	11, // 19: temporal.xns.v1.WorkflowRequest.heartbeat_interval:type_name -> google.protobuf.Duration
+	6,  // 20: temporal.xns.v1.WorkflowRequest.start_workflow_options:type_name -> temporal.xns.v1.StartWorkflowOptions
+	10, // 21: temporal.xns.v1.WorkflowRequest.request:type_name -> google.protobuf.Any
+	10, // 22: temporal.xns.v1.WorkflowRequest.signal:type_name -> google.protobuf.Any
+	13, // 23: temporal.xns.v1.WorkflowRequest.parent_close_policy:type_name -> temporal.v1.ParentClosePolicy
+	24, // [24:24] is the sub-list for method output_type
+	24, // [24:24] is the sub-list for method input_type
+	24, // [24:24] is the sub-list for extension type_name
+	24, // [24:24] is the sub-list for extension extendee
+	0,  // [0:24] is the sub-list for field type_name
 }
 
 func init() { file_temporal_xns_v1_xns_proto_init() }
@@ -1059,7 +1074,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_temporal_xns_v1_xns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryRequest); i {
 			case 0:
 				return &v.state
@@ -1071,7 +1086,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*RetryPolicy); i {
 			case 0:
 				return &v.state
@@ -1083,7 +1098,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*SignalRequest); i {
 			case 0:
 				return &v.state
@@ -1095,7 +1110,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*StartWorkflowOptions); i {
 			case 0:
 				return &v.state
@@ -1107,7 +1122,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateRequest); i {
 			case 0:
 				return &v.state
@@ -1119,7 +1134,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateWorkflowWithOptionsRequest); i {
 			case 0:
 				return &v.state
@@ -1131,7 +1146,7 @@ func file_temporal_xns_v1_xns_proto_init() {
 				return nil
 			}
 		}
-		file_temporal_xns_v1_xns_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_temporal_xns_v1_xns_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowRequest); i {
 			case 0:
 				return &v.state
diff --git a/gen/test/expression/v1/expression.pb.go b/gen/test/expression/v1/expression.pb.go
index 40d6c642..4c433f1a 100644
--- a/gen/test/expression/v1/expression.pb.go
+++ b/gen/test/expression/v1/expression.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: test/expression/v1/expression.proto
 
@@ -316,7 +316,7 @@ func file_test_expression_v1_expression_proto_rawDescGZIP() []byte {
 }
 
 var file_test_expression_v1_expression_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_test_expression_v1_expression_proto_goTypes = []interface{}{
+var file_test_expression_v1_expression_proto_goTypes = []any{
 	(*Request)(nil),                         // 0: temporal.v1.test.expression.v1.Request
 	(*Request_OuterNested)(nil),             // 1: temporal.v1.test.expression.v1.Request.OuterNested
 	(*Request_OuterNested_InnerNested)(nil), // 2: temporal.v1.test.expression.v1.Request.OuterNested.InnerNested
@@ -339,7 +339,7 @@ func file_test_expression_v1_expression_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_test_expression_v1_expression_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_test_expression_v1_expression_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Request); i {
 			case 0:
 				return &v.state
@@ -351,7 +351,7 @@ func file_test_expression_v1_expression_proto_init() {
 				return nil
 			}
 		}
-		file_test_expression_v1_expression_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_test_expression_v1_expression_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Request_OuterNested); i {
 			case 0:
 				return &v.state
@@ -363,7 +363,7 @@ func file_test_expression_v1_expression_proto_init() {
 				return nil
 			}
 		}
-		file_test_expression_v1_expression_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_test_expression_v1_expression_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Request_OuterNested_InnerNested); i {
 			case 0:
 				return &v.state
diff --git a/gen/test/option/v1/option.pb.go b/gen/test/option/v1/option.pb.go
index 9e82a3f0..400daf6e 100644
--- a/gen/test/option/v1/option.pb.go
+++ b/gen/test/option/v1/option.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: test/option/v1/option.proto
 
@@ -231,7 +231,7 @@ var file_test_option_v1_option_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x2e, 0x0a, 0x18, 0x57, 0x6f, 0x72,
 	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x57, 0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0xa6, 0x04, 0x0a, 0x04, 0x54, 0x65,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0xa8, 0x04, 0x0a, 0x04, 0x54, 0x65,
 	0x73, 0x74, 0x12, 0x91, 0x01, 0x0a, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x57,
 	0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x28, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
 	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
@@ -241,44 +241,45 @@ var file_test_option_v1_option_proto_rawDesc = []byte{
 	0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x92,
 	0xc4, 0x03, 0x23, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x76, 0x32, 0x12, 0x02,
 	0x08, 0x78, 0x1a, 0x02, 0x08, 0x0a, 0x22, 0x02, 0x08, 0x3c, 0x2a, 0x02, 0x08, 0x1e, 0x32, 0x04,
-	0x1a, 0x02, 0x08, 0x05, 0x40, 0x01, 0x12, 0x95, 0x01, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x1a, 0x02, 0x08, 0x05, 0x40, 0x01, 0x12, 0x97, 0x01, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74,
 	0x65, 0x57, 0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x26, 0x2e, 0x74, 0x65, 0x73,
 	0x74, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61,
 	0x74, 0x65, 0x57, 0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x42, 0xaa, 0xc4, 0x03, 0x3e,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x44, 0xaa, 0xc4, 0x03, 0x40,
 	0x0a, 0x3a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2d, 0x77, 0x69, 0x74, 0x68, 0x2d, 0x69, 0x6e,
 	0x70, 0x75, 0x74, 0x3a, 0x24, 0x7b, 0x21, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2e, 0x6f, 0x72, 0x28,
 	0x74, 0x68, 0x72, 0x6f, 0x77, 0x28, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x69, 0x73, 0x20, 0x72,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x29, 0x29, 0x20, 0x7d, 0x18, 0x03, 0x12, 0xe0,
-	0x01, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x57, 0x69, 0x74, 0x68, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x12, 0x28, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x57, 0x69,
-	0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x88, 0x01, 0x8a, 0xc4, 0x03, 0x83, 0x01, 0x1a, 0x11,
-	0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75,
-	0x74, 0x22, 0x03, 0x08, 0xd8, 0x04, 0x2a, 0x3c, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x2d, 0x77, 0x69, 0x74, 0x68, 0x2d, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x3a, 0x24, 0x7b, 0x21, 0x20,
-	0x6e, 0x61, 0x6d, 0x65, 0x2e, 0x6f, 0x72, 0x28, 0x74, 0x68, 0x72, 0x6f, 0x77, 0x28, 0x22, 0x6e,
-	0x61, 0x6d, 0x65, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22,
-	0x29, 0x29, 0x20, 0x7d, 0x30, 0x02, 0x40, 0x03, 0x4a, 0x02, 0x20, 0x05, 0x52, 0x03, 0x08, 0xac,
-	0x02, 0x5a, 0x09, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x76, 0x32, 0x62, 0x02, 0x08, 0x0a,
-	0x68, 0x01, 0x7a, 0x0d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20,
-	0x0a, 0x1a, 0x0f, 0x8a, 0xc4, 0x03, 0x0b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2d,
-	0x76, 0x31, 0x42, 0xc2, 0x01, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6c, 0x75, 0x64, 0x64, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x74, 0x65, 0x6d, 0x70, 0x6f,
-	0x72, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x31, 0xa2,
-	0x02, 0x03, 0x54, 0x4f, 0x58, 0xaa, 0x02, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x2e, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x5c, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x5c, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x10, 0x54, 0x65, 0x73, 0x74, 0x3a, 0x3a, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x29, 0x29, 0x20, 0x7d, 0x18, 0x01, 0x38, 0x03,
+	0x12, 0xe0, 0x01, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x57, 0x69, 0x74,
+	0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x28, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
+	0x57, 0x69, 0x74, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x88, 0x01, 0x8a, 0xc4, 0x03, 0x83, 0x01,
+	0x1a, 0x11, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x69, 0x74, 0x68, 0x49, 0x6e,
+	0x70, 0x75, 0x74, 0x22, 0x03, 0x08, 0xd8, 0x04, 0x2a, 0x3c, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x2d, 0x77, 0x69, 0x74, 0x68, 0x2d, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x3a, 0x24, 0x7b,
+	0x21, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2e, 0x6f, 0x72, 0x28, 0x74, 0x68, 0x72, 0x6f, 0x77, 0x28,
+	0x22, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
+	0x64, 0x22, 0x29, 0x29, 0x20, 0x7d, 0x30, 0x02, 0x40, 0x03, 0x4a, 0x02, 0x20, 0x05, 0x52, 0x03,
+	0x08, 0xac, 0x02, 0x5a, 0x09, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x76, 0x32, 0x62, 0x02,
+	0x08, 0x0a, 0x68, 0x01, 0x7a, 0x0d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x61, 0x6d,
+	0x65, 0x20, 0x0a, 0x1a, 0x0f, 0x8a, 0xc4, 0x03, 0x0b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x2d, 0x76, 0x31, 0x42, 0xc2, 0x01, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73,
+	0x74, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6c, 0x75, 0x64, 0x64, 0x65, 0x6e, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x74, 0x65, 0x6d,
+	0x70, 0x6f, 0x72, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x76,
+	0x31, 0xa2, 0x02, 0x03, 0x54, 0x4f, 0x58, 0xaa, 0x02, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x2e, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x5c,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1a, 0x54, 0x65, 0x73, 0x74,
+	0x5c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x10, 0x54, 0x65, 0x73, 0x74, 0x3a, 0x3a, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -294,7 +295,7 @@ func file_test_option_v1_option_proto_rawDescGZIP() []byte {
 }
 
 var file_test_option_v1_option_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_test_option_v1_option_proto_goTypes = []interface{}{
+var file_test_option_v1_option_proto_goTypes = []any{
 	(*ActivityWithInputRequest)(nil),  // 0: test.option.v1.ActivityWithInputRequest
 	(*ActivityWithInputResponse)(nil), // 1: test.option.v1.ActivityWithInputResponse
 	(*UpdateWithInputRequest)(nil),    // 2: test.option.v1.UpdateWithInputRequest
@@ -321,7 +322,7 @@ func file_test_option_v1_option_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_test_option_v1_option_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_test_option_v1_option_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ActivityWithInputRequest); i {
 			case 0:
 				return &v.state
@@ -333,7 +334,7 @@ func file_test_option_v1_option_proto_init() {
 				return nil
 			}
 		}
-		file_test_option_v1_option_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_test_option_v1_option_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*ActivityWithInputResponse); i {
 			case 0:
 				return &v.state
@@ -345,7 +346,7 @@ func file_test_option_v1_option_proto_init() {
 				return nil
 			}
 		}
-		file_test_option_v1_option_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_test_option_v1_option_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateWithInputRequest); i {
 			case 0:
 				return &v.state
@@ -357,7 +358,7 @@ func file_test_option_v1_option_proto_init() {
 				return nil
 			}
 		}
-		file_test_option_v1_option_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_test_option_v1_option_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*WorkflowWithInputRequest); i {
 			case 0:
 				return &v.state
diff --git a/gen/test/option/v1/option_temporal.pb.go b/gen/test/option/v1/option_temporal.pb.go
index bf79abe4..c707d210 100644
--- a/gen/test/option/v1/option_temporal.pb.go
+++ b/gen/test/option/v1/option_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -20,7 +20,6 @@ import (
 	v2 "github.com/urfave/cli/v2"
 	enumsv1 "go.temporal.io/api/enums/v1"
 	serviceerror "go.temporal.io/api/serviceerror"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -221,8 +220,8 @@ func (c *testClient) UpdateWithInput(ctx context.Context, workflowID string, run
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.UpdateWithInputAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.UpdateWithInputAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return err
 	}
@@ -241,14 +240,14 @@ func (c *testClient) UpdateWithInputAsync(ctx context.Context, workflowID string
 		o = NewUpdateWithInputOptions()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -533,23 +532,23 @@ func (h *updateWithInputHandle) Get(ctx context.Context) error {
 
 // UpdateWithInputOptions provides configuration for a test.option.v1.Test.UpdateWithInput update operation
 type UpdateWithInputOptions struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewUpdateWithInputOptions initializes a new UpdateWithInputOptions value
 func NewUpdateWithInputOptions() *UpdateWithInputOptions {
-	return &UpdateWithInputOptions{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &UpdateWithInputOptions{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *UpdateWithInputOptions) Build(workflowID string, runID string, req *UpdateWithInputRequest) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *UpdateWithInputOptions) Build(workflowID string, runID string, req *UpdateWithInputRequest) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -570,10 +569,10 @@ func (o *UpdateWithInputOptions) Build(workflowID string, runID string, req *Upd
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
-	} else if opts.WaitPolicy.GetLifecycleStage() == enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
+	} else if opts.WaitForStage == client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = client.WorkflowUpdateStageCompleted
 	}
 	return opts, nil
 }
@@ -584,14 +583,14 @@ func (o *UpdateWithInputOptions) WithUpdateID(id string) *UpdateWithInputOptions
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *UpdateWithInputOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *UpdateWithInputOptions {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *UpdateWithInputOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *UpdateWithInputOptions {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *UpdateWithInputOptions) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *UpdateWithInputOptions {
+func (o *UpdateWithInputOptions) WithWaitPolicy(policy client.WorkflowUpdateStage) *UpdateWithInputOptions {
 	o.waitPolicy = policy
 	return o
 }
@@ -1278,7 +1277,7 @@ func (c *TestTestClient) UpdateWithInput(ctx context.Context, workflowID string,
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.UpdateWithInputAsync(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return err
@@ -1321,7 +1320,7 @@ var _ UpdateWithInputHandle = &testUpdateWithInputHandle{}
 type testUpdateWithInputHandle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *UpdateWithInputRequest
 	runID      string
 	workflowID string
diff --git a/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go b/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go
index 2ac263c7..a7d19530 100644
--- a/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go
+++ b/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -19,7 +19,6 @@ import (
 	xns "github.com/cludden/protoc-gen-go-temporal/pkg/xns"
 	uuid "github.com/google/uuid"
 	enumsv1 "go.temporal.io/api/enums/v1"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -327,7 +326,7 @@ func WorkflowWithInputAsync(ctx workflow.Context, req *v1.WorkflowWithInputReque
 type UpdateWithInputUpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewUpdateWithInputUpdateOptions initializes a new UpdateWithInputUpdateOptions value
@@ -348,7 +347,7 @@ func (opts *UpdateWithInputUpdateOptions) WithHeartbeatInterval(d time.Duration)
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *UpdateWithInputUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *UpdateWithInputUpdateOptions {
+func (opts *UpdateWithInputUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *UpdateWithInputUpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -447,7 +446,7 @@ func UpdateWithInputAsync(ctx workflow.Context, workflowID string, runID string,
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -652,9 +651,7 @@ func (a *testActivities) UpdateWithInput(ctx context.Context, input *xnsv1.Updat
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.UpdateWithInputAsync(
diff --git a/gen/test/simple/common/v1/common.pb.go b/gen/test/simple/common/v1/common.pb.go
index e631f50b..db9f32d0 100644
--- a/gen/test/simple/common/v1/common.pb.go
+++ b/gen/test/simple/common/v1/common.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: test/simple/common/v1/common.proto
 
@@ -184,7 +184,7 @@ func file_test_simple_common_v1_common_proto_rawDescGZIP() []byte {
 }
 
 var file_test_simple_common_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_test_simple_common_v1_common_proto_goTypes = []interface{}{
+var file_test_simple_common_v1_common_proto_goTypes = []any{
 	(*PaginatedRequest)(nil),  // 0: mycompany.simple.common.v1.PaginatedRequest
 	(*PaginatedResponse)(nil), // 1: mycompany.simple.common.v1.PaginatedResponse
 	(*anypb.Any)(nil),         // 2: google.protobuf.Any
@@ -204,7 +204,7 @@ func file_test_simple_common_v1_common_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_test_simple_common_v1_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_common_v1_common_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*PaginatedRequest); i {
 			case 0:
 				return &v.state
@@ -216,7 +216,7 @@ func file_test_simple_common_v1_common_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_common_v1_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_common_v1_common_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PaginatedResponse); i {
 			case 0:
 				return &v.state
diff --git a/gen/test/simple/v1/simple.pb.go b/gen/test/simple/v1/simple.pb.go
index 680db418..47bc77e0 100644
--- a/gen/test/simple/v1/simple.pb.go
+++ b/gen/test/simple/v1/simple.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: test/simple/v1/simple.proto
 
@@ -2134,7 +2134,7 @@ func file_test_simple_v1_simple_proto_rawDescGZIP() []byte {
 
 var file_test_simple_v1_simple_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_test_simple_v1_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
-var file_test_simple_v1_simple_proto_goTypes = []interface{}{
+var file_test_simple_v1_simple_proto_goTypes = []any{
 	(OtherEnum)(0),                   // 0: mycompany.simple.OtherEnum
 	(*SomeWorkflow1Request)(nil),     // 1: mycompany.simple.SomeWorkflow1Request
 	(*SomeWorkflow1Response)(nil),    // 2: mycompany.simple.SomeWorkflow1Response
@@ -2254,7 +2254,7 @@ func file_test_simple_v1_simple_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_test_simple_v1_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeWorkflow1Request); i {
 			case 0:
 				return &v.state
@@ -2266,7 +2266,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeWorkflow1Response); i {
 			case 0:
 				return &v.state
@@ -2278,7 +2278,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeWorkflow3Request); i {
 			case 0:
 				return &v.state
@@ -2290,7 +2290,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeActivity2Request); i {
 			case 0:
 				return &v.state
@@ -2302,7 +2302,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeActivity3Request); i {
 			case 0:
 				return &v.state
@@ -2314,7 +2314,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeActivity3Response); i {
 			case 0:
 				return &v.state
@@ -2326,7 +2326,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeQuery1Response); i {
 			case 0:
 				return &v.state
@@ -2338,7 +2338,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeQuery2Request); i {
 			case 0:
 				return &v.state
@@ -2350,7 +2350,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeQuery2Response); i {
 			case 0:
 				return &v.state
@@ -2362,7 +2362,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeSignal2Request); i {
 			case 0:
 				return &v.state
@@ -2374,7 +2374,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeSignal3Request); i {
 			case 0:
 				return &v.state
@@ -2386,7 +2386,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeSignal3Response); i {
 			case 0:
 				return &v.state
@@ -2398,7 +2398,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeUpdate1Request); i {
 			case 0:
 				return &v.state
@@ -2410,7 +2410,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeUpdate1Response); i {
 			case 0:
 				return &v.state
@@ -2422,7 +2422,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherWorkflowRequest); i {
 			case 0:
 				return &v.state
@@ -2434,7 +2434,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[15].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherWorkflowResponse); i {
 			case 0:
 				return &v.state
@@ -2446,7 +2446,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[16].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherQueryResponse); i {
 			case 0:
 				return &v.state
@@ -2458,7 +2458,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[17].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherSignalRequest); i {
 			case 0:
 				return &v.state
@@ -2470,7 +2470,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[18].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherUpdateRequest); i {
 			case 0:
 				return &v.state
@@ -2482,7 +2482,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[19].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherUpdateResponse); i {
 			case 0:
 				return &v.state
@@ -2494,7 +2494,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[20].Exporter = func(v any, i int) any {
 			switch v := v.(*Foo); i {
 			case 0:
 				return &v.state
@@ -2506,7 +2506,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[21].Exporter = func(v any, i int) any {
 			switch v := v.(*Qux); i {
 			case 0:
 				return &v.state
@@ -2518,7 +2518,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[22].Exporter = func(v any, i int) any {
 			switch v := v.(*WhatRequest); i {
 			case 0:
 				return &v.state
@@ -2530,7 +2530,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[23].Exporter = func(v any, i int) any {
 			switch v := v.(*LonelyActivity1Request); i {
 			case 0:
 				return &v.state
@@ -2542,7 +2542,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[24].Exporter = func(v any, i int) any {
 			switch v := v.(*LonelyActivity1Response); i {
 			case 0:
 				return &v.state
@@ -2554,7 +2554,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[25].Exporter = func(v any, i int) any {
 			switch v := v.(*SomeDeprecatedMessage); i {
 			case 0:
 				return &v.state
@@ -2566,7 +2566,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[26].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherWorkflowRequest_Bar); i {
 			case 0:
 				return &v.state
@@ -2578,7 +2578,7 @@ func file_test_simple_v1_simple_proto_init() {
 				return nil
 			}
 		}
-		file_test_simple_v1_simple_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_test_simple_v1_simple_proto_msgTypes[27].Exporter = func(v any, i int) any {
 			switch v := v.(*OtherWorkflowRequest_Baz); i {
 			case 0:
 				return &v.state
@@ -2591,7 +2591,7 @@ func file_test_simple_v1_simple_proto_init() {
 			}
 		}
 	}
-	file_test_simple_v1_simple_proto_msgTypes[14].OneofWrappers = []interface{}{
+	file_test_simple_v1_simple_proto_msgTypes[14].OneofWrappers = []any{
 		(*OtherWorkflowRequest_Foo)(nil),
 		(*OtherWorkflowRequest_Bar_)(nil),
 		(*OtherWorkflowRequest_ExampleBytes)(nil),
diff --git a/gen/test/simple/v1/simple_temporal.pb.go b/gen/test/simple/v1/simple_temporal.pb.go
index 7624c6ae..d508b5f8 100644
--- a/gen/test/simple/v1/simple_temporal.pb.go
+++ b/gen/test/simple/v1/simple_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -24,7 +24,6 @@ import (
 	v2 "github.com/urfave/cli/v2"
 	enumsv1 "go.temporal.io/api/enums/v1"
 	serviceerror "go.temporal.io/api/serviceerror"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -548,8 +547,8 @@ func (c *simpleClient) SomeUpdate1(ctx context.Context, workflowID string, runID
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.SomeUpdate1Async(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.SomeUpdate1Async(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -568,14 +567,14 @@ func (c *simpleClient) SomeUpdate1Async(ctx context.Context, workflowID string,
 		o = NewSomeUpdate1Options()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -1403,23 +1402,23 @@ func (h *someUpdate1Handle) Get(ctx context.Context) (*SomeUpdate1Response, erro
 
 // SomeUpdate1Options provides configuration for a mycompany.simple.Simple.SomeUpdate1 update operation
 type SomeUpdate1Options struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewSomeUpdate1Options initializes a new SomeUpdate1Options value
 func NewSomeUpdate1Options() *SomeUpdate1Options {
-	return &SomeUpdate1Options{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &SomeUpdate1Options{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *SomeUpdate1Options) Build(workflowID string, runID string, req *SomeUpdate1Request) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *SomeUpdate1Options) Build(workflowID string, runID string, req *SomeUpdate1Request) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -1440,10 +1439,10 @@ func (o *SomeUpdate1Options) Build(workflowID string, runID string, req *SomeUpd
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
-	} else if opts.WaitPolicy.GetLifecycleStage() == enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
+	} else if opts.WaitForStage == client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = client.WorkflowUpdateStageCompleted
 	}
 	return opts, nil
 }
@@ -1454,14 +1453,14 @@ func (o *SomeUpdate1Options) WithUpdateID(id string) *SomeUpdate1Options {
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *SomeUpdate1Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *SomeUpdate1Options {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *SomeUpdate1Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *SomeUpdate1Options {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *SomeUpdate1Options) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *SomeUpdate1Options {
+func (o *SomeUpdate1Options) WithWaitPolicy(policy client.WorkflowUpdateStage) *SomeUpdate1Options {
 	o.waitPolicy = policy
 	return o
 }
@@ -4990,7 +4989,7 @@ func (c *TestSimpleClient) SomeUpdate1(ctx context.Context, workflowID string, r
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.SomeUpdate1Async(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -5033,7 +5032,7 @@ var _ SomeUpdate1Handle = &testSomeUpdate1Handle{}
 type testSomeUpdate1Handle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *SomeUpdate1Request
 	runID      string
 	workflowID string
@@ -6551,8 +6550,8 @@ func (c *otherClient) OtherUpdate(ctx context.Context, workflowID string, runID
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.OtherUpdateAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.OtherUpdateAsync(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -6571,14 +6570,14 @@ func (c *otherClient) OtherUpdateAsync(ctx context.Context, workflowID string, r
 		o = NewOtherUpdateOptions()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -6829,23 +6828,23 @@ func (h *otherUpdateHandle) Get(ctx context.Context) (*OtherUpdateResponse, erro
 
 // OtherUpdateOptions provides configuration for a mycompany.simple.Other.OtherUpdate update operation
 type OtherUpdateOptions struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewOtherUpdateOptions initializes a new OtherUpdateOptions value
 func NewOtherUpdateOptions() *OtherUpdateOptions {
-	return &OtherUpdateOptions{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &OtherUpdateOptions{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *OtherUpdateOptions) Build(workflowID string, runID string, req *OtherUpdateRequest) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *OtherUpdateOptions) Build(workflowID string, runID string, req *OtherUpdateRequest) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -6866,8 +6865,8 @@ func (o *OtherUpdateOptions) Build(workflowID string, runID string, req *OtherUp
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
 	}
 	return opts, nil
 }
@@ -6878,14 +6877,14 @@ func (o *OtherUpdateOptions) WithUpdateID(id string) *OtherUpdateOptions {
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *OtherUpdateOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *OtherUpdateOptions {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *OtherUpdateOptions) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *OtherUpdateOptions {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *OtherUpdateOptions) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *OtherUpdateOptions {
+func (o *OtherUpdateOptions) WithWaitPolicy(policy client.WorkflowUpdateStage) *OtherUpdateOptions {
 	o.waitPolicy = policy
 	return o
 }
@@ -7567,7 +7566,7 @@ func (c *TestOtherClient) OtherUpdate(ctx context.Context, workflowID string, ru
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.OtherUpdateAsync(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -7610,7 +7609,7 @@ var _ OtherUpdateHandle = &testOtherUpdateHandle{}
 type testOtherUpdateHandle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *OtherUpdateRequest
 	runID      string
 	workflowID string
@@ -9988,8 +9987,8 @@ func (c *deprecatedClient) SomeDeprecatedUpdate1(ctx context.Context, workflowID
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.SomeDeprecatedUpdate1Async(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.SomeDeprecatedUpdate1Async(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -10012,14 +10011,14 @@ func (c *deprecatedClient) SomeDeprecatedUpdate1Async(ctx context.Context, workf
 		o = NewSomeDeprecatedUpdate1Options()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -10046,8 +10045,8 @@ func (c *deprecatedClient) SomeDeprecatedUpdate2(ctx context.Context, workflowID
 		o = opts[0]
 	}
 
-	// call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy
-	handle, err := c.SomeDeprecatedUpdate2Async(ctx, workflowID, runID, req, o.WithWaitPolicy(enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED))
+	// call sync update with WorkflowUpdateStageCompleted wait policy
+	handle, err := c.SomeDeprecatedUpdate2Async(ctx, workflowID, runID, req, o.WithWaitPolicy(client.WorkflowUpdateStageCompleted))
 	if err != nil {
 		return nil, err
 	}
@@ -10070,14 +10069,14 @@ func (c *deprecatedClient) SomeDeprecatedUpdate2Async(ctx context.Context, workf
 		o = NewSomeDeprecatedUpdate2Options()
 	}
 
-	// build UpdateWorkflowWithOptionsRequest
+	// build UpdateWorkflowOptions
 	options, err := o.Build(workflowID, runID, req)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing UpdateWorkflowWithOptions: %w", err)
 	}
 
 	// update workflow
-	handle, err := c.client.UpdateWorkflowWithOptions(ctx, options)
+	handle, err := c.client.UpdateWorkflow(ctx, *options)
 	if err != nil {
 		return nil, err
 	}
@@ -10583,23 +10582,23 @@ func (h *someDeprecatedUpdate1Handle) Get(ctx context.Context) (*SomeDeprecatedM
 
 // SomeDeprecatedUpdate1Options provides configuration for a mycompany.simple.Deprecated.SomeDeprecatedUpdate1 update operation
 type SomeDeprecatedUpdate1Options struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewSomeDeprecatedUpdate1Options initializes a new SomeDeprecatedUpdate1Options value
 func NewSomeDeprecatedUpdate1Options() *SomeDeprecatedUpdate1Options {
-	return &SomeDeprecatedUpdate1Options{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &SomeDeprecatedUpdate1Options{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *SomeDeprecatedUpdate1Options) Build(workflowID string, runID string, req *SomeDeprecatedMessage) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *SomeDeprecatedUpdate1Options) Build(workflowID string, runID string, req *SomeDeprecatedMessage) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -10614,8 +10613,8 @@ func (o *SomeDeprecatedUpdate1Options) Build(workflowID string, runID string, re
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
 	}
 	return opts, nil
 }
@@ -10626,14 +10625,14 @@ func (o *SomeDeprecatedUpdate1Options) WithUpdateID(id string) *SomeDeprecatedUp
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *SomeDeprecatedUpdate1Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *SomeDeprecatedUpdate1Options {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *SomeDeprecatedUpdate1Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *SomeDeprecatedUpdate1Options {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *SomeDeprecatedUpdate1Options) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *SomeDeprecatedUpdate1Options {
+func (o *SomeDeprecatedUpdate1Options) WithWaitPolicy(policy client.WorkflowUpdateStage) *SomeDeprecatedUpdate1Options {
 	o.waitPolicy = policy
 	return o
 }
@@ -10703,23 +10702,23 @@ func (h *someDeprecatedUpdate2Handle) Get(ctx context.Context) (*SomeDeprecatedM
 
 // SomeDeprecatedUpdate2Options provides configuration for a mycompany.simple.Deprecated.SomeDeprecatedUpdate2 update operation
 type SomeDeprecatedUpdate2Options struct {
-	Options    *client.UpdateWorkflowWithOptionsRequest
+	Options    *client.UpdateWorkflowOptions
 	id         *string
-	waitPolicy enumsv1.UpdateWorkflowExecutionLifecycleStage
+	waitPolicy client.WorkflowUpdateStage
 }
 
 // NewSomeDeprecatedUpdate2Options initializes a new SomeDeprecatedUpdate2Options value
 func NewSomeDeprecatedUpdate2Options() *SomeDeprecatedUpdate2Options {
-	return &SomeDeprecatedUpdate2Options{Options: &client.UpdateWorkflowWithOptionsRequest{}}
+	return &SomeDeprecatedUpdate2Options{Options: &client.UpdateWorkflowOptions{}}
 }
 
-// Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied
-func (o *SomeDeprecatedUpdate2Options) Build(workflowID string, runID string, req *SomeDeprecatedMessage) (opts *client.UpdateWorkflowWithOptionsRequest, err error) {
-	// use user-provided UpdateWorkflowWithOptionsRequest if exists
+// Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied
+func (o *SomeDeprecatedUpdate2Options) Build(workflowID string, runID string, req *SomeDeprecatedMessage) (opts *client.UpdateWorkflowOptions, err error) {
+	// use user-provided UpdateWorkflowOptions if exists
 	if o.Options != nil {
 		opts = o.Options
 	} else {
-		opts = &client.UpdateWorkflowWithOptionsRequest{}
+		opts = &client.UpdateWorkflowOptions{}
 	}
 
 	// set constants
@@ -10734,8 +10733,8 @@ func (o *SomeDeprecatedUpdate2Options) Build(workflowID string, runID string, re
 	}
 
 	// set WaitPolicy
-	if v := o.waitPolicy; v != enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED {
-		opts.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: v}
+	if v := o.waitPolicy; v != client.WorkflowUpdateStageUnspecified {
+		opts.WaitForStage = v
 	}
 	return opts, nil
 }
@@ -10746,14 +10745,14 @@ func (o *SomeDeprecatedUpdate2Options) WithUpdateID(id string) *SomeDeprecatedUp
 	return o
 }
 
-// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest
-func (o *SomeDeprecatedUpdate2Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowWithOptionsRequest) *SomeDeprecatedUpdate2Options {
+// WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions
+func (o *SomeDeprecatedUpdate2Options) WithUpdateWorkflowOptions(options client.UpdateWorkflowOptions) *SomeDeprecatedUpdate2Options {
 	o.Options = &options
 	return o
 }
 
 // WithWaitPolicy sets the WaitPolicy
-func (o *SomeDeprecatedUpdate2Options) WithWaitPolicy(policy enumsv1.UpdateWorkflowExecutionLifecycleStage) *SomeDeprecatedUpdate2Options {
+func (o *SomeDeprecatedUpdate2Options) WithWaitPolicy(policy client.WorkflowUpdateStage) *SomeDeprecatedUpdate2Options {
 	o.waitPolicy = policy
 	return o
 }
@@ -12185,7 +12184,7 @@ func (c *TestDeprecatedClient) SomeDeprecatedUpdate1(ctx context.Context, workfl
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.SomeDeprecatedUpdate1Async(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -12228,7 +12227,7 @@ var _ SomeDeprecatedUpdate1Handle = &testSomeDeprecatedUpdate1Handle{}
 type testSomeDeprecatedUpdate1Handle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *SomeDeprecatedMessage
 	runID      string
 	workflowID string
@@ -12267,7 +12266,7 @@ func (c *TestDeprecatedClient) SomeDeprecatedUpdate2(ctx context.Context, workfl
 	if len(opts) > 0 && opts[0].Options != nil {
 		options = opts[0]
 	}
-	options.Options.WaitPolicy = &updatev1.WaitPolicy{LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+	options.Options.WaitForStage = client.WorkflowUpdateStageCompleted
 	handle, err := c.SomeDeprecatedUpdate2Async(ctx, workflowID, runID, req, options)
 	if err != nil {
 		return nil, err
@@ -12310,7 +12309,7 @@ var _ SomeDeprecatedUpdate2Handle = &testSomeDeprecatedUpdate2Handle{}
 type testSomeDeprecatedUpdate2Handle struct {
 	callbacks  *testutil.UpdateCallbacks
 	env        *testsuite.TestWorkflowEnvironment
-	opts       *client.UpdateWorkflowWithOptionsRequest
+	opts       *client.UpdateWorkflowOptions
 	req        *SomeDeprecatedMessage
 	runID      string
 	workflowID string
diff --git a/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go b/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go
index edc23fb0..b1d01155 100644
--- a/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go
+++ b/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
@@ -20,7 +20,6 @@ import (
 	xns "github.com/cludden/protoc-gen-go-temporal/pkg/xns"
 	uuid "github.com/google/uuid"
 	enumsv1 "go.temporal.io/api/enums/v1"
-	updatev1 "go.temporal.io/api/update/v1"
 	activity "go.temporal.io/sdk/activity"
 	client "go.temporal.io/sdk/client"
 	temporal "go.temporal.io/sdk/temporal"
@@ -1915,7 +1914,7 @@ func SomeSignal3Async(ctx workflow.Context, workflowID string, runID string, req
 type SomeUpdate1UpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewSomeUpdate1UpdateOptions initializes a new SomeUpdate1UpdateOptions value
@@ -1936,7 +1935,7 @@ func (opts *SomeUpdate1UpdateOptions) WithHeartbeatInterval(d time.Duration) *So
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *SomeUpdate1UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *SomeUpdate1UpdateOptions {
+func (opts *SomeUpdate1UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *SomeUpdate1UpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -2036,7 +2035,7 @@ func SomeUpdate1Async(ctx workflow.Context, workflowID string, runID string, req
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -2816,9 +2815,7 @@ func (a *simpleActivities) SomeUpdate1(ctx context.Context, input *xnsv1.UpdateR
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.SomeUpdate1Async(
@@ -3388,7 +3385,7 @@ func OtherSignalAsync(ctx workflow.Context, workflowID string, runID string, req
 type OtherUpdateUpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewOtherUpdateUpdateOptions initializes a new OtherUpdateUpdateOptions value
@@ -3409,7 +3406,7 @@ func (opts *OtherUpdateUpdateOptions) WithHeartbeatInterval(d time.Duration) *Ot
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *OtherUpdateUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *OtherUpdateUpdateOptions {
+func (opts *OtherUpdateUpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *OtherUpdateUpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -3509,7 +3506,7 @@ func OtherUpdateAsync(ctx workflow.Context, workflowID string, runID string, req
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -3777,9 +3774,7 @@ func (a *otherActivities) OtherUpdate(ctx context.Context, input *xnsv1.UpdateRe
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.OtherUpdateAsync(
@@ -5707,7 +5702,7 @@ func SomeDeprecatedSignal2Async(ctx workflow.Context, workflowID string, runID s
 type SomeDeprecatedUpdate1UpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewSomeDeprecatedUpdate1UpdateOptions initializes a new SomeDeprecatedUpdate1UpdateOptions value
@@ -5728,7 +5723,7 @@ func (opts *SomeDeprecatedUpdate1UpdateOptions) WithHeartbeatInterval(d time.Dur
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *SomeDeprecatedUpdate1UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *SomeDeprecatedUpdate1UpdateOptions {
+func (opts *SomeDeprecatedUpdate1UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *SomeDeprecatedUpdate1UpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -5834,7 +5829,7 @@ func SomeDeprecatedUpdate1Async(ctx workflow.Context, workflowID string, runID s
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -5882,7 +5877,7 @@ func SomeDeprecatedUpdate1Async(ctx workflow.Context, workflowID string, runID s
 type SomeDeprecatedUpdate2UpdateOptions struct {
 	ActivityOptions       *workflow.ActivityOptions
 	HeartbeatInterval     time.Duration
-	UpdateWorkflowOptions *client.UpdateWorkflowWithOptionsRequest
+	UpdateWorkflowOptions *client.UpdateWorkflowOptions
 }
 
 // NewSomeDeprecatedUpdate2UpdateOptions initializes a new SomeDeprecatedUpdate2UpdateOptions value
@@ -5903,7 +5898,7 @@ func (opts *SomeDeprecatedUpdate2UpdateOptions) WithHeartbeatInterval(d time.Dur
 }
 
 // WithUpdateWorkflowOptions can be used to customize the update workflow options
-func (opts *SomeDeprecatedUpdate2UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowWithOptionsRequest) *SomeDeprecatedUpdate2UpdateOptions {
+func (opts *SomeDeprecatedUpdate2UpdateOptions) WithUpdateWorkflowOptions(uwo client.UpdateWorkflowOptions) *SomeDeprecatedUpdate2UpdateOptions {
 	opts.UpdateWorkflowOptions = &uwo
 	return opts
 }
@@ -6009,7 +6004,7 @@ func SomeDeprecatedUpdate2Async(ctx workflow.Context, workflowID string, runID s
 	}
 	ctx = workflow.WithActivityOptions(ctx, ao)
 
-	uo := client.UpdateWorkflowWithOptionsRequest{}
+	uo := client.UpdateWorkflowOptions{}
 	if opt.UpdateWorkflowOptions != nil {
 		uo = *opt.UpdateWorkflowOptions
 	}
@@ -6653,9 +6648,7 @@ func (a *deprecatedActivities) SomeDeprecatedUpdate1(ctx context.Context, input
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.SomeDeprecatedUpdate1Async(
@@ -6731,9 +6724,7 @@ func (a *deprecatedActivities) SomeDeprecatedUpdate2(ctx context.Context, input
 		}
 
 		uo := xns.UnmarshalUpdateWorkflowOptions(input.GetUpdateWorkflowOptions())
-		uo.WaitPolicy = &updatev1.WaitPolicy{
-			LifecycleStage: enumsv1.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-		}
+		uo.WaitForStage = client.WorkflowUpdateStageAccepted
 
 		// initialize update execution
 		handle, err = a.client.SomeDeprecatedUpdate2Async(
diff --git a/gen/test/xnserr/v1/xnserr.pb.go b/gen/test/xnserr/v1/xnserr.pb.go
index 039a67a8..0b83d4e5 100644
--- a/gen/test/xnserr/v1/xnserr.pb.go
+++ b/gen/test/xnserr/v1/xnserr.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: test/xnserr/v1/xnserr.proto
 
@@ -394,7 +394,7 @@ func file_test_xnserr_v1_xnserr_proto_rawDescGZIP() []byte {
 
 var file_test_xnserr_v1_xnserr_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_test_xnserr_v1_xnserr_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_test_xnserr_v1_xnserr_proto_goTypes = []interface{}{
+var file_test_xnserr_v1_xnserr_proto_goTypes = []any{
 	(FailureInfo)(0),                // 0: test.xnserr.v1.FailureInfo
 	(*CallSleepRequest)(nil),        // 1: test.xnserr.v1.CallSleepRequest
 	(*SleepRequest)(nil),            // 2: test.xnserr.v1.SleepRequest
@@ -429,7 +429,7 @@ func file_test_xnserr_v1_xnserr_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_test_xnserr_v1_xnserr_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_test_xnserr_v1_xnserr_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*CallSleepRequest); i {
 			case 0:
 				return &v.state
@@ -441,7 +441,7 @@ func file_test_xnserr_v1_xnserr_proto_init() {
 				return nil
 			}
 		}
-		file_test_xnserr_v1_xnserr_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_test_xnserr_v1_xnserr_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*SleepRequest); i {
 			case 0:
 				return &v.state
@@ -453,7 +453,7 @@ func file_test_xnserr_v1_xnserr_proto_init() {
 				return nil
 			}
 		}
-		file_test_xnserr_v1_xnserr_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_test_xnserr_v1_xnserr_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Failure); i {
 			case 0:
 				return &v.state
diff --git a/gen/test/xnserr/v1/xnserr_temporal.pb.go b/gen/test/xnserr/v1/xnserr_temporal.pb.go
index 1543bed7..69990dcc 100644
--- a/gen/test/xnserr/v1/xnserr_temporal.pb.go
+++ b/gen/test/xnserr/v1/xnserr_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go b/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go
index 13829baf..0b73e8d2 100644
--- a/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go
+++ b/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go_temporal. DO NOT EDIT.
 // versions:
 //
-//	protoc-gen-go_temporal 1.13.3-next (63174f1c48e0790b0a0d555228ee3a9390371a3b)
+//	protoc-gen-go_temporal 1.13.4-next (7ae99e9e231554f11d4bfd70e5cb6e589932bcc0)
 //	go go1.22.2
 //	protoc (unknown)
 //
diff --git a/go.mod b/go.mod
index ebc0c7a4..083646b9 100644
--- a/go.mod
+++ b/go.mod
@@ -7,18 +7,18 @@ require (
 	github.com/alta/protopatch v0.5.3
 	github.com/cludden/benthos/v4 v4.24.0-no-otel.2
 	github.com/dave/jennifer v1.7.0
-	github.com/google/uuid v1.4.0
+	github.com/google/uuid v1.6.0
 	github.com/gosimple/slug v1.13.1
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
 	github.com/iancoleman/strcase v0.3.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/oklog/run v1.1.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.4
-	github.com/urfave/cli/v2 v2.25.7
-	go.temporal.io/api v1.26.0
-	go.temporal.io/sdk v1.25.1
-	google.golang.org/protobuf v1.33.0
+	github.com/stretchr/testify v1.9.0
+	github.com/urfave/cli/v2 v2.27.2
+	go.temporal.io/api v1.34.0
+	go.temporal.io/sdk v1.27.0
+	google.golang.org/protobuf v1.34.1
 )
 
 require (
@@ -31,27 +31,23 @@ require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
 	github.com/generikvault/gvalstrings v0.0.0-20180926130504-471f38f0112a // indirect
 	github.com/go-faker/faker/v4 v4.2.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
-	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/gogo/status v1.1.1 // indirect
 	github.com/golang/mock v1.7.0-rc.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/itchyny/timefmt-go v0.1.5 // indirect
 	github.com/klauspost/compress v1.17.3 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/matoous/go-nanoid/v2 v2.0.0 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.26 // indirect
 	github.com/mitchellh/copystructure v1.0.0 // indirect
@@ -63,29 +59,26 @@ require (
 	github.com/rickb777/date v1.20.5 // indirect
 	github.com/rickb777/plural v1.4.1 // indirect
 	github.com/robfig/cron v1.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/ksuid v1.0.4 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
-	github.com/stretchr/objx v0.5.1 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tilinna/z85 v1.0.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.4.0 // indirect
-	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
+	google.golang.org/grpc v1.64.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 815ce759..137f51d0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,4 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Jeffail/gabs/v2 v2.7.0 h1:Y2edYaTcE8ZpRsR2AtmPu5xQdFDIthFG0jYhu5PY8kg=
 github.com/Jeffail/gabs/v2 v2.7.0/go.mod h1:dp5ocw1FvBBQYssgHsG7I1WYsiLRtkUaB1FEtSwvNUw=
@@ -20,7 +19,6 @@ github.com/PaesslerAG/jsonpath v0.1.1 h1:c1/AToHQMVsduPAa4Vh6xp2U0evy4t8SWp8imEs
 github.com/PaesslerAG/jsonpath v0.1.1/go.mod h1:lVboNxFGal/VwW6d9JzIy56bUsYAP6tH/x80vjnCseY=
 github.com/alta/protopatch v0.5.3 h1:U0/UzEeFFTLm0+zW7E/zCi9yjV6QIPPR3InZ/SakLdU=
 github.com/alta/protopatch v0.5.3/go.mod h1:aD5JWR4D9s/sTBoTNoZDiFY2SUTYAWiQ8T9a1tttPYI=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -33,9 +31,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cludden/benthos/v4 v4.24.0-no-otel.2 h1:u8BWE6O1xfWSITx4nGhexmsl8d3tLuLDBz0Dy+7YEv8=
 github.com/cludden/benthos/v4 v4.24.0-no-otel.2/go.mod h1:lbr412TPhtS9tNecnWPNLhmaW7QamZ1MuLS6ulWQ2nU=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE=
 github.com/dave/jennifer v1.7.0/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -49,7 +46,6 @@ github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yi
 github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
 github.com/generikvault/gvalstrings v0.0.0-20180926130504-471f38f0112a h1:J8FuFJ7K+Hiwkla2kT9fVIVix+EZhAlDsZwRlfFI3MA=
 github.com/generikvault/gvalstrings v0.0.0-20180926130504-471f38f0112a/go.mod h1:ms6iGk40n2YQrbM9Sr6onzwYBD1q5D0T5DQmcaye6uU=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-faker/faker/v4 v4.2.0 h1:dGebOupKwssrODV51E0zbMrv5e2gO9VWSLNC1WDCpWg=
 github.com/go-faker/faker/v4 v4.2.0/go.mod h1:F/bBy8GH9NxOxMInug5Gx4WYeG6fHJZ8Ol/dhcpRub4=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -57,13 +53,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
-github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
-github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
-github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=
@@ -74,14 +65,12 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q=
@@ -90,8 +79,8 @@ github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
 github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b h1:wDUNC2eKiL35DbLvsDhiblTUXHxcOPwQSCzi7xpQUN4=
 github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0=
 github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
@@ -148,7 +137,6 @@ github.com/rickb777/plural v1.4.1 h1:5MMLcbIaapLFmvDGRT5iPk8877hpTPt8Y9cdSKRw9sU
 github.com/rickb777/plural v1.4.1/go.mod h1:kdmXUpmKBJTS0FtG/TFumd//VBWsNTD7zOw7x4umxNw=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -165,25 +153,20 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
-github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tilinna/z85 v1.0.0 h1:uqFnJBlD01dosSeo5sK1G1YGbPuwqVHqR+12OJDRjUw=
 github.com/tilinna/z85 v1.0.0/go.mod h1:EfpFU/DUY4ddEy6CRvk2l+UQNEzHbh+bqBQS+04Nkxs=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
+github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
 github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
@@ -195,19 +178,17 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.temporal.io/api v1.26.0 h1:N4V0Daqa0qqK5+9LELSZV7clBYrwB4l33iaFfKgycPk=
-go.temporal.io/api v1.26.0/go.mod h1:uVAcpQJ6bM4mxZ3m7vSHU65fHjrwy9ktGQMtsNfMZQQ=
-go.temporal.io/sdk v1.25.1 h1:jC9l9vHHz5OJ7PR6OjrpYSN4+uEG0bLe5rdF9nlMSGk=
-go.temporal.io/sdk v1.25.1/go.mod h1:X7iFKZpsj90BfszfpFCzLX8lwEJXbnRrl351/HyEgmU=
+go.temporal.io/api v1.34.0 h1:RBQtYF+jJa252uruscL0TULgdFNqUkhk5R7Bj8PT2ko=
+go.temporal.io/api v1.34.0/go.mod h1:YN5Ty/DSp7uAdJxLxup+Y3aQLM00q+7cZuOEGFJ2Ob8=
+go.temporal.io/sdk v1.27.0 h1:C5oOE/IRyLcZaFoB13kEHsjvSHEnGcwT6bNys0HFFHk=
+go.temporal.io/sdk v1.27.0/go.mod h1:PnOq5f3dWuU2NAbY+yczXkIeycsIIdBtoCO62ZE0aak=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
@@ -216,11 +197,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -231,25 +212,21 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -259,7 +236,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -269,8 +245,8 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -279,8 +255,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
 golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -300,34 +276,27 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
-google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
-google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY=
-google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
-google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e h1:SkdGTrROJl2jRGT/Fxv5QUf9jtdKCQh4KQJXbXVLAi0=
+google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e/go.mod h1:LweJcLbyVij6rCex8YunD8DYR5VDonap/jYl3ZRxcIU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e h1:Elxv5MwEkCI9f5SkoL6afed6NTdxaGoAo39eANBwHL8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
+google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/internal/plugin/client.go b/internal/plugin/client.go
index bc1ea6d9..41d11bd0 100644
--- a/internal/plugin/client.go
+++ b/internal/plugin/client.go
@@ -414,7 +414,7 @@ func (svc *Manifest) genClientImplUpdateMethod(f *g.File, update protoreflect.Fu
 			)
 
 			fn.Line()
-			fn.Comment("call sync update with UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED wait policy")
+			fn.Comment("call sync update with WorkflowUpdateStageCompleted wait policy")
 			fn.List(g.Id("handle"), g.Err()).Op(":=").Id("c").Dot(svc.toCamel("%sAsync", update)).CallFunc(func(args *g.Group) {
 				args.Id("ctx")
 				args.Id("workflowID")
@@ -422,7 +422,7 @@ func (svc *Manifest) genClientImplUpdateMethod(f *g.File, update protoreflect.Fu
 				if hasInput {
 					args.Id("req")
 				}
-				args.Id("o").Dot("WithWaitPolicy").Call(g.Qual(enumsPkg, "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED"))
+				args.Id("o").Dot("WithWaitPolicy").Call(g.Qual(clientPkg, "WorkflowUpdateStageCompleted"))
 			})
 			fn.If(g.Err().Op("!=").Nil()).Block(
 				g.ReturnFunc(func(returnVals *g.Group) {
@@ -479,7 +479,7 @@ func (svc *Manifest) genClientImplUpdateMethodAsync(f *g.File, update protorefle
 			)
 
 			fn.Line()
-			fn.Comment("build UpdateWorkflowWithOptionsRequest")
+			fn.Comment("build UpdateWorkflowOptions")
 			fn.List(g.Id("options"), g.Err()).Op(":=").Id("o").Dot("Build").CallFunc(func(args *g.Group) {
 				args.Id("workflowID")
 				args.Id("runID")
@@ -493,7 +493,7 @@ func (svc *Manifest) genClientImplUpdateMethodAsync(f *g.File, update protorefle
 
 			fn.Line()
 			fn.Comment("update workflow")
-			fn.List(g.Id("handle"), g.Err()).Op(":=").Id("c").Dot("client").Dot("UpdateWorkflowWithOptions").Call(g.Id("ctx"), g.Id("options"))
+			fn.List(g.Id("handle"), g.Err()).Op(":=").Id("c").Dot("client").Dot("UpdateWorkflow").Call(g.Id("ctx"), g.Op("*").Id("options"))
 			fn.If(g.Err().Op("!=").Nil()).Block(
 				g.Return(g.Nil(), g.Err()),
 			)
@@ -1201,19 +1201,19 @@ func (svc *Manifest) genClientUpdateOptions(f *g.File, update protoreflect.FullN
 
 	f.Commentf("%s provides configuration for a %s update operation", typeName, svc.fqnForUpdate(update))
 	f.Type().Id(typeName).Struct(
-		g.Id("Options").Op("*").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest"),
+		g.Id("Options").Op("*").Qual(clientPkg, "UpdateWorkflowOptions"),
 		g.Id("id").Op("*").String(),
-		g.Id("waitPolicy").Qual(enumsPkg, "UpdateWorkflowExecutionLifecycleStage"),
+		g.Id("waitPolicy").Qual(clientPkg, "WorkflowUpdateStage"),
 	)
 
 	f.Commentf("%s initializes a new %s value", constructorName, typeName)
 	f.Func().Id(constructorName).Params().Op("*").Id(typeName).Block(
 		g.Return(g.Op("&").Id(typeName).Values(
-			g.Id("Options").Op(":").Op("&").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest").Values(),
+			g.Id("Options").Op(":").Op("&").Qual(clientPkg, "UpdateWorkflowOptions").Values(),
 		)),
 	)
 
-	f.Comment("Build initializes a new client.UpdateWorkflowWithOptionsRequest with defaults and overrides applied")
+	f.Comment("Build initializes a new client.UpdateWorkflowOptions with defaults and overrides applied")
 	f.Func().
 		Params(g.Id("o").Op("*").Id(typeName)).
 		Id("Build").
@@ -1225,15 +1225,15 @@ func (svc *Manifest) genClientUpdateOptions(f *g.File, update protoreflect.FullN
 			}
 		}).
 		Params(
-			g.Id("opts").Op("*").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest"),
+			g.Id("opts").Op("*").Qual(clientPkg, "UpdateWorkflowOptions"),
 			g.Err().Error(),
 		).
 		BlockFunc(func(fn *g.Group) {
-			fn.Comment("use user-provided UpdateWorkflowWithOptionsRequest if exists")
+			fn.Comment("use user-provided UpdateWorkflowOptions if exists")
 			fn.If(g.Id("o").Dot("Options").Op("!=").Nil()).Block(
 				g.Id("opts").Op("=").Id("o").Dot("Options"),
 			).Else().Block(
-				g.Id("opts").Op("=").Op("&").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest").Values(),
+				g.Id("opts").Op("=").Op("&").Qual(clientPkg, "UpdateWorkflowOptions").Values(),
 			)
 
 			fn.Line()
@@ -1269,25 +1269,25 @@ func (svc *Manifest) genClientUpdateOptions(f *g.File, update protoreflect.FullN
 
 			fn.Line()
 			fn.Comment("set WaitPolicy")
-			waitPolicy := fn.If(g.Id("v").Op(":=").Id("o").Dot("waitPolicy"), g.Id("v").Op("!=").Qual(enumsPkg, "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED")).Block(
-				g.Id("opts").Dot("WaitPolicy").Op("=").Op("&").Qual(updatePkg, "WaitPolicy").Values(
-					g.Id("LifecycleStage").Op(":").Id("v"),
-				),
+			waitPolicy := fn.If(g.Id("v").Op(":=").Id("o").Dot("waitPolicy"), g.Id("v").Op("!=").Qual(clientPkg, "WorkflowUpdateStageUnspecified")).Block(
+				g.Id("opts").Dot("WaitForStage").Op("=").Id("v"),
 			)
-			if wp := updateOpts.GetWaitPolicy(); wp != temporalv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED {
+			wp := updateOpts.GetWaitForStage()
+			if wp == temporalv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED && updateOpts.GetWaitPolicy() != temporalv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED {
+				wp = updateOpts.GetWaitPolicy()
+			}
+			if wp != temporalv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED {
 				var stage string
 				switch wp {
 				case temporalv1.WaitPolicy_WAIT_POLICY_ACCEPTED:
-					stage = "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ADMITTED"
+					stage = "WorkflowUpdateStageAccepted"
 				case temporalv1.WaitPolicy_WAIT_POLICY_ADMITTED:
-					stage = "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED"
+					stage = "WorkflowUpdateStageAdmitted"
 				case temporalv1.WaitPolicy_WAIT_POLICY_COMPLETED:
-					stage = "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED"
+					stage = "WorkflowUpdateStageCompleted"
 				}
-				waitPolicy.Else().If(g.Id("opts").Dot("WaitPolicy").Dot("GetLifecycleStage").Call().Op("==").Qual(enumsPkg, "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_UNSPECIFIED")).Block(
-					g.Id("opts").Dot("WaitPolicy").Op("=").Op("&").Qual(updatePkg, "WaitPolicy").Values(
-						g.Id("LifecycleStage").Op(":").Qual(enumsPkg, stage),
-					),
+				waitPolicy.Else().If(g.Id("opts").Dot("WaitForStage").Op("==").Qual(clientPkg, "WorkflowUpdateStageUnspecified")).Block(
+					g.Id("opts").Dot("WaitForStage").Op("=").Qual(clientPkg, stage),
 				)
 			}
 
@@ -1305,11 +1305,11 @@ func (svc *Manifest) genClientUpdateOptions(f *g.File, update protoreflect.FullN
 			g.Return(g.Id("o")),
 		)
 
-	f.Comment("WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowWithOptionsRequest")
+	f.Comment("WithUpdateWorkflowOptions sets the initial client.UpdateWorkflowOptions")
 	f.Func().
 		Params(g.Id("o").Op("*").Id(typeName)).
 		Id("WithUpdateWorkflowOptions").
-		Params(g.Id("options").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest")).
+		Params(g.Id("options").Qual(clientPkg, "UpdateWorkflowOptions")).
 		Op("*").Id(typeName).
 		Block(
 			g.Id("o").Dot("Options").Op("=").Op("&").Id("options"),
@@ -1320,7 +1320,7 @@ func (svc *Manifest) genClientUpdateOptions(f *g.File, update protoreflect.FullN
 	f.Func().
 		Params(g.Id("o").Op("*").Id(typeName)).
 		Id("WithWaitPolicy").
-		Params(g.Id("policy").Qual(enumsPkg, "UpdateWorkflowExecutionLifecycleStage")).
+		Params(g.Id("policy").Qual(clientPkg, "WorkflowUpdateStage")).
 		Op("*").Id(typeName).
 		Block(
 			g.Id("o").Dot("waitPolicy").Op("=").Id("policy"),
diff --git a/internal/plugin/testclient.go b/internal/plugin/testclient.go
index e3e20926..44b940e4 100644
--- a/internal/plugin/testclient.go
+++ b/internal/plugin/testclient.go
@@ -176,9 +176,7 @@ func (svc *Manifest) genTestClientImplUpdateMethod(f *g.File, update protoreflec
 			),
 
 			// override wait policy
-			g.Id("options").Dot("Options").Dot("WaitPolicy").Op("=").Op("&").Qual(updatePkg, "WaitPolicy").Values(
-				g.Id("LifecycleStage").Op(":").Qual(enumsPkg, "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED"),
-			),
+			g.Id("options").Dot("Options").Dot("WaitForStage").Op("=").Qual(clientPkg, "WorkflowUpdateStageCompleted"),
 			g.List(g.Id("handle"), g.Err()).Op(":=").Id("c").Dot(asyncName).CallFunc(func(args *g.Group) {
 				args.Id("ctx")
 				args.Id("workflowID")
@@ -591,7 +589,7 @@ func (svc *Manifest) genTestClientUpdateHandleImpl(f *g.File, update protoreflec
 		StructFunc(func(fields *g.Group) {
 			fields.Id("callbacks").Op("*").Qual(testutilPkg, "UpdateCallbacks")
 			fields.Id("env").Op("*").Qual(testsuitePkg, "TestWorkflowEnvironment")
-			fields.Id("opts").Op("*").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest")
+			fields.Id("opts").Op("*").Qual(clientPkg, "UpdateWorkflowOptions")
 			if hasInput {
 				fields.Id("req").Op("*").Qual(string(handler.Input.GoIdent.GoImportPath), svc.getMessageName(handler.Input))
 			}
diff --git a/internal/plugin/xns.go b/internal/plugin/xns.go
index 768d72d0..3b2f5320 100644
--- a/internal/plugin/xns.go
+++ b/internal/plugin/xns.go
@@ -398,10 +398,7 @@ func (svc *Manifest) genXNSActivitiesUpdateMethod(f *g.File, update protoreflect
 				bl.Id("uo").Op(":=").Qual(xnsPkg, "UnmarshalUpdateWorkflowOptions").Call(
 					g.Id("input").Dot("GetUpdateWorkflowOptions").Call(),
 				)
-				bl.Id("uo").Dot("WaitPolicy").Op("=").Op("&").Qual(updatePkg, "WaitPolicy").Custom(
-					multiLineValues,
-					g.Id("LifecycleStage").Op(":").Qual(enumsPkg, "UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED"),
-				).Line()
+				bl.Id("uo").Dot("WaitForStage").Op("=").Qual(clientPkg, "WorkflowUpdateStageAccepted").Line()
 
 				bl.Comment("initialize update execution")
 				bl.List(g.Id("handle"), g.Err()).Op("=").Id("a").Dot("client").Dot(svc.toCamel("%sAsync", methodName)).CustomFunc(multiLineArgs, func(args *g.Group) {
@@ -1597,7 +1594,7 @@ func (svc *Manifest) genXNSUpdateFunctionAsync(f *g.File, update protoreflect.Fu
 			initializeXNSOptions(fn, opts.GetXns(), time.Minute*5)
 
 			// build update options
-			fn.Id("uo").Op(":=").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest").Values()
+			fn.Id("uo").Op(":=").Qual(clientPkg, "UpdateWorkflowOptions").Values()
 			fn.If(g.Id("opt").Dot("UpdateWorkflowOptions").Op("!=").Nil()).Block(
 				g.Id("uo").Op("=").Op("*").Id("opt").Dot("UpdateWorkflowOptions"),
 			)
@@ -1710,7 +1707,7 @@ func (svc *Manifest) genXNSUpdateOptions(f *g.File, update protoreflect.FullName
 	f.Type().Id(typeName).Struct(
 		g.Id("ActivityOptions").Op("*").Qual(workflowPkg, "ActivityOptions"),
 		g.Id("HeartbeatInterval").Qual("time", "Duration"),
-		g.Id("UpdateWorkflowOptions").Op("*").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest"),
+		g.Id("UpdateWorkflowOptions").Op("*").Qual(clientPkg, "UpdateWorkflowOptions"),
 	)
 
 	f.Commentf("New%s initializes a new %s value", typeName, typeName)
@@ -1761,7 +1758,7 @@ func (svc *Manifest) genXNSUpdateOptions(f *g.File, update protoreflect.FullName
 		).
 		Id("WithUpdateWorkflowOptions").
 		Params(
-			g.Id("uwo").Qual(clientPkg, "UpdateWorkflowWithOptionsRequest"),
+			g.Id("uwo").Qual(clientPkg, "UpdateWorkflowOptions"),
 		).
 		Op("*").Id(typeName).
 		Block(
diff --git a/mocks/go.temporal.io/sdk/client/mock_Client.go b/mocks/go.temporal.io/sdk/client/mock_Client.go
index 7b2e7d19..fa0424c1 100644
--- a/mocks/go.temporal.io/sdk/client/mock_Client.go
+++ b/mocks/go.temporal.io/sdk/client/mock_Client.go
@@ -390,6 +390,63 @@ func (_c *MockClient_DescribeTaskQueue_Call) RunAndReturn(run func(context.Conte
 	return _c
 }
 
+// DescribeTaskQueueEnhanced provides a mock function with given fields: ctx, options
+func (_m *MockClient) DescribeTaskQueueEnhanced(ctx context.Context, options client.DescribeTaskQueueEnhancedOptions) (client.TaskQueueDescription, error) {
+	ret := _m.Called(ctx, options)
+
+	if len(ret) == 0 {
+		panic("no return value specified for DescribeTaskQueueEnhanced")
+	}
+
+	var r0 client.TaskQueueDescription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, client.DescribeTaskQueueEnhancedOptions) (client.TaskQueueDescription, error)); ok {
+		return rf(ctx, options)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, client.DescribeTaskQueueEnhancedOptions) client.TaskQueueDescription); ok {
+		r0 = rf(ctx, options)
+	} else {
+		r0 = ret.Get(0).(client.TaskQueueDescription)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, client.DescribeTaskQueueEnhancedOptions) error); ok {
+		r1 = rf(ctx, options)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockClient_DescribeTaskQueueEnhanced_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DescribeTaskQueueEnhanced'
+type MockClient_DescribeTaskQueueEnhanced_Call struct {
+	*mock.Call
+}
+
+// DescribeTaskQueueEnhanced is a helper method to define mock.On call
+//   - ctx context.Context
+//   - options client.DescribeTaskQueueEnhancedOptions
+func (_e *MockClient_Expecter) DescribeTaskQueueEnhanced(ctx interface{}, options interface{}) *MockClient_DescribeTaskQueueEnhanced_Call {
+	return &MockClient_DescribeTaskQueueEnhanced_Call{Call: _e.mock.On("DescribeTaskQueueEnhanced", ctx, options)}
+}
+
+func (_c *MockClient_DescribeTaskQueueEnhanced_Call) Run(run func(ctx context.Context, options client.DescribeTaskQueueEnhancedOptions)) *MockClient_DescribeTaskQueueEnhanced_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(client.DescribeTaskQueueEnhancedOptions))
+	})
+	return _c
+}
+
+func (_c *MockClient_DescribeTaskQueueEnhanced_Call) Return(_a0 client.TaskQueueDescription, _a1 error) *MockClient_DescribeTaskQueueEnhanced_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockClient_DescribeTaskQueueEnhanced_Call) RunAndReturn(run func(context.Context, client.DescribeTaskQueueEnhancedOptions) (client.TaskQueueDescription, error)) *MockClient_DescribeTaskQueueEnhanced_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DescribeWorkflowExecution provides a mock function with given fields: ctx, workflowID, runID
 func (_m *MockClient) DescribeWorkflowExecution(ctx context.Context, workflowID string, runID string) (*workflowservice.DescribeWorkflowExecutionResponse, error) {
 	ret := _m.Called(ctx, workflowID, runID)
@@ -697,6 +754,65 @@ func (_c *MockClient_GetWorkerTaskReachability_Call) RunAndReturn(run func(conte
 	return _c
 }
 
+// GetWorkerVersioningRules provides a mock function with given fields: ctx, options
+func (_m *MockClient) GetWorkerVersioningRules(ctx context.Context, options client.GetWorkerVersioningOptions) (*client.WorkerVersioningRules, error) {
+	ret := _m.Called(ctx, options)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetWorkerVersioningRules")
+	}
+
+	var r0 *client.WorkerVersioningRules
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, client.GetWorkerVersioningOptions) (*client.WorkerVersioningRules, error)); ok {
+		return rf(ctx, options)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, client.GetWorkerVersioningOptions) *client.WorkerVersioningRules); ok {
+		r0 = rf(ctx, options)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*client.WorkerVersioningRules)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, client.GetWorkerVersioningOptions) error); ok {
+		r1 = rf(ctx, options)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockClient_GetWorkerVersioningRules_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWorkerVersioningRules'
+type MockClient_GetWorkerVersioningRules_Call struct {
+	*mock.Call
+}
+
+// GetWorkerVersioningRules is a helper method to define mock.On call
+//   - ctx context.Context
+//   - options client.GetWorkerVersioningOptions
+func (_e *MockClient_Expecter) GetWorkerVersioningRules(ctx interface{}, options interface{}) *MockClient_GetWorkerVersioningRules_Call {
+	return &MockClient_GetWorkerVersioningRules_Call{Call: _e.mock.On("GetWorkerVersioningRules", ctx, options)}
+}
+
+func (_c *MockClient_GetWorkerVersioningRules_Call) Run(run func(ctx context.Context, options client.GetWorkerVersioningOptions)) *MockClient_GetWorkerVersioningRules_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(client.GetWorkerVersioningOptions))
+	})
+	return _c
+}
+
+func (_c *MockClient_GetWorkerVersioningRules_Call) Return(_a0 *client.WorkerVersioningRules, _a1 error) *MockClient_GetWorkerVersioningRules_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockClient_GetWorkerVersioningRules_Call) RunAndReturn(run func(context.Context, client.GetWorkerVersioningOptions) (*client.WorkerVersioningRules, error)) *MockClient_GetWorkerVersioningRules_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetWorkflow provides a mock function with given fields: ctx, workflowID, runID
 func (_m *MockClient) GetWorkflow(ctx context.Context, workflowID string, runID string) client.WorkflowRun {
 	ret := _m.Called(ctx, workflowID, runID)
@@ -1776,32 +1892,29 @@ func (_c *MockClient_UpdateWorkerBuildIdCompatibility_Call) RunAndReturn(run fun
 	return _c
 }
 
-// UpdateWorkflow provides a mock function with given fields: ctx, workflowID, workflowRunID, updateName, args
-func (_m *MockClient) UpdateWorkflow(ctx context.Context, workflowID string, workflowRunID string, updateName string, args ...interface{}) (client.WorkflowUpdateHandle, error) {
-	var _ca []interface{}
-	_ca = append(_ca, ctx, workflowID, workflowRunID, updateName)
-	_ca = append(_ca, args...)
-	ret := _m.Called(_ca...)
+// UpdateWorkerVersioningRules provides a mock function with given fields: ctx, options
+func (_m *MockClient) UpdateWorkerVersioningRules(ctx context.Context, options client.UpdateWorkerVersioningRulesOptions) (*client.WorkerVersioningRules, error) {
+	ret := _m.Called(ctx, options)
 
 	if len(ret) == 0 {
-		panic("no return value specified for UpdateWorkflow")
+		panic("no return value specified for UpdateWorkerVersioningRules")
 	}
 
-	var r0 client.WorkflowUpdateHandle
+	var r0 *client.WorkerVersioningRules
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...interface{}) (client.WorkflowUpdateHandle, error)); ok {
-		return rf(ctx, workflowID, workflowRunID, updateName, args...)
+	if rf, ok := ret.Get(0).(func(context.Context, client.UpdateWorkerVersioningRulesOptions) (*client.WorkerVersioningRules, error)); ok {
+		return rf(ctx, options)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...interface{}) client.WorkflowUpdateHandle); ok {
-		r0 = rf(ctx, workflowID, workflowRunID, updateName, args...)
+	if rf, ok := ret.Get(0).(func(context.Context, client.UpdateWorkerVersioningRulesOptions) *client.WorkerVersioningRules); ok {
+		r0 = rf(ctx, options)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(client.WorkflowUpdateHandle)
+			r0 = ret.Get(0).(*client.WorkerVersioningRules)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, string, string, string, ...interface{}) error); ok {
-		r1 = rf(ctx, workflowID, workflowRunID, updateName, args...)
+	if rf, ok := ret.Get(1).(func(context.Context, client.UpdateWorkerVersioningRulesOptions) error); ok {
+		r1 = rf(ctx, options)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -1809,68 +1922,58 @@ func (_m *MockClient) UpdateWorkflow(ctx context.Context, workflowID string, wor
 	return r0, r1
 }
 
-// MockClient_UpdateWorkflow_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateWorkflow'
-type MockClient_UpdateWorkflow_Call struct {
+// MockClient_UpdateWorkerVersioningRules_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateWorkerVersioningRules'
+type MockClient_UpdateWorkerVersioningRules_Call struct {
 	*mock.Call
 }
 
-// UpdateWorkflow is a helper method to define mock.On call
+// UpdateWorkerVersioningRules is a helper method to define mock.On call
 //   - ctx context.Context
-//   - workflowID string
-//   - workflowRunID string
-//   - updateName string
-//   - args ...interface{}
-func (_e *MockClient_Expecter) UpdateWorkflow(ctx interface{}, workflowID interface{}, workflowRunID interface{}, updateName interface{}, args ...interface{}) *MockClient_UpdateWorkflow_Call {
-	return &MockClient_UpdateWorkflow_Call{Call: _e.mock.On("UpdateWorkflow",
-		append([]interface{}{ctx, workflowID, workflowRunID, updateName}, args...)...)}
+//   - options client.UpdateWorkerVersioningRulesOptions
+func (_e *MockClient_Expecter) UpdateWorkerVersioningRules(ctx interface{}, options interface{}) *MockClient_UpdateWorkerVersioningRules_Call {
+	return &MockClient_UpdateWorkerVersioningRules_Call{Call: _e.mock.On("UpdateWorkerVersioningRules", ctx, options)}
 }
 
-func (_c *MockClient_UpdateWorkflow_Call) Run(run func(ctx context.Context, workflowID string, workflowRunID string, updateName string, args ...interface{})) *MockClient_UpdateWorkflow_Call {
+func (_c *MockClient_UpdateWorkerVersioningRules_Call) Run(run func(ctx context.Context, options client.UpdateWorkerVersioningRulesOptions)) *MockClient_UpdateWorkerVersioningRules_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		variadicArgs := make([]interface{}, len(args)-4)
-		for i, a := range args[4:] {
-			if a != nil {
-				variadicArgs[i] = a.(interface{})
-			}
-		}
-		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string), variadicArgs...)
+		run(args[0].(context.Context), args[1].(client.UpdateWorkerVersioningRulesOptions))
 	})
 	return _c
 }
 
-func (_c *MockClient_UpdateWorkflow_Call) Return(_a0 client.WorkflowUpdateHandle, _a1 error) *MockClient_UpdateWorkflow_Call {
+func (_c *MockClient_UpdateWorkerVersioningRules_Call) Return(_a0 *client.WorkerVersioningRules, _a1 error) *MockClient_UpdateWorkerVersioningRules_Call {
 	_c.Call.Return(_a0, _a1)
 	return _c
 }
 
-func (_c *MockClient_UpdateWorkflow_Call) RunAndReturn(run func(context.Context, string, string, string, ...interface{}) (client.WorkflowUpdateHandle, error)) *MockClient_UpdateWorkflow_Call {
+func (_c *MockClient_UpdateWorkerVersioningRules_Call) RunAndReturn(run func(context.Context, client.UpdateWorkerVersioningRulesOptions) (*client.WorkerVersioningRules, error)) *MockClient_UpdateWorkerVersioningRules_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
-// UpdateWorkflowWithOptions provides a mock function with given fields: ctx, request
-func (_m *MockClient) UpdateWorkflowWithOptions(ctx context.Context, request *client.UpdateWorkflowWithOptionsRequest) (client.WorkflowUpdateHandle, error) {
-	ret := _m.Called(ctx, request)
+// UpdateWorkflow provides a mock function with given fields: ctx, options
+func (_m *MockClient) UpdateWorkflow(ctx context.Context, options client.UpdateWorkflowOptions) (client.WorkflowUpdateHandle, error) {
+	ret := _m.Called(ctx, options)
 
 	if len(ret) == 0 {
-		panic("no return value specified for UpdateWorkflowWithOptions")
+		panic("no return value specified for UpdateWorkflow")
 	}
 
 	var r0 client.WorkflowUpdateHandle
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *client.UpdateWorkflowWithOptionsRequest) (client.WorkflowUpdateHandle, error)); ok {
-		return rf(ctx, request)
+	if rf, ok := ret.Get(0).(func(context.Context, client.UpdateWorkflowOptions) (client.WorkflowUpdateHandle, error)); ok {
+		return rf(ctx, options)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *client.UpdateWorkflowWithOptionsRequest) client.WorkflowUpdateHandle); ok {
-		r0 = rf(ctx, request)
+	if rf, ok := ret.Get(0).(func(context.Context, client.UpdateWorkflowOptions) client.WorkflowUpdateHandle); ok {
+		r0 = rf(ctx, options)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(client.WorkflowUpdateHandle)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *client.UpdateWorkflowWithOptionsRequest) error); ok {
-		r1 = rf(ctx, request)
+	if rf, ok := ret.Get(1).(func(context.Context, client.UpdateWorkflowOptions) error); ok {
+		r1 = rf(ctx, options)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -1878,31 +1981,31 @@ func (_m *MockClient) UpdateWorkflowWithOptions(ctx context.Context, request *cl
 	return r0, r1
 }
 
-// MockClient_UpdateWorkflowWithOptions_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateWorkflowWithOptions'
-type MockClient_UpdateWorkflowWithOptions_Call struct {
+// MockClient_UpdateWorkflow_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateWorkflow'
+type MockClient_UpdateWorkflow_Call struct {
 	*mock.Call
 }
 
-// UpdateWorkflowWithOptions is a helper method to define mock.On call
+// UpdateWorkflow is a helper method to define mock.On call
 //   - ctx context.Context
-//   - request *client.UpdateWorkflowWithOptionsRequest
-func (_e *MockClient_Expecter) UpdateWorkflowWithOptions(ctx interface{}, request interface{}) *MockClient_UpdateWorkflowWithOptions_Call {
-	return &MockClient_UpdateWorkflowWithOptions_Call{Call: _e.mock.On("UpdateWorkflowWithOptions", ctx, request)}
+//   - options client.UpdateWorkflowOptions
+func (_e *MockClient_Expecter) UpdateWorkflow(ctx interface{}, options interface{}) *MockClient_UpdateWorkflow_Call {
+	return &MockClient_UpdateWorkflow_Call{Call: _e.mock.On("UpdateWorkflow", ctx, options)}
 }
 
-func (_c *MockClient_UpdateWorkflowWithOptions_Call) Run(run func(ctx context.Context, request *client.UpdateWorkflowWithOptionsRequest)) *MockClient_UpdateWorkflowWithOptions_Call {
+func (_c *MockClient_UpdateWorkflow_Call) Run(run func(ctx context.Context, options client.UpdateWorkflowOptions)) *MockClient_UpdateWorkflow_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(*client.UpdateWorkflowWithOptionsRequest))
+		run(args[0].(context.Context), args[1].(client.UpdateWorkflowOptions))
 	})
 	return _c
 }
 
-func (_c *MockClient_UpdateWorkflowWithOptions_Call) Return(_a0 client.WorkflowUpdateHandle, _a1 error) *MockClient_UpdateWorkflowWithOptions_Call {
+func (_c *MockClient_UpdateWorkflow_Call) Return(_a0 client.WorkflowUpdateHandle, _a1 error) *MockClient_UpdateWorkflow_Call {
 	_c.Call.Return(_a0, _a1)
 	return _c
 }
 
-func (_c *MockClient_UpdateWorkflowWithOptions_Call) RunAndReturn(run func(context.Context, *client.UpdateWorkflowWithOptionsRequest) (client.WorkflowUpdateHandle, error)) *MockClient_UpdateWorkflowWithOptions_Call {
+func (_c *MockClient_UpdateWorkflow_Call) RunAndReturn(run func(context.Context, client.UpdateWorkflowOptions) (client.WorkflowUpdateHandle, error)) *MockClient_UpdateWorkflow_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/xns/xns.go b/pkg/xns/xns.go
index 5f540c07..ed57a906 100644
--- a/pkg/xns/xns.go
+++ b/pkg/xns/xns.go
@@ -6,7 +6,6 @@ import (
 
 	xnsv1 "github.com/cludden/protoc-gen-go-temporal/gen/temporal/xns/v1"
 	"go.temporal.io/api/enums/v1"
-	"go.temporal.io/api/update/v1"
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/temporal"
 	"google.golang.org/protobuf/types/known/durationpb"
@@ -215,40 +214,44 @@ func UnmarshalRetryPolicy(rp *xnsv1.RetryPolicy) *temporal.RetryPolicy {
 	return result
 }
 
-func MarshalUpdateWorkflowOptions(o client.UpdateWorkflowWithOptionsRequest) (*xnsv1.UpdateWorkflowWithOptionsRequest, error) {
+func MarshalUpdateWorkflowOptions(o client.UpdateWorkflowOptions) (*xnsv1.UpdateWorkflowWithOptionsRequest, error) {
 	opts := &xnsv1.UpdateWorkflowWithOptionsRequest{
 		UpdateId:            o.UpdateID,
 		WorkflowId:          o.WorkflowID,
 		RunId:               o.RunID,
 		FirstExecutionRunId: o.FirstExecutionRunID,
 	}
-	if o.WaitPolicy != nil {
-		switch o.WaitPolicy.LifecycleStage {
-		case enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED:
-			opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_ACCEPTED
-		case enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ADMITTED:
-			opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_ADMITTED
-		case enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED:
-			opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_COMPLETED
-		}
+	switch o.WaitForStage {
+	case client.WorkflowUpdateStageAccepted:
+		opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_ACCEPTED
+	case client.WorkflowUpdateStageAdmitted:
+		opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_ADMITTED
+	case client.WorkflowUpdateStageCompleted:
+		opts.WaitPolicy = xnsv1.WaitPolicy_WAIT_POLICY_COMPLETED
 	}
 	return opts, nil
 }
 
-func UnmarshalUpdateWorkflowOptions(o *xnsv1.UpdateWorkflowWithOptionsRequest) client.UpdateWorkflowWithOptionsRequest {
-	opts := client.UpdateWorkflowWithOptionsRequest{
+func UnmarshalUpdateWorkflowOptions(o *xnsv1.UpdateWorkflowWithOptionsRequest) client.UpdateWorkflowOptions {
+	opts := client.UpdateWorkflowOptions{
 		UpdateID:            o.GetUpdateId(),
 		WorkflowID:          o.GetWorkflowId(),
 		RunID:               o.GetRunId(),
 		FirstExecutionRunID: o.GetFirstExecutionRunId(),
 	}
-	switch o.WaitPolicy {
+
+	wp := o.GetWaitForStage()
+	if wp == xnsv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED && o.GetWaitPolicy() != xnsv1.WaitPolicy_WAIT_POLICY_UNSPECIFIED {
+		wp = o.GetWaitPolicy()
+	}
+
+	switch wp {
 	case xnsv1.WaitPolicy_WAIT_POLICY_ACCEPTED:
-		opts.WaitPolicy = &update.WaitPolicy{LifecycleStage: enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED}
+		opts.WaitForStage = client.WorkflowUpdateStageAccepted
 	case xnsv1.WaitPolicy_WAIT_POLICY_ADMITTED:
-		opts.WaitPolicy = &update.WaitPolicy{LifecycleStage: enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ADMITTED}
+		opts.WaitForStage = client.WorkflowUpdateStageAdmitted
 	case xnsv1.WaitPolicy_WAIT_POLICY_COMPLETED:
-		opts.WaitPolicy = &update.WaitPolicy{LifecycleStage: enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED}
+		opts.WaitForStage = client.WorkflowUpdateStageCompleted
 	}
 	return opts
 }
diff --git a/proto/README.md b/proto/README.md
index 955124b1..91ca2c73 100644
--- a/proto/README.md
+++ b/proto/README.md
@@ -4164,7 +4164,7 @@ go_name: Name</pre></td>
 
 <table>
 <tr><th>Name</th><th>Value</th></tr>
-<tr><td>wait_policy</td><td><pre>WAIT_POLICY_COMPLETED</pre></td></tr>
+<tr><td>wait_policy</td><td><pre>WAIT_POLICY_ADMITTED</pre></td></tr>
 </table>
 
 <a name="test-option-v1-test-activities"></a>
diff --git a/proto/temporal/v1/temporal.proto b/proto/temporal/v1/temporal.proto
index a185069b..773c0f34 100644
--- a/proto/temporal/v1/temporal.proto
+++ b/proto/temporal/v1/temporal.proto
@@ -191,7 +191,11 @@ message UpdateOptions {
   bool validate = 2;
 
   // Default wait policy if not specified
-  WaitPolicy wait_policy = 3;
+  WaitPolicy wait_for_stage = 7;
+
+  WaitPolicy wait_policy = 3 [
+    deprecated = true
+  ];
 
   // XNS can be used to configure default activity options for xns workflow executions
   XNSActivityOptions xns = 5;
diff --git a/proto/temporal/xns/v1/xns.proto b/proto/temporal/xns/v1/xns.proto
index da046efe..6d3ac20f 100644
--- a/proto/temporal/xns/v1/xns.proto
+++ b/proto/temporal/xns/v1/xns.proto
@@ -88,7 +88,10 @@ message UpdateWorkflowWithOptionsRequest {
   string workflow_id = 2;
   string run_id = 3;
   string first_execution_run_id = 4;
-  WaitPolicy wait_policy = 5;
+  WaitPolicy wait_policy = 5 [
+    deprecated = true
+  ];
+  WaitPolicy wait_for_stage = 6;
 }
 
 // WaitPolicy used to indicate to the server how long the client wishes to wait for a return 
diff --git a/test/option/main_test.go b/test/option/main_test.go
index a5d53cd3..fdb46451 100644
--- a/test/option/main_test.go
+++ b/test/option/main_test.go
@@ -8,7 +8,6 @@ import (
 	optionv1 "github.com/cludden/protoc-gen-go-temporal/gen/test/option/v1"
 	"github.com/stretchr/testify/suite"
 	"go.temporal.io/api/enums/v1"
-	"go.temporal.io/api/update/v1"
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/temporal"
 	"go.temporal.io/sdk/testsuite"
@@ -456,23 +455,21 @@ func (s *OptionSuite) TestLocalActivityOptions() {
 func (s *OptionSuite) TestUpdateOptions() {
 	cases := []struct {
 		desc     string
-		expected client.UpdateWorkflowWithOptionsRequest
+		expected client.UpdateWorkflowOptions
 		options  []*optionv1.UpdateWithInputOptions
 	}{
 		{
 			desc: "defaults",
-			expected: client.UpdateWorkflowWithOptionsRequest{
+			expected: client.UpdateWorkflowOptions{
 				Args: []any{
 					&optionv1.UpdateWithInputRequest{
 						Name: "bar",
 					},
 				},
-				WorkflowID: "foo",
-				RunID:      "",
-				UpdateID:   "update-with-input:bar",
-				WaitPolicy: &update.WaitPolicy{
-					LifecycleStage: enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_COMPLETED,
-				},
+				WorkflowID:   "foo",
+				RunID:        "",
+				UpdateID:     "update-with-input:bar",
+				WaitForStage: client.WorkflowUpdateStageCompleted,
 			},
 			options: []*optionv1.UpdateWithInputOptions{
 				optionv1.NewUpdateWithInputOptions(),
@@ -480,27 +477,25 @@ func (s *OptionSuite) TestUpdateOptions() {
 		},
 		{
 			desc: "overrides",
-			expected: client.UpdateWorkflowWithOptionsRequest{
+			expected: client.UpdateWorkflowOptions{
 				Args: []any{
 					&optionv1.UpdateWithInputRequest{
 						Name: "bar",
 					},
 				},
-				WorkflowID: "foo",
-				RunID:      "",
-				UpdateID:   "bar",
-				WaitPolicy: &update.WaitPolicy{
-					LifecycleStage: enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED,
-				},
+				WorkflowID:   "foo",
+				RunID:        "",
+				UpdateID:     "bar",
+				WaitForStage: client.WorkflowUpdateStageAccepted,
 			},
 			options: []*optionv1.UpdateWithInputOptions{
 				optionv1.NewUpdateWithInputOptions().
-					WithUpdateWorkflowOptions(client.UpdateWorkflowWithOptionsRequest{
+					WithUpdateWorkflowOptions(client.UpdateWorkflowOptions{
 						WorkflowID: "FOO",
 						RunID:      "BAZ",
 					}).
 					WithUpdateID("bar").
-					WithWaitPolicy(enums.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ACCEPTED),
+					WithWaitPolicy(client.WorkflowUpdateStageAccepted),
 			},
 		},
 	}
@@ -516,7 +511,7 @@ func (s *OptionSuite) TestUpdateOptions() {
 				s.Require().Equal(c.expected.WorkflowID, actual.WorkflowID)
 				s.Require().Equal(c.expected.RunID, actual.RunID)
 				s.Require().Equal(c.expected.UpdateID, actual.UpdateID)
-				s.Require().Equal(c.expected.WaitPolicy.LifecycleStage.String(), actual.WaitPolicy.LifecycleStage.String())
+				s.Require().Equal(c.expected.WaitForStage, actual.WaitForStage)
 				s.Require().Len(actual.Args, len(c.expected.Args))
 				for j, arg := range c.expected.Args {
 					s.Require().True(proto.Equal(arg.(proto.Message), actual.Args[j].(proto.Message)))
diff --git a/test/option/proto/test/option/v1/option.proto b/test/option/proto/test/option/v1/option.proto
index ea92d92f..c733c2e1 100644
--- a/test/option/proto/test/option/v1/option.proto
+++ b/test/option/proto/test/option/v1/option.proto
@@ -25,7 +25,8 @@ service Test {
   rpc UpdateWithInput(UpdateWithInputRequest) returns (google.protobuf.Empty) {
     option (temporal.v1.update) = {
       id: 'update-with-input:${! name.or(throw("name is required")) }'
-      wait_policy: WAIT_POLICY_COMPLETED
+      wait_policy: WAIT_POLICY_ADMITTED
+      wait_for_stage: WAIT_POLICY_COMPLETED
     };
   }
 
diff --git a/test/xnserr/client_test.go b/test/xnserr/client_test.go
index ac8efcbf..caf845dc 100644
--- a/test/xnserr/client_test.go
+++ b/test/xnserr/client_test.go
@@ -74,7 +74,7 @@ func registerNamespaceIfNotExists(ctx context.Context, t *testing.T, c client.Cl
 	}
 
 	// since we don't have this ns let's create it
-	_, err = c.WorkflowService().RegisterNamespace(ctx, &workflowservice.RegisterNamespaceRequest{Namespace: "xnserr-server", WorkflowExecutionRetentionPeriod: &retention})
+	_, err = c.WorkflowService().RegisterNamespace(ctx, &workflowservice.RegisterNamespaceRequest{Namespace: "xnserr-server", WorkflowExecutionRetentionPeriod: durationpb.New(retention)})
 	require.NoError(t, err)
 }