From 44d8ba4b24f8d774fc4837154c01db191432f696 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:15:23 -0500
Subject: [PATCH 01/10] add organization-id flag to suppress organization
 selection

---
 packages/app/src/cli/commands/app/init.ts | 23 ++++++++++++++++++++++-
 packages/cli/README.md                    |  6 ++++--
 packages/cli/oclif.manifest.json          |  9 +++++++++
 packages/create-app/oclif.manifest.json   |  9 +++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/cli/commands/app/init.ts b/packages/app/src/cli/commands/app/init.ts
index c2935186968..05703270c37 100644
--- a/packages/app/src/cli/commands/app/init.ts
+++ b/packages/app/src/cli/commands/app/init.ts
@@ -7,6 +7,7 @@ import {validateFlavorValue, validateTemplateValue} from '../../services/init/va
 import {MinimalOrganizationApp, Organization, OrganizationApp} from '../../models/organization.js'
 import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompts/dev.js'
 import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js'
+import {fetchOrganizations} from '../../services/dev/fetch.js'
 import {isValidName} from '../../models/app/validation/common.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
@@ -64,6 +65,12 @@ export default class Init extends AppLinkedCommand {
       env: 'SHOPIFY_FLAG_CLIENT_ID',
       exclusive: ['config'],
     }),
