From 04f35fd9e13c2c372aca563ae3733ba9a4b2ab17 Mon Sep 17 00:00:00 2001
From: Donald Merand <donald.merand@shopify.com>
Date: Fri, 5 Jun 2026 10:23:48 -0400
Subject: [PATCH] Add store-auth source and auto fallback to store list

Adds `--from auto | organization | store-auth` (default auto). `auto` prefers the
Shopify organization and falls back to locally stored store auth on any listing
failure; `--from organization` stays strict and surfaces the error. The store-auth
source renders Subdomain | Connected. Threads noPrompt through
ensureAuthenticatedBusinessPlatform so auto can probe without prompting.
---
 .changeset/store-list-bp-auto.md              |   2 +-
 .../interfaces/store-list.interface.ts        |   6 +
 .../generated/generated_docs_data_v2.json     |  11 +-
 .../cli-kit/src/public/node/session.test.ts   |  15 ++
 packages/cli-kit/src/public/node/session.ts   |   8 +-
 packages/cli/README.md                        |  28 +++-
 packages/cli/oclif.manifest.json              |  23 ++-
 .../store/src/cli/commands/store/list.test.ts |  20 +--
 packages/store/src/cli/commands/store/list.ts |  34 +++-
 .../src/cli/services/store/auth/index.ts      |   2 +-
 .../cli/services/store/auth/stored-auth.ts    |   2 +-
 .../cli/services/store/list/bp-source.test.ts | 119 ++++++--------
 .../src/cli/services/store/list/bp-source.ts  | 152 ++++++++++--------
 .../src/cli/services/store/list/index.test.ts | 109 ++++++++++---
 .../src/cli/services/store/list/index.ts      |  56 ++++++-
 .../services/store/list/local-source.test.ts  |  42 +++++
 .../cli/services/store/list/local-source.ts   |  11 ++
 .../cli/services/store/list/result.test.ts    |  66 +++++++-
 .../src/cli/services/store/list/result.ts     |  52 ++++--
 .../src/cli/services/store/list/types.ts      |  28 +++-
 20 files changed, 575 insertions(+), 211 deletions(-)
 create mode 100644 packages/store/src/cli/services/store/list/local-source.test.ts
 create mode 100644 packages/store/src/cli/services/store/list/local-source.ts

diff --git a/.changeset/store-list-bp-auto.md b/.changeset/store-list-bp-auto.md
index f9843d66dc..c77c4b49a6 100644
--- a/.changeset/store-list-bp-auto.md
+++ b/.changeset/store-list-bp-auto.md
@@ -5,4 +5,4 @@
 '@shopify/cli-kit': patch
 ---
 
