Harden store list auto fallback against any Business Platform failure

Author: dmerand

packages/store/src/cli/services/store/list/bp-source.test.ts

@@ -297,7 +297,9 @@ describe('listBusinessPlatformStores', () => {
       status: 'unavailable',
       error: expect.any(AbortError),
     })
-    expect(result.status === 'unavailable' ? result.error.message : '').toContain('Access denied for accessibleShops')
+    expect(result.status === 'unavailable' ? (result.error as Error).message : '').toContain(
+      'Access denied for accessibleShops',
+    )
     expect(output.debug()).toContain(
       'Business Platform store listing failed for organization Acme (1234): Access denied for accessibleShops',
     )
@@ -306,14 +308,31 @@ describe('listBusinessPlatformStores', () => {
     )
   })
 
-  test('rethrows non-abort errors', async () => {
+  test('returns an unavailable status for non-abort errors so auto can fall back', async () => {
+    const output = mockAndCaptureOutput()
+
     vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
     vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
       organizations: [{id: '1234', businessName: 'Acme'}],
       currentUserResolved: true,
     })
     vi.mocked(businessPlatformOrganizationsRequestDoc).mockRejectedValueOnce(new Error('Network exploded'))
 
-    await expect(listBusinessPlatformStores()).rejects.toThrow('Network exploded')
+    const result = await listBusinessPlatformStores()
+
+    expect(result).toMatchObject({status: 'unavailable'})
+    expect(result.status === 'unavailable' ? (result.error as Error).message : '').toContain('Network exploded')
+    expect(output.debug()).toContain(
+      'Business Platform store listing failed for the current session: Network exploded',
+    )
+  })
+
+  test('returns an unavailable status when Business Platform authentication fails', async () => {
+    vi.mocked(ensureAuthenticatedBusinessPlatform).mockRejectedValue(new Error('Network exploded'))
+
+    const result = await listBusinessPlatformStores()
+
+    expect(result).toMatchObject({status: 'unavailable'})
+    expect(result.status === 'unavailable' ? (result.error as Error).message : '').toContain('Network exploded')
   })
 })

packages/store/src/cli/services/store/list/bp-source.ts

@@ -3,7 +3,6 @@ import {type BusinessPlatformStoreListEntry, type FailedStoreListRetrieval} from
 import {businessPlatformOrganizationsRequestDoc} from '@shopify/cli-kit/node/api/business-platform'
 import {type UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql'
 import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
-import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputDebug} from '@shopify/cli-kit/node/output'
 import {ensureAuthenticatedBusinessPlatform} from '@shopify/cli-kit/node/session'
 import {fetchOrganizationsWithAccessInfo} from '@shopify/organizations'
@@ -26,7 +25,7 @@ interface UnresolvedBusinessPlatformStoreListResult {
 
 interface UnavailableBusinessPlatformStoreListResult {
   status: 'unavailable'
-  error: AbortError
+  error: unknown
 }
 
 type ListBusinessPlatformStoresResult =
@@ -101,14 +100,14 @@ export async function listBusinessPlatformStores(
         : {}),
     }
   } catch (error) {
-    if (error instanceof AbortError) {
-      return {
-        status: 'unavailable',
-        error,
-      }
+    // Any failure while authenticating or listing through Business Platform is treated as
+    // "unavailable" so `--source auto` can fall back to locally stored store auth. Callers that
+    // explicitly request `--source bp` rethrow this error, so real failures still surface there.
+    outputDebug(`Business Platform store listing failed for the current session: ${errorMessage(error)}`)
+    return {
+      status: 'unavailable',
+      error,
     }
-
-    throw error
   }
 }
 

packages/store/src/cli/services/store/list/index.test.ts

@@ -135,6 +135,23 @@ describe('listStores', () => {
     })
   })
 
+  test('falls back to local when Business Platform fails with a non-abort error in auto mode', async () => {
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue([{store: 'shop.myshopify.com', userId: '42'}])
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new Error('Network exploded'),
+    })
+
+    const result = await listStores()
+
+    expect(result).toEqual({
+      entries: [{store: 'shop.myshopify.com', userId: '42'}],
+      source: 'local',
+      notice:
+        'Business Platform store listing was unavailable for the current session. Showing locally stored store auth instead.',
+    })
+  })
+
   test('returns Business Platform unresolved results without fallback when user explicitly requests bp', async () => {
     vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
       status: 'unresolved-session',
@@ -158,4 +175,13 @@ describe('listStores', () => {
 
     await expect(listStores({source: 'bp'})).rejects.toThrow('Access denied for accessibleShops')
   })
+
+  test('rethrows non-abort unavailable errors when user explicitly requests bp', async () => {
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new Error('Network exploded'),
+    })
+
+    await expect(listStores({source: 'bp'})).rejects.toThrow('Network exploded')
+  })
 })