From 7674c381b8d69a2cc20fbfe3baa56f7bde1dbf12 Mon Sep 17 00:00:00 2001
From: Donald Merand <donald.merand@shopify.com>
Date: Wed, 10 Jun 2026 15:24:04 -0400
Subject: [PATCH] Add store-auth source and auto fallback to store list

Adds `--from auto|organization|store-auth`. `auto` (default) prefers the
Shopify organization listing and falls back to locally stored store auth when
the organization can't be listed for the current CLI session. Adds the
store-auth source/local-source, the discriminated result contract, and the
unavailable status that drives the fallback.
---
 .changeset/store-list-bp-auto.md              |   2 +-
 .../interfaces/store-list.interface.ts        |   8 +-
 .../generated/generated_docs_data_v2.json     |  13 +-
 .../cli-kit/src/public/node/session.test.ts   |  15 ++
 packages/cli-kit/src/public/node/session.ts   |   8 +-
 packages/cli/README.md                        |  30 ++-
 packages/cli/oclif.manifest.json              |  25 ++-
 .../store/src/cli/commands/store/list.test.ts |  27 +--
 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 | 110 +++++-----
 .../src/cli/services/store/list/bp-source.ts  | 141 +++++++-----
 .../src/cli/services/store/list/index.test.ts | 205 +++++++++++++-----
 .../src/cli/services/store/list/index.ts      |  71 +++++-
 .../services/store/list/local-source.test.ts  |  39 ++++
 .../cli/services/store/list/local-source.ts   |  11 +
 .../cli/services/store/list/result.test.ts    |  73 +++++--
 .../src/cli/services/store/list/result.ts     |  47 +++-
 .../src/cli/services/store/list/types.ts      |  26 ++-
 20 files changed, 627 insertions(+), 262 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 633ebc68162..c77c4b49a63 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 the stores in the Shopify organizations available to the current CLI account. When some organization lookups fail, the command returns the successful organizations with a warning and failure details for the skipped ones.
+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 757311f7e7f..7f21583dbfd 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
@@ -17,7 +23,7 @@ export interface storelist {
   '--no-color'?: ''
 
   /**
-   * List stores for a single organization, by ID.
+   * List stores for a single organization, by ID. Only valid with `--from auto` or `--from organization`.
    * @environment SHOPIFY_FLAG_ORGANIZATION_ID
    */
   '--organization-id <value>'?: string
diff --git a/docs-shopify.dev/generated/generated_docs_data_v2.json b/docs-shopify.dev/generated/generated_docs_data_v2.json
index cf6b3ecdb44..56f4cbaf5d0 100644
--- a/docs-shopify.dev/generated/generated_docs_data_v2.json
+++ b/docs-shopify.dev/generated/generated_docs_data_v2.json
@@ -4346,6 +4346,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",
@@ -4360,7 +4369,7 @@
           "syntaxKind": "PropertySignature",
           "name": "--organization-id <value>",
           "value": "string",
-          "description": "List stores for a single organization, by ID.",
+          "description": "List stores for a single organization, by ID. Only valid with `--from auto` or `--from organization`.",
           "isOptional": true,
           "environmentValue": "SHOPIFY_FLAG_ORGANIZATION_ID"
         },
@@ -4383,7 +4392,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   * List stores for a single organization, by ID.\n   * @environment SHOPIFY_FLAG_ORGANIZATION_ID\n   */\n  '--organization-id <value>'?: string\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   * List stores for a single organization, by ID. Only valid with `--from auto` or `--from organization`.\n   * @environment SHOPIFY_FLAG_ORGANIZATION_ID\n   */\n  '--organization-id <value>'?: string\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 810f9acc1c1..ef689ec2104 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 1ebffdeaf47..630626ecd90 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 bc25e3977d7..1a4b96f7e93 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2209,31 +2209,49 @@ EXAMPLES
 
 ## `shopify store list`
 
-List stores in your Shopify organizations.
+List stores available to the current CLI session.
 
 ```
 USAGE
-  $ shopify store list [-j] [--no-color] [--organization-id <value>] [--verbose]
+  $ shopify store list [--from auto|organization|store-auth] [-j] [--no-color] [--organization-id <value>]
+    [--verbose]
 
 FLAGS
   -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.
-      --organization-id=<value>  [env: SHOPIFY_FLAG_ORGANIZATION_ID] List stores for a single organization, by ID.
+      --organization-id=<value>  [env: SHOPIFY_FLAG_ORGANIZATION_ID] List stores for a single organization, by ID. Only
+                                 valid with `--from auto` or `--from organization`.
       --verbose                  [env: SHOPIFY_FLAG_VERBOSE] Increase the verbosity of the output.
 
 DESCRIPTION
-  List stores in your Shopify organizations.
+  List stores available to the current CLI session.
+
+  Lists stores for the current Shopify 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
 
-  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`.
 
-  Use `--organization-id` to list a single organization. Run `shopify organization list` to find organization IDs.
+  Use `--organization-id` to scope the organization listing to a single organization. Run `shopify organization list` to
+  find organization IDs.
 
 EXAMPLES
   $ shopify store list
 