-Add `shopify store list` to list stores from Business Platform for the current Shopify CLI account. When some organization-scoped Business Platform lookups fail, the command now returns successful organizations with a warning and failure details for the skipped organizations.
+Add `shopify store list` with `--from auto|organization|store-auth`. By default the command prefers your Shopify organization and falls back to locally stored store auth when the organization can't be listed for the current CLI session. When some organization lookups fail, the command still returns successful organizations with a warning and failure details for the skipped organizations.
diff --git a/docs-shopify.dev/commands/interfaces/store-list.interface.ts b/docs-shopify.dev/commands/interfaces/store-list.interface.ts
index a4e9b1420b..f49780278a 100644
--- a/docs-shopify.dev/commands/interfaces/store-list.interface.ts
+++ b/docs-shopify.dev/commands/interfaces/store-list.interface.ts
@@ -4,6 +4,12 @@
  * @publicDocs
  */
 export interface storelist {
+  /**
+   * Source for the listing. `auto` prefers your Shopify organization and falls back to locally stored store auth when necessary.
+   * @environment SHOPIFY_FLAG_STORE_LIST_FROM
+   */
+  '--from <value>'?: string
+
   /**
    * Output the result as JSON. Automatically disables color output.
    * @environment SHOPIFY_FLAG_JSON
diff --git a/docs-shopify.dev/generated/generated_docs_data_v2.json b/docs-shopify.dev/generated/generated_docs_data_v2.json
index 3ca54e2028..9ac1a2c6cb 100644
--- a/docs-shopify.dev/generated/generated_docs_data_v2.json
+++ b/docs-shopify.dev/generated/generated_docs_data_v2.json
@@ -4300,6 +4300,15 @@
       "description": "The following flags are available for the `store list` command:",
       "isPublicDocs": true,
       "members": [
+        {
+          "filePath": "docs-shopify.dev/commands/interfaces/store-list.interface.ts",
+          "syntaxKind": "PropertySignature",
+          "name": "--from <value>",
+          "value": "string",
+          "description": "Source for the listing. `auto` prefers your Shopify organization and falls back to locally stored store auth when necessary.",
+          "isOptional": true,
+          "environmentValue": "SHOPIFY_FLAG_STORE_LIST_FROM"
+        },
         {
           "filePath": "docs-shopify.dev/commands/interfaces/store-list.interface.ts",
           "syntaxKind": "PropertySignature",
@@ -4328,7 +4337,7 @@
           "environmentValue": "SHOPIFY_FLAG_JSON"
         }
       ],
-      "value": "export interface storelist {\n  /**\n   * Output the result as JSON. Automatically disables color output.\n   * @environment SHOPIFY_FLAG_JSON\n   */\n  '-j, --json'?: ''\n\n  /**\n   * Disable color output.\n   * @environment SHOPIFY_FLAG_NO_COLOR\n   */\n  '--no-color'?: ''\n\n  /**\n   * Increase the verbosity of the output.\n   * @environment SHOPIFY_FLAG_VERBOSE\n   */\n  '--verbose'?: ''\n}"
+      "value": "export interface storelist {\n  /**\n   * Source for the listing. `auto` prefers your Shopify organization and falls back to locally stored store auth when necessary.\n   * @environment SHOPIFY_FLAG_STORE_LIST_FROM\n   */\n  '--from <value>'?: string\n\n  /**\n   * Output the result as JSON. Automatically disables color output.\n   * @environment SHOPIFY_FLAG_JSON\n   */\n  '-j, --json'?: ''\n\n  /**\n   * Disable color output.\n   * @environment SHOPIFY_FLAG_NO_COLOR\n   */\n  '--no-color'?: ''\n\n  /**\n   * Increase the verbosity of the output.\n   * @environment SHOPIFY_FLAG_VERBOSE\n   */\n  '--verbose'?: ''\n}"
     }
   },
   "themecheck": {
diff --git a/packages/cli-kit/src/public/node/session.test.ts b/packages/cli-kit/src/public/node/session.test.ts
index 810f9acc1c..ef689ec210 100644
--- a/packages/cli-kit/src/public/node/session.test.ts
+++ b/packages/cli-kit/src/public/node/session.test.ts
@@ -216,6 +216,21 @@ describe('ensureAuthenticatedBusinessPlatform', () => {
     expect(got).toEqual('business_platform')
   })
 
+  test('passes auth options through to the private auth helper', async () => {
+    // Given
+    vi.mocked(ensureAuthenticated).mockResolvedValueOnce({businessPlatform: 'business_platform', userId: '1234-5678'})
+
+    // When
+    await ensureAuthenticatedBusinessPlatform([], {noPrompt: true})
+
+    // Then
+    expect(ensureAuthenticated).toHaveBeenCalledWith(
+      {businessPlatformApi: {scopes: []}},
+      process.env,
+      expect.objectContaining({noPrompt: true}),
+    )
+  })
+
   test('throws error if there is no business_platform token', async () => {
     // Given
     vi.mocked(ensureAuthenticated).mockResolvedValueOnce({partners: 'partners_token', userId: '1234-5678'})
diff --git a/packages/cli-kit/src/public/node/session.ts b/packages/cli-kit/src/public/node/session.ts
index 1ebffdeaf4..630626ecd9 100644
--- a/packages/cli-kit/src/public/node/session.ts
+++ b/packages/cli-kit/src/public/node/session.ts
@@ -270,13 +270,17 @@ ${outputToken.json(scopes)}
  * Ensure that we have a valid session to access the Business Platform API.
  *
  * @param scopes - Optional array of extra scopes to authenticate with.
+ * @param options - Optional auth behavior overrides such as `noPrompt`.
  * @returns The access token for the Business Platform API.
  */
-export async function ensureAuthenticatedBusinessPlatform(scopes: BusinessPlatformScope[] = []): Promise<string> {
+export async function ensureAuthenticatedBusinessPlatform(
+  scopes: BusinessPlatformScope[] = [],
+  options: EnsureAuthenticatedAdditionalOptions = {},
+): Promise<string> {
   outputDebug(outputContent`Ensuring that the user is authenticated with the Business Platform API with the following scopes:
 ${outputToken.json(scopes)}
 `)
-  const tokens = await ensureAuthenticated({businessPlatformApi: {scopes}}, process.env)
+  const tokens = await ensureAuthenticated({businessPlatformApi: {scopes}}, process.env, options)
   if (!tokens.businessPlatform) {
     throw new BugError('No business-platform token found after ensuring authenticated')
   }
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 9632471b40..a676a67696 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2182,25 +2182,39 @@ EXAMPLES
 
 ## `shopify store list`
 
-List stores in your Shopify organization.
+List stores available to the current CLI session.
 
 ```
 USAGE
-  $ shopify store list [-j] [--no-color] [--verbose]
+  $ shopify store list [--from auto|organization|store-auth] [-j] [--no-color] [--verbose]
 
 FLAGS
-  -j, --json      [env: SHOPIFY_FLAG_JSON] Output the result as JSON. Automatically disables color output.
-      --no-color  [env: SHOPIFY_FLAG_NO_COLOR] Disable color output.
-      --verbose   [env: SHOPIFY_FLAG_VERBOSE] Increase the verbosity of the output.
+  -j, --json           [env: SHOPIFY_FLAG_JSON] Output the result as JSON. Automatically disables color output.
+      --from=<option>  [default: auto, env: SHOPIFY_FLAG_STORE_LIST_FROM] Source for the listing. `auto` prefers your
+                       Shopify organization and falls back to locally stored store auth when necessary.
+                       <options: auto|organization|store-auth>
+      --no-color       [env: SHOPIFY_FLAG_NO_COLOR] Disable color output.
+      --verbose        [env: SHOPIFY_FLAG_VERBOSE] Increase the verbosity of the output.
 
 DESCRIPTION
-  List stores in your Shopify organization.
+  List stores available to the current CLI session.
+
+  Lists stores for the current Shopify CLI account.
 
-  Lists the stores in the Shopify organizations available to the current CLI account.
+  By default, the command uses `--from auto`:
+  - your Shopify organization when the current CLI session can be used without reauthentication
+  - the locally stored store auth cache when the organization can't be listed for the current session
+
+  Use `--from organization` to only list organization stores, or `--from store-auth` to inspect only stores connected
+  with `shopify store auth`.
 
 EXAMPLES
   $ shopify store list
 
+  $ shopify store list --from organization
+
+  $ shopify store list --from store-auth
+
   $ shopify store list --json
 ```
 
diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json
index 2af55ebfeb..4f849da6ab 100644
--- a/packages/cli/oclif.manifest.json
+++ b/packages/cli/oclif.manifest.json
@@ -5868,13 +5868,30 @@
       "args": {
       },
       "customPluginName": "@shopify/store",
-      "description": "Lists the stores in the Shopify organizations available to the current CLI account.",
-      "descriptionWithMarkdown": "Lists the stores in the Shopify organizations available to the current CLI account.",
+      "description": "Lists stores for the current Shopify CLI account.\n\nBy default, the command uses `--from auto`:\n- your Shopify organization when the current CLI session can be used without reauthentication\n- the locally stored store auth cache when the organization can't be listed for the current session\n\nUse `--from organization` to only list organization stores, or `--from store-auth` to inspect only stores connected with `shopify store auth`.",
+      "descriptionWithMarkdown": "Lists stores for the current Shopify CLI account.\n\nBy default, the command uses `--from auto`:\n- your Shopify organization when the current CLI session can be used without reauthentication\n- the locally stored store auth cache when the organization can't be listed for the current session\n\nUse `--from organization` to only list organization stores, or `--from store-auth` to inspect only stores connected with `shopify store auth`.",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --from organization",
+        "<%= config.bin %> <%= command.id %> --from store-auth",
         "<%= config.bin %> <%= command.id %> --json"
       ],
       "flags": {
+        "from": {
+          "default": "auto",
+          "description": "Source for the listing. `auto` prefers your Shopify organization and falls back to locally stored store auth when necessary.",
+          "env": "SHOPIFY_FLAG_STORE_LIST_FROM",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "name": "from",
+          "options": [
+            "auto",
+            "organization",
+            "store-auth"
+          ],
+          "required": false,
+          "type": "option"
+        },
         "json": {
           "allowNo": false,
           "char": "j",
@@ -5909,7 +5926,7 @@
       "pluginName": "@shopify/cli",
       "pluginType": "core",
       "strict": true,
-      "summary": "List stores in your Shopify organization."
+      "summary": "List stores available to the current CLI session."
     },
     "theme:check": {
       "aliases": [
diff --git a/packages/store/src/cli/commands/store/list.test.ts b/packages/store/src/cli/commands/store/list.test.ts
index b6953bc741..d94e20685a 100644
--- a/packages/store/src/cli/commands/store/list.test.ts
+++ b/packages/store/src/cli/commands/store/list.test.ts
@@ -8,26 +8,26 @@ vi.mock('../../services/store/list/result.js')
 vi.mock('../../services/store/attribution.js')
 
 describe('store list command', () => {
-  test('runs the list service and writes text output by default', async () => {
-    vi.mocked(listStores).mockResolvedValue({entries: []})
+  test('passes the parsed --from flag through to the list service', async () => {
+    vi.mocked(listStores).mockResolvedValue({entries: [], source: 'store-auth'})
 
-    await StoreList.run([])
+    await StoreList.run(['--from', 'store-auth'])
 
-    expect(listStores).toHaveBeenCalledWith()
-    expect(writeStoreListResult).toHaveBeenCalledWith({entries: []}, 'text')
+    expect(listStores).toHaveBeenCalledWith({source: 'store-auth'})
+    expect(writeStoreListResult).toHaveBeenCalledWith({entries: [], source: 'store-auth'}, 'text')
   })
 
-  test('writes json output when requested', async () => {
-    vi.mocked(listStores).mockResolvedValue({entries: []})
+  test('defaults to the auto source and writes json output when requested', async () => {
+    vi.mocked(listStores).mockResolvedValue({entries: [], source: 'organization'})
 
     await StoreList.run(['--json'])
 
-    expect(listStores).toHaveBeenCalledWith()
-    expect(writeStoreListResult).toHaveBeenCalledWith({entries: []}, 'json')
+    expect(listStores).toHaveBeenCalledWith({source: 'auto'})
+    expect(writeStoreListResult).toHaveBeenCalledWith({entries: [], source: 'organization'}, 'json')
   })
 
   test('defines the expected flags', () => {
+    expect(StoreList.flags.from).toBeDefined()
     expect(StoreList.flags.json).toBeDefined()
-    expect('source' in StoreList.flags).toBe(false)
   })
 })
diff --git a/packages/store/src/cli/commands/store/list.ts b/packages/store/src/cli/commands/store/list.ts
index 914f18f7a5..61cccb0492 100644
--- a/packages/store/src/cli/commands/store/list.ts
+++ b/packages/store/src/cli/commands/store/list.ts
@@ -1,25 +1,51 @@
 import {listStores} from '../../services/store/list/index.js'
+import {type StoreListRequestedSource} from '../../services/store/list/types.js'
 import {writeStoreListResult} from '../../services/store/list/result.js'
 import StoreCommand from '../../utilities/store-command.js'
 import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli'
+import {Flags} from '@oclif/core'
+
+const STORE_LIST_SOURCES: StoreListRequestedSource[] = ['auto', 'organization', 'store-auth']
 
 export default class StoreList extends StoreCommand {
-  static summary = 'List stores in your Shopify organization.'
+  static summary = 'List stores available to the current CLI session.'
+
+  static descriptionWithMarkdown = `Lists stores for the current Shopify CLI account.
+
+By default, the command uses \
+\`--from auto\`:\n- your Shopify organization when the current CLI session can be used without reauthentication\n- the locally stored store auth cache when the organization can't be listed for the current session
 
-  static descriptionWithMarkdown = 'Lists the stores in the Shopify organizations available to the current CLI account.'
+Use \
+\`--from organization\` to only list organization stores, or \
+\`--from store-auth\` to inspect only stores connected with \`shopify store auth\`.`
 
   static description = this.descriptionWithoutMarkdown()
 
-  static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> --json']
+  static examples = [
+    '<%= config.bin %> <%= command.id %>',
+    '<%= config.bin %> <%= command.id %> --from organization',
+    '<%= config.bin %> <%= command.id %> --from store-auth',
+    '<%= config.bin %> <%= command.id %> --json',
+  ]
 
   static flags = {
     ...globalFlags,
     ...jsonFlag,
+    from: Flags.string({
+      description:
+        'Source for the listing. `auto` prefers your Shopify organization and falls back to locally stored store auth when necessary.',
+      env: 'SHOPIFY_FLAG_STORE_LIST_FROM',
+      options: STORE_LIST_SOURCES,
+      default: 'auto',
+      required: false,
+    }),
   }
 
   public async run(): Promise<void> {
     const {flags} = await this.parse(StoreList)
-    const result = await listStores()
+    const result = await listStores({
+      source: flags.from as StoreListRequestedSource,
+    })
 
     writeStoreListResult(result, flags.json ? 'json' : 'text')
   }
diff --git a/packages/store/src/cli/services/store/auth/index.ts b/packages/store/src/cli/services/store/auth/index.ts
index 6cd398dd7f..1999e3fe1b 100644
--- a/packages/store/src/cli/services/store/auth/index.ts
+++ b/packages/store/src/cli/services/store/auth/index.ts
@@ -13,7 +13,7 @@ import {outputContent, outputDebug, outputToken} from '@shopify/cli-kit/node/out
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 
-export {listStoredStoreAuthSummaries, type StoredStoreAuthSummary} from './stored-auth.js'
+export {listStoredStoreAuthSummaries} from './stored-auth.js'
 
 interface StoreAuthInput {
   store: string
diff --git a/packages/store/src/cli/services/store/auth/stored-auth.ts b/packages/store/src/cli/services/store/auth/stored-auth.ts
index f382a788ae..7cfee689b9 100644
--- a/packages/store/src/cli/services/store/auth/stored-auth.ts
+++ b/packages/store/src/cli/services/store/auth/stored-auth.ts
@@ -1,6 +1,6 @@
 import {listCurrentStoredStoreAppSessions, type StoredStoreAppSession} from './session-store.js'
 
-export interface StoredStoreAuthSummary {
+interface StoredStoreAuthSummary {
   store: string
   userId: string
   scopes: string[]
diff --git a/packages/store/src/cli/services/store/list/bp-source.test.ts b/packages/store/src/cli/services/store/list/bp-source.test.ts
index f501d4bd05..7e5dcc87d3 100644
--- a/packages/store/src/cli/services/store/list/bp-source.test.ts
+++ b/packages/store/src/cli/services/store/list/bp-source.test.ts
@@ -15,6 +15,18 @@ describe('listBusinessPlatformStores', () => {
     mockAndCaptureOutput().clear()
   })
 
+  test('passes noPrompt through to authentication when requested', async () => {
+    vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
+    vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
+      organizations: [],
+      currentUserResolved: false,
+    })
+
+    await listBusinessPlatformStores({noPrompt: true})
+
+    expect(ensureAuthenticatedBusinessPlatform).toHaveBeenCalledWith([], {noPrompt: true})
+  })
+
   test('returns an unresolved-session status when the current account cannot be resolved', async () => {
     vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
     vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
@@ -53,10 +65,7 @@ describe('listBusinessPlatformStores', () => {
               },
             },
           ],
-          pageInfo: {
-            hasNextPage: false,
-            endCursor: null,
-          },
+          pageInfo: {hasNextPage: false, endCursor: null},
         },
       },
     } as any)
@@ -79,43 +88,6 @@ describe('listBusinessPlatformStores', () => {
     })
   })
 
-  test('skips accessible shops that have no URL or primary domain', async () => {
-    vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
-    vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
-      organizations: [{id: '1234', businessName: 'Acme'}],
-      currentUserResolved: true,
-    })
-    vi.mocked(businessPlatformOrganizationsRequestDoc).mockResolvedValue({
-      organization: {
-        id: '1234',
-        name: 'Acme',
-        accessibleShops: {
-          edges: [
-            {
-              node: {
-                id: 'gid://shopify/Shop/1',
-                externalId: '1',
-                name: 'Missing Domain Shop',
-                storeType: 'PRODUCTION',
-                primaryDomain: null,
-                url: null,
-                createdAt: '2026-01-15T00:00:00Z',
-              },
-            },
-          ],
-          pageInfo: {
-            hasNextPage: false,
-            endCursor: null,
-          },
-        },
-      },
-    } as any)
-
-    const result = await listBusinessPlatformStores()
-
-    expect(result).toEqual({status: 'success', entries: []})
-  })
-
   test('sorts accessible shops by creation date, most recent first', async () => {
     vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
     vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
@@ -141,10 +113,7 @@ describe('listBusinessPlatformStores', () => {
                 },
               },
             ],
-            pageInfo: {
-              hasNextPage: true,
-              endCursor: 'cursor-1',
-            },
+            pageInfo: {hasNextPage: true, endCursor: 'cursor-1'},
           },
         },
       } as any)
@@ -166,10 +135,7 @@ describe('listBusinessPlatformStores', () => {
                 },
               },
             ],
-            pageInfo: {
-              hasNextPage: false,
-              endCursor: null,
-            },
+            pageInfo: {hasNextPage: false, endCursor: null},
           },
         },
       } as any)
