Merge origin/master into standalone-nexus-op

Author: stephanos

openapi/openapiv2.json

@@ -9902,6 +9902,10 @@
         "selector": {
           "$ref": "#/definitions/v1WorkerSelector",
           "description": "Defines which workers should receive this command.\nonly single worker is supported at this time."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the worker grouping key."
         }
       }
     },
@@ -10015,6 +10019,10 @@
         "identity": {
           "type": "string",
           "title": "The identity of the worker/client"
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the workflow ID or activity ID for standalone activities."
         }
       }
     },
@@ -10032,6 +10040,10 @@
         "identity": {
           "type": "string",
           "title": "The identity of the worker/client"
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains \"workflow:workflow_id\" or \"activity:activity_id\" for standalone activities."
         }
       }
     },
@@ -10048,6 +10060,10 @@
             "type": "object",
             "$ref": "#/definitions/v1WorkerHeartbeat"
           }
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the worker grouping key."
         }
       }
     },
@@ -10238,6 +10254,10 @@
           "type": "string",
           "title": "The identity of the worker/client"
         },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the workflow ID or activity ID for standalone activities."
+        },
         "workerVersion": {
           "$ref": "#/definitions/v1WorkerVersionStamp",
           "description": "Version info of the worker who processed this task. This message's `build_id` field should\nalways be set by SDKs. Workers opting into versioning will also set the `use_versioning`\nfield to true. See message docstrings for more.\nDeprecated. Use `deployment_options` instead."
@@ -10270,6 +10290,10 @@
         "deploymentOptions": {
           "$ref": "#/definitions/v1WorkerDeploymentOptions",
           "description": "Worker deployment options that user has set in the worker."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains \"workflow:workflow_id\" or \"activity:activity_id\" for standalone activities."
         }
       }
     },
@@ -10289,6 +10313,10 @@
           "type": "string",
           "title": "The identity of the worker/client"
         },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the workflow ID or activity ID for standalone activities."
+        },
         "workerVersion": {
           "$ref": "#/definitions/v1WorkerVersionStamp",
           "description": "Version info of the worker who processed this task. This message's `build_id` field should\nalways be set by SDKs. Workers opting into versioning will also set the `use_versioning`\nfield to true. See message docstrings for more.\nDeprecated. Use `deployment_options` instead."
@@ -10317,6 +10345,10 @@
         "identity": {
           "type": "string",
           "title": "The identity of the worker/client"
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains \"workflow:workflow_id\" or \"activity:activity_id\" for standalone activities."
         }
       }
     },
@@ -10336,6 +10368,10 @@
           "type": "string",
           "title": "The identity of the worker/client"
         },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the workflow ID or activity ID for standalone activities."
+        },
         "lastHeartbeatDetails": {
           "$ref": "#/definitions/v1Payloads",
           "title": "Additional details to be stored as last activity heartbeat"
@@ -10372,6 +10408,10 @@
         "lastHeartbeatDetails": {
           "$ref": "#/definitions/v1Payloads",
           "title": "Additional details to be stored as last activity heartbeat"
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains \"workflow:workflow_id\" or \"activity:activity_id\" for standalone activities."
         }
       }
     },
@@ -11233,6 +11273,10 @@
         "selector": {
           "$ref": "#/definitions/v1WorkerSelector",
           "description": "Defines which workers should receive this command."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource ID for routing. Contains the worker grouping key."
         }
       }
     },
@@ -12969,6 +13013,15 @@
         }
       }
     },
+    "v1DeclinedTargetVersionUpgrade": {
+      "type": "object",
+      "properties": {
+        "deploymentVersion": {
+          "$ref": "#/definitions/v1WorkerDeploymentVersion"
+        }
+      },
+      "description": "Wrapper for a target deployment version that the SDK declined to upgrade to.\nSee declined_target_version_upgrade on WorkflowExecutionStartedEventAttributes."
+    },
     "v1DeleteNexusEndpointResponse": {
       "type": "object"
     },
