fix: Fix bug where cancelled workflow commands were unnecessarily sen… (#745)

Author: bergundy

packages/core-bridge/sdk-core

@@ -1191,4 +1191,23 @@ export function runIntegrationTests(codec?: PayloadCodec): void {
       );
     });
   }
+
+  test('issue-731', async (t) => {
+    const { client } = t.context;
+    const workflowId = uuid4();
+    await client.execute(workflows.issue731, {
+      taskQueue: 'test',
+      workflowId,
+      workflowTaskTimeout: '1m', // Give our local activities enough time to run in CI
+    });
+    const { history } = await client.workflowService.getWorkflowExecutionHistory({
+      namespace: 'default',
+      execution: { workflowId },
+    });
+    if (history?.events == null) {
+      throw new Error('Expected non null events');
+    }
+    // Verify only one timer was scheduled
+    t.is(history.events.filter(({ timerStartedEventAttributes }) => timerStartedEventAttributes != null).length, 1);
+  });
 }

packages/test/src/integration-tests.ts

@@ -43,6 +43,7 @@ export { interceptedChild, interceptorExample } from './interceptor-example';
 export { internalsInterceptorExample } from './internals-interceptor-example';
 export * from './interrupt-signal';
 export * from './invalid-or-failed-queries';
+export * from './issue-731';
 export * from './log-before-timing-out';
 export * from './log-sink-tester';
 export * from './long-history-generator';

packages/test/src/workflows/index.ts

@@ -0,0 +1,23 @@
+import * as wf from '@temporalio/workflow';
+import type * as activities from '../activities';
+
+const { echo } = wf.proxyLocalActivities<typeof activities>({
+  startToCloseTimeout: '1 minute',
+});
+
+/**
+ * Reproduces https://github.com/temporalio/sdk-typescript/issues/731
+ */
+export async function issue731(): Promise<void> {
+  await wf.CancellationScope.cancellable(async () => {
+    const localActivityPromise = echo('activity');
+    const sleepPromise = wf.sleep('30s').then(() => 'timer');
+    const result = await Promise.race([localActivityPromise, sleepPromise]);
+    if (result === 'timer') {
+      throw wf.ApplicationFailure.nonRetryable('Timer unexpectedly beat local activity');
+    }
+    wf.CancellationScope.current().cancel();
+  });
+
+  await wf.sleep(100);
+}