@temporalio/core-bridge 1.12.0 → 1.12.2

package/sdk-core/etc/deps.svg

@@ -1,162 +1,162 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 7.0.4 (0)
+<!-- Generated by graphviz version 13.0.1 (0)
  -->
 <!-- Pages: 1 -->
-<svg width="436pt" height="404pt"
- viewBox="0.00 0.00 436.26 404.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="433pt" height="404pt"
+ viewBox="0.00 0.00 433.00 404.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 400)">
-<polygon fill="white" stroke="none" points="-4,4 -4,-400 432.26,-400 432.26,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-400 429.23,-400 429.23,4 -4,4"/>
 <!-- 0 -->
 <g id="node1" class="node">
 <title>0</title>
-<polygon fill="none" stroke="black" points="255,-396 139,-396 139,-360 255,-360 255,-396"/>
-<text text-anchor="middle" x="197" y="-374.3" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core</text>
+<polygon fill="none" stroke="black" points="239.5,-396 123.75,-396 123.75,-360 239.5,-360 239.5,-396"/>
+<text xml:space="preserve" text-anchor="middle" x="181.62" y="-372.95" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core</text>
 </g>
 <!-- 1 -->
 <g id="node2" class="node">
 <title>1</title>
-<polygon fill="none" stroke="black" points="58,-324 0,-324 0,-288 58,-288 58,-324"/>
-<text text-anchor="middle" x="29" y="-302.3" font-family="Times,serif" font-size="14.00">rustfsm</text>
+<polygon fill="none" stroke="black" points="57.25,-324 0,-324 0,-288 57.25,-288 57.25,-324"/>
+<text xml:space="preserve" text-anchor="middle" x="28.62" y="-300.95" font-family="Times,serif" font-size="14.00">rustfsm</text>
 </g>
 <!-- 0&#45;&gt;1 -->
 <g id="edge1" class="edge">
 <title>0&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M155.04,-359.52C128.68,-348.53 94.87,-334.45 68.91,-323.63"/>
-<polygon fill="black" stroke="black" points="70.28,-320.41 59.7,-319.79 67.59,-326.87 70.28,-320.41"/>
+<path fill="none" stroke="black" d="M143.41,-359.52C120.38,-348.98 91.12,-335.59 67.91,-324.97"/>
+<polygon fill="black" stroke="black" points="69.64,-321.91 59.09,-320.94 66.72,-328.28 69.64,-321.91"/>
 </g>
 <!-- 3 -->
 <g id="node3" class="node">
 <title>3</title>
-<polygon fill="none" stroke="black" points="368,-108 268,-108 268,-72 368,-72 368,-108"/>
-<text text-anchor="middle" x="318" y="-86.3" font-family="Times,serif" font-size="14.00">temporal&#45;client</text>
+<polygon fill="none" stroke="black" points="289.25,-180 190,-180 190,-144 289.25,-144 289.25,-180"/>
+<text xml:space="preserve" text-anchor="middle" x="239.62" y="-156.95" font-family="Times,serif" font-size="14.00">temporal&#45;client</text>
 </g>
 <!-- 0&#45;&gt;3 -->
 <g id="edge2" class="edge">
 <title>0&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M255.43,-370.58C312.02,-363.02 391.98,-348.3 411,-324 461.94,-258.91 386.25,-162.28 343.68,-116.65"/>
-<polygon fill="black" stroke="black" points="346.38,-114.4 336.95,-109.58 341.31,-119.23 346.38,-114.4"/>
+<path fill="none" stroke="black" d="M186.27,-359.85C196.24,-323.07 219.76,-236.29 231.97,-191.24"/>
+<polygon fill="black" stroke="black" points="235.32,-192.26 234.56,-181.69 228.56,-190.43 235.32,-192.26"/>
 </g>
 <!-- 4 -->
 <g id="node4" class="node">
 <title>4</title>
-<polygon fill="none" stroke="black" points="298.5,-36 143.5,-36 143.5,0 298.5,0 298.5,-36"/>
-<text text-anchor="middle" x="221" y="-14.3" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;protos</text>
+<polygon fill="none" stroke="black" points="346,-108 209.25,-108 209.25,-72 346,-72 346,-108"/>
+<text xml:space="preserve" text-anchor="middle" x="277.62" y="-84.95" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;api</text>
 </g>
 <!-- 0&#45;&gt;4 -->
