merge conflicts

Author: spkane31

openapi/openapiv2.json

@@ -2012,6 +2012,7 @@ paths:
               - TASK_QUEUE_KIND_UNSPECIFIED
               - TASK_QUEUE_KIND_NORMAL
               - TASK_QUEUE_KIND_STICKY
+              - TASK_QUEUE_KIND_WORKER_COMMANDS
             type: string
             format: enum
         - name: taskQueue.normalName
@@ -6678,6 +6679,7 @@ paths:
               - TASK_QUEUE_KIND_UNSPECIFIED
               - TASK_QUEUE_KIND_NORMAL
               - TASK_QUEUE_KIND_STICKY
+              - TASK_QUEUE_KIND_WORKER_COMMANDS
             type: string
             format: enum
         - name: taskQueue.normalName
@@ -12588,18 +12590,16 @@ components:
       properties:
         attachRequestId:
           type: boolean
-          description: Attaches the request ID to the running workflow.
+          description: Attaches the request ID to the running execution.
         attachCompletionCallbacks:
           type: boolean
-          description: Attaches the completion callbacks to the running workflow.
+          description: Attaches the completion callbacks to the running execution.
         attachLinks:
           type: boolean
-          description: Attaches the links to the WorkflowExecutionOptionsUpdatedEvent history event.
+          description: Attaches the links to the running execution.
       description: |-
-        When StartWorkflowExecution uses the conflict policy WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING and
-         there is already an existing running workflow, OnConflictOptions defines actions to be taken on
-         the existing running workflow. In this case, it will create a WorkflowExecutionOptionsUpdatedEvent
-         history event in the running workflow with the changes requested in this object.
+        When starting an execution with a conflict policy that uses an existing execution and there is already an existing
+         running execution, OnConflictOptions defines actions to be taken on the existing running execution.
     Outcome:
       type: object
       properties:
@@ -15109,6 +15109,13 @@ components:
         started:
           type: boolean
           description: If true, a new workflow was started.
+        signalLink:
+          allOf:
+            - $ref: '#/components/schemas/Link'
+          description: |-
+            Link to be associated with the WorkflowExecutionSignaled event.
+             Added on the response to propagate the backlink.
+             Available from Temporal server 1.31 and up.
     SignalWorkflowExecutionRequest:
       type: object
       properties:
@@ -15149,7 +15156,14 @@ components:
            - temporal.api.workflow.v1.PostResetOperation.SignalWorkflow.
     SignalWorkflowExecutionResponse:
       type: object
-      properties: {}
+      properties:
+        link:
+          allOf:
+            - $ref: '#/components/schemas/Link'
+          description: |-
+            Link to be associated with the WorkflowExecutionSignaled event.
+             Added on the response to propagate the backlink.
+             Available from Temporal server 1.31 and up.
     StartActivityExecutionRequest:
       type: object
       properties:
@@ -15267,6 +15281,10 @@ components:
           description: |-
             Links to be associated with the activity. Callbacks may also have associated links;
              links already included with a callback should not be duplicated here.
+        onConflictOptions:
+          allOf:
+            - $ref: '#/components/schemas/OnConflictOptions'
+          description: Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING.
     StartActivityExecutionResponse:
       type: object
       properties:
@@ -15731,6 +15749,7 @@ components:
             - TASK_QUEUE_KIND_UNSPECIFIED
             - TASK_QUEUE_KIND_NORMAL
             - TASK_QUEUE_KIND_STICKY
+            - TASK_QUEUE_KIND_WORKER_COMMANDS
           type: string
           description: 'Default: TASK_QUEUE_KIND_NORMAL.'
           format: enum
@@ -18149,6 +18168,11 @@ components:
           allOf:
             - $ref: '#/components/schemas/WorkflowExecution'
           description: When signal origin is a workflow execution, this field is set.
+        requestId:
+          type: string
+          description: |-
+            The request ID of the Signal request, used by the server to attach this to
+             the correct Event ID when generating link.
     WorkflowExecutionStartedEventAttributes:
       type: object
       properties:
@@ -18389,6 +18413,16 @@ components:
 
              Used internally by the server during continue-as-new and retry.
              Should not be read or interpreted by SDKs.