+    'organization-id': Flags.string({
+      hidden: false,
+      description:
+        'The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
+      env: 'SHOPIFY_FLAG_ORGANIZATION_ID',
+    }),
   }
 
   async run(): Promise<AppLinkedCommandOutput> {
@@ -93,7 +100,21 @@ export default class Init extends AppLinkedCommand {
       developerPlatformClient = selectedApp.developerPlatformClient ?? developerPlatformClient
       selectAppResult = {result: 'existing', app: selectedApp}
     } else {
-      const org = await selectOrg()
+      let org: Organization
+      if (flags['organization-id']) {
+        // If an organization-id is provided, fetch all organizations and find the matching one
+        const orgs = await fetchOrganizations()
+        const matchingOrg = orgs.find((organization) => organization.id === flags['organization-id'])
+        if (!matchingOrg) {
+          throw new AbortError(
+            `Organization with ID ${flags['organization-id']} not found`,
+            'Please verify the organization ID and try again. You can find your organization ID in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
+          )
+        }
+        org = matchingOrg
+      } else {
+        org = await selectOrg()
+      }
       developerPlatformClient = selectDeveloperPlatformClient({organization: org})
       const {organization, apps, hasMorePages} = await developerPlatformClient.orgAndApps(org.id)
       selectAppResult = await selectAppOrNewAppName(name, apps, hasMorePages, organization, developerPlatformClient)
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 41a104121be..81660d084f8 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -581,8 +581,8 @@ Create a new app project
 
 ```
 USAGE
-  $ shopify app init [--client-id <value> | ] [--flavor <value>] [-n <value>] [--no-color] [-d
-    npm|yarn|pnpm|bun] [-p <value>] [--template <value>] [--verbose]
+  $ shopify app init [--client-id <value> | ] [--flavor <value>] [-n <value>] [--no-color] [--organization-id
+    <value>] [-d npm|yarn|pnpm|bun] [-p <value>] [--template <value>] [--verbose]
 
 FLAGS
   -d, --package-manager=<option>  <options: npm|yarn|pnpm|bun>
@@ -592,6 +592,8 @@ FLAGS
                                   existing app. Using this flag avoids the app selection prompt.
       --flavor=<value>            Which flavor of the given template to use.
       --no-color                  Disable color output.
+      --organization-id=<value>   The organization ID. Your organization ID can be found in your Dev Dashboard URL:
+                                  https://dev.shopify.com/dashboard/<organization-id>.
       --template=<value>          The app template. Accepts one of the following:
                                   - <reactRouter|remix|none>
                                   - Any GitHub repo with optional branch and subpath, e.g.,
diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json
index d8d00d63b12..0e265415ad8 100644
--- a/packages/cli/oclif.manifest.json
+++ b/packages/cli/oclif.manifest.json
@@ -1905,6 +1905,15 @@
           "name": "no-color",
           "type": "boolean"
         },
+        "organization-id": {
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
+          "hasDynamicHelp": false,
+          "hidden": false,
+          "multiple": false,
+          "name": "organization-id",
+          "type": "option"
+        },
         "package-manager": {
           "char": "d",
           "env": "SHOPIFY_FLAG_PACKAGE_MANAGER",
diff --git a/packages/create-app/oclif.manifest.json b/packages/create-app/oclif.manifest.json
index 9d2d7d7e3b6..549b4c70194 100644
--- a/packages/create-app/oclif.manifest.json
+++ b/packages/create-app/oclif.manifest.json
@@ -51,6 +51,15 @@
           "name": "no-color",
           "type": "boolean"
         },
+        "organization-id": {
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
+          "hasDynamicHelp": false,
+          "hidden": false,
+          "multiple": false,
+          "name": "organization-id",
+          "type": "option"
+        },
         "package-manager": {
           "char": "d",
           "env": "SHOPIFY_FLAG_PACKAGE_MANAGER",

From 80bd18594affff3f9536d2edd67eea9c1677cb89 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:16:08 -0500
Subject: [PATCH 02/10] ensure --name flag suppresses interactive name prompt

---
 packages/app/src/cli/commands/app/init.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/cli/commands/app/init.ts b/packages/app/src/cli/commands/app/init.ts
index 05703270c37..e955cc0bdf3 100644
--- a/packages/app/src/cli/commands/app/init.ts
+++ b/packages/app/src/cli/commands/app/init.ts
@@ -117,7 +117,14 @@ export default class Init extends AppLinkedCommand {
       }
       developerPlatformClient = selectDeveloperPlatformClient({organization: org})
       const {organization, apps, hasMorePages} = await developerPlatformClient.orgAndApps(org.id)
-      selectAppResult = await selectAppOrNewAppName(name, apps, hasMorePages, organization, developerPlatformClient)
+      selectAppResult = await selectAppOrNewAppName(
+        flags.name !== undefined,
+        name,
+        apps,
+        hasMorePages,
+        organization,
+        developerPlatformClient,
+      )
       appName = selectAppResult.result === 'new' ? selectAppResult.name : selectAppResult.app.title
     }
 
@@ -173,18 +180,19 @@ export type SelectAppOrNewAppNameResult =
  * But doesn't create the app yet, the app creation is deferred and is responsibility of the caller.
  */
 async function selectAppOrNewAppName(
+  nameProvidedAsFlag: boolean,
   localAppName: string,
   apps: MinimalOrganizationApp[],
   hasMorePages: boolean,
   org: Organization,
   developerPlatformClient: DeveloperPlatformClient,
 ): Promise<SelectAppOrNewAppNameResult> {
-  let createNewApp = apps.length === 0
+  let createNewApp = apps.length === 0 || nameProvidedAsFlag
   if (!createNewApp) {
     createNewApp = await createAsNewAppPrompt()
   }
   if (createNewApp) {
-    const name = await appNamePrompt(localAppName)
+    const name = nameProvidedAsFlag ? localAppName : await appNamePrompt(localAppName)
     return {result: 'new', name, org}
   } else {
     const app = await selectAppPrompt(searchForAppsByNameFactory(developerPlatformClient, org.id), apps, hasMorePages)

From ea6850b39ba3b8c6600a9cb8a1b010e72be6bee4 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:16:22 -0500
Subject: [PATCH 03/10] add unit tests for init command

---
 .../app/src/cli/commands/app/init.test.ts     | 161 ++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 packages/app/src/cli/commands/app/init.test.ts

diff --git a/packages/app/src/cli/commands/app/init.test.ts b/packages/app/src/cli/commands/app/init.test.ts
new file mode 100644
index 00000000000..5c452a6c0cf
--- /dev/null
+++ b/packages/app/src/cli/commands/app/init.test.ts
@@ -0,0 +1,161 @@
+import Init from './init.js'
+import initPrompt from '../../prompts/init/init.js'
+import initService from '../../services/init/init.js'
+import {selectDeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
+import {selectOrg} from '../../services/context.js'
+import {appNamePrompt, createAsNewAppPrompt} from '../../prompts/dev.js'
+import {validateFlavorValue, validateTemplateValue} from '../../services/init/validate.js'
+import {testAppLinked, testDeveloperPlatformClient, testOrganization} from '../../models/app/app.test-data.js'
+import {describe, expect, test, vi} from 'vitest'
+import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output'
+import {generateRandomNameForSubdirectory} from '@shopify/cli-kit/node/fs'
+import {inferPackageManager} from '@shopify/cli-kit/node/node-package-manager'
+
+vi.mock('../../prompts/init/init.js')
+vi.mock('../../services/init/init.js')
+vi.mock('../../utilities/developer-platform-client.js')
+vi.mock('../../services/context.js')
+vi.mock('../../prompts/dev.js')
+vi.mock('../../services/dev/fetch.js')
+vi.mock('../../services/init/validate.js')
+vi.mock('@shopify/cli-kit/node/is-global')
+vi.mock('@shopify/cli-kit/node/fs')
+vi.mock('@shopify/cli-kit/node/node-package-manager')
+vi.mock('@shopify/cli-kit/node/metadata')
+
+describe('Init command', () => {
+  test('runs init command with default flags', async () => {
+    // Given
+    const mockOrganization = testOrganization()
+    const mockDeveloperPlatformClient = testDeveloperPlatformClient()
+    const mockApp = testAppLinked()
+
+    mockAndCaptureOutput()
+    vi.mocked(validateTemplateValue).mockReturnValue(undefined)
+    vi.mocked(validateFlavorValue).mockReturnValue(undefined)
+    vi.mocked(inferPackageManager).mockReturnValue('npm')
+    vi.mocked(generateRandomNameForSubdirectory).mockResolvedValue('test-app')
+    vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
+    vi.mocked(selectOrg).mockResolvedValue(mockOrganization)
+
+    // Mock the orgAndApps method on the developer platform client
+    vi.mocked(mockDeveloperPlatformClient.orgAndApps).mockResolvedValue({
+      organization: mockOrganization,
+      apps: [],
+      hasMorePages: false,
+    })
+
+    vi.mocked(initPrompt).mockResolvedValue({
+      template: 'https://github.com/Shopify/shopify-app-template-remix',
+      templateType: 'remix',
+      globalCLIResult: {install: false, alreadyInstalled: false},
+    })
+    vi.mocked(createAsNewAppPrompt).mockResolvedValue(true)
+    vi.mocked(appNamePrompt).mockResolvedValue('test-app')
+    vi.mocked(initService).mockResolvedValue({app: mockApp})
+
+    // When
+    await Init.run([])
+
+    // Then
+    expect(initService).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'test-app',
+        packageManager: 'npm',
+      }),
+    )
+  })
+
+  test('runs init command without prompts when organization-id, name, and template flags are provided', async () => {
+    // Given
+    const mockOrganization = testOrganization()
+    const mockDeveloperPlatformClient = testDeveloperPlatformClient()
+    const mockApp = testAppLinked()
+
+    mockAndCaptureOutput()
+    vi.mocked(validateTemplateValue).mockReturnValue(undefined)
+    vi.mocked(validateFlavorValue).mockReturnValue(undefined)
+    vi.mocked(inferPackageManager).mockReturnValue('npm')
+    vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
+
+    // Mock fetchOrganizations to return the organization
+    const {fetchOrganizations} = await import('../../services/dev/fetch.js')
+    vi.mocked(fetchOrganizations).mockResolvedValue([mockOrganization])
+
+    // Mock the orgAndApps method on the developer platform client
+    vi.mocked(mockDeveloperPlatformClient.orgAndApps).mockResolvedValue({
+      organization: mockOrganization,
+      apps: [],
+      hasMorePages: false,
+    })
+
+    vi.mocked(initPrompt).mockResolvedValue({
+      template: 'https://github.com/Shopify/shopify-app-template-remix',
+      templateType: 'remix',
+      globalCLIResult: {install: false, alreadyInstalled: false},
+    })
+    vi.mocked(initService).mockResolvedValue({app: mockApp})
+
+    // When
+    await Init.run(['--organization-id', mockOrganization.id, '--name', 'my-app', '--template', 'remix'])
+
+    // Then
+    // Verify that prompt functions were NOT called
+    // Any other interactive prompts would also cause the test to fail with an AbortError
+    expect(selectOrg).not.toHaveBeenCalled()
+    expect(createAsNewAppPrompt).not.toHaveBeenCalled()
+    expect(appNamePrompt).not.toHaveBeenCalled()
+
+    // Verify the command completed successfully
+    expect(initService).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'my-app',
+        packageManager: 'npm',
+        template: 'https://github.com/Shopify/shopify-app-template-remix',
+      }),
+    )
+  })
+
+  test('fails with clear error message when invalid organization-id is provided', async () => {
+    // Given
+    const validOrg = testOrganization()
+    const mockDeveloperPlatformClient = testDeveloperPlatformClient()
+
+    // Suppress stderr output for this error test
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    try {
+      const outputMock = mockAndCaptureOutput()
+      vi.mocked(validateTemplateValue).mockReturnValue(undefined)
+      vi.mocked(validateFlavorValue).mockReturnValue(undefined)
+      vi.mocked(inferPackageManager).mockReturnValue('npm')
+      vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
+
+      // Mock fetchOrganizations to return only the valid organization
+      const {fetchOrganizations} = await import('../../services/dev/fetch.js')
+      vi.mocked(fetchOrganizations).mockResolvedValue([validOrg])
+
+      vi.mocked(initPrompt).mockResolvedValue({
+        template: 'https://github.com/Shopify/shopify-app-template-remix',
+        templateType: 'remix',
+        globalCLIResult: {install: false, alreadyInstalled: false},
+      })
+
+      // When/Then
+      // The command throws an AbortError which is caught by oclif's error handler
+      // This causes process.exit(1) which vitest intercepts
+      await expect(
+        Init.run(['--organization-id', 'invalid-org-id', '--name', 'my-app', '--template', 'remix']),
+      ).rejects.toThrow('process.exit unexpectedly called with "1"')
+
+      // Verify the error message was displayed
+      expect(outputMock.error()).toContain('Organization with ID invalid-org-id not found')
+
+      // Verify initService was never called since validation failed
+      expect(initService).not.toHaveBeenCalled()
+    } finally {
+      // Always restore console.error, even if the test fails
+      consoleErrorSpy.mockRestore()
+    }
+  })
+})

From 8ea0ceeafbb7de3c5679f1dc4a5ccd63b60a3ee9 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:40:22 -0500
Subject: [PATCH 04/10] remove unused mocks

---
 packages/app/src/cli/commands/app/init.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/app/src/cli/commands/app/init.test.ts b/packages/app/src/cli/commands/app/init.test.ts
index 5c452a6c0cf..25572d12e78 100644
--- a/packages/app/src/cli/commands/app/init.test.ts
+++ b/packages/app/src/cli/commands/app/init.test.ts
@@ -18,10 +18,8 @@ vi.mock('../../services/context.js')
 vi.mock('../../prompts/dev.js')
 vi.mock('../../services/dev/fetch.js')
 vi.mock('../../services/init/validate.js')
-vi.mock('@shopify/cli-kit/node/is-global')
 vi.mock('@shopify/cli-kit/node/fs')
 vi.mock('@shopify/cli-kit/node/node-package-manager')
-vi.mock('@shopify/cli-kit/node/metadata')
 
 describe('Init command', () => {
   test('runs init command with default flags', async () => {

From 20711d2f5e49e1900c6a7d13950651901787c533 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:43:23 -0500
Subject: [PATCH 05/10] added changeset

---
 .changeset/grumpy-mirrors-exist.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/grumpy-mirrors-exist.md

diff --git a/.changeset/grumpy-mirrors-exist.md b/.changeset/grumpy-mirrors-exist.md
new file mode 100644
index 00000000000..af374618b2d
--- /dev/null
+++ b/.changeset/grumpy-mirrors-exist.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Enable non-interactive `app init` via a new `--organization-id` flag and not prompting to link to an existing app if `--name` is provided.

From 404bba00e345e00750cfbc275e35164256f47f5f Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:48:05 -0500
Subject: [PATCH 06/10] update manifest again for changes

---
 packages/cli/README.md                  | 2 +-
 packages/cli/oclif.manifest.json        | 2 +-
 packages/create-app/oclif.manifest.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/README.md b/packages/cli/README.md
index 81660d084f8..749c5ffbb34 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -593,7 +593,7 @@ FLAGS
       --flavor=<value>            Which flavor of the given template to use.
       --no-color                  Disable color output.
       --organization-id=<value>   The organization ID. Your organization ID can be found in your Dev Dashboard URL:
-                                  https://dev.shopify.com/dashboard/<organization-id>.
+                                  https://dev.shopify.com/dashboard/<organization-id>
       --template=<value>          The app template. Accepts one of the following:
                                   - <reactRouter|remix|none>
                                   - Any GitHub repo with optional branch and subpath, e.g.,
diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json
index 0e265415ad8..2c4748202c9 100644
--- a/packages/cli/oclif.manifest.json
+++ b/packages/cli/oclif.manifest.json
@@ -1906,7 +1906,7 @@
           "type": "boolean"
         },
         "organization-id": {
-          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>",
           "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
           "hasDynamicHelp": false,
           "hidden": false,
diff --git a/packages/create-app/oclif.manifest.json b/packages/create-app/oclif.manifest.json
index 549b4c70194..612321e2c23 100644
--- a/packages/create-app/oclif.manifest.json
+++ b/packages/create-app/oclif.manifest.json
@@ -52,7 +52,7 @@
           "type": "boolean"
         },
         "organization-id": {
-          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>",
           "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
           "hasDynamicHelp": false,
           "hidden": false,

From 73f9e40c52228273400ecda68bbd76f4099b002a Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:51:22 -0500
Subject: [PATCH 07/10] update dev docs

---
 .../commands/interfaces/app-init.interface.ts         |  6 ++++++
 docs-shopify.dev/generated/generated_docs_data.json   | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs-shopify.dev/commands/interfaces/app-init.interface.ts b/docs-shopify.dev/commands/interfaces/app-init.interface.ts
index 7e2265bb453..0d5e08ec98d 100644
--- a/docs-shopify.dev/commands/interfaces/app-init.interface.ts
+++ b/docs-shopify.dev/commands/interfaces/app-init.interface.ts
@@ -24,6 +24,12 @@ export interface appinit {
    */
   '--no-color'?: ''
 
+  /**
+   * The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>
+   * @environment SHOPIFY_FLAG_ORGANIZATION_ID
+   */
+  '--organization-id <value>'?: string
+
   /**
    * 
    * @environment SHOPIFY_FLAG_PACKAGE_MANAGER
diff --git a/docs-shopify.dev/generated/generated_docs_data.json b/docs-shopify.dev/generated/generated_docs_data.json
index 971f2310826..5a1332f6f3c 100644
--- a/docs-shopify.dev/generated/generated_docs_data.json
+++ b/docs-shopify.dev/generated/generated_docs_data.json
@@ -1916,6 +1916,15 @@
                 "isOptional": true,
                 "environmentValue": "SHOPIFY_FLAG_NO_COLOR"
               },
+              {
+                "filePath": "docs-shopify.dev/commands/interfaces/app-init.interface.ts",
+                "syntaxKind": "PropertySignature",
+                "name": "--organization-id <value>",
+                "value": "string",
+                "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>",
+                "isOptional": true,
+                "environmentValue": "SHOPIFY_FLAG_ORGANIZATION_ID"
+              },
               {
                 "filePath": "docs-shopify.dev/commands/interfaces/app-init.interface.ts",
                 "syntaxKind": "PropertySignature",
@@ -1962,7 +1971,7 @@
                 "environmentValue": "SHOPIFY_FLAG_PATH"
               }
             ],
-            "value": "export interface appinit {\n  /**\n   * The Client ID of your app. Use this to automatically link your new project to an existing app. Using this flag avoids the app selection prompt.\n   * @environment SHOPIFY_FLAG_CLIENT_ID\n   */\n  '--client-id <value>'?: string\n\n  /**\n   * Which flavor of the given template to use.\n   * @environment SHOPIFY_FLAG_TEMPLATE_FLAVOR\n   */\n  '--flavor <value>'?: string\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_NAME\n   */\n  '-n, --name <value>'?: string\n\n  /**\n   * Disable color output.\n   * @environment SHOPIFY_FLAG_NO_COLOR\n   */\n  '--no-color'?: ''\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_PACKAGE_MANAGER\n   */\n  '-d, --package-manager <value>'?: string\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_PATH\n   */\n  '-p, --path <value>'?: string\n\n  /**\n   * The app template. Accepts one of the following:\n       - <reactRouter|remix|none>\n       - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]\n   * @environment SHOPIFY_FLAG_TEMPLATE\n   */\n  '--template <value>'?: string\n\n  /**\n   * Increase the verbosity of the output.\n   * @environment SHOPIFY_FLAG_VERBOSE\n   */\n  '--verbose'?: ''\n}"
+            "value": "export interface appinit {\n  /**\n   * The Client ID of your app. Use this to automatically link your new project to an existing app. Using this flag avoids the app selection prompt.\n   * @environment SHOPIFY_FLAG_CLIENT_ID\n   */\n  '--client-id <value>'?: string\n\n  /**\n   * Which flavor of the given template to use.\n   * @environment SHOPIFY_FLAG_TEMPLATE_FLAVOR\n   */\n  '--flavor <value>'?: string\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_NAME\n   */\n  '-n, --name <value>'?: string\n\n  /**\n   * Disable color output.\n   * @environment SHOPIFY_FLAG_NO_COLOR\n   */\n  '--no-color'?: ''\n\n  /**\n   * The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>\n   * @environment SHOPIFY_FLAG_ORGANIZATION_ID\n   */\n  '--organization-id <value>'?: string\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_PACKAGE_MANAGER\n   */\n  '-d, --package-manager <value>'?: string\n\n  /**\n   * \n   * @environment SHOPIFY_FLAG_PATH\n   */\n  '-p, --path <value>'?: string\n\n  /**\n   * The app template. Accepts one of the following:\n       - <reactRouter|remix|none>\n       - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]\n   * @environment SHOPIFY_FLAG_TEMPLATE\n   */\n  '--template <value>'?: string\n\n  /**\n   * Increase the verbosity of the output.\n   * @environment SHOPIFY_FLAG_VERBOSE\n   */\n  '--verbose'?: ''\n}"
           }
         }
       }

From 64d4541b787f77998783beac4f4645dab685baf6 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Thu, 20 Nov 2025 08:47:25 -0500
Subject: [PATCH 08/10] only apply SHOPIFY_FLAG_CLIENT_ID to acceptance tests

---
 .github/workflows/cli-main.yml    | 2 +-
 .github/workflows/shopify-cli.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cli-main.yml b/.github/workflows/cli-main.yml
index de9fcd09b39..c961ff983bc 100644
--- a/.github/workflows/cli-main.yml
+++ b/.github/workflows/cli-main.yml
@@ -20,7 +20,6 @@ env:
   SHOPIFY_CONFIG: debug
   PNPM_VERSION: '10.11.1'
   BUNDLE_WITHOUT: 'test:development'
-  SHOPIFY_FLAG_CLIENT_ID: ${{ secrets.SHOPIFY_FLAG_CLIENT_ID }}
   GH_TOKEN: ${{ secrets.SHOPIFY_GH_READ_CONTENT_TOKEN }}
   GH_TOKEN_SHOP: ${{ secrets.SHOP_GH_READ_CONTENT_TOKEN }}
   DEFAULT_NODE_VERSION: '24.1.0'
@@ -64,6 +63,7 @@ jobs:
         if: ${{ matrix.node == '24.1.0' }}
         env:
           SHOPIFY_CLI_PARTNERS_TOKEN: ${{ secrets.SHOPIFY_CLI_PARTNERS_TOKEN }}
+          SHOPIFY_FLAG_CLIENT_ID: ${{ secrets.SHOPIFY_FLAG_CLIENT_ID }}
         run: pnpm nx run features:test
       - name: Send Slack notification on failure
         uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # pin@v1.23.0
diff --git a/.github/workflows/shopify-cli.yml b/.github/workflows/shopify-cli.yml
index cbcc127e126..f19b0edc6ed 100644
--- a/.github/workflows/shopify-cli.yml
+++ b/.github/workflows/shopify-cli.yml
@@ -14,7 +14,6 @@ env:
   SHOPIFY_CONFIG: debug
   PNPM_VERSION: '10.11.1'
   BUNDLE_WITHOUT: 'test:development'
-  SHOPIFY_FLAG_CLIENT_ID: ${{ secrets.SHOPIFY_FLAG_CLIENT_ID }}
   GH_TOKEN: ${{ secrets.SHOPIFY_GH_READ_CONTENT_TOKEN }}
   GH_TOKEN_SHOP: ${{ secrets.SHOP_GH_READ_CONTENT_TOKEN }}
   DEFAULT_NODE_VERSION: '24.1.0'
@@ -192,6 +191,7 @@ jobs:
       - name: Acceptance tests
         env:
           SHOPIFY_CLI_PARTNERS_TOKEN: ${{ secrets.SHOPIFY_CLI_PARTNERS_TOKEN }}
+          SHOPIFY_FLAG_CLIENT_ID: ${{ secrets.SHOPIFY_FLAG_CLIENT_ID }}
         run: pnpm test:features --output-style=stream
 
   test-coverage:

From c4f56c3304fde0dd5e305cfffc24ea28dbb80165 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Thu, 20 Nov 2025 09:16:59 -0500
Subject: [PATCH 09/10] improve org error message

---
 packages/app/src/cli/commands/app/init.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/cli/commands/app/init.ts b/packages/app/src/cli/commands/app/init.ts
index e955cc0bdf3..0034586bf64 100644
--- a/packages/app/src/cli/commands/app/init.ts
+++ b/packages/app/src/cli/commands/app/init.ts
@@ -108,7 +108,8 @@ export default class Init extends AppLinkedCommand {
         if (!matchingOrg) {
           throw new AbortError(
             `Organization with ID ${flags['organization-id']} not found`,
-            'Please verify the organization ID and try again. You can find your organization ID in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
+            "Run `shopify auth login` to confirm you've selected the right account, and verify your organization ID. " +
+              'You can find your organization ID in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
           )
         }
         org = matchingOrg

From 37f0070c945ccec89adb8357cf18962eba48526d Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Fri, 21 Nov 2025 08:18:05 -0500
Subject: [PATCH 10/10] Use orgFromId to validate organization

---
 packages/app/src/cli/commands/app/init.test.ts | 11 ++++-------
 packages/app/src/cli/commands/app/init.ts      |  6 ++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/app/src/cli/commands/app/init.test.ts b/packages/app/src/cli/commands/app/init.test.ts
index 25572d12e78..d2f6f49724d 100644
--- a/packages/app/src/cli/commands/app/init.test.ts
+++ b/packages/app/src/cli/commands/app/init.test.ts
@@ -16,7 +16,6 @@ vi.mock('../../services/init/init.js')
 vi.mock('../../utilities/developer-platform-client.js')
 vi.mock('../../services/context.js')
 vi.mock('../../prompts/dev.js')
-vi.mock('../../services/dev/fetch.js')
 vi.mock('../../services/init/validate.js')
 vi.mock('@shopify/cli-kit/node/fs')
 vi.mock('@shopify/cli-kit/node/node-package-manager')
@@ -76,9 +75,8 @@ describe('Init command', () => {
     vi.mocked(inferPackageManager).mockReturnValue('npm')
     vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
 
-    // Mock fetchOrganizations to return the organization
-    const {fetchOrganizations} = await import('../../services/dev/fetch.js')
-    vi.mocked(fetchOrganizations).mockResolvedValue([mockOrganization])
+    // Mock orgFromId to return the organization
+    vi.mocked(mockDeveloperPlatformClient.orgFromId).mockResolvedValue(mockOrganization)
 
     // Mock the orgAndApps method on the developer platform client
     vi.mocked(mockDeveloperPlatformClient.orgAndApps).mockResolvedValue({
@@ -129,9 +127,8 @@ describe('Init command', () => {
       vi.mocked(inferPackageManager).mockReturnValue('npm')
       vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
 
-      // Mock fetchOrganizations to return only the valid organization
-      const {fetchOrganizations} = await import('../../services/dev/fetch.js')
-      vi.mocked(fetchOrganizations).mockResolvedValue([validOrg])
+      // Mock orgFromId to return undefined for invalid organization
+      vi.mocked(mockDeveloperPlatformClient.orgFromId).mockResolvedValue(undefined)
 
       vi.mocked(initPrompt).mockResolvedValue({
         template: 'https://github.com/Shopify/shopify-app-template-remix',
diff --git a/packages/app/src/cli/commands/app/init.ts b/packages/app/src/cli/commands/app/init.ts
index 0034586bf64..e8398f78f40 100644
--- a/packages/app/src/cli/commands/app/init.ts
+++ b/packages/app/src/cli/commands/app/init.ts
@@ -7,7 +7,6 @@ import {validateFlavorValue, validateTemplateValue} from '../../services/init/va
 import {MinimalOrganizationApp, Organization, OrganizationApp} from '../../models/organization.js'
 import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompts/dev.js'
 import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js'
-import {fetchOrganizations} from '../../services/dev/fetch.js'
 import {isValidName} from '../../models/app/validation/common.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
@@ -102,9 +101,8 @@ export default class Init extends AppLinkedCommand {
     } else {
       let org: Organization
       if (flags['organization-id']) {
-        // If an organization-id is provided, fetch all organizations and find the matching one
-        const orgs = await fetchOrganizations()
-        const matchingOrg = orgs.find((organization) => organization.id === flags['organization-id'])
+        // If an organization-id is provided, fetch the organization directly
+        const matchingOrg = await developerPlatformClient.orgFromId(flags['organization-id'])
         if (!matchingOrg) {
           throw new AbortError(
             `Organization with ID ${flags['organization-id']} not found`,