-<g id="edge5" class="edge">
+<g id="edge4" class="edge">
 <title>0&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M170.41,-359.59C137.57,-335.74 86,-289.6 86,-235 86,-235 86,-235 86,-161 86,-107.38 137.19,-65.95 176.53,-42.03"/>
-<polygon fill="black" stroke="black" points="178.08,-45.18 184.93,-37.1 174.53,-39.14 178.08,-45.18"/>
+<path fill="none" stroke="black" d="M239.96,-371.52C300.11,-364.52 387.94,-350.08 408.62,-324 463.57,-254.75 364.22,-159.56 309.77,-115.37"/>
+<polygon fill="black" stroke="black" points="312,-112.66 301.99,-109.17 307.63,-118.14 312,-112.66"/>
 </g>
 <!-- 5 -->
 <g id="node5" class="node">
 <title>5</title>
-<polygon fill="none" stroke="black" points="289.5,-180 152.5,-180 152.5,-144 289.5,-144 289.5,-180"/>
-<text text-anchor="middle" x="221" y="-158.3" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;api</text>
+<polygon fill="none" stroke="black" points="258.62,-36 104.62,-36 104.62,0 258.62,0 258.62,-36"/>
+<text xml:space="preserve" text-anchor="middle" x="181.62" y="-12.95" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;protos</text>
 </g>
 <!-- 0&#45;&gt;5 -->
-<g id="edge4" class="edge">
+<g id="edge5" class="edge">
 <title>0&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M188.08,-359.89C173.64,-329.74 148.72,-265.64 169,-216 173.27,-205.55 180.7,-196.05 188.64,-188.07"/>
-<polygon fill="black" stroke="black" points="190.92,-190.72 195.87,-181.35 186.16,-185.59 190.92,-190.72"/>
+<path fill="none" stroke="black" d="M159.84,-359.83C131.52,-335.39 85.62,-287.67 85.62,-235 85.62,-235 85.62,-235 85.62,-161 85.62,-113.27 123.32,-69.6 151.46,-43.65"/>
+<polygon fill="black" stroke="black" points="153.58,-46.45 158.71,-37.18 148.92,-41.23 153.58,-46.45"/>
 </g>
 <!-- 6 -->
 <g id="node6" class="node">
 <title>6</title>
-<polygon fill="none" stroke="black" points="266.5,-252 177.5,-252 177.5,-216 266.5,-216 266.5,-252"/>
-<text text-anchor="middle" x="222" y="-230.3" font-family="Times,serif" font-size="14.00">temporal&#45;sdk</text>
+<polygon fill="none" stroke="black" points="202.62,-252 114.62,-252 114.62,-216 202.62,-216 202.62,-252"/>
+<text xml:space="preserve" text-anchor="middle" x="158.62" y="-228.95" font-family="Times,serif" font-size="14.00">temporal&#45;sdk</text>
 </g>
 <!-- 0&#45;&gt;6 -->
 <g id="edge3" class="edge">
 <title>0&#45;&gt;6</title>
-<path fill="none" stroke="blue" d="M195.45,-359.59C197.18,-335.5 204.59,-291.75 211.56,-263.03"/>
-<polygon fill="blue" stroke="blue" points="214.89,-264.13 214.02,-253.58 208.12,-262.37 214.89,-264.13"/>
+<path fill="none" stroke="blue" d="M174.19,-359.59C167.81,-335.61 160.46,-292.14 157.7,-263.42"/>
+<polygon fill="blue" stroke="blue" points="161.2,-263.32 156.93,-253.62 154.22,-263.86 161.2,-263.32"/>
 </g>
 <!-- 7 -->
 <g id="node7" class="node">
 <title>7</title>