+        timeSkippingConfig:
+          allOf:
+            - $ref: '#/components/schemas/TimeSkippingConfig'
+          description: |-
+            Initial time-skipping configuration for this workflow execution, recorded at start time.
+             This may have been set explicitly via the start workflow request, or propagated from a
+             parent/previous execution.
+
+             The configuration may be updated after start via UpdateWorkflowExecutionOptions, which
+             will be reflected in the WorkflowExecutionOptionsUpdatedEvent.
       description: Always the first event in workflow history
     WorkflowExecutionTerminatedEventAttributes:
       type: object

openapi/openapiv3.yaml

@@ -363,3 +363,14 @@ message WorkerSelector {
         string worker_instance_key = 1;
     }
 }
+
+// When starting an execution with a conflict policy that uses an existing execution and there is already an existing
+// running execution, OnConflictOptions defines actions to be taken on the existing running execution.
+message OnConflictOptions {
+    // Attaches the request ID to the running execution.
+    bool attach_request_id = 1;
+    // Attaches the completion callbacks to the running execution.
+    bool attach_completion_callbacks = 2;
+    // Attaches the links to the running execution.
+    bool attach_links = 3;
+}

temporal/api/common/v1/message.proto

@@ -31,6 +31,11 @@ enum TaskQueueKind {
     //
     // Sticky queues are only for workflow tasks. There are no sticky task queues for activities.
     TASK_QUEUE_KIND_STICKY = 2;
+    // A worker-commands task queue is used for server-to-worker communication (e.g. activity
+    // cancellations). These queues are ephemeral and per-worker-process — they exist only for
+    // the lifetime of the worker process. Used with TASK_QUEUE_TYPE_NEXUS and polled via
+    // PollNexusTaskQueue.
+    TASK_QUEUE_KIND_WORKER_COMMANDS = 3;
 }
 
 enum TaskQueueType {

temporal/api/enums/v1/task_queue.proto

@@ -196,6 +196,14 @@ message WorkflowExecutionStartedEventAttributes {
     // Used internally by the server during continue-as-new and retry.
     // Should not be read or interpreted by SDKs.
     DeclinedTargetVersionUpgrade declined_target_version_upgrade = 40;
+
+    // Initial time-skipping configuration for this workflow execution, recorded at start time.
+    // This may have been set explicitly via the start workflow request, or propagated from a
+    // parent/previous execution.
+    //
+    // The configuration may be updated after start via UpdateWorkflowExecutionOptions, which
+    // will be reflected in the WorkflowExecutionOptionsUpdatedEvent.
+    temporal.api.workflow.v1.TimeSkippingConfig time_skipping_config = 41;
 }
 
 // Wrapper for a target deployment version that the SDK declined to upgrade to.
@@ -604,6 +612,9 @@ message WorkflowExecutionSignaledEventAttributes {
     bool skip_generate_workflow_task = 5 [deprecated = true];
     // When signal origin is a workflow execution, this field is set.
     temporal.api.common.v1.WorkflowExecution external_workflow_execution = 6;
+    // The request ID of the Signal request, used by the server to attach this to
+    // the correct Event ID when generating link.
+    string request_id = 7;
 }
 
 message WorkflowExecutionTerminatedEventAttributes {

temporal/api/history/v1/message.proto

@@ -793,6 +793,10 @@ message SignalWorkflowExecutionRequest {
 }
 
 message SignalWorkflowExecutionResponse {
+    // Link to be associated with the WorkflowExecutionSignaled event.
+    // Added on the response to propagate the backlink.
+    // Available from Temporal server 1.31 and up.
+    temporal.api.common.v1.Link link = 1;
 }
 
 message SignalWithStartWorkflowExecutionRequest {
@@ -865,6 +869,10 @@ message SignalWithStartWorkflowExecutionResponse {
     string run_id = 1;
     // If true, a new workflow was started.
     bool started = 2;
+    // Link to be associated with the WorkflowExecutionSignaled event.
+    // Added on the response to propagate the backlink.
+    // Available from Temporal server 1.31 and up.
+    temporal.api.common.v1.Link signal_link = 3;
 }
 
 message ResetWorkflowExecutionRequest {
@@ -3078,6 +3086,8 @@ message StartActivityExecutionRequest {
     // Links to be associated with the activity. Callbacks may also have associated links;
     // links already included with a callback should not be duplicated here.
     repeated temporal.api.common.v1.Link links = 20;
+    // Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING.
+    temporal.api.common.v1.OnConflictOptions on_conflict_options = 21;
 }
 
 message StartActivityExecutionResponse {