@@ -214,10 +180,7 @@ describe('listBusinessPlatformStores', () => {
                 },
               },
             ],
-            pageInfo: {
-              hasNextPage: false,
-              endCursor: null,
-            },
+            pageInfo: {hasNextPage: false, endCursor: null},
           },
         },
       } as any)
@@ -253,27 +216,47 @@ describe('listBusinessPlatformStores', () => {
     )
   })
 
-  test('raises the underlying error when all organizations fail', async () => {
+  test('returns an unavailable status when every organization fails', async () => {
+    vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
+    vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
+      organizations: [{id: '1234', businessName: 'Acme'}],
+      currentUserResolved: true,
+    })
+    vi.mocked(businessPlatformOrganizationsRequestDoc).mockRejectedValue(
+      new AbortError('Access denied for accessibleShops'),
+    )
+
+    const result = await listBusinessPlatformStores()
+
+    expect(result).toMatchObject({status: 'unavailable'})
+    expect(result.status === 'unavailable' ? (result.error as Error).message : '').toContain(
+      'Access denied for accessibleShops',
+    )
+  })
+
+  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'},
-        {id: '5678', businessName: 'Beta'},
-      ],
+      organizations: [{id: '1234', businessName: 'Acme'}],
       currentUserResolved: true,
     })