-<polygon fill="none" stroke="black" points="401.5,-324 234.5,-324 234.5,-288 401.5,-288 401.5,-324"/>
-<text text-anchor="middle" x="318" y="-302.3" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;test&#45;utils</text>
+<polygon fill="none" stroke="black" points="400,-324 233.25,-324 233.25,-288 400,-288 400,-324"/>
+<text xml:space="preserve" text-anchor="middle" x="316.62" y="-300.95" font-family="Times,serif" font-size="14.00">temporal&#45;sdk&#45;core&#45;test&#45;utils</text>
 </g>
 <!-- 0&#45;&gt;7 -->
 <g id="edge6" class="edge">
 <title>0&#45;&gt;7</title>
-<path fill="none" stroke="blue" d="M221.29,-359.52C235.94,-350.51 254.96,-339.42 272.29,-329.76"/>
-<polygon fill="blue" stroke="blue" points="273.86,-332.89 280.93,-324.99 270.48,-326.76 273.86,-332.89"/>
+<path fill="none" stroke="blue" d="M209.41,-359.52C226.09,-350.39 247.7,-339.11 267.17,-329.35"/>
+<polygon fill="blue" stroke="blue" points="268.67,-332.52 276.07,-324.93 265.56,-326.25 268.67,-332.52"/>
 </g>
 <!-- 3&#45;&gt;4 -->
 <g id="edge7" class="edge">
 <title>3&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M294.02,-71.7C282.01,-63.03 267.28,-52.4 254.21,-42.96"/>
-<polygon fill="black" stroke="black" points="256.42,-40.25 246.27,-37.23 252.33,-45.92 256.42,-40.25"/>
+<path fill="none" stroke="black" d="M249.02,-143.7C253.21,-135.98 258.24,-126.71 262.91,-118.11"/>
+<polygon fill="black" stroke="black" points="265.92,-119.89 267.62,-109.43 259.77,-116.55 265.92,-119.89"/>
 </g>
-<!-- 5&#45;&gt;3 -->
+<!-- 3&#45;&gt;5 -->
 <g id="edge8" class="edge">
-<title>5&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M244.98,-143.7C256.99,-135.03 271.72,-124.4 284.79,-114.96"/>
-<polygon fill="black" stroke="black" points="286.67,-117.92 292.73,-109.23 282.58,-112.25 286.67,-117.92"/>
+<title>3&#45;&gt;5</title>
+<path fill="none" stroke="black" d="M223.84,-143.56C215.76,-133.76 206.43,-120.92 200.62,-108 192.01,-88.82 187.21,-65.53 184.6,-47.59"/>
+<polygon fill="black" stroke="black" points="188.1,-47.37 183.34,-37.9 181.16,-48.27 188.1,-47.37"/>
 </g>
-<!-- 5&#45;&gt;4 -->
+<!-- 4&#45;&gt;5 -->
 <g id="edge9" class="edge">
-<title>5&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M221,-143.59C221,-119.61 221,-76.14 221,-47.42"/>
-<polygon fill="black" stroke="black" points="224.5,-47.62 221,-37.62 217.5,-47.62 224.5,-47.62"/>
+<title>4&#45;&gt;5</title>
+<path fill="none" stroke="black" d="M253.89,-71.7C242.01,-63.03 227.43,-52.4 214.49,-42.96"/>
+<polygon fill="black" stroke="black" points="216.78,-40.3 206.64,-37.24 212.66,-45.96 216.78,-40.3"/>
 </g>
 <!-- 6&#45;&gt;0 -->
 <g id="edge11" class="edge">
 <title>6&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M223.57,-252.11C221.89,-276.03 214.51,-319.76 207.53,-348.6"/>
-<polygon fill="black" stroke="black" points="204.18,-347.56 205.06,-358.12 210.96,-349.32 204.18,-347.56"/>
+<path fill="none" stroke="black" d="M165.98,-252.11C172.36,-275.92 179.72,-319.37 182.51,-348.22"/>
+<polygon fill="black" stroke="black" points="179.02,-348.39 183.3,-358.08 186,-347.83 179.02,-348.39"/>
 </g>
 <!-- 6&#45;&gt;3 -->
 <g id="edge10" class="edge">
 <title>6&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M258.49,-215.67C273.19,-206.93 288.99,-194.98 299,-180 310.95,-162.11 315.57,-138.07 317.27,-119.49"/>
