diff --git a/src/cli/args.test.ts b/src/cli/args.test.ts
index 8764cbe67e3..1ac86d99e12 100644
--- a/src/cli/args.test.ts
+++ b/src/cli/args.test.ts
@@ -123,6 +123,16 @@ describe('parseArgs', () => {
     expect(parsed.flags.get('environment')).toBe('worktree')
   })
 
+  it.each([
+    ['--project', 'project', 'project', 'setups'],
+    ['--project=project', 'project', 'setups']
+  ])('preserves a command-named project selector in %j', (...args) => {
+    const parsed = parseArgs(args, [['project', 'setups']])
+
+    expect(parsed.commandPath).toEqual(['project', 'setups'])
+    expect(parsed.flags.get('project')).toBe('project')
+  })
+
   it('parses emulator reinstall as a boolean flag', () => {
     const parsed = parseArgs(['emulator', 'install', 'app.apk', '--reinstall', '--device', 'emu'])
 
diff --git a/src/main/startup/cli-launch-redirect.test.ts b/src/main/startup/cli-launch-redirect.test.ts
index 6831ca0ff03..0cb8fd13a89 100644
--- a/src/main/startup/cli-launch-redirect.test.ts
+++ b/src/main/startup/cli-launch-redirect.test.ts
@@ -136,7 +136,9 @@ describe('CLI launch redirect: command form', () => {
 
   it.each([
     ['--project', 'github:stablyai/orca', 'project', 'setups'],
-    ['--project=github:stablyai/orca', 'project', 'setups']
+    ['--project=github:stablyai/orca', 'project', 'setups'],
+    ['--project', 'project', 'project', 'setups'],
+    ['--project=project', 'project', 'setups']
   ])('preserves a project selector in %j', (...args) => {
     expect(getCliLaunchArgs([linux.execPath, ...args], linux.cliEntryPath, linuxOptions)).toEqual(
       args