-    vi.mocked(businessPlatformOrganizationsRequestDoc)
-      .mockRejectedValueOnce(new AbortError('Access denied for accessibleShops'))
-      .mockRejectedValueOnce(new AbortError('Access denied for accessibleShops'))
+    vi.mocked(businessPlatformOrganizationsRequestDoc).mockRejectedValue(new Error('Network exploded'))
 
-    await expect(listBusinessPlatformStores()).rejects.toThrow('Access denied for accessibleShops')
-    expect(output.debug()).toContain(
-      'Store listing failed for organization Acme (1234): Access denied for accessibleShops',
-    )
-    expect(output.debug()).toContain(
-      'Store listing failed for organization Beta (5678): Access denied for accessibleShops',
-    )
+    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('Store listing failed for the current session: Network exploded')
+  })
+
+  test('returns an unavailable status when 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')
   })
 })
diff --git a/packages/store/src/cli/services/store/list/bp-source.ts b/packages/store/src/cli/services/store/list/bp-source.ts
index 7d76b9f1f3..8fa5bdc1c1 100644
--- a/packages/store/src/cli/services/store/list/bp-source.ts
+++ b/packages/store/src/cli/services/store/list/bp-source.ts
@@ -1,15 +1,19 @@
 import {ListAccessibleShops, type ListAccessibleShopsQuery} from '../../../api/graphql/business-platform-organizations/generated/list_accessible_shops.js'
-import {type FailedStoreListRetrieval, type StoreListEntry} from './types.js'
+import {type FailedStoreListRetrieval, type OrganizationStoreListEntry} from './types.js'
 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 {outputDebug} from '@shopify/cli-kit/node/output'
 import {ensureAuthenticatedBusinessPlatform} from '@shopify/cli-kit/node/session'