-<polygon fill="black" stroke="black" points="320.75,-119.9 317.91,-109.69 313.76,-119.44 320.75,-119.9"/>
+<path fill="none" stroke="black" d="M178.65,-215.7C188.38,-207.28 200.26,-197.02 210.94,-187.79"/>
+<polygon fill="black" stroke="black" points="213.13,-190.52 218.41,-181.34 208.55,-185.23 213.13,-190.52"/>
 </g>
 <!-- 6&#45;&gt;4 -->
-<g id="edge13" class="edge">
+<g id="edge12" class="edge">
 <title>6&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M181.41,-215.53C166.89,-207.06 152.12,-195.34 144,-180 136.51,-165.86 139.64,-159.39 144,-144 154.67,-106.33 180.26,-68.86 199.02,-44.92"/>
-<polygon fill="black" stroke="black" points="201.6,-47.29 205.13,-37.31 196.14,-42.91 201.6,-47.29"/>
+<path fill="none" stroke="black" d="M158.87,-215.84C159.98,-196.51 164.4,-165.05 180.62,-144 190.33,-131.4 203.92,-121.4 217.86,-113.65"/>
+<polygon fill="black" stroke="black" points="219.41,-116.79 226.68,-109.08 216.19,-110.57 219.41,-116.79"/>
 </g>
 <!-- 6&#45;&gt;5 -->
-<g id="edge12" class="edge">
+<g id="edge13" class="edge">
 <title>6&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M221.75,-215.7C221.65,-208.41 221.52,-199.73 221.41,-191.54"/>
-<polygon fill="black" stroke="black" points="224.91,-191.57 221.27,-181.62 217.91,-191.67 224.91,-191.57"/>
+<path fill="none" stroke="black" d="M158.28,-215.56C158.09,-197.59 158.28,-168.77 160.62,-144 163.8,-110.53 170.66,-72.48 175.68,-47.24"/>
+<polygon fill="black" stroke="black" points="179.05,-48.27 177.61,-37.77 172.19,-46.87 179.05,-48.27"/>
 </g>
 <!-- 7&#45;&gt;0 -->
 <g id="edge16" class="edge">
 <title>7&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M294.08,-324.26C279.5,-333.23 260.5,-344.31 243.14,-354"/>
-<polygon fill="black" stroke="black" points="241.54,-350.89 234.48,-358.78 244.93,-357.01 241.54,-350.89"/>
+<path fill="none" stroke="black" d="M289.25,-324.26C272.65,-333.36 251.07,-344.62 231.55,-354.41"/>
+<polygon fill="black" stroke="black" points="230.03,-351.26 222.63,-358.84 233.15,-357.53 230.03,-351.26"/>
 </g>
 <!-- 7&#45;&gt;3 -->
 <g id="edge14" class="edge">
 <title>7&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M318.57,-287.61C319.46,-258.08 320.99,-196.26 320,-144 319.85,-136.05 319.57,-127.44 319.27,-119.51"/>
-<polygon fill="black" stroke="black" points="322.78,-119.54 318.87,-109.69 315.78,-119.83 322.78,-119.54"/>
+<path fill="none" stroke="black" d="M307.18,-287.59C293.95,-263.18 269.77,-218.58 254.21,-189.89"/>
+<polygon fill="black" stroke="black" points="257.47,-188.56 249.62,-181.44 251.32,-191.9 257.47,-188.56"/>
 </g>
 <!-- 7&#45;&gt;4 -->
-<g id="edge18" class="edge">
+<g id="edge17" class="edge">
 <title>7&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M331.1,-287.73C360.65,-246.5 426.21,-140.69 377,-72 361.19,-49.92 335.65,-36.93 309.77,-29.32"/>
-<polygon fill="black" stroke="black" points="310.71,-25.95 300.15,-26.77 308.92,-32.72 310.71,-25.95"/>
+<path fill="none" stroke="black" d="M316.2,-287.82C315.13,-258.08 311.41,-195.31 298.62,-144 296.54,-135.64 293.45,-126.85 290.27,-118.87"/>
+<polygon fill="black" stroke="black" points="293.51,-117.54 286.41,-109.68 287.06,-120.25 293.51,-117.54"/>
 </g>
 <!-- 7&#45;&gt;5 -->
