Merge branch 'main' into feature/issue-1213

Author: emiling

.github/workflows/heavy.yml

@@ -4,7 +4,7 @@ on: # rebuild any PRs and main branch changes
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read

.github/workflows/per-pr.yml

@@ -4,7 +4,7 @@ on: # rebuild any PRs and main branch changes
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read
@@ -17,7 +17,7 @@ concurrency:
 jobs:
   build-and-lint:
     name: "Format, docs, and lint"
-    timeout-minutes: ${{ github.ref == 'refs/heads/master' && 15 || 10 }}
+    timeout-minutes: ${{ github.ref == 'refs/heads/main' && 15 || 10 }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -33,7 +33,7 @@ jobs:
       - run: rustup component add rustfmt clippy
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo fmt --all --check
       - run: cargo doc --workspace --all-features --no-deps
         env:
@@ -46,7 +46,7 @@ jobs:
   test:
     name: Unit Tests
     # Give extra time to ensure pushes to main have time to populate the cache
-    timeout-minutes: ${{ matrix.timeoutMinutes || (github.ref == 'refs/heads/master' && 20 || 15) }}
+    timeout-minutes: ${{ matrix.timeoutMinutes || (github.ref == 'refs/heads/main' && 20 || 15) }}
     strategy:
       fail-fast: false
       matrix:
@@ -82,7 +82,7 @@ jobs:
             core.exportVariable('RUSTFLAGS', '-Csymbol-mangling-version=v0');
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo test -- --include-ignored --nocapture
       - name: Find test executable for cgroup tests
         id: find-cgroup-test
@@ -107,7 +107,7 @@ jobs:
 
   msrv:
     name: "Verify MSRV"
-    timeout-minutes: ${{ github.ref == 'refs/heads/master' && 15 || 10 }}
+    timeout-minutes: ${{ github.ref == 'refs/heads/main' && 15 || 10 }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -123,7 +123,7 @@ jobs:
       - run: rustup component add rustfmt clippy
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
           key: msrv
       - run: cargo install cargo-msrv
       - run: cargo msrv verify
@@ -150,7 +150,7 @@ jobs:
 
   integ-tests:
     name: Integ tests
-    timeout-minutes: ${{ github.ref == 'refs/heads/master' && 30 || 25 }}
+    timeout-minutes: ${{ github.ref == 'refs/heads/main' && 30 || 25 }}
     strategy:
       fail-fast: false
       matrix:
@@ -185,18 +185,18 @@ jobs:
             core.exportVariable('RUSTFLAGS', '-Csymbol-mangling-version=v0');
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo integ-test
 
   cloud-tests:
-    if: github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == 'temporalio/sdk-core'
+    if: github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == 'temporalio/sdk-rust'
     name: Cloud tests
     env:
       TEMPORAL_CLOUD_ADDRESS: https://${{ vars.TEMPORAL_CLIENT_NAMESPACE }}.tmprl.cloud:7233
       TEMPORAL_NAMESPACE: ${{ vars.TEMPORAL_CLIENT_NAMESPACE }}
       TEMPORAL_CLIENT_CERT: ${{ secrets.TEMPORAL_CLIENT_CERT }}
       TEMPORAL_CLIENT_KEY: ${{ secrets.TEMPORAL_CLIENT_KEY }}
-    timeout-minutes: ${{ github.ref == 'refs/heads/master' && 25 || 20 }}
+    timeout-minutes: ${{ github.ref == 'refs/heads/main' && 25 || 20 }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -210,7 +210,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo test --features=test-utilities --test cloud_tests
 
   docker-integ-tests:
@@ -221,7 +221,7 @@ jobs:
       TEMPORAL_CLIENT_CERT: ${{ secrets.TEMPORAL_CLIENT_CERT }}
       TEMPORAL_CLIENT_KEY: ${{ secrets.TEMPORAL_CLIENT_KEY }}
       DOCKER_PROMETHEUS_RUNNING: true
-    timeout-minutes: ${{ github.ref == 'refs/heads/master' && 25 || 20 }}
+    timeout-minutes: ${{ github.ref == 'refs/heads/main' && 25 || 20 }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -238,7 +238,7 @@ jobs:
           compose-file: ./etc/docker/docker-compose-ci.yaml
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo integ-test docker_
 
   examples:
@@ -255,7 +255,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
-          save-if: ${{ github.ref == 'refs/heads/master' }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: Build examples
         run: cargo build --examples -p temporalio-sdk --features examples
       - name: Install Temporal CLI

AGENTS.md

@@ -1,4 +1,4 @@
-# Contributor Guidance for `sdk-core`
+# Contributor Guidance for `sdk-rust`
 
 This repository provides a Rust workspace for the Temporal Core SDK and related crates. Use this
 document as your quick reference when submitting pull requests.

ARCHITECTURE.md

@@ -112,7 +112,7 @@ definitions. The actual implementations of this "service" are not generated by g
 the messages themselves are, and make it easier to hit the ground running in new languages.
 
 See the latest API
-definition [here](https://github.com/temporalio/sdk-core/tree/master/sdk-core-protos/protos/local/temporal/sdk/core)
+definition [here](https://github.com/temporalio/sdk-rust/tree/main/crates/common/protos/local/temporal/sdk/core)
 
 ## Other topics
 

crates/client/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "temporalio-client"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 authors = ["Temporal Technologies Inc. <sdk@temporal.io>"]
 license-file = { workspace = true }
 description = "Clients for interacting with Temporal"
 homepage = "https://temporal.io/"
-repository = "https://github.com/temporalio/sdk-core"
+repository = "https://github.com/temporalio/sdk-rust"
 keywords = ["temporal", "workflow"]
 categories = ["development-tools"]
 readme = "README.md"
@@ -51,7 +51,7 @@ rand = "0.10"
 
 [dependencies.temporalio-common]
 path = "../common"
-version = "0.2"
+version = "0.3"
 
 [dev-dependencies]
 assert_matches = "1"

crates/client/src/grpc.rs

@@ -1582,6 +1582,114 @@ proxier! {
             r.extensions_mut().insert(labels);
         }
     );
+    (
+        count_nexus_operation_executions,
+        CountNexusOperationExecutionsRequest,
+        CountNexusOperationExecutionsResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        create_worker_deployment,
+        CreateWorkerDeploymentRequest,
+        CreateWorkerDeploymentResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        create_worker_deployment_version,
+        CreateWorkerDeploymentVersionRequest,
+        CreateWorkerDeploymentVersionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        delete_nexus_operation_execution,
+        DeleteNexusOperationExecutionRequest,
+        DeleteNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        describe_nexus_operation_execution,
+        DescribeNexusOperationExecutionRequest,
+        DescribeNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        list_nexus_operation_executions,
+        ListNexusOperationExecutionsRequest,
+        ListNexusOperationExecutionsResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        poll_nexus_operation_execution,
+        PollNexusOperationExecutionRequest,
+        PollNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        request_cancel_nexus_operation_execution,
+        RequestCancelNexusOperationExecutionRequest,
+        RequestCancelNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        start_nexus_operation_execution,
+        StartNexusOperationExecutionRequest,
+        StartNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        terminate_nexus_operation_execution,
+        TerminateNexusOperationExecutionRequest,
+        TerminateNexusOperationExecutionResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        update_worker_deployment_version_compute_config,
+        UpdateWorkerDeploymentVersionComputeConfigRequest,
+        UpdateWorkerDeploymentVersionComputeConfigResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (
+        validate_worker_deployment_version_compute_config,
+        ValidateWorkerDeploymentVersionComputeConfigRequest,
+        ValidateWorkerDeploymentVersionComputeConfigResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
 }
 
 proxier! {

crates/common/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "temporalio-common"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 authors = ["Temporal Technologies Inc. <sdk@temporal.io>"]
 license-file = { workspace = true }
 description = "Common functionality for the Temporal SDK Core, Client, and Rust SDK"
 homepage = "https://temporal.io/"
-repository = "https://github.com/temporalio/sdk-core"
+repository = "https://github.com/temporalio/sdk-rust"
 keywords = ["temporal", "workflow"]
 categories = ["development-tools"]
 exclude = ["protos/*/.github/*"]

crates/common/build.rs

@@ -30,8 +30,10 @@ const SERDE_DERIVE_PREFIXES: &[&str] = &[
     ".grpc",
     ".temporal.api.activity",
     ".temporal.api.batch",
+    ".temporal.api.callback",
     ".temporal.api.cloud",
     ".temporal.api.command",
+    ".temporal.api.compute",
     ".temporal.api.deployment",
     ".temporal.api.filter",
     ".temporal.api.history",

crates/common/protos/api_upstream/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,3 @@
-_**READ BEFORE MERGING:** All PRs require approval by both Server AND SDK teams before merging! This is why the number of required approvals is "2" and not "1"--two reviewers from the same team is NOT sufficient. If your PR is not approved by someone in BOTH teams, it may be summarily reverted._
-
 <!-- Describe what has changed in this PR -->
 **What changed?**
 

crates/common/protos/api_upstream/.github/workflows/trigger-api-go-update.yml

@@ -56,7 +56,7 @@ jobs:
           esac
 
           gh workflow run update-proto.yml -R https://github.com/temporalio/api-go \
-            -r master \
+            -r "${BRANCH}" \
             -f branch="${BRANCH}" \
             -f commit_author="${COMMIT_AUTHOR}" \
             -f commit_author_email="${COMMIT_AUTHOR_EMAIL}" \