@@ -18937,6 +18990,10 @@
         "eagerExecutionAccepted": {
           "type": "boolean",
           "description": "A boolean indicating whether the SDK has asked to eagerly execute the first workflow task for this workflow and\neager execution was accepted by the server.\nOnly populated by server with version >= 1.29.0."
+        },
+        "declinedTargetVersionUpgrade": {
+          "$ref": "#/definitions/v1DeclinedTargetVersionUpgrade",
+          "description": "During a previous run of this workflow, the server may have notified the SDK\nthat the Target Worker Deployment Version changed, but the SDK declined to\nupgrade (e.g., by continuing-as-new with PINNED behavior). This field records\nthe target version that was declined.\n\nThis is a wrapper message to distinguish \"never declined\" (nil wrapper) from\n\"declined an unversioned target\" (non-nil wrapper with nil deployment_version).\n\nUsed internally by the server during continue-as-new and retry.\nShould not be read or interpreted by SDKs."
         }
       },
       "title": "Always the first event in workflow history"

openapi/openapiv3.yaml

@@ -9895,6 +9895,14 @@ components:
         data:
           type: string
           format: bytes
+    DeclinedTargetVersionUpgrade:
+      type: object
+      properties:
+        deploymentVersion:
+          $ref: '#/components/schemas/WorkerDeploymentVersion'
+      description: |-
+        Wrapper for a target deployment version that the SDK declined to upgrade to.
+         See declined_target_version_upgrade on WorkflowExecutionStartedEventAttributes.
     DeleteNexusEndpointResponse:
       type: object
       properties: {}
@@ -10540,6 +10548,9 @@ components:
           description: |-
             Defines which workers should receive this command.
              only single worker is supported at this time.
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the worker grouping key.
     FetchWorkerConfigResponse:
       type: object
       properties:
@@ -12849,6 +12860,9 @@ components:
         identity:
           type: string
           description: The identity of the worker/client
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains "workflow:workflow_id" or "activity:activity_id" for standalone activities.
     RecordActivityTaskHeartbeatByIdResponse:
       type: object
       properties:
@@ -12881,6 +12895,9 @@ components:
           description: The identity of the worker/client
         namespace:
           type: string
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the workflow ID or activity ID for standalone activities.
     RecordActivityTaskHeartbeatResponse:
       type: object
       properties:
@@ -12910,6 +12927,9 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/WorkerHeartbeat'
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the worker grouping key.
     RecordWorkerHeartbeatResponse:
       type: object
       properties: {}
@@ -13421,6 +13441,9 @@ components:
           allOf:
             - $ref: '#/components/schemas/WorkerDeploymentOptions'
           description: Worker deployment options that user has set in the worker.
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains "workflow:workflow_id" or "activity:activity_id" for standalone activities.
     RespondActivityTaskCanceledByIdResponse:
       type: object
       properties: {}
@@ -13440,6 +13463,9 @@ components:
           description: The identity of the worker/client
         namespace:
           type: string
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the workflow ID or activity ID for standalone activities.
         workerVersion:
           allOf:
             - $ref: '#/components/schemas/WorkerVersionStamp'
@@ -13486,6 +13512,9 @@ components:
         identity:
           type: string
           description: The identity of the worker/client
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains "workflow:workflow_id" or "activity:activity_id" for standalone activities.
     RespondActivityTaskCompletedByIdResponse:
       type: object
       properties: {}
@@ -13505,6 +13534,9 @@ components:
           description: The identity of the worker/client
         namespace:
           type: string
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the workflow ID or activity ID for standalone activities.
         workerVersion:
           allOf:
             - $ref: '#/components/schemas/WorkerVersionStamp'
@@ -13555,6 +13587,9 @@ components:
           allOf:
             - $ref: '#/components/schemas/Payloads'
           description: Additional details to be stored as last activity heartbeat
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains "workflow:workflow_id" or "activity:activity_id" for standalone activities.
     RespondActivityTaskFailedByIdResponse:
       type: object
       properties:
@@ -13581,6 +13616,9 @@ components:
           description: The identity of the worker/client
         namespace:
           type: string
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the workflow ID or activity ID for standalone activities.
         lastHeartbeatDetails:
           allOf:
             - $ref: '#/components/schemas/Payloads'
@@ -15904,6 +15942,9 @@ components:
           allOf:
             - $ref: '#/components/schemas/WorkerSelector'
           description: Defines which workers should receive this command.
+        resourceId:
+          type: string
+          description: Resource ID for routing. Contains the worker grouping key.
     UpdateWorkerConfigResponse:
       type: object
       properties:
@@ -17599,6 +17640,20 @@ components:
             A boolean indicating whether the SDK has asked to eagerly execute the first workflow task for this workflow and
              eager execution was accepted by the server.
              Only populated by server with version >= 1.29.0.
+        declinedTargetVersionUpgrade:
+          allOf:
+            - $ref: '#/components/schemas/DeclinedTargetVersionUpgrade'
+          description: |-
+            During a previous run of this workflow, the server may have notified the SDK
+             that the Target Worker Deployment Version changed, but the SDK declined to
+             upgrade (e.g., by continuing-as-new with PINNED behavior). This field records
+             the target version that was declined.
+
+             This is a wrapper message to distinguish "never declined" (nil wrapper) from
+             "declined an unversioned target" (non-nil wrapper with nil deployment_version).
+
+             Used internally by the server during continue-as-new and retry.
+             Should not be read or interpreted by SDKs.
       description: Always the first event in workflow history
     WorkflowExecutionTerminatedEventAttributes:
       type: object

temporal/api/history/v1/message.proto

@@ -184,6 +184,24 @@ message WorkflowExecutionStartedEventAttributes {
     // eager execution was accepted by the server.
     // Only populated by server with version >= 1.29.0.
     bool eager_execution_accepted = 38;
+
+    // During a previous run of this workflow, the server may have notified the SDK
+    // that the Target Worker Deployment Version changed, but the SDK declined to
+    // upgrade (e.g., by continuing-as-new with PINNED behavior). This field records
+    // the target version that was declined.
+    //
+    // This is a wrapper message to distinguish "never declined" (nil wrapper) from
+    // "declined an unversioned target" (non-nil wrapper with nil deployment_version).
+    //
+    // 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;
+}
+
+// Wrapper for a target deployment version that the SDK declined to upgrade to.
+// See declined_target_version_upgrade on WorkflowExecutionStartedEventAttributes.
+message DeclinedTargetVersionUpgrade {
+    temporal.api.deployment.v1.WorkerDeploymentVersion deployment_version = 1;
 }
 
 message WorkflowExecutionCompletedEventAttributes {

temporal/api/protometa/v1/annotations.proto

@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package temporal.api.protometa.v1;
+
+option go_package = "go.temporal.io/api/protometa/v1;protometa";
+option java_package = "io.temporal.api.protometa.v1";
+option java_multiple_files = true;
+option java_outer_classname = "AnnotationsProto";
+option ruby_package = "Temporalio::Api::Protometa::V1";
+option csharp_namespace = "Temporalio.Api.Protometa.V1";
+
+import "google/protobuf/descriptor.proto";
+
+// RequestHeaderAnnotation allows specifying that field values from a request
+// should be propagated as outbound headers.
+//
+// The value field supports template interpolation where field paths enclosed
+// in braces will be replaced with the actual field values from the request.
+// For example:
+//   value: "{workflow_execution.workflow_id}"
+//   value: "workflow-{workflow_execution.workflow_id}"
+//   value: "{namespace}/{workflow_execution.workflow_id}"
+message RequestHeaderAnnotation {
+  // The name of the header to set (e.g., "temporal-resource-id")
+  string header = 1;
+
+  // A template string that may contain field paths in braces.
+  // Field paths use dot notation to traverse nested messages.
+  // Example: "{workflow_execution.workflow_id}"
+  string value = 2;
+}
+
+// Extension to add request-header annotations to RPC methods.
+// Multiple headers can be set by repeating this option.
+extend google.protobuf.MethodOptions {
+  repeated RequestHeaderAnnotation request_header = 7234001;
+}