-<g id="edge17" class="edge">
+<g id="edge18" class="edge">
 <title>7&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M311.96,-287.6C304.98,-268.89 292.34,-238.77 276,-216 268.79,-205.96 259.54,-196.2 250.69,-187.86"/>
-<polygon fill="black" stroke="black" points="253.28,-185.48 243.53,-181.34 248.57,-190.66 253.28,-185.48"/>
+<path fill="none" stroke="black" d="M327.2,-287.78C351.21,-246.21 404.1,-138.9 354.62,-72 334.91,-45.34 302.04,-31.66 270.22,-24.78"/>
+<polygon fill="black" stroke="black" points="271,-21.36 260.51,-22.9 269.67,-28.24 271,-21.36"/>
 </g>
 <!-- 7&#45;&gt;6 -->
 <g id="edge15" class="edge">
 <title>7&#45;&gt;6</title>
-<path fill="none" stroke="black" d="M294.27,-287.7C282.38,-279.03 267.81,-268.4 254.86,-258.96"/>
-<polygon fill="black" stroke="black" points="257.16,-256.3 247.01,-253.24 253.03,-261.96 257.16,-256.3"/>
+<path fill="none" stroke="black" d="M277.16,-287.52C256.25,-278.25 230.36,-266.78 208.12,-256.93"/>
+<polygon fill="black" stroke="black" points="209.8,-253.85 199.24,-252.99 206.97,-260.25 209.8,-253.85"/>
 </g>
 </g>
 </svg>

package/sdk-core/sdk/src/activity_context.rs

