fix(mothership): answer a workflow tool run that settles as its log is read with its result

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/lib/mothership/tools/handlers/workflow/mutations.test.ts

@@ -476,6 +476,8 @@ describe('a workflow tool run past its wait', () => {
         executeRunWorkflow({ workflowId: 'workflow-1' }, { ...context, workflowRunWaitMs: 240_000 })
     )
     await vi.advanceTimersByTimeAsync(240_000)
+    // The one-macrotask settle check after the log read (a 0 ms timer runs at 1 ms).
+    await vi.advanceTimersByTimeAsync(1)
     const result = await answer
     const executionId = run.lifecycle().executionId
     expect(executionId).toEqual(expect.any(String))
@@ -525,11 +527,26 @@ describe('a workflow tool run past its wait', () => {
     await vi.advanceTimersByTimeAsync(1_000)
     expect(answered).toBe(false)
     await vi.advanceTimersByTimeAsync(1_000)
+    await vi.advanceTimersByTimeAsync(1)
     await expect(answer).resolves.toMatchObject({ output: { status: 'running' } })
     expect(mocks.logStatus).toHaveBeenCalledWith(run.lifecycle().executionId, 'workflow-1')
     run.settle({ success: true, output: {}, logs: [] })
   })
 
+  it('answers a run that settles as its log read returns with how it settled', async () => {
+    const run = pendingRun()
+    mocks.logStatus.mockReset().mockImplementation(async () => {
+      queueMicrotask(() => run.settle({ success: true, output: { value: 5 }, logs: [] }))
+      return 'running'
+    })
+    const answer = executeRunWorkflow(
+      { workflowId: 'workflow-1' },
+      { ...context, workflowRunWaitMs: 1_000 }
+    )
+    await vi.advanceTimersByTimeAsync(1_000)
+    await expect(answer).resolves.toMatchObject({ success: true, output: { output: { value: 5 } } })
+  })
+
   it('keeps waiting on a run past its wait when its log cannot be read', async () => {
     const run = pendingRun()
     mocks.logStatus.mockReset().mockRejectedValue(new Error('db down'))
@@ -574,6 +591,7 @@ describe('a workflow tool run past its wait', () => {
       { ...context, boundWorkflowExecutionId: 'bound-1', workflowRunWaitMs: 1_000 }
     )
     await vi.advanceTimersByTimeAsync(1_000)
+    await vi.advanceTimersByTimeAsync(1)
     await expect(answer).resolves.toMatchObject({
       output: { status: 'running', executionId: 'bound-1' },
     })

apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts

@@ -325,10 +325,11 @@ async function answerWithinWait(
       readable = await runIsReadable(executionId, workflowId)
       if (!readable) await Promise.race([finished, waited(RUN_LOG_POLL_MS)])
     }
+    // One macrotask lets a run that settled as its log was read deliver its result first.
+    if (!outcome.current) await Promise.race([finished, waited(0)])
   } finally {
     stopWaiting.abort()
   }
-  // A run that settled while its log was being read answers with how it settled.
   if (outcome.current?.ok === false) throw outcome.current.error
   if (outcome.current) return outcome.current.result
   logger.info('Workflow tool run outlasted its wait; answering it still running', {