-import {type UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql'
 import {fetchOrganizationsWithAccessInfo} from '@shopify/organizations'
 
+interface ListBusinessPlatformStoresOptions {
+  noPrompt?: boolean
+}
+
 interface SuccessfulBusinessPlatformStoreListResult {
   status: 'success'
-  entries: StoreListEntry[]
+  entries: OrganizationStoreListEntry[]
   currentUserEmail?: string
   warning?: string
   failedOrganizations?: FailedStoreListRetrieval[]
@@ -19,70 +23,89 @@ interface UnresolvedBusinessPlatformStoreListResult {
   status: 'unresolved-session'
 }
 
+interface UnavailableBusinessPlatformStoreListResult {
+  status: 'unavailable'
+  error: unknown
+}
+
 type ListBusinessPlatformStoresResult =
   | SuccessfulBusinessPlatformStoreListResult
   | UnresolvedBusinessPlatformStoreListResult
+  | UnavailableBusinessPlatformStoreListResult
 
-export async function listBusinessPlatformStores(): Promise<ListBusinessPlatformStoresResult> {
-  const token = await ensureAuthenticatedBusinessPlatform()
-  const organizationsResult = await fetchOrganizationsWithAccessInfo(token)
+export async function listBusinessPlatformStores(
+  options: ListBusinessPlatformStoresOptions = {},
+): Promise<ListBusinessPlatformStoresResult> {
+  try {
+    const token = await ensureAuthenticatedBusinessPlatform([], {noPrompt: options.noPrompt})
+    const organizationsResult = await fetchOrganizationsWithAccessInfo(token)
 
-  if (!organizationsResult.currentUserResolved) {
-    return {status: 'unresolved-session'}
-  }
+    if (!organizationsResult.currentUserResolved) {
+      return {status: 'unresolved-session'}
+    }
 
-  if (organizationsResult.organizations.length === 0) {
-    return {
-      status: 'success',
-      entries: [],
-      ...(organizationsResult.currentUserEmail ? {currentUserEmail: organizationsResult.currentUserEmail} : {}),
+    if (organizationsResult.organizations.length === 0) {
+      return {
+        status: 'success',
+        entries: [],
+        ...(organizationsResult.currentUserEmail ? {currentUserEmail: organizationsResult.currentUserEmail} : {}),
+      }
     }
-  }
 
-  const organizationResults = await Promise.allSettled(
-    organizationsResult.organizations.map(async (organization) => ({
-      organization,
-      entries: await fetchOrganizationStores(token, organization.id, organization.businessName),
-    })),
-  )
-
-  const failedOrganizations = organizationResults.flatMap((result, index) => {
-    if (result.status === 'fulfilled') return []
-
-    const organization = organizationsResult.organizations[index]!
-    const reason = errorMessage(result.reason)
-    outputDebug(`Store listing failed for organization ${organization.businessName} (${organization.id}): ${reason}`)
-
-    return [
-      {
-        organizationId: organization.id,
-        organizationName: organization.businessName,
-        reason,
-      },
-    ]
-  })
-
-  if (failedOrganizations.length === organizationsResult.organizations.length) {
-    throw organizationResults.find((result): result is PromiseRejectedResult => result.status === 'rejected')!.reason
-  }
+    const organizationResults = await Promise.allSettled(
+      organizationsResult.organizations.map(async (organization) => ({
+        organization,
+        entries: await fetchOrganizationStores(token, organization.id, organization.businessName, options),
+      })),
+    )
+
+    const failedOrganizations = organizationResults.flatMap((result, index) => {
+      if (result.status === 'fulfilled') return []
+
+      const organization = organizationsResult.organizations[index]!
+      const reason = errorMessage(result.reason)
+      outputDebug(`Store listing failed for organization ${organization.businessName} (${organization.id}): ${reason}`)
+
+      return [
+        {
+          organizationId: organization.id,
+          organizationName: organization.businessName,
+          reason,
+        },
+      ]
+    })
 
-  const entries = organizationResults
-    .flatMap((result) => (result.status === 'fulfilled' ? result.value.entries : []))
-    .sort(byCreatedAtDescending)
+    if (failedOrganizations.length === organizationsResult.organizations.length) {
+      throw organizationResults.find((result): result is PromiseRejectedResult => result.status === 'rejected')!.reason
+    }
 
-  return {
-    status: 'success',
-    entries,
-    ...(organizationsResult.currentUserEmail ? {currentUserEmail: organizationsResult.currentUserEmail} : {}),
-    ...(failedOrganizations.length > 0
-      ? {
-          warning: buildPartialFailureWarning(
-            organizationsResult.organizations.length - failedOrganizations.length,
-            failedOrganizations.length,
-          ),
-          failedOrganizations,
-        }
-      : {}),
+    const entries = organizationResults
+      .flatMap((result) => (result.status === 'fulfilled' ? result.value.entries : []))
+      .sort(byCreatedAtDescending)
+
+    return {
+      status: 'success',
+      entries,
+      ...(organizationsResult.currentUserEmail ? {currentUserEmail: organizationsResult.currentUserEmail} : {}),
+      ...(failedOrganizations.length > 0
+        ? {
+            warning: buildPartialFailureWarning(
+              organizationsResult.organizations.length - failedOrganizations.length,
+              failedOrganizations.length,
+            ),
+            failedOrganizations,
+          }
+        : {}),
+    }
+  } catch (error) {
+    // Any failure while authenticating or listing the organization's stores is treated as
+    // "unavailable" so `--from auto` can fall back to locally stored store auth. Callers that
+    // explicitly request `--from organization` rethrow this error, so real failures still surface.
+    outputDebug(`Store listing failed for the current session: ${errorMessage(error)}`)
+    return {
+      status: 'unavailable',
+      error,
+    }
   }
 }
 
@@ -90,13 +113,14 @@ async function fetchOrganizationStores(
   token: string,
   organizationId: string,
   organizationName: string,
-): Promise<StoreListEntry[]> {
+  options: ListBusinessPlatformStoresOptions,
+): Promise<OrganizationStoreListEntry[]> {
   const unauthorizedHandler: UnauthorizedHandler = {
     type: 'token_refresh',
-    handler: async () => ({token: await ensureAuthenticatedBusinessPlatform()}),
+    handler: async () => ({token: await ensureAuthenticatedBusinessPlatform([], {noPrompt: options.noPrompt})}),
   }
 
-  const entries: StoreListEntry[] = []
+  const entries: OrganizationStoreListEntry[] = []
   let cursor: string | null | undefined
 
   do {
@@ -130,21 +154,21 @@ function toStoreListEntry(
   node: ShopNode,
   organizationId: string,
   organizationName: string,
-): StoreListEntry | undefined {
+): OrganizationStoreListEntry | undefined {
   const store = node.url ?? node.primaryDomain
   if (!store) return undefined
 
   return {
     store: normalizeStoreFqdn(store),
     createdAt: typeof node.createdAt === 'string' ? node.createdAt : String(node.createdAt),
-    name: node.name,
-    type: node.storeType ?? undefined,
     organizationId,
     organizationName,
+    name: node.name,
+    type: node.storeType ?? undefined,
   }
 }
 
-function byCreatedAtDescending(left: StoreListEntry, right: StoreListEntry): number {
+function byCreatedAtDescending(left: OrganizationStoreListEntry, right: OrganizationStoreListEntry): number {
   if (left.createdAt === right.createdAt) return left.store.localeCompare(right.store)
   return right.createdAt.localeCompare(left.createdAt)
 }
diff --git a/packages/store/src/cli/services/store/list/index.test.ts b/packages/store/src/cli/services/store/list/index.test.ts
index 4c9d6d86e1..81259f7231 100644
--- a/packages/store/src/cli/services/store/list/index.test.ts
+++ b/packages/store/src/cli/services/store/list/index.test.ts
@@ -1,10 +1,38 @@
 import {listStores} from './index.js'
 import * as bpSource from './bp-source.js'
+import * as localSource from './local-source.js'
 import {describe, expect, test, vi} from 'vitest'
 import {AbortError} from '@shopify/cli-kit/node/error'
 
+const localEntry = {store: 'shop.myshopify.com', connectedAt: '2026-06-03T00:00:00Z', userId: '42'}
+
 describe('listStores', () => {
-  test('returns organization results when the current session resolves to an account', async () => {
+  test('returns store-auth source immediately when requested', async () => {
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue([localEntry])
+    const listBusinessPlatformStores = vi.spyOn(bpSource, 'listBusinessPlatformStores')
+
+    const result = await listStores({source: 'store-auth'})
+
+    expect(result).toEqual({entries: [localEntry], source: 'store-auth'})
+    expect(listBusinessPlatformStores).not.toHaveBeenCalled()
+  })
+
+  test('falls back to store-auth when the session cannot be resolved in auto mode', async () => {
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue([localEntry])
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({status: 'unresolved-session'})
+
+    const result = await listStores()
+
+    expect(bpSource.listBusinessPlatformStores).toHaveBeenCalledWith({noPrompt: true})
+    expect(result).toEqual({
+      entries: [localEntry],
+      source: 'store-auth',
+      notice:
+        "Couldn't resolve a Shopify account for the current CLI session. Showing locally stored store auth instead.",
+    })
+  })
+
+  test('returns organization results when auto can resolve the current session', async () => {
     vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
       status: 'success',
       entries: [
@@ -12,6 +40,7 @@ describe('listStores', () => {
           store: 'shop.myshopify.com',
           createdAt: '2026-01-15T00:00:00Z',
           name: 'Shop',
+          organizationId: '1234',
           organizationName: 'Org',
           type: 'PRODUCTION',
         },
@@ -21,12 +50,15 @@ describe('listStores', () => {
 
     const result = await listStores()
 
+    expect(bpSource.listBusinessPlatformStores).toHaveBeenCalledWith({noPrompt: true})
     expect(result).toEqual({
+      source: 'organization',
       entries: [
         {
           store: 'shop.myshopify.com',
           createdAt: '2026-01-15T00:00:00Z',
           name: 'Shop',
+          organizationId: '1234',
           organizationName: 'Org',
           type: 'PRODUCTION',
         },
@@ -35,7 +67,7 @@ describe('listStores', () => {
     })
   })
 
-  test('returns partial results with a warning when some organizations fail', async () => {
+  test('returns partial organization results with a warning when some organizations fail', async () => {
     vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
       status: 'success',
       entries: [
@@ -43,6 +75,7 @@ describe('listStores', () => {
           store: 'shop.myshopify.com',
           createdAt: '2026-01-15T00:00:00Z',
           name: 'Shop',
+          organizationId: '1234',
           organizationName: 'Org',
           type: 'PRODUCTION',
         },
@@ -50,22 +83,20 @@ describe('listStores', () => {
       currentUserEmail: 'merchant@example.com',
       warning: 'Skipped 1 organization whose store listing failed. Showing results from 1 successful organization.',
       failedOrganizations: [
-        {
-          organizationId: '5678',
-          organizationName: 'Failed Org',
-          reason: 'Access denied for accessibleShops',
-        },
+        {organizationId: '5678', organizationName: 'Failed Org', reason: 'Access denied for accessibleShops'},
       ],
     })
 
     const result = await listStores()
 
     expect(result).toEqual({
+      source: 'organization',
       entries: [
         {
           store: 'shop.myshopify.com',
           createdAt: '2026-01-15T00:00:00Z',
           name: 'Shop',
+          organizationId: '1234',
           organizationName: 'Org',
           type: 'PRODUCTION',
         },
@@ -73,33 +104,73 @@ describe('listStores', () => {
       currentUserEmail: 'merchant@example.com',
       warning: 'Skipped 1 organization whose store listing failed. Showing results from 1 successful organization.',
       failedOrganizations: [
-        {
-          organizationId: '5678',
-          organizationName: 'Failed Org',
-          reason: 'Access denied for accessibleShops',
-        },
+        {organizationId: '5678', organizationName: 'Failed Org', reason: 'Access denied for accessibleShops'},
       ],
     })
   })
 
-  test('returns a notice when the current CLI session cannot be resolved to an account', async () => {
+  test('falls back to store-auth when the organization listing is unavailable in auto mode', async () => {
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue([localEntry])
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new AbortError('Access denied for accessibleShops'),
+    })
+
+    const result = await listStores()
+
+    expect(result).toEqual({
+      entries: [localEntry],
+      source: 'store-auth',
+      notice:
+        "Couldn't list stores from your Shopify organization for the current CLI session. Showing locally stored store auth instead.",
+    })
+  })
+
+  test('falls back to store-auth on a non-abort failure in auto mode', async () => {
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue([localEntry])
     vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
-      status: 'unresolved-session',
+      status: 'unavailable',
+      error: new Error('Network exploded'),
     })
 
     const result = await listStores()
 
+    expect(result).toEqual({
+      entries: [localEntry],
+      source: 'store-auth',
+      notice:
+        "Couldn't list stores from your Shopify organization for the current CLI session. Showing locally stored store auth instead.",
+    })
+  })
+
+  test('returns an unresolved notice without fallback when organization source is explicit', async () => {
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({status: 'unresolved-session'})
+
+    const result = await listStores({source: 'organization'})
+
+    expect(bpSource.listBusinessPlatformStores).toHaveBeenCalledWith({noPrompt: false})
     expect(result).toEqual({
       entries: [],
+      source: 'organization',
       notice: "Couldn't resolve a Shopify account for the current CLI session.",
     })
   })
 
-  test('propagates store listing failures', async () => {
-    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockRejectedValue(
-      new AbortError('Access denied for accessibleShops'),
-    )
+  test('rethrows unavailable errors when organization source is explicit', async () => {
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new AbortError('Access denied for accessibleShops'),
+    })
+
+    await expect(listStores({source: 'organization'})).rejects.toThrow('Access denied for accessibleShops')
+  })
+
+  test('rethrows non-abort unavailable errors when organization source is explicit', async () => {
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new Error('Network exploded'),
+    })
 
-    await expect(listStores()).rejects.toThrow('Access denied for accessibleShops')
+    await expect(listStores({source: 'organization'})).rejects.toThrow('Network exploded')
   })
 })
diff --git a/packages/store/src/cli/services/store/list/index.ts b/packages/store/src/cli/services/store/list/index.ts
index 8a7200c734..8bebd86310 100644
--- a/packages/store/src/cli/services/store/list/index.ts
+++ b/packages/store/src/cli/services/store/list/index.ts
@@ -1,20 +1,60 @@
 import {listBusinessPlatformStores} from './bp-source.js'
-import {type ListStoresResult} from './types.js'
+import {listLocalStores} from './local-source.js'
+import {type ListStoresResult, type StoreListRequestedSource} from './types.js'
 
-export async function listStores(): Promise<ListStoresResult> {
-  const result = await listBusinessPlatformStores()
+interface ListStoresOptions {
+  source?: StoreListRequestedSource
+}
+
+export async function listStores(options: ListStoresOptions = {}): Promise<ListStoresResult> {
+  const requestedSource = options.source ?? 'auto'
+
+  if (requestedSource === 'store-auth') {
+    return {
+      entries: listLocalStores(),
+      source: 'store-auth',
+    }
+  }
+
+  const organizationResult = await listBusinessPlatformStores({
+    noPrompt: requestedSource === 'auto',
+  })
+
+  if (organizationResult.status === 'unresolved-session') {
+    if (requestedSource === 'auto') {
+      return {
+        entries: listLocalStores(),
+        source: 'store-auth',
+        notice:
+          "Couldn't resolve a Shopify account for the current CLI session. Showing locally stored store auth instead.",
+      }
+    }
 
-  if (result.status === 'unresolved-session') {
     return {
       entries: [],
+      source: 'organization',
       notice: "Couldn't resolve a Shopify account for the current CLI session.",
     }
   }
 
+  if (organizationResult.status === 'unavailable') {
+    if (requestedSource === 'auto') {
+      return {
+        entries: listLocalStores(),
+        source: 'store-auth',
+        notice:
+          "Couldn't list stores from your Shopify organization for the current CLI session. Showing locally stored store auth instead.",
+      }
+    }
+
+    throw organizationResult.error
+  }
+
   return {
-    entries: result.entries,
-    ...(result.currentUserEmail ? {currentUserEmail: result.currentUserEmail} : {}),
-    ...(result.warning ? {warning: result.warning} : {}),
-    ...(result.failedOrganizations ? {failedOrganizations: result.failedOrganizations} : {}),
+    entries: organizationResult.entries,
+    source: 'organization',
+    ...(organizationResult.currentUserEmail ? {currentUserEmail: organizationResult.currentUserEmail} : {}),
+    ...(organizationResult.warning ? {warning: organizationResult.warning} : {}),
+    ...(organizationResult.failedOrganizations ? {failedOrganizations: organizationResult.failedOrganizations} : {}),
   }
 }
diff --git a/packages/store/src/cli/services/store/list/local-source.test.ts b/packages/store/src/cli/services/store/list/local-source.test.ts
new file mode 100644
index 0000000000..cc2af3c82d
--- /dev/null
+++ b/packages/store/src/cli/services/store/list/local-source.test.ts
@@ -0,0 +1,42 @@
+import {listLocalStores} from './local-source.js'
+import {listStoredStoreAuthSummaries} from '../auth/index.js'
+import {describe, expect, test, vi} from 'vitest'
+
+vi.mock('../auth/index.js')
+
+describe('listLocalStores', () => {
+  test('maps stored auth summaries to store-auth entries and prefers associated user email', () => {
+    vi.mocked(listStoredStoreAuthSummaries).mockReturnValue([
+      {
+        store: 'a-shop.myshopify.com',
+        userId: '42',
+        scopes: ['read_products'],
+        acquiredAt: '2026-03-27T00:00:00.000Z',
+        associatedUser: {
+          id: 42,
+          email: 'merchant@example.com',
+        },
+      },
+      {
+        store: 'z-shop.myshopify.com',
+        userId: '84',
+        scopes: ['read_products'],
+        acquiredAt: '2026-04-02T00:00:00.000Z',
+      },
+    ])
+
+    expect(listLocalStores()).toEqual([
+      {
+        store: 'a-shop.myshopify.com',
+        connectedAt: '2026-03-27T00:00:00.000Z',
+        userId: '42',
+        email: 'merchant@example.com',
+      },
+      {
+        store: 'z-shop.myshopify.com',
+        connectedAt: '2026-04-02T00:00:00.000Z',
+        userId: '84',
+      },
+    ])
+  })
+})
diff --git a/packages/store/src/cli/services/store/list/local-source.ts b/packages/store/src/cli/services/store/list/local-source.ts
new file mode 100644
index 0000000000..e95f962293
--- /dev/null
+++ b/packages/store/src/cli/services/store/list/local-source.ts
@@ -0,0 +1,11 @@
+import {listStoredStoreAuthSummaries} from '../auth/index.js'
+import {type StoreAuthStoreListEntry} from './types.js'
+
+export function listLocalStores(): StoreAuthStoreListEntry[] {
+  return listStoredStoreAuthSummaries().map((session) => ({
+    store: session.store,
+    connectedAt: session.acquiredAt,
+    userId: session.userId,
+    ...(session.associatedUser?.email ? {email: session.associatedUser.email} : {}),
+  }))
+}
diff --git a/packages/store/src/cli/services/store/list/result.test.ts b/packages/store/src/cli/services/store/list/result.test.ts
index fa0d676edd..63ce80c0ae 100644
--- a/packages/store/src/cli/services/store/list/result.test.ts
+++ b/packages/store/src/cli/services/store/list/result.test.ts
@@ -12,12 +12,14 @@ describe('writeStoreListResult', () => {
 
     writeStoreListResult(
       {
+        source: 'organization',
         entries: [
           {
             store: 'my-shop.myshopify.com',
             createdAt: '2026-05-22T00:00:00Z',
             name: 'My Shop',
             type: 'DEVELOPMENT',
+            organizationId: '1234',
             organizationName: 'Acme',
           },
         ],
@@ -40,7 +42,16 @@ describe('writeStoreListResult', () => {
 
     writeStoreListResult(
       {
-        entries: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z', name: 'My Shop'}],
+        source: 'organization',
+        entries: [
+          {
+            store: 'shop.myshopify.com',
+            createdAt: '2026-05-22T00:00:00Z',
+            name: 'My Shop',
+            organizationId: '1234',
+            organizationName: 'Acme',
+          },
+        ],
         warning: 'Skipped 1 organization whose store listing failed. Showing results from 1 successful organization.',
       },
       'text',
@@ -52,32 +63,53 @@ describe('writeStoreListResult', () => {
     expect(output.info()).toContain('shop')
   })
 
-  test('renders the unresolved-session notice and empty state', () => {
+  test('renders store-auth rows with subdomain and connected date', () => {
     const output = mockAndCaptureOutput()
 
     writeStoreListResult(
       {
+        source: 'store-auth',
+        entries: [{store: 'shop.myshopify.com', connectedAt: '2026-06-03T00:00:00Z', userId: '42', email: 'merchant@example.com'}],
+      },
+      'text',
+    )
+
+    expect(output.info()).toContain('Subdomain')
+    expect(output.info()).toContain('Connected')
+    expect(output.info()).toContain('shop')
+    expect(output.info()).toContain('Jun 03, 2026')
+    expect(output.info()).toContain('1 store from local store auth')
+  })
+
+  test('renders the store-auth empty state and notice', () => {
+    const output = mockAndCaptureOutput()
+
+    writeStoreListResult(
+      {
+        source: 'store-auth',
         entries: [],
-        notice: "Couldn't resolve a Shopify account for the current CLI session.",
+        notice: 'Showing locally stored store auth instead.',
       },
       'text',
     )
 
-    expect(output.info()).toContain("Couldn't resolve a Shopify account for the current CLI session.")
-    expect(output.info()).toContain('No stores were returned for the current CLI session.')
+    expect(output.info()).toContain('Showing locally stored store auth instead.')
+    expect(output.info()).toContain('No stores authenticated locally.')
   })
 
-  test('renders the organization empty state', () => {
+  test('renders the organization empty state and store-auth fallback guidance', () => {
     const output = mockAndCaptureOutput()
 
     writeStoreListResult(
       {
+        source: 'organization',
         entries: [],
       },
       'text',
     )
 
     expect(output.info()).toContain('No stores found in your Shopify organizations.')
+    expect(output.info()).toContain('Run `shopify store list --from store-auth` to inspect locally stored store auth.')
   })
 
   test('emits JSON for machine-readable consumers', () => {
@@ -85,7 +117,16 @@ describe('writeStoreListResult', () => {
 
     writeStoreListResult(
       {
-        entries: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z', name: 'My Shop'}],
+        source: 'organization',
+        entries: [
+          {
+            store: 'shop.myshopify.com',
+            createdAt: '2026-05-22T00:00:00Z',
+            name: 'My Shop',
+            organizationId: '1234',
+            organizationName: 'Acme',
+          },
+        ],
         warning: 'Skipped 1 organization whose store listing failed.',
         failedOrganizations: [
           {
@@ -99,7 +140,16 @@ describe('writeStoreListResult', () => {
     )
 
     expect(JSON.parse(output.output())).toEqual({
-      entries: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z', name: 'My Shop'}],
+      source: 'organization',
+      entries: [
+        {
+          store: 'shop.myshopify.com',
+          createdAt: '2026-05-22T00:00:00Z',
+          name: 'My Shop',
+          organizationId: '1234',
+          organizationName: 'Acme',
+        },
+      ],
       warning: 'Skipped 1 organization whose store listing failed.',
       failedOrganizations: [
         {
diff --git a/packages/store/src/cli/services/store/list/result.ts b/packages/store/src/cli/services/store/list/result.ts
index 4db8a91d65..dcc9d6d7e8 100644
--- a/packages/store/src/cli/services/store/list/result.ts
+++ b/packages/store/src/cli/services/store/list/result.ts
@@ -1,4 +1,8 @@
-import {type ListStoresResult, type StoreListEntry} from './types.js'
+import {
+  type ListStoresResult,
+  type OrganizationStoreListEntry,
+  type StoreAuthStoreListEntry,
+} from './types.js'
 import {outputInfo, outputResult, outputWarn} from '@shopify/cli-kit/node/output'
 import {renderTable} from '@shopify/cli-kit/node/ui'
 
@@ -21,7 +25,7 @@ export function writeStoreListResult(result: ListStoresResult, format: 'text' |
 }
 
 function renderTextResult(result: ListStoresResult): void {
-  if (result.warning) outputWarn(`${result.warning}\n`)
+  if (result.source === 'organization' && result.warning) outputWarn(`${result.warning}\n`)
   if (result.notice) outputInfo(`${result.notice}\n`)
 
   if (result.entries.length === 0) {
@@ -29,11 +33,16 @@ function renderTextResult(result: ListStoresResult): void {
     return
   }
 
-  renderOrganizationTable(result.entries)
+  if (result.source === 'organization') {
+    renderOrganizationTable(result.entries)
+  } else {
+    renderStoreAuthTable(result.entries)
+  }
+
   outputInfo(`\n${summaryLine(result)}`)
 }
 
-function renderOrganizationTable(entries: StoreListEntry[]): void {
+function renderOrganizationTable(entries: OrganizationStoreListEntry[]): void {
   renderTable({
     rows: entries.map((entry) => ({
       subdomain: subdomainFor(entry.store),
@@ -50,19 +59,44 @@ function renderOrganizationTable(entries: StoreListEntry[]): void {
   })
 }
 
+function renderStoreAuthTable(entries: StoreAuthStoreListEntry[]): void {
+  renderTable({
+    rows: entries.map((entry) => ({
+      subdomain: subdomainFor(entry.store),
+      connected: formatListDate(entry.connectedAt),
+    })),
+    columns: {
+      subdomain: {header: 'Subdomain'},
+      connected: {header: 'Connected'},
+    },
+  })
+}
+
 function emptyStateMessage(result: ListStoresResult): string {
-  if (result.notice) {
-    return 'No stores were returned for the current CLI session.'
+  if (result.source === 'organization') {
+    return [
+      'No stores found in your Shopify organizations.',
+      '',
+      'Run `shopify store list --from store-auth` to inspect locally stored store auth.',
+    ].join('\n')
   }
 
-  return 'No stores found in your Shopify organizations.'
+  return [
+    'No stores authenticated locally.',
+    '',
+    'Run `shopify store auth --store <domain>` to authenticate against an existing store.',
+  ].join('\n')
 }
 
 function summaryLine(result: ListStoresResult): string {
   const noun = result.entries.length === 1 ? 'store' : 'stores'
-  const currentUser = result.currentUserEmail ? ` (logged in as ${result.currentUserEmail})` : ''
 
-  return `${result.entries.length} ${noun}${currentUser}`
+  if (result.source === 'organization') {
+    const currentUser = result.currentUserEmail ? ` (logged in as ${result.currentUserEmail})` : ''
+    return `${result.entries.length} ${noun}${currentUser}`
+  }
+
+  return `${result.entries.length} ${noun} from local store auth`
 }
 
 function subdomainFor(store: string): string {
diff --git a/packages/store/src/cli/services/store/list/types.ts b/packages/store/src/cli/services/store/list/types.ts
index 471fa57df2..df91d4be25 100644
--- a/packages/store/src/cli/services/store/list/types.ts
+++ b/packages/store/src/cli/services/store/list/types.ts
@@ -1,10 +1,19 @@
-export interface StoreListEntry {
+export type StoreListRequestedSource = 'auto' | 'organization' | 'store-auth'
+
+export interface OrganizationStoreListEntry {
   store: string
   createdAt: string
+  organizationId: string
+  organizationName: string
   name?: string
   type?: string
-  organizationId?: string
-  organizationName?: string
+}
+
+export interface StoreAuthStoreListEntry {
+  store: string
+  connectedAt: string
+  userId: string
+  email?: string
 }
 
 export interface FailedStoreListRetrieval {
@@ -13,10 +22,19 @@ export interface FailedStoreListRetrieval {
   reason: string
 }
 
-export interface ListStoresResult {
-  entries: StoreListEntry[]
+interface OrganizationListStoresResult {
+  source: 'organization'
+  entries: OrganizationStoreListEntry[]
   notice?: string
   warning?: string
   currentUserEmail?: string
   failedOrganizations?: FailedStoreListRetrieval[]
 }
+
+interface StoreAuthListStoresResult {
+  source: 'store-auth'
+  entries: StoreAuthStoreListEntry[]
+  notice?: string
+}
+
+export type ListStoresResult = OrganizationListStoresResult | StoreAuthListStoresResult