fix(mcp): preserve ambiguous refresh locks

Author: waleedlatif1

apps/sim/lib/mcp/oauth/storage.test.ts

@@ -164,18 +164,15 @@ describe('withMcpOauthRefreshLock', () => {
     expect(fn).not.toHaveBeenCalled()
   })
 
-  it('cleans up an uncertain owner token before falling open when Redis is unavailable', async () => {
+  it('preserves an uncertain owner token when falling open after an acquire failure', async () => {
     mockAcquireLock.mockRejectedValueOnce(new Error('Redis connection refused'))
     const fn = vi.fn(async () => 'uncoordinated')
 
     const result = await withMcpOauthRefreshLock('row-redis-down', fn)
 
     expect(result).toBe('uncoordinated')
     expect(fn).toHaveBeenCalledTimes(1)
-    expect(mockReleaseLock).toHaveBeenCalledWith(
-      'mcp:oauth:refresh:row-redis-down',
-      expect.any(String)
-    )
+    expect(mockReleaseLock).not.toHaveBeenCalled()
   })
 
   it('cleans up an uncertain owner token before propagating cancellation', async () => {

apps/sim/lib/mcp/oauth/storage.ts

@@ -350,13 +350,15 @@ async function runWithRedisMutex<T>(
     try {
       acquired = await acquireLock(lockKey, ownerToken, REFRESH_LOCK_TTL_SEC)
     } catch (error) {
-      await releaseLock(lockKey, ownerToken).catch((releaseError) => {
-        logger.warn('Refresh lock cleanup after acquire failure failed (will expire via TTL)', {
-          rowId,
-          error: toError(releaseError).message,
+      if (signal?.aborted) {
+        await releaseLock(lockKey, ownerToken).catch((releaseError) => {
+          logger.warn('Refresh lock cleanup after cancelled acquire failed (will expire via TTL)', {
+            rowId,
+            error: toError(releaseError).message,
+          })
         })
-      })
-      signal?.throwIfAborted()
+        signal.throwIfAborted()
+      }
       logger.warn('Redis unavailable, running OAuth flow uncoordinated', {
         rowId,
         error: toError(error).message,