@@ -149,10 +149,12 @@ impl ActContext {
 
     /// RecordHeartbeat sends heartbeat for the currently executing activity
     pub fn record_heartbeat(&self, details: Vec<Payload>) {
-        self.worker.record_activity_heartbeat(ActivityHeartbeat {
-            task_token: self.info.task_token.clone(),
-            details,
-        })
+        if !self.info.is_local {
+            self.worker.record_activity_heartbeat(ActivityHeartbeat {
+                task_token: self.info.task_token.clone(),
+                details,
+            })
+        }
     }
 
     /// Get activity info of the executing activity

package/sdk-core/sdk/src/lib.rs

@@ -109,6 +109,7 @@ use temporal_sdk_core_protos::{
 };
 use tokio::{
     sync::{
+        Notify,
         mpsc::{UnboundedSender, unbounded_channel},
         oneshot,
     },
@@ -151,6 +152,7 @@ struct WorkflowHalf {
     workflows: RefCell<HashMap<String, WorkflowData>>,
     /// Maps workflow type to the function for executing workflow runs with that ID
     workflow_fns: RefCell<HashMap<String, WorkflowFunction>>,
+    workflow_removed_from_map: Notify,
 }
 struct WorkflowData {
     /// Channel used to send the workflow activations
@@ -180,6 +182,7 @@ impl Worker {
             workflow_half: WorkflowHalf {
                 workflows: Default::default(),
                 workflow_fns: Default::default(),
+                workflow_removed_from_map: Default::default(),
             },
             activity_half: ActivityHalf {
                 activity_fns: Default::default(),
@@ -260,6 +263,7 @@ impl Worker {
                             join_handle.await??;
                             debug!(run_id=%run_id, "Removing workflow from cache");
                             wf_half.workflows.borrow_mut().remove(&run_id);
+                            wf_half.workflow_removed_from_map.notify_one();
                             Ok(())
                         }
                     },
@@ -293,12 +297,15 @@ impl Worker {
                     if let Some(ref i) = common.worker_interceptor {
                         i.on_workflow_activation(&activation).await?;
                     }
-                    if let Some(wf_fut) = wf_half.workflow_activation_handler(
-                        common,
-                        shutdown_token.clone(),
-                        activation,
-                        &completions_tx,
-                    )? && wf_future_tx.send(wf_fut).is_err()
+                    if let Some(wf_fut) = wf_half
+                        .workflow_activation_handler(
+                            common,
+                            shutdown_token.clone(),
+                            activation,
+                            &completions_tx,
+                        )
+                        .await?
+                        && wf_future_tx.send(wf_fut).is_err()
                     {
                         panic!("Receive half of completion processor channel cannot be dropped");
                     }
@@ -384,7 +391,7 @@ impl Worker {
 
 impl WorkflowHalf {
     #[allow(clippy::type_complexity)]
-    fn workflow_activation_handler(
+    async fn workflow_activation_handler(
         &self,
         common: &CommonWorker,
         shutdown_token: CancellationToken,
@@ -408,26 +415,29 @@ impl WorkflowHalf {
             _ => None,
         }) {
             let workflow_type = &sw.workflow_type;
-            let wf_fns_borrow = self.workflow_fns.borrow();
-            let Some(wf_function) = wf_fns_borrow.get(workflow_type) else {
-                warn!("Workflow type {workflow_type} not found");
+            let (wff, activations) = {
+                let wf_fns_borrow = self.workflow_fns.borrow();
+
+                let Some(wf_function) = wf_fns_borrow.get(workflow_type) else {
+                    warn!("Workflow type {workflow_type} not found");
+
+                    completions_tx
+                        .send(WorkflowActivationCompletion::fail(
+                            run_id,
+                            format!("Workflow type {workflow_type} not found").into(),
+                            Some(WorkflowTaskFailedCause::WorkflowWorkerUnhandledFailure),
+                        ))
+                        .expect("Completion channel intact");
+                    return Ok(None);
+                };
 
-                completions_tx
-                    .send(WorkflowActivationCompletion::fail(
-                        run_id,
-                        format!("Workflow type {workflow_type} not found").into(),
-                        Some(WorkflowTaskFailedCause::WorkflowWorkerUnhandledFailure),
-                    ))
-                    .expect("Completion channel intact");
-                return Ok(None);
+                wf_function.start_workflow(
+                    common.worker.get_config().namespace.clone(),
+                    common.task_queue.clone(),
+                    std::mem::take(sw),
+                    completions_tx.clone(),
+                )
             };
-
-            let (wff, activations) = wf_function.start_workflow(
-                common.worker.get_config().namespace.clone(),
-                common.task_queue.clone(),
-                std::mem::take(sw),
-                completions_tx.clone(),
-            );
             let jh = tokio::spawn(async move {
                 tokio::select! {
                     r = wff.fuse() => r,
@@ -442,6 +452,17 @@ impl WorkflowHalf {
                 join_handle: jh,
                 run_id: run_id.clone(),
             });
+            loop {
+                // It's possible that we've got a new initialize workflow action before the last
+                // future for this run finished evicting, as a result of how futures might be
+                // interleaved. In that case, just wait until it's not in the map, which should be
+                // a matter of only a few `poll` calls.
+                if self.workflows.borrow_mut().contains_key(&run_id) {
+                    self.workflow_removed_from_map.notified().await;
+                } else {
+                    break;
+                }
+            }
             self.workflows.borrow_mut().insert(
                 run_id.clone(),
                 WorkflowData {
@@ -474,7 +495,8 @@ impl WorkflowHalf {
                 return Ok(None);
             }
 
-            // In all other cases, we want to panic as the runtime could be in an inconsistent state at this point.
+            // In all other cases, we want to error as the runtime could be in an inconsistent state
+            // at this point.
             bail!(
                 "Got activation {:?} for unknown workflow {}",
                 activation,
@@ -719,7 +741,7 @@ impl Unblockable for NexusStartResult {
                         unblock_dat: od,
                     })
                 }
-                resolve_nexus_operation_start::Status::CancelledBeforeStart(f) => Err(f),
+                resolve_nexus_operation_start::Status::Failed(f) => Err(f),
             },
             _ => panic!("Invalid unblock event for nexus operation"),
         }

package/sdk-core/sdk/src/workflow_future.rs

@@ -177,7 +177,7 @@ impl WorkflowFuture {
         &mut self,
         variant: Option<Variant>,
         outgoing_cmds: &mut Vec<WorkflowCommand>,
-    ) -> Result<bool, Error> {
+    ) -> Result<(), Error> {
         if let Some(v) = variant {
             match v {
                 Variant::InitializeWorkflow(_) => {
@@ -326,17 +326,14 @@ impl WorkflowFuture {
                     ))?
                 }
                 Variant::RemoveFromCache(_) => {
-                    // TODO: Need to abort any user-spawned tasks, etc. See also cancel WF.
-                    //   How best to do this in executor agnostic way? Is that possible?
-                    //  -- tokio JoinSet does this in a nice way.
-                    return Ok(true);
+                    unreachable!("Cache removal should happen higher up");
                 }
             }
         } else {
             bail!("Empty activation job variant");
         }
 
-        Ok(false)
+        Ok(())
     }
 }
 
@@ -370,8 +367,8 @@ impl Future for WorkflowFuture {
                     .map(Into::into);
             }
 
-            let mut die_of_eviction_when_done = false;
             let mut activation_cmds = vec![];
+            let mut init_activation_cmds = vec![];
             // Lame hack to avoid hitting "unregistered" update handlers in a situation where
             // the history has no commands until an update is accepted. Will go away w/ SDK redesign
             if activation
@@ -386,24 +383,11 @@ impl Future for WorkflowFuture {
                 })
             {
                 // Poll the workflow future once to get things registered
-                if self.poll_wf_future(cx, &run_id, &mut activation_cmds)? {
+                if self.poll_wf_future(cx, &run_id, &mut init_activation_cmds)? {
                     continue;
                 }
             }
 
-            for WorkflowActivationJob { variant } in activation.jobs {
-                match self.handle_job(variant, &mut activation_cmds) {
-                    Ok(true) => {
-                        die_of_eviction_when_done = true;
-                    }
-                    Err(e) => {
-                        self.fail_wft(run_id, e);
-                        continue 'activations;
-                    }
-                    _ => (),
-                }
-            }
-
             if is_only_eviction {
                 // No need to do anything with the workflow code in this case
                 self.outgoing_completions
@@ -412,6 +396,13 @@ impl Future for WorkflowFuture {
                 return Ok(WfExitValue::Evicted).into();
             }
 
+            for WorkflowActivationJob { variant } in activation.jobs {
+                if let Err(e) = self.handle_job(variant, &mut activation_cmds) {
+                    self.fail_wft(run_id, e);
+                    continue 'activations;
+                }
+            }
+
             // Drive update functions
             self.update_futures = std::mem::take(&mut self.update_futures)
                 .into_iter()
@@ -438,6 +429,12 @@ impl Future for WorkflowFuture {
                 )
                 .collect();
 
+            // The commands from the initial activation should go _after_ the updates run. This
+            // is still a bit of hacky nonsense, as the first poll of the WF future should be able
+            // to observe any state changed by the update handlers - but that's impossible to do
+            // with current handler registration. In the real SDK, this will be obviated by them
+            // being functions on a struct.
+            activation_cmds.extend(init_activation_cmds);
             if self.poll_wf_future(cx, &run_id, &mut activation_cmds)? {
                 continue;
             }
@@ -450,10 +447,6 @@ impl Future for WorkflowFuture {
 
             self.send_completion(run_id, activation_cmds);
 
-            if die_of_eviction_when_done {
-                return Ok(WfExitValue::Evicted).into();
-            }
-
             // We don't actually return here, since we could be queried after finishing executing,
             // and it allows us to rely on evictions for death and cache management
         }

package/sdk-core/sdk-core-protos/protos/api_upstream/README.md

@@ -6,6 +6,10 @@ This repository contains both the protobuf descriptors and OpenAPI documentation
 
 Install as git submodule to the project.
 
+## Contribution
+
+Make your change to the temporal/proto files, and run `make` to update the openapi definitions.
+
 ## License
 
 MIT License, please see [LICENSE](LICENSE) for details.

package/sdk-core/sdk-core-protos/protos/api_upstream/buf.yaml

@@ -13,8 +13,6 @@ breaking:
     - WIRE_JSON
   ignore:
     - google
-    # TODO (yuri) remove this
-    - temporal/api/workflow/v1/message.proto
 lint:
   use:
     - DEFAULT