@temporalio/core-bridge 1.12.0 → 1.12.2

package/sdk-core/sdk-core-protos/protos/api_upstream/temporal/api/workflow/v1/message.proto

@@ -45,7 +45,7 @@ message WorkflowExecutionInfo {
     int64 history_size_bytes = 15;
     // If set, the most recent worker version stamp that appeared in a workflow task completion
     // Deprecated. This field should be cleaned up when versioning-2 API is removed. [cleanup-experimental-wv]
-    temporal.api.common.v1.WorkerVersionStamp most_recent_worker_version_stamp = 16;
+    temporal.api.common.v1.WorkerVersionStamp most_recent_worker_version_stamp = 16 [deprecated = true];
     // Workflow execution duration is defined as difference between close time and execution time.
     // This field is only populated if the workflow is closed.
     google.protobuf.Duration execution_duration = 17;
@@ -137,7 +137,7 @@ message WorkflowExecutionVersioningInfo {
     // behaviors.
     // This field is first set after an execution completes its first workflow task on a versioned
     // worker, and set again on completion of every subsequent workflow task.
-    // For child workflows of Pinned parents, this will be set to Pinned (along with `version`) when
+    // For child workflows of Pinned parents, this will be set to Pinned (along with `deployment_version`) when
     // the the child starts so that child's first workflow task goes to the same Version as the
     // parent. After the first workflow task, it depends on the child workflow itself if it wants
     // to stay pinned or become unpinned (according to Versioning Behavior set in the worker).
@@ -167,7 +167,8 @@ message WorkflowExecutionVersioningInfo {
     // precedence over SDK-sent `behavior` (and `version` when override is PINNED). An
     // override can be set when starting a new execution, as well as afterwards by calling the
     // `UpdateWorkflowExecutionOptions` API.
-    // Pinned overrides are automatically inherited by child workflows.
+    // Pinned overrides are automatically inherited by child workflows, continue-as-new workflows,
+    // workflow retries, and cron workflows.
     VersioningOverride versioning_override = 3;
     // When present, indicates the workflow is transitioning to a different deployment. Can
     // indicate one of the following transitions: unversioned -> versioned, versioned -> versioned
@@ -202,7 +203,7 @@ message WorkflowExecutionVersioningInfo {
     // start a transition to that version and continue execution there.
     // A version transition can only exist while there is a pending or started workflow task.
     // Once the pending workflow task completes on the transition's target version, the
-    // transition completes and the workflow's `behavior`, and `version` fields are updated per the
+    // transition completes and the workflow's `behavior`, and `deployment_version` fields are updated per the
     // worker's task completion response.
     // Pending activities will not start new attempts during a transition. Once the transition is
     // completed, pending activities will start their next attempt on the new version.
@@ -260,16 +261,16 @@ message PendingActivityInfo {
     // independently-assigned build ID to the database. This case heals automatically once the task is dispatched.
     // Deprecated. This field should be cleaned up when versioning-2 API is removed. [cleanup-experimental-wv]
     oneof assigned_build_id {
-        // When present, it means this activity is assigned to the build ID of its workflow.
+        // Deprecated. When present, it means this activity is assigned to the build ID of its workflow.
         google.protobuf.Empty use_workflow_build_id = 13 [deprecated = true];
-        // This means the activity is independently versioned and not bound to the build ID of its workflow.
+        // Deprecated. This means the activity is independently versioned and not bound to the build ID of its workflow.
         // The activity will use the build id in this field instead.
         // If the task fails and is scheduled again, the assigned build ID may change according to the latest versioning
         // rules.
         string last_independently_assigned_build_id = 14 [deprecated = true];
     }
-    // The version stamp of the worker to whom this activity was most recently dispatched
-    // Deprecated. This field should be cleaned up when versioning-2 API is removed. [cleanup-experimental-wv]
+    // Deprecated. The version stamp of the worker to whom this activity was most recently dispatched
+    // This field should be cleaned up when versioning-2 API is removed. [cleanup-experimental-wv]
     temporal.api.common.v1.WorkerVersionStamp last_worker_version_stamp = 15 [deprecated = true];
 
     // The time activity will wait until the next retry.
@@ -370,7 +371,7 @@ message ResetPoints {
 message ResetPointInfo {
     // Worker build id.
     string build_id = 7;
-    // A worker binary version identifier (deprecated).
+    // Deprecated. A worker binary version identifier.
     string binary_checksum = 1 [deprecated = true];
     // The first run ID in the execution chain that was touched by this worker build.
     string run_id = 2;
@@ -465,8 +466,8 @@ message PendingNexusOperationInfo {
 
     // Operation ID. Only set for asynchronous operations after a successful StartOperation call.
     //
-    // Deprecated: Renamed to operation_token.
-    string operation_id = 4;
+    // Deprecated. Renamed to operation_token.
+    string operation_id = 4 [deprecated = true];
 
     // Schedule-to-close timeout for this operation.
     // This is the only timeout settable by a workflow.
@@ -535,6 +536,8 @@ message WorkflowExecutionOptions {
 // `WorkflowExecutionInfo.VersioningInfo` for more information. To remove the override, call
 // `UpdateWorkflowExecutionOptions` with a null `VersioningOverride`, and use the `update_mask`
 // to indicate that it should be mutated.
+// Pinned overrides are automatically inherited by child workflows, continue-as-new workflows,
+// workflow retries, and cron workflows.
 message VersioningOverride {
     // Indicates whether to override the workflow to be AutoUpgrade or Pinned.
     oneof override {

package/sdk-core/sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/request_response.proto

@@ -40,6 +40,7 @@ import "temporal/api/batch/v1/message.proto";
 import "temporal/api/sdk/v1/task_complete_metadata.proto";
 import "temporal/api/sdk/v1/user_metadata.proto";
 import "temporal/api/nexus/v1/message.proto";
+import "temporal/api/worker/v1/message.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/field_mask.proto";
@@ -254,17 +255,20 @@ message PollWorkflowTaskQueueRequest {
     temporal.api.taskqueue.v1.TaskQueue task_queue = 2;
     // The identity of the worker/client who is polling this task queue
     string identity = 3;
-    // DEPRECATED since 1.21 - use `deployment_options` instead.
+    // Deprecated. Use deployment_options instead.
     // Each worker process should provide an ID unique to the specific set of code it is running
     // "checksum" in this field name isn't very accurate, it should be though of as an id.
     string binary_checksum = 4 [deprecated = true];
+    // Deprecated. Use deployment_options instead.
     // Information about this worker's build identifier and if it is choosing to use the versioning
     // feature. See the `WorkerVersionCapabilities` docstring for more.
-    // Deprecated. Replaced by deployment_options.
     temporal.api.common.v1.WorkerVersionCapabilities worker_version_capabilities = 5 [deprecated = true];
     // Worker deployment options that user has set in the worker.
     // Experimental. Worker Deployments are experimental and might significantly change in the future.
     temporal.api.deployment.v1.WorkerDeploymentOptions deployment_options = 6;
+
+    // Worker info to be sent to the server.
+    temporal.api.worker.v1.WorkerHeartbeat worker_heartbeat = 7;
 }
 
 message PollWorkflowTaskQueueResponse {
@@ -339,7 +343,7 @@ message RespondWorkflowTaskCompletedRequest {
     // something useful, but cannot complete it within the workflow task timeout. Local activities
     // which run for longer than the task timeout being the prime example.
     bool force_create_new_workflow_task = 6;
-    // DEPRECATED since 1.21 - use `deployment_options` instead.
+    // Deprecated. Use `deployment_options` instead.
     // Worker process' unique binary id
     string binary_checksum = 7 [deprecated = true];
     // Responses to the `queries` field in the task being responded to
@@ -402,7 +406,7 @@ message RespondWorkflowTaskFailedRequest {
     temporal.api.failure.v1.Failure failure = 3;
     // The identity of the worker/client
     string identity = 4;
-    // DEPRECATED since 1.21 - use `deployment_options` instead.
+    // Deprecated. Use `deployment_options` instead.
     // Worker process' unique binary id
     string binary_checksum = 5 [deprecated = true];
     string namespace = 6;
@@ -436,6 +440,10 @@ message PollActivityTaskQueueRequest {
     temporal.api.common.v1.WorkerVersionCapabilities worker_version_capabilities = 5 [deprecated = true];
     // Worker deployment options that user has set in the worker.
     temporal.api.deployment.v1.WorkerDeploymentOptions deployment_options = 6;
+
+    // Worker info to be sent to the server.
+    temporal.api.worker.v1.WorkerHeartbeat worker_heartbeat = 7;
+
 }
 
 message PollActivityTaskQueueResponse {
@@ -713,8 +721,8 @@ message SignalWorkflowExecutionRequest {
     string identity = 5;
     // Used to de-dupe sent signals
     string request_id = 6;
-    // Deprecated
-    string control = 7;
+    // Deprecated.
+    string control = 7 [deprecated = true];
     // Headers that are passed with the signal to the processing workflow.
     // These can include things like auth or tracing tokens.
     temporal.api.common.v1.Header header = 8;
@@ -760,8 +768,8 @@ message SignalWithStartWorkflowExecutionRequest {
     string signal_name = 12;
     // Serialized value(s) to provide with the signal
     temporal.api.common.v1.Payloads signal_input = 13;
-    // Deprecated
-    string control = 14;
+    // Deprecated.
+    string control = 14 [deprecated = true];
     // Retry policy for the workflow
     temporal.api.common.v1.RetryPolicy retry_policy = 15;
     // See https://docs.temporal.io/docs/content/what-is-a-temporal-cron-job/
@@ -809,15 +817,17 @@ message ResetWorkflowExecutionRequest {
     int64 workflow_task_finish_event_id = 4;
     // Used to de-dupe reset requests
     string request_id = 5;
-    // Event types to be reapplied (deprecated)
+    // Deprecated. Use `options`.
     // Default: RESET_REAPPLY_TYPE_SIGNAL
-    temporal.api.enums.v1.ResetReapplyType reset_reapply_type = 6;
+    temporal.api.enums.v1.ResetReapplyType reset_reapply_type = 6 [deprecated = true];
     // Event types not to be reapplied
     repeated temporal.api.enums.v1.ResetReapplyExcludeType reset_reapply_exclude_types = 7;
     // Operations to perform after the workflow has been reset. These operations will be applied
     // to the *new* run of the workflow execution in the order they are provided.
     // All operations are applied to the workflow before the first new workflow task is generated
     repeated temporal.api.workflow.v1.PostResetOperation post_reset_operations = 8;
+    // The identity of the worker/client
+    string identity = 9;
 }
 
 message ResetWorkflowExecutionResponse {
@@ -975,6 +985,9 @@ message RespondQueryTaskCompletedRequest {
     // traces.
     // Mutually exclusive with `query_result`. Set when the query fails.
     temporal.api.failure.v1.Failure failure = 7;
+    // Why did the task fail? It's important to note that many of the variants in this enum cannot
+    // apply to worker responses. See the type's doc for more.
+    temporal.api.enums.v1.WorkflowTaskFailedCause cause = 8;
 }
 
 message RespondQueryTaskCompletedResponse {
@@ -993,6 +1006,8 @@ message ShutdownWorkerRequest {
     string sticky_task_queue = 2;
     string identity = 3;
     string reason = 4;
+
+    temporal.api.worker.v1.WorkerHeartbeat worker_heartbeat = 5;
 }
 
 message ShutdownWorkerResponse {
@@ -1032,44 +1047,52 @@ message DescribeWorkflowExecutionResponse {
 //     aip.dev/not-precedent: field_behavior annotation not available in our gogo fork --)
 message DescribeTaskQueueRequest {
     string namespace = 1;
-    // Sticky queues are not supported in `ENHANCED` mode.
+
+    // Sticky queues are not supported in deprecated ENHANCED mode.
     temporal.api.taskqueue.v1.TaskQueue task_queue = 2;
-    // Deprecated. Use `ENHANCED` mode with `task_queue_types`. Ignored in `ENHANCED` mode.
+
     // If unspecified (TASK_QUEUE_TYPE_UNSPECIFIED), then default value (TASK_QUEUE_TYPE_WORKFLOW) will be used.
+    // Only supported in default mode (use `task_queue_types` in ENHANCED mode instead).
     temporal.api.enums.v1.TaskQueueType task_queue_type = 3;
-    // Deprecated. Ignored in `ENHANCED` mode.
-    bool include_task_queue_status = 4;
 
-    // All options except `task_queue_type` and `include_task_queue_status` are only available in the `ENHANCED` mode.
-    temporal.api.enums.v1.DescribeTaskQueueMode api_mode = 5;
+    // Report stats for the requested task queue type(s).
+    bool report_stats = 8;
+
+    // Deprecated, use `report_stats` instead.
+    // If true, the task queue status will be included in the response.
+    bool include_task_queue_status = 4 [deprecated = true];
 
+    // Deprecated. ENHANCED mode is also being deprecated.
+    // Select the API mode to use for this request: DEFAULT mode (if unset) or ENHANCED mode.
+    // Consult the documentation for each field to understand which mode it is supported in.
+    temporal.api.enums.v1.DescribeTaskQueueMode api_mode = 5 [deprecated = true];
+
+    // Deprecated (as part of the ENHANCED mode deprecation).
     // Optional. If not provided, the result for the default Build ID will be returned. The default Build ID is the one
     // mentioned in the first unconditional Assignment Rule. If there is no default Build ID, the result for the
     // unversioned queue will be returned.
     // (-- api-linter: core::0140::prepositions --)
-    temporal.api.taskqueue.v1.TaskQueueVersionSelection versions = 6;
+    temporal.api.taskqueue.v1.TaskQueueVersionSelection versions = 6 [deprecated = true];
 
+    // Deprecated (as part of the ENHANCED mode deprecation).
     // Task queue types to report info about. If not specified, all types are considered.
-    repeated temporal.api.enums.v1.TaskQueueType task_queue_types = 7;
-    // Report stats for the requested task queue types and versions
-    bool report_stats = 8;
-    // Report list of pollers for requested task queue types and versions
-    bool report_pollers = 9;
+    repeated temporal.api.enums.v1.TaskQueueType task_queue_types = 7 [deprecated = true];
+
+    // Deprecated (as part of the ENHANCED mode deprecation).
+    // Report list of pollers for requested task queue types and versions.
+    bool report_pollers = 9 [deprecated = true];
+
+    // Deprecated (as part of the ENHANCED mode deprecation).
     // Report task reachability for the requested versions and all task types (task reachability is not reported
     // per task type).
-    bool report_task_reachability = 10;
+    bool report_task_reachability = 10 [deprecated = true];
 }
 
 message DescribeTaskQueueResponse {
-    // Deprecated. Use `versions_info.types_info.pollers` with `ENHANCED` mode instead.
-    // Not set in `ENHANCED` mode.
     repeated temporal.api.taskqueue.v1.PollerInfo pollers = 1;
-    // Deprecated. Not set in `ENHANCED` mode.
-    temporal.api.taskqueue.v1.TaskQueueStatus task_queue_status = 2;
 
-    // This map contains Task Queue information for each Build ID. Empty string as key value means unversioned.
-    // Only set in `ENHANCED` mode.
-    map<string, temporal.api.taskqueue.v1.TaskQueueVersionInfo> versions_info = 3;
+    // Statistics for the task queue. Only populated when `report_stats` is set to true in the request.
+    temporal.api.taskqueue.v1.TaskQueueStats stats = 5;
 
     // Specifies which Worker Deployment Version(s) Server routes this Task Queue's tasks to.
     // When not present, it means the tasks are routed to Unversioned workers (workers with
@@ -1081,6 +1104,15 @@ message DescribeTaskQueueResponse {
     // are typically not Pinned until they complete their first task (unless they are started with
     // a Pinned VersioningOverride or are Child Workflows of a Pinned parent).
     temporal.api.taskqueue.v1.TaskQueueVersioningInfo versioning_info = 4;
+
+    // Deprecated.
+    // Status of the task queue. Only populated when `include_task_queue_status` is set to true in the request.
+    temporal.api.taskqueue.v1.TaskQueueStatus task_queue_status = 2 [deprecated = true];
+
+    // Deprecated.
+    // Only returned in ENHANCED mode.
+    // This map contains Task Queue information for each Build ID. Empty string as key value means unversioned.
+    map<string, temporal.api.taskqueue.v1.TaskQueueVersionInfo> versions_info = 3 [deprecated = true];
 }
 
 message GetClusterInfoRequest {
@@ -1153,6 +1185,7 @@ message GetSystemInfoResponse {
         // True if the server supports Nexus operations.
         // This flag is dependent both on server version and for Nexus to be enabled via server configuration.
         bool nexus = 11;
+
     }
 }
 
@@ -1737,6 +1770,9 @@ message PollNexusTaskQueueRequest {
     temporal.api.common.v1.WorkerVersionCapabilities worker_version_capabilities = 4 [deprecated = true];
     // Worker deployment options that user has set in the worker.
     temporal.api.deployment.v1.WorkerDeploymentOptions deployment_options = 6;
+
+    // Worker info to be sent to the server.
+    repeated temporal.api.worker.v1.WorkerHeartbeat worker_heartbeat = 7;
 }
 
 message PollNexusTaskQueueResponse {
@@ -1835,13 +1871,20 @@ message UpdateActivityOptionsRequest {
     // Controls which fields from `activity_options` will be applied
     google.protobuf.FieldMask update_mask = 5;
 
-        // either activity id or activity type must be provided
-        oneof activity {
-            // Only activity with this ID will be updated.
-            string id = 6;
-            // Update all running activities of this type.
-            string type = 7;
-        }
+    // either activity id or activity type must be provided
+    oneof activity {
+        // Only activity with this ID will be updated.
+        string id = 6;
+        // Update all running activities of this type.
+        string type = 7;
+    }
+
+    // If set, the activity options will be restored to the default.
+    // Default options are then options activity was created with.
+    // They are part of the first SCHEDULE event.
+    // This flag cannot be combined with any other option; if you supply
+    // restore_original together with other options, the request will be rejected.
+    bool restore_original = 8;
 }
 
 message UpdateActivityOptionsResponse {
@@ -1932,6 +1975,12 @@ message ResetActivityRequest {
     // If set, and activity is in backoff, the activity will start at a random time within the specified jitter duration.
     // (unless it is paused and keep_paused is set)
     google.protobuf.Duration jitter = 8;
+
+    // If set, the activity options will be restored to the defaults.
+    // Default options are then options activity was created with.
+    // They are part of the first SCHEDULE event.
+    bool restore_original_options = 9;
+
 }
 
 message ResetActivityResponse {
@@ -1977,10 +2026,22 @@ message DescribeWorkerDeploymentVersionRequest {
     string version = 2 [deprecated = true];
     // Required.
     temporal.api.deployment.v1.WorkerDeploymentVersion deployment_version = 3;
+    // Report stats for task queues which have been polled by this version.
+    bool report_task_queue_stats = 4;
 }
 
 message DescribeWorkerDeploymentVersionResponse {
     temporal.api.deployment.v1.WorkerDeploymentVersionInfo worker_deployment_version_info = 1;
+
+    // All the Task Queues that have ever polled from this Deployment version.
+    repeated VersionTaskQueue version_task_queues = 2;
+    // (-- api-linter: core::0123::resource-annotation=disabled --)
+    message VersionTaskQueue {
+        string name = 1;
+        temporal.api.enums.v1.TaskQueueType type = 2;
+        // Only set if `report_task_queue_stats` is set on the request.
+        temporal.api.taskqueue.v1.TaskQueueStats stats = 3;
+    }
 }
 
 message DescribeWorkerDeploymentRequest {
@@ -2146,6 +2207,12 @@ message ListWorkerDeploymentsResponse {
         string name = 1;
         google.protobuf.Timestamp create_time = 2;
         temporal.api.deployment.v1.RoutingConfig routing_config = 3;
+        // Summary of the version that was added most recently in the Worker Deployment.
+        temporal.api.deployment.v1.WorkerDeploymentInfo.WorkerDeploymentVersionSummary latest_version_summary = 4; 
+        // Summary of the current version of the Worker Deployment. 
+        temporal.api.deployment.v1.WorkerDeploymentInfo.WorkerDeploymentVersionSummary current_version_summary = 5;
+        // Summary of the ramping version of the Worker Deployment.
+        temporal.api.deployment.v1.WorkerDeploymentInfo.WorkerDeploymentVersionSummary ramping_version_summary = 6;
     }
 }
 
@@ -2193,6 +2260,8 @@ message UpdateWorkerDeploymentVersionMetadataRequest {
     map<string, temporal.api.common.v1.Payload> upsert_entries = 3;
     // List of keys to remove from the metadata.
     repeated string remove_entries = 4;
+    // Optional. The identity of the client who initiated this request.
+    string identity = 6;
 }
 
 message UpdateWorkerDeploymentVersionMetadataResponse {
@@ -2308,3 +2377,45 @@ message TriggerWorkflowRuleResponse {
     // True is the rule was applied, based on the rule conditions (predicate/visibility_query).
     bool applied = 1;
 }
+message RecordWorkerHeartbeatRequest {
+    // Namespace this worker belongs to.
+    string namespace = 1;
+
+    // The identity of the client who initiated this request.
+    string identity = 2;
+
+    repeated temporal.api.worker.v1.WorkerHeartbeat worker_heartbeat = 3;
+}
+
+message RecordWorkerHeartbeatResponse {
+
+}
+
+message ListWorkersRequest {
+    string namespace = 1;
+    int32 page_size = 2;
+    bytes next_page_token = 3;
+
+    // `query` in ListWorkers is used to filter workers based on worker status info.
+    // The following worker status attributes are expected are supported as part of the query:
+    //* WorkerInstanceKey
+    //* WorkerIdentity
+    //* HostName
+    //* TaskQueue
+    //* DeploymentName
+    //* BuildId
+    //* SdkName
+    //* SdkVersion
+    //* StartTime
+    //* LastHeartbeatTime
+    //* Status
+    // Currently metrics are not supported as a part of ListWorkers query.
+    string query = 4;
+}
+
+message ListWorkersResponse {
+    repeated temporal.api.worker.v1.WorkerInfo workers_info = 1;
+
+    // Next page token
+    bytes next_page_token = 2;
+}

package/sdk-core/sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/service.proto

@@ -1173,4 +1173,25 @@ service WorkflowService {
         };
     }
 
+    // WorkerHeartbeat receive heartbeat request from the worker.
+    rpc RecordWorkerHeartbeat (RecordWorkerHeartbeatRequest) returns (RecordWorkerHeartbeatResponse) {
+        option (google.api.http) = {
+            post: "/namespaces/{namespace}/workers/heartbeat"
+            body: "*"
+            additional_bindings {
+                post: "/api/v1/namespaces/{namespace}/workers/heartbeat"
+                body: "*"
+            }
+        };
+    };
+
+    // ListWorkers is a visibility API to list worker status information in a specific namespace.
+    rpc ListWorkers (ListWorkersRequest) returns (ListWorkersResponse) {
+        option (google.api.http) = {
+            get: "/namespaces/{namespace}/workers"
+            additional_bindings {
+                get: "/api/v1/namespaces/{namespace}/workers"
+            }
+        };
+    }
 }

package/sdk-core/sdk-core-protos/protos/local/temporal/sdk/core/workflow_activation/workflow_activation.proto

@@ -350,10 +350,10 @@ message ResolveNexusOperationStart {
         // If true the operation "started" but only because it's also already resolved. A
         // `ResolveNexusOperation` job will be in the same activation.
         bool started_sync = 3;
-        // The operation was cancelled before it was ever sent to server (same WFT).
-        // Note that core will still send a `ResolveNexusOperation` job in the same activation, so
-        // there does not need to be an exceptional case for this in lang.
-        temporal.api.failure.v1.Failure cancelled_before_start = 4;
+        // The operation either failed to start, was cancelled before it started, timed out, or
+        // failed synchronously. Details are included inside the message. In this case, the
+        // subsequent ResolveNexusOperation will never be sent.
+        temporal.api.failure.v1.Failure failed = 4;
     }
 }
 

package/sdk-core/sdk-core-protos/src/history_builder.rs

@@ -243,12 +243,12 @@ impl TestHistoryBuilder {
         self.build_and_push_event(EventType::WorkflowTaskFailed, attrs.into());
     }
 
-    pub fn add_timer_started(&mut self, timer_id: String) {
+    pub fn add_timer_started(&mut self, timer_id: String) -> i64 {
         self.add(TimerStartedEventAttributes {
             timer_id,
             workflow_task_completed_event_id: self.previous_task_completed_id,
             ..Default::default()
-        });
+        })
     }
 
     pub fn add_timer_fired(&mut self, timer_started_evt_id: i64, timer_id: String) {
@@ -367,7 +367,6 @@ impl TestHistoryBuilder {
                 run_id: run_id.into(),
             }),
             signal_name: signal_name.into(),
-            control: "".to_string(),
             ..Default::default()
         })
     }
@@ -452,7 +451,7 @@ impl TestHistoryBuilder {
         update_name: impl Into<String>,
     ) -> i64 {
         let protocol_instance_id = instance_id.into();
-        let last_wft_started_id = self
+        let last_wft_scheduled_id = self
             .events
             .iter()
             .rev()
@@ -466,7 +465,7 @@ impl TestHistoryBuilder {
             .expect("Must have wft scheduled event");
         let attrs = WorkflowExecutionUpdateAcceptedEventAttributes {
             accepted_request_message_id: format!("{}/request", &protocol_instance_id),
-            accepted_request_sequencing_event_id: last_wft_started_id,
+            accepted_request_sequencing_event_id: last_wft_scheduled_id,
             accepted_request: Some(update::v1::Request {
                 meta: Some(update::v1::Meta {
                     update_id: protocol_instance_id.clone(),
@@ -568,6 +567,11 @@ impl TestHistoryBuilder {
         self.current_event_id
     }
 
+    /// Get mutable ref to the most recently added event
+    pub fn last_event(&mut self) -> Option<&mut HistoryEvent> {
+        self.events.last_mut()
+    }
+
     fn set_flags<'a>(
         mut events: impl Iterator<Item = &'a mut HistoryEvent>,
         core: &[u32],