fix(cli): fix E2E test failures, broken sharding, and --no-git/--bare bugs

- Remove broken E2E sharding (fileParallelism: false defeats --shard)
- Fix --bare in unattended mode: skip --output-path check since bare
  produces no files and the flags are mutually exclusive
- Fix --no-git: the hidden no-git boolean flag was defined but never
  checked in the useGit logic, so git init always ran
- Fix template import idempotency: pass --missing to dataset import so
  re-importing into an existing dataset skips duplicate documents
- Fix interactive test expectations to match actual CLI prompt order:
  dataset selection default, Next.js TypeScript-before-studio flow,
  and moviedb import prompt text

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: binoy14

.github/workflows/e2e.yml

@@ -55,7 +55,6 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node-version: [20, 22, 24]
-        shard: [1, 2, 3]
       fail-fast: false
 
     steps:
@@ -84,7 +83,7 @@ jobs:
           SANITY_E2E_TOKEN: ${{ secrets.SANITY_E2E_TOKEN }}
           SANITY_E2E_PROJECT_ID: ${{ secrets.SANITY_E2E_PROJECT_ID }}
           SANITY_E2E_DATASET: ${{ secrets.SANITY_E2E_DATASET }}
-        run: pnpm --filter @sanity/cli-e2e test -- --shard=${{ matrix.shard }}/3
+        run: pnpm --filter @sanity/cli-e2e test
 
   notify-failure:
     if: ${{ failure() && inputs.cli_version }}

packages/@sanity/cli-e2e/__tests__/init/init-interactive.test.ts

@@ -120,7 +120,9 @@ describe('sanity init - interactive', () => {
         interactive: true,
       })
 
-      await session.waitForText(/Select dataset|dataset/i)
+      await session.waitForText(/Select dataset/i)
+      // "Create new dataset" is selected by default; navigate down to "production"
+      session.sendKey('ArrowDown')
       session.sendKey('Enter')
 
       await session.waitForText(/output path|template/i)
@@ -134,11 +136,11 @@ describe('sanity init - interactive', () => {
         interactive: true,
       })
 
-      await session.waitForText(/Select dataset|dataset/i)
-      session.sendKey('ArrowUp')
+      await session.waitForText(/Select dataset/i)
+      // "Create new dataset" is the default first item; press Enter to select it
       session.sendKey('Enter')
 
-      await session.waitForText(/name.*dataset|dataset.*name/i)
+      await session.waitForText(/Dataset name/i)
 
       session.kill()
     }, 60_000)
@@ -236,17 +238,20 @@ describe('sanity init - interactive', () => {
             tmp.path,
             '--template',
             'moviedb',
+            '--no-mcp',
+            '--package-manager',
+            'pnpm',
           ],
           interactive: true,
         })
 
         await session.waitForText(/TypeScript/i)
         session.sendKey('Enter')
 
-        await session.waitForText(/sample dataset|import/i)
+        await session.waitForText(/sampling.*movies|dataset on the hosted backend/i)
         session.write('y\n')
 
-        await session.waitForText(/import/i)
+        await session.waitForText(/import/i, {timeout: 90_000})
 
         session.kill()
       } finally {
@@ -268,17 +273,20 @@ describe('sanity init - interactive', () => {
             tmp.path,
             '--template',
             'moviedb',
+            '--no-mcp',
+            '--package-manager',
+            'pnpm',
           ],
           interactive: true,
         })
 
         await session.waitForText(/TypeScript/i)
         session.sendKey('Enter')
 
-        await session.waitForText(/sample dataset|import/i)
+        await session.waitForText(/sampling.*movies|dataset on the hosted backend/i)
         session.write('n\n')
 
-        await session.waitForText(/package manager|Success/i)
+        await session.waitForText(/installing|Success/i, {timeout: 90_000})
 
         session.kill()
       } finally {

packages/@sanity/cli-e2e/__tests__/init/init-nextjs.test.ts

@@ -152,7 +152,11 @@ describe.skipIf(!hasToken)('sanity init - Next.js integration', () => {
       await session.waitForText(/add configuration files|Would you like to add/i)
       session.sendKey('Enter')
 
-      await session.waitForText(/embed.*studio|studio.*route/i)
+      // TypeScript prompt comes before embedded studio prompt
+      await session.waitForText(/TypeScript/i)
+      session.sendKey('Enter')
+
+      await session.waitForText(/embed.*studio|Would you like an embedded/i)
       session.sendKey('Enter')
 
       await session.waitForText(/route.*studio|What route/i)
@@ -174,7 +178,11 @@ describe.skipIf(!hasToken)('sanity init - Next.js integration', () => {
       await session.waitForText(/add configuration files|Would you like to add/i)
       session.sendKey('Enter')
 
-      await session.waitForText(/embed.*studio|studio.*route/i)
+      // TypeScript prompt comes before embedded studio prompt
+      await session.waitForText(/TypeScript/i)
+      session.sendKey('Enter')
+
+      await session.waitForText(/embed.*studio|Would you like an embedded/i)
       session.sendKey('Enter')
 
       await session.waitForText(/route.*studio|What route/i)

packages/@sanity/cli-e2e/__tests__/init/init-noninteractive.test.ts

@@ -275,7 +275,7 @@ describe.skipIf(!hasToken)('sanity init --yes (non-interactive)', () => {
   }, 120_000)
 
   test('2.25 --import-dataset with moviedb template imports sample data', async () => {
-    const {exitCode, stdout} = await runCli({
+    const {error, exitCode, stdout} = await runCli({
       args: baseInitArgs({
         extraArgs: [
           '--template',
@@ -290,6 +290,7 @@ describe.skipIf(!hasToken)('sanity init --yes (non-interactive)', () => {
       }),
     })
 
+    if (error) throw error
     expect(exitCode).toBe(0)
     expect(stdout).toMatch(/import/i)
   }, 120_000)

packages/@sanity/cli/src/commands/init.ts

@@ -611,7 +611,8 @@ export class InitCommand extends SanityCommand<typeof InitCommand> {
       workDir,
     })
 
-    const useGit = this.flags.git === undefined || Boolean(this.flags.git)
+    const useGit =
+      !this.flags['no-git'] && (this.flags.git === undefined || Boolean(this.flags.git))
     const commitMessage = this.flags.git
     await this.writeStagingEnvIfNeeded(outputPath)
 
@@ -635,6 +636,7 @@ export class InitCommand extends SanityCommand<typeof InitCommand> {
           datasetName,
           '--token',
           token,
+          '--missing',
         ],
         {
           root: outputPath,
@@ -756,8 +758,8 @@ export class InitCommand extends SanityCommand<typeof InitCommand> {
       })
     }
 
-    // output-path is required in unattended mode when not using nextjs
-    if (!isNextJs && !this.flags['output-path']) {
+    // output-path is required in unattended mode when not using nextjs or bare
+    if (!isNextJs && !this.flags.bare && !this.flags['output-path']) {
       this.error(`\`--output-path\` must be specified in unattended mode`, {
         exit: 1,
       })