+  $ shopify store list --from organization
+
   $ shopify store list --organization-id 1234567
 
+  $ 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 fe916978f7e..e9ff0d7ba59 100644
--- a/packages/cli/oclif.manifest.json
+++ b/packages/cli/oclif.manifest.json
@@ -5927,14 +5927,31 @@
       "args": {
       },
       "customPluginName": "@shopify/store",
-      "description": "Lists the stores in the Shopify organizations available to the current CLI account.\n\nUse `--organization-id` to list a single organization. Run `shopify organization list` to find organization IDs.",
-      "descriptionWithMarkdown": "Lists the stores in the Shopify organizations available to the current CLI account.\n\nUse `--organization-id` to list a single organization. Run `shopify organization list` to find organization IDs.",
+      "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`.\n\nUse `--organization-id` to scope the organization listing to a single organization. Run `shopify organization list` to find organization IDs.",
+      "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`.\n\nUse `--organization-id` to scope the organization listing to a single organization. Run `shopify organization list` to find organization IDs.",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --from organization",
         "<%= config.bin %> <%= command.id %> --organization-id 1234567",
+        "<%= 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",
@@ -5953,7 +5970,7 @@
           "type": "boolean"
         },
         "organization-id": {
-          "description": "List stores for a single organization, by ID.",
+          "description": "List stores for a single organization, by ID. Only valid with `--from auto` or `--from organization`.",
           "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -5978,7 +5995,7 @@
       "pluginName": "@shopify/cli",
       "pluginType": "core",
       "strict": true,
-      "summary": "List stores in your Shopify organizations."
+      "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 b62847b9e04..d351e90a944 100644
--- a/packages/store/src/cli/commands/store/list.test.ts
+++ b/packages/store/src/cli/commands/store/list.test.ts
@@ -8,34 +8,35 @@ 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({stores: [], source: 'organization'})
+  test('passes the parsed --from flag through to the list service', async () => {
+    vi.mocked(listStores).mockResolvedValue({stores: [], source: 'store-auth'})
 
-    await StoreList.run([])
+    await StoreList.run(['--from', 'store-auth'])
 
-    expect(listStores).toHaveBeenCalledWith({organizationId: undefined})
-    expect(writeStoreListResult).toHaveBeenCalledWith({stores: [], source: 'organization'}, 'text')
+    expect(listStores).toHaveBeenCalledWith({source: 'store-auth'})
+    expect(writeStoreListResult).toHaveBeenCalledWith({stores: [], source: 'store-auth'}, 'text')
   })
 
-  test('passes the organization id through to the list service', async () => {
+  test('defaults to the auto source and writes json output when requested', async () => {
     vi.mocked(listStores).mockResolvedValue({stores: [], source: 'organization'})
 
-    await StoreList.run(['--organization-id', '1234567'])
+    await StoreList.run(['--json'])
 
-    expect(listStores).toHaveBeenCalledWith({organizationId: '1234567'})
+    expect(listStores).toHaveBeenCalledWith({source: 'auto', organizationId: undefined})
+    expect(writeStoreListResult).toHaveBeenCalledWith({stores: [], source: 'organization'}, 'json')
   })
 
-  test('writes json output when requested', async () => {
+  test('passes the organization id through to the list service', async () => {
     vi.mocked(listStores).mockResolvedValue({stores: [], source: 'organization'})
 
-    await StoreList.run(['--json'])
+    await StoreList.run(['--organization-id', '1234567'])
 
-    expect(listStores).toHaveBeenCalledWith({organizationId: undefined})
-    expect(writeStoreListResult).toHaveBeenCalledWith({stores: [], source: 'organization'}, 'json')
+    expect(listStores).toHaveBeenCalledWith({source: 'auto', organizationId: '1234567'})
   })
 
   test('defines the expected flags', () => {
-    expect(StoreList.flags.json).toBeDefined()
+    expect(StoreList.flags.from).toBeDefined()
     expect(StoreList.flags['organization-id']).toBeDefined()
+    expect(StoreList.flags.json).toBeDefined()
   })
 })
diff --git a/packages/store/src/cli/commands/store/list.ts b/packages/store/src/cli/commands/store/list.ts
index 261102a1087..cbe340fe977 100644
--- a/packages/store/src/cli/commands/store/list.ts
+++ b/packages/store/src/cli/commands/store/list.ts
@@ -1,29 +1,50 @@
 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 organizations.'
+  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\`.
 
-Use \`--organization-id\` to list a single organization. Run \`shopify organization list\` to find organization IDs.`
+Use \`--organization-id\` to scope the organization listing to a single organization. Run \`shopify organization list\` to find organization IDs.`
 
   static description = this.descriptionWithoutMarkdown()
 
   static examples = [
     '<%= config.bin %> <%= command.id %>',
+    '<%= config.bin %> <%= command.id %> --from organization',
     '<%= config.bin %> <%= command.id %> --organization-id 1234567',
+    '<%= 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,
+    }),
     'organization-id': Flags.string({
-      description: 'List stores for a single organization, by ID.',
+      description:
+        'List stores for a single organization, by ID. Only valid with `--from auto` or `--from organization`.',
       env: 'SHOPIFY_FLAG_ORGANIZATION_ID',
       required: false,
     }),
@@ -31,7 +52,10 @@ Use \`--organization-id\` to list a single organization. Run \`shopify organizat
 
   public async run(): Promise<void> {
     const {flags} = await this.parse(StoreList)
-    const result = await listStores({organizationId: flags['organization-id']})
+    const result = await listStores({
+      source: flags.from as StoreListRequestedSource,
+      organizationId: flags['organization-id'],
+    })
 
     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 6cd398dd7f8..1999e3fe1bd 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 f382a788aed..7cfee689b95 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 37449632b5b..0002c92bc54 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({
@@ -108,10 +120,7 @@ describe('listBusinessPlatformStores', () => {
               },
             },
           ],
-          pageInfo: {
-            hasNextPage: false,
-            endCursor: null,
-          },
+          pageInfo: {hasNextPage: false, endCursor: null},
         },
       },
     } as any)
@@ -134,43 +143,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',
-                shopifyShopId: '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('fetches a single bounded page per organization and orders newest first', async () => {
     vi.mocked(ensureAuthenticatedBusinessPlatform).mockResolvedValue('bp-token')
     vi.mocked(fetchOrganizationsWithAccessInfo).mockResolvedValue({
@@ -217,7 +189,6 @@ describe('listBusinessPlatformStores', () => {
       'newer.myshopify.com',
       'older.myshopify.com',
     ])
-    // One bounded request per organization — no full pagination.
     expect(businessPlatformOrganizationsRequestDoc).toHaveBeenCalledTimes(1)
     expect(businessPlatformOrganizationsRequestDoc).toHaveBeenCalledWith(
       expect.objectContaining({variables: {first: 250}}),
@@ -289,10 +260,7 @@ describe('listBusinessPlatformStores', () => {
                 },
               },
             ],
-            pageInfo: {
-              hasNextPage: false,
-              endCursor: null,
-            },
+            pageInfo: {hasNextPage: false, endCursor: null},
           },
         },
       } as any)
@@ -377,27 +345,47 @@ describe('listBusinessPlatformStores', () => {
     ).toEqual(['1001'])
   })
 
-  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 c2440ffdcf4..d50b2448e07 100644
--- a/packages/store/src/cli/services/store/list/bp-source.ts
+++ b/packages/store/src/cli/services/store/list/bp-source.ts
@@ -1,5 +1,5 @@
 import {ORG_FETCH_CONCURRENCY, STORE_LIST_LIMIT} from './constants.js'
-import {type FailedStoreListRetrieval, type StoreListEntry} from './types.js'
+import {type FailedStoreListRetrieval, type OrganizationStoreListEntry} from './types.js'
 import {storeTypeHandle} from '../store-type.js'
 import {
   ListAccessibleShops,
@@ -7,9 +7,9 @@ import {
 } from '../../../api/graphql/business-platform-organizations/generated/list_accessible_shops.js'
 import {businessPlatformOrganizationsRequestDoc} from '@shopify/cli-kit/node/api/business-platform'
 import {extractHost} from '@shopify/cli-kit/common/url'
+import {type UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql'
 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'
 
 // Stores fetched from a single organization in one server-sorted page. Deliberately equal to the
@@ -18,12 +18,18 @@ import {fetchOrganizationsWithAccessInfo} from '@shopify/organizations'
 // cover the global cap.
 const ORG_PAGE_SIZE = STORE_LIST_LIMIT
 
+interface ListBusinessPlatformStoresOptions {
+  noPrompt?: boolean
+  organizationId?: string
+}
+
 interface SuccessfulBusinessPlatformStoreListResult {
   status: 'success'
-  entries: StoreListEntry[]
+  entries: OrganizationStoreListEntry[]
   warning?: string
   failedOrganizations?: FailedStoreListRetrieval[]
-  // True when at least one organization had more stores than we fetched (server-side limited).
+  // True when at least one organization had more stores than we fetched, or organizations were left
+  // unqueried after the limit was reached.
   hasMore?: boolean
 }
 
@@ -31,77 +37,98 @@ interface UnresolvedBusinessPlatformStoreListResult {
   status: 'unresolved-session'
 }
 
+interface UnavailableBusinessPlatformStoreListResult {
+  status: 'unavailable'
+  error: unknown
+}
+
 interface OrganizationNotFoundStoreListResult {
   status: 'organization-not-found'
   organizationId: string
   availableOrganizations: {id: string; businessName: string}[]
 }
 
-interface ListBusinessPlatformStoresOptions {
-  organizationId?: string
-}
-
 type ListBusinessPlatformStoresResult =
   | SuccessfulBusinessPlatformStoreListResult
   | UnresolvedBusinessPlatformStoreListResult
+  | UnavailableBusinessPlatformStoreListResult
   | OrganizationNotFoundStoreListResult
 
 export async function listBusinessPlatformStores(
   options: ListBusinessPlatformStoresOptions = {},
 ): Promise<ListBusinessPlatformStoresResult> {
-  const token = await ensureAuthenticatedBusinessPlatform()
-  const organizationsResult = await fetchOrganizationsWithAccessInfo(token)
+  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 (options.organizationId && !organizationsResult.organizations.some((org) => org.id === options.organizationId)) {
-    return {
-      status: 'organization-not-found',
-      organizationId: options.organizationId,
-      availableOrganizations: organizationsResult.organizations.map((org) => ({
-        id: org.id,
-        businessName: org.businessName,
-      })),
+    if (
+      options.organizationId &&
+      !organizationsResult.organizations.some((organization) => organization.id === options.organizationId)
+    ) {
+      return {
+        status: 'organization-not-found',
+        organizationId: options.organizationId,
+        availableOrganizations: organizationsResult.organizations.map((organization) => ({
+          id: organization.id,
+          businessName: organization.businessName,
+        })),
+      }
     }
-  }
 
-  const organizations = options.organizationId
-    ? organizationsResult.organizations.filter((org) => org.id === options.organizationId)
-    : organizationsResult.organizations
+    const organizations = options.organizationId
+      ? organizationsResult.organizations.filter((organization) => organization.id === options.organizationId)
+      : organizationsResult.organizations
 
-  if (organizations.length === 0) {
-    return {
-      status: 'success',
-      entries: [],
+    if (organizations.length === 0) {
+      return {
+        status: 'success',
+        entries: [],
+      }
     }
-  }
 
-  const {entries, failedOrganizations, firstFailure, hasMore} = await collectStoresInBatches(token, organizations)
+    const {entries, failedOrganizations, firstFailure, hasMore} = await collectStoresInBatches(
+      token,
+      organizations,
+      options,
+    )
 
-  if (failedOrganizations.length === organizations.length) {
-    throw firstFailure
-  }
+    if (failedOrganizations.length === organizations.length) {
+      throw firstFailure
+    }
 
-  return {
-    status: 'success',
-    entries,
-    ...(hasMore ? {hasMore: true} : {}),
-    ...(failedOrganizations.length > 0
-      ? {
-          warning: buildPartialFailureWarning(
-            organizations.length - failedOrganizations.length,
-            failedOrganizations.length,
-          ),
-          failedOrganizations,
-        }
-      : {}),
+    return {
+      status: 'success',
+      entries,
+      ...(hasMore ? {hasMore: true} : {}),
+      ...(failedOrganizations.length > 0
+        ? {
+            warning: buildPartialFailureWarning(
+              organizations.length - failedOrganizations.length,
+              failedOrganizations.length,
+            ),
+            failedOrganizations,
+          }
+        : {}),
+    }
+    // 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.
+    // eslint-disable-next-line no-catch-all/no-catch-all
+  } catch (error) {
+    outputDebug(`Store listing failed for the current session: ${errorMessage(error)}`)
+    return {
+      status: 'unavailable',
+      error,
+    }
   }
 }
 
 interface BatchedStoreCollection {
-  entries: StoreListEntry[]
+  entries: OrganizationStoreListEntry[]
   failedOrganizations: FailedStoreListRetrieval[]
   firstFailure: unknown
   hasMore: boolean
@@ -116,8 +143,9 @@ interface BatchedStoreCollection {
 async function collectStoresInBatches(
   token: string,
   organizations: {id: string; businessName: string}[],
+  options: ListBusinessPlatformStoresOptions,
 ): Promise<BatchedStoreCollection> {
-  const entries: StoreListEntry[] = []
+  const entries: OrganizationStoreListEntry[] = []
   const failedOrganizations: FailedStoreListRetrieval[] = []
   let firstFailure: unknown
   let firstFailureCaptured = false
@@ -128,7 +156,9 @@ async function collectStoresInBatches(
     // Batches run sequentially to cap concurrency at ORG_FETCH_CONCURRENCY; the await is intentional.
     // eslint-disable-next-line no-await-in-loop
     const settled = await Promise.allSettled(
-      batch.map(async (organization) => fetchOrganizationStores(token, organization.id, organization.businessName)),
+      batch.map(async (organization) =>
+        fetchOrganizationStores(token, organization.id, organization.businessName, options),
+      ),
     )
 
     for (const [index, result] of settled.entries()) {
@@ -163,10 +193,11 @@ async function fetchOrganizationStores(
   token: string,
   organizationId: string,
   organizationName: string,
-): Promise<{entries: StoreListEntry[]; hasMore: boolean}> {
+  options: ListBusinessPlatformStoresOptions,
+): Promise<{entries: OrganizationStoreListEntry[]; hasMore: boolean}> {
   const unauthorizedHandler: UnauthorizedHandler = {
     type: 'token_refresh',
-    handler: async () => ({token: await ensureAuthenticatedBusinessPlatform()}),
+    handler: async () => ({token: await ensureAuthenticatedBusinessPlatform([], {noPrompt: options.noPrompt})}),
   }
 
   const result = await businessPlatformOrganizationsRequestDoc({
@@ -180,7 +211,7 @@ async function fetchOrganizationStores(
   const accessibleShops = result.organization?.accessibleShops
   if (!accessibleShops) return {entries: [], hasMore: false}
 
-  const entries: StoreListEntry[] = []
+  const entries: OrganizationStoreListEntry[] = []
   for (const edge of accessibleShops.edges) {
     const entry = toStoreListEntry(edge.node, organizationId, organizationName)
     if (entry) entries.push(entry)
@@ -197,7 +228,7 @@ function toStoreListEntry(
   node: ShopNode,
   organizationId: string,
   organizationName: string,
-): StoreListEntry | undefined {
+): OrganizationStoreListEntry | undefined {
   const store = node.url ?? node.primaryDomain
   if (!store) return undefined
 
@@ -216,7 +247,7 @@ function toStoreListEntry(
   }
 }
 
-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 cdc42fa3d6f..db74304e8e3 100644
--- a/packages/store/src/cli/services/store/list/index.test.ts
+++ b/packages/store/src/cli/services/store/list/index.test.ts
@@ -1,91 +1,118 @@
 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'}
+
+const orgEntry = {
+  id: 'gid://shopify/Shop/1',
+  store: 'shop.myshopify.com',
+  createdAt: '2026-01-15T00:00:00Z',
+  organizationId: '1234',
+  organizationName: 'Org',
+  name: 'Shop',
+  type: 'production',
+}
+
 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({stores: [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({
+      stores: [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: [
-        {
-          id: 'gid://shopify/Shop/1',
-          store: 'shop.myshopify.com',
-          createdAt: '2026-01-15T00:00:00Z',
-          organizationId: '1234',
-          organizationName: 'Org',
-          name: 'Shop',
-          type: 'production',
-        },
-      ],
+      entries: [orgEntry],
     })
 
     const result = await listStores()
 
-    expect(result).toEqual({
-      stores: [
-        {
-          id: 'gid://shopify/Shop/1',
-          store: 'shop.myshopify.com',
-          createdAt: '2026-01-15T00:00:00Z',
-          organizationId: '1234',
-          organizationName: 'Org',
-          name: 'Shop',
-          type: 'production',
-        },
-      ],
-      source: 'organization',
-    })
+    expect(bpSource.listBusinessPlatformStores).toHaveBeenCalledWith({noPrompt: true})
+    expect(result).toEqual({source: 'organization', stores: [orgEntry]})
   })
 
-  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: [
-        {
-          store: 'shop.myshopify.com',
-          createdAt: '2026-01-15T00:00:00Z',
-          organizationId: '1234',
-          organizationName: 'Org',
-          name: 'Shop',
-          type: 'production',
-        },
-      ],
+      entries: [orgEntry],
       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({
-      stores: [
-        {
-          store: 'shop.myshopify.com',
-          createdAt: '2026-01-15T00:00:00Z',
-          organizationId: '1234',
-          organizationName: 'Org',
-          name: 'Shop',
-          type: 'production',
-        },
-      ],
       source: 'organization',
+      stores: [orgEntry],
       warning: 'Skipped 1 organization whose store listing failed. Showing results from 1 successful organization.',
     })
   })
 
-  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({
+      stores: [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({
+      stores: [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({
       stores: [],
       source: 'organization',
@@ -93,12 +120,22 @@ describe('listStores', () => {
     })
   })
 
-  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()).rejects.toThrow('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({source: 'organization'})).rejects.toThrow('Network exploded')
   })
 
   test('rejects a present-but-empty organization id', async () => {
@@ -113,7 +150,55 @@ describe('listStores', () => {
 
     await listStores({organizationId: '1234567'})
 
-    expect(spy).toHaveBeenCalledWith({organizationId: '1234567'})
+    expect(spy).toHaveBeenCalledWith({noPrompt: true, organizationId: '1234567'})
+  })
+
+  test('does not fall back to store-auth when --organization-id is set and the listing is unavailable', async () => {
+    const localSpy = vi.spyOn(localSource, 'listLocalStores')
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({
+      status: 'unavailable',
+      error: new AbortError('Access denied for accessibleShops'),
+    })
+
+    await expect(listStores({organizationId: '1234567'})).rejects.toThrow('Access denied for accessibleShops')
+    expect(localSpy).not.toHaveBeenCalled()
+  })
+
+  test('does not fall back to store-auth when --organization-id is set and the session is unresolved', async () => {
+    const localSpy = vi.spyOn(localSource, 'listLocalStores')
+    vi.spyOn(bpSource, 'listBusinessPlatformStores').mockResolvedValue({status: 'unresolved-session'})
+
+    const result = await listStores({organizationId: '1234567'})
+
+    expect(result).toEqual({
+      stores: [],
+      source: 'organization',
+      notice: "Couldn't resolve a Shopify account for the current CLI session.",
+    })
+    expect(localSpy).not.toHaveBeenCalled()
+  })
+
+  test('caps the store-auth listing at 250 and flags truncation', async () => {
+    const entries = Array.from({length: 260}, (_unused, index) => ({
+      store: `shop-${index}.myshopify.com`,
+      connectedAt: '2026-06-03T00:00:00Z',
+    }))
+    vi.spyOn(localSource, 'listLocalStores').mockReturnValue(entries)
+
+    const result = await listStores({source: 'store-auth'})
+
+    expect(result.source).toBe('store-auth')
+    expect(result.stores).toHaveLength(250)
+    expect(result.truncated).toBe(true)
+  })
+
+  test('rejects --organization-id combined with the store-auth source', async () => {
+    const spy = vi.spyOn(bpSource, 'listBusinessPlatformStores')
+
+    await expect(listStores({source: 'store-auth', organizationId: '1234567'})).rejects.toThrow(
+      "`--organization-id` can't be combined with `--from store-auth`.",
+    )
+    expect(spy).not.toHaveBeenCalled()
   })
 
   test('throws with the accessible organizations when the requested organization is not found', async () => {
diff --git a/packages/store/src/cli/services/store/list/index.ts b/packages/store/src/cli/services/store/list/index.ts
index e561d8fbfd5..9513d9dfd2d 100644
--- a/packages/store/src/cli/services/store/list/index.ts
+++ b/packages/store/src/cli/services/store/list/index.ts
@@ -1,9 +1,11 @@
 import {listBusinessPlatformStores} from './bp-source.js'
+import {listLocalStores} from './local-source.js'
 import {STORE_LIST_LIMIT} from './constants.js'
-import {type ListStoresResult, type StoreListEntry} from './types.js'
+import {type ListStoresResult, type StoreListRequestedSource} from './types.js'
 import {AbortError} from '@shopify/cli-kit/node/error'
 
 interface ListStoresOptions {
+  source?: StoreListRequestedSource
   organizationId?: string
 }
 
@@ -17,20 +19,45 @@ export async function listStores(options: ListStoresOptions = {}): Promise<ListS
     )
   }
 
-  const result = await listBusinessPlatformStores({organizationId: options.organizationId})
+  const requestedSource = options.source ?? 'auto'
 
-  if (result.status === 'organization-not-found') {
+  if (requestedSource === 'store-auth') {
+    if (options.organizationId) {
+      throw new AbortError(
+        "`--organization-id` can't be combined with `--from store-auth`.",
+        'Locally stored store auth is not organization-scoped. Drop `--organization-id` or use `--from organization`.',
+      )
+    }
+    return storeAuthResult()
+  }
+
+  const organizationResult = await listBusinessPlatformStores({
+    noPrompt: requestedSource === 'auto',
+    organizationId: options.organizationId,
+  })
+
+  if (organizationResult.status === 'organization-not-found') {
     throw new AbortError(
-      `Organization ${result.organizationId} not found.`,
-      result.availableOrganizations.length > 0
-        ? `Organizations available to you: ${result.availableOrganizations
-            .map((org) => `${org.businessName} (${org.id})`)
+      `Organization ${organizationResult.organizationId} not found.`,
+      organizationResult.availableOrganizations.length > 0
+        ? `Organizations available to you: ${organizationResult.availableOrganizations
+            .map((organization) => `${organization.businessName} (${organization.id})`)
             .join(', ')}`
         : 'Make sure you have access to a Shopify organization.',
     )
   }
 
-  if (result.status === 'unresolved-session') {
+  // `--organization-id` expresses organization intent, so it suppresses the store-auth fallback:
+  // the local cache can't honor an organization filter, and silently dropping it would be misleading.
+  const canFallBackToStoreAuth = requestedSource === 'auto' && !options.organizationId
+
+  if (organizationResult.status === 'unresolved-session') {
+    if (canFallBackToStoreAuth) {
+      return storeAuthResult(
+        "Couldn't resolve a Shopify account for the current CLI session. Showing locally stored store auth instead.",
+      )
+    }
+
     return {
       stores: [],
       source: 'organization',
@@ -38,19 +65,41 @@ export async function listStores(options: ListStoresOptions = {}): Promise<ListS
     }
   }
 
-  const {stores, truncated} = limitEntries(result.entries, result.hasMore ?? false)
+  if (organizationResult.status === 'unavailable') {
+    if (canFallBackToStoreAuth) {
+      return storeAuthResult(
+        "Couldn't list stores from your Shopify organization for the current CLI session. Showing locally stored store auth instead.",
+      )
+    }
+
+    throw organizationResult.error
+  }
+
+  const {stores, truncated} = limitEntries(organizationResult.entries, organizationResult.hasMore ?? false)
 
   return {
     stores,
     source: 'organization',
     ...(truncated ? {truncated: true} : {}),
-    ...(result.warning ? {warning: result.warning} : {}),
+    ...(organizationResult.warning ? {warning: organizationResult.warning} : {}),
+  }
+}
+
+function storeAuthResult(notice?: string): ListStoresResult {
+  // Locally stored store auth is fully read, so truncation only happens if the cache exceeds the limit.
+  const {stores, truncated} = limitEntries(listLocalStores(), false)
+
+  return {
+    source: 'store-auth',
+    stores,
+    ...(truncated ? {truncated: true} : {}),
+    ...(notice ? {notice} : {}),
   }
 }
 
 // Caps the listing at STORE_LIST_LIMIT, keeping the already-sorted (newest-first) head. The result
 // is truncated when the source reported more stores than it fetched, or when merging organizations
 // produced more than the limit.
-function limitEntries(entries: StoreListEntry[], hasMore: boolean): {stores: StoreListEntry[]; truncated: boolean} {
+function limitEntries<T>(entries: T[], hasMore: boolean): {stores: T[]; truncated: boolean} {
   return {stores: entries.slice(0, STORE_LIST_LIMIT), truncated: hasMore || entries.length > STORE_LIST_LIMIT}
 }
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 00000000000..9f2af9a2f26
--- /dev/null
+++ b/packages/store/src/cli/services/store/list/local-source.test.ts
@@ -0,0 +1,39 @@
+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 (store + connected date), newest first', () => {
+    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: 'z-shop.myshopify.com',
+        connectedAt: '2026-04-02T00:00:00.000Z',
+      },
+      {
+        store: 'a-shop.myshopify.com',
+        connectedAt: '2026-03-27T00:00:00.000Z',
+      },
+    ])
+  })
+})
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 00000000000..670775cc238
--- /dev/null
+++ b/packages/store/src/cli/services/store/list/local-source.ts
@@ -0,0 +1,11 @@
+import {type StoreAuthStoreListEntry} from './types.js'
+import {listStoredStoreAuthSummaries} from '../auth/index.js'
+
+export function listLocalStores(): StoreAuthStoreListEntry[] {
+  return listStoredStoreAuthSummaries()
+    .map((session) => ({
+      store: session.store,
+      connectedAt: session.acquiredAt,
+    }))
+    .sort((left, right) => right.connectedAt.localeCompare(left.connectedAt))
+}
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 55aaa368ca8..c1bbb95b6d2 100644
--- a/packages/store/src/cli/services/store/list/result.test.ts
+++ b/packages/store/src/cli/services/store/list/result.test.ts
@@ -65,7 +65,15 @@ describe('writeStoreListResult', () => {
     writeStoreListResult(
       {
         source: 'organization',
-        stores: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z', name: 'My Shop'}],
+        stores: [
+          {
+            store: 'shop.myshopify.com',
+            createdAt: '2026-05-22T00:00:00Z',
+            organizationId: '1234',
+            organizationName: 'Acme',
+            name: 'My Shop',
+          },
+        ],
         warning: 'Skipped 1 organization whose store listing failed. Showing results from 1 successful organization.',
       },
       'text',
@@ -77,28 +85,46 @@ describe('writeStoreListResult', () => {
     expect(output.info()).toContain('shop')
   })
 
-  test('writes the unresolved-session notice to stderr and the empty state to stdout', () => {
+  test('renders store-auth rows with subdomain and connected date', () => {
     const output = mockAndCaptureOutput()
 
     writeStoreListResult(
       {
-        source: 'organization',
+        source: 'store-auth',
+        stores: [{store: 'shop.myshopify.com', connectedAt: '2026-06-03T00:00:00Z'}],
+      },
+      'text',
+    )
+
+    expect(output.info()).toContain('Subdomain')
+    expect(output.info()).toContain('Connected')
+    expect(output.info()).toContain('shop')
+    expect(output.info()).toContain('Jun 03, 2026')
+  })
+
+  test('writes the store-auth notice to stderr and the empty state to stdout', () => {
+    const output = mockAndCaptureOutput()
+
+    writeStoreListResult(
+      {
+        source: 'store-auth',
         stores: [],
-        notice: "Couldn't resolve a Shopify account for the current CLI session.",
+        notice: 'Showing locally stored store auth instead.',
       },
       'text',
     )
 
-    expect(output.warn()).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.warn()).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', stores: []}, '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 a {stores, source} JSON document on stdout', () => {
@@ -144,7 +170,14 @@ describe('writeStoreListResult', () => {
     writeStoreListResult(
       {
         source: 'organization',
-        stores: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z'}],
+        stores: [
+          {
+            store: 'shop.myshopify.com',
+            createdAt: '2026-05-22T00:00:00Z',
+            organizationId: '1234',
+            organizationName: 'Acme',
+          },
+        ],
         warning: 'Skipped 1 organization whose store listing failed.',
       },
       'json',
@@ -154,26 +187,18 @@ describe('writeStoreListResult', () => {
   })
 
   test('warns on stderr when the listing was truncated, in both text and json', () => {
+    const truncated = {
+      source: 'store-auth' as const,
+      stores: [{store: 'shop.myshopify.com', connectedAt: '2026-05-22T00:00:00Z'}],
+      truncated: true,
+    }
+
     const textOutput = mockAndCaptureOutput()
-    writeStoreListResult(
-      {
-        source: 'organization',
-        stores: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z'}],
-        truncated: true,
-      },
-      'text',
-    )
+    writeStoreListResult(truncated, 'text')
     expect(textOutput.warn()).toContain('Showing the 250 most recent stores. More stores exist')
 
     const jsonOutput = mockAndCaptureOutput()
-    writeStoreListResult(
-      {
-        source: 'organization',
-        stores: [{store: 'shop.myshopify.com', createdAt: '2026-05-22T00:00:00Z'}],
-        truncated: true,
-      },
-      'json',
-    )
+    writeStoreListResult(truncated, 'json')
     expect(jsonOutput.warn()).toContain('Showing the 250 most recent stores. More stores exist')
     // The structured truncation flag is part of the JSON document on stdout (prose stays on stderr).
     expect(jsonOutput.output()).toContain('"truncated": true')
diff --git a/packages/store/src/cli/services/store/list/result.ts b/packages/store/src/cli/services/store/list/result.ts
index 70aff378362..e27cf8a357d 100644
--- a/packages/store/src/cli/services/store/list/result.ts
+++ b/packages/store/src/cli/services/store/list/result.ts
@@ -1,5 +1,5 @@
 import {STORE_LIST_LIMIT} from './constants.js'
-import {type ListStoresResult, type StoreListEntry} from './types.js'
+import {type ListStoresResult, type OrganizationStoreListEntry, type StoreAuthStoreListEntry} from './types.js'
 import {storeTypeLabel} from '../store-type.js'
 import {outputInfo, outputResult, outputWarn} from '@shopify/cli-kit/node/output'
 import {renderTable} from '@shopify/cli-kit/node/ui'
@@ -10,8 +10,8 @@ export function writeStoreListResult(result: ListStoresResult, format: 'text' |
   // Human diagnostics always go to stderr so they never corrupt the JSON document on stdout, and so
   // the truncation signal is visible in both formats.
   if (result.notice) outputWarn(result.notice)
-  if (result.warning) outputWarn(result.warning)
-  if (result.truncated) outputWarn(truncationWarning())
+  if (result.source === 'organization' && result.warning) outputWarn(result.warning)
+  if (result.truncated) outputWarn(truncationWarning(result))
 
   if (format === 'json') {
     outputResult(
@@ -27,8 +27,10 @@ export function writeStoreListResult(result: ListStoresResult, format: 'text' |
   renderTextResult(result)
 }
 
-function truncationWarning(): string {
-  return `Showing the ${STORE_LIST_LIMIT} most recent stores. More stores exist — narrow the results with \`--organization-id\`.`
+function truncationWarning(result: ListStoresResult): string {
+  // `--organization-id` only narrows the organization listing, so only suggest it there.
+  const base = `Showing the ${STORE_LIST_LIMIT} most recent stores. More stores exist`
+  return result.source === 'organization' ? `${base} — narrow the results with \`--organization-id\`.` : `${base}.`
 }
 
 function renderTextResult(result: ListStoresResult): void {
@@ -37,10 +39,14 @@ function renderTextResult(result: ListStoresResult): void {
     return
   }
 
-  renderOrganizationTable(result.stores)
+  if (result.source === 'organization') {
+    renderOrganizationTable(result.stores)
+  } else {
+    renderStoreAuthTable(result.stores)
+  }
 }
 
-function renderOrganizationTable(stores: StoreListEntry[]): void {
+function renderOrganizationTable(stores: OrganizationStoreListEntry[]): void {
   renderTable({
     rows: stores.map((entry) => ({
       subdomain: subdomainFor(entry.store),
@@ -57,12 +63,33 @@ function renderOrganizationTable(stores: StoreListEntry[]): void {
   })
 }
 
+function renderStoreAuthTable(stores: StoreAuthStoreListEntry[]): void {
+  renderTable({
+    rows: stores.map((entry) => ({
+      subdomain: subdomainFor(entry.store),
+      connected: formatDate(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 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 21c2794f1a5..132405ff76d 100644
--- a/packages/store/src/cli/services/store/list/types.ts
+++ b/packages/store/src/cli/services/store/list/types.ts
@@ -1,23 +1,39 @@
-export interface StoreListEntry {
+export type StoreListRequestedSource = 'auto' | 'organization' | 'store-auth'
+
+export interface OrganizationStoreListEntry {
   id?: string
   store: string
   createdAt: string
-  organizationId?: string
-  organizationName?: string
+  organizationId: string
+  organizationName: string
   name?: string
   type?: string
 }
 
+export interface StoreAuthStoreListEntry {
+  store: string
+  connectedAt: string
+}
+
 export interface FailedStoreListRetrieval {
   organizationId: string
   organizationName: string
   reason: string
 }
 
-export interface ListStoresResult {
-  stores: StoreListEntry[]
+interface OrganizationListStoresResult {
   source: 'organization'
+  stores: OrganizationStoreListEntry[]
   notice?: string
   warning?: string
   truncated?: boolean
 }
+
+interface StoreAuthListStoresResult {
+  source: 'store-auth'
+  stores: StoreAuthStoreListEntry[]
+  notice?: string
+  truncated?: boolean
+}
+
+export type ListStoresResult = OrganizationListStoresResult | StoreAuthListStoresResult