Add project picker helper and tests

Author: brandonkachen

cli/src/__tests__/utils/project-picker.test.ts

@@ -0,0 +1,38 @@
+import { describe, test, expect } from 'bun:test'
+import path from 'path'
+
+import { shouldShowProjectPicker } from '../../utils/project-picker'
+
+describe('cli/utils/project-picker', () => {
+  test('returns true when start cwd is home directory', () => {
+    const root = path.parse(process.cwd()).root
+    const homeDir = path.join(root, 'home', 'test-user')
+
+    expect(shouldShowProjectPicker(homeDir, homeDir)).toBe(true)
+  })
+
+  test('returns true when start cwd is a parent of home directory', () => {
+    const root = path.parse(process.cwd()).root
+    const homeDir = path.join(root, 'home', 'test-user')
+    const parentDir = path.dirname(homeDir)
+
+    expect(shouldShowProjectPicker(parentDir, homeDir)).toBe(true)
+    expect(shouldShowProjectPicker(root, homeDir)).toBe(true)
+  })
+
+  test('returns false when start cwd is a child of home directory', () => {
+    const root = path.parse(process.cwd()).root
+    const homeDir = path.join(root, 'home', 'test-user')
+    const childDir = path.join(homeDir, 'projects')
+
+    expect(shouldShowProjectPicker(childDir, homeDir)).toBe(false)
+  })
+
+  test('returns false when start cwd is a sibling of home directory', () => {
+    const root = path.parse(process.cwd()).root
+    const homeDir = path.join(root, 'home', 'test-user')
+    const siblingDir = path.join(root, 'home', 'other-user')
+
+    expect(shouldShowProjectPicker(siblingDir, homeDir)).toBe(false)
+  })
+})

cli/src/index.tsx

@@ -23,9 +23,9 @@ import { getProjectRoot, setProjectRoot } from './project-files'
 import { initAnalytics } from './utils/analytics'
 import { getAuthTokenDetails } from './utils/auth'
 import { getCliEnv } from './utils/env'
-import { findGitRoot } from './utils/git'
 import { initializeAgentRegistry } from './utils/local-agent-registry'
 import { clearLogFile, logger } from './utils/logger'
+import { shouldShowProjectPicker } from './utils/project-picker'
 import { saveRecentProject } from './utils/recent-projects'
 import { detectTerminalTheme } from './utils/terminal-color-detection'
 import { setOscDetectedTheme } from './utils/theme-system'
@@ -173,12 +173,11 @@ async function main(): Promise<void> {
 
   await initializeApp({ cwd })
 
-  // Detect if user is at home directory or outside a project (should show project picker)
+  // Show project picker only when user starts at the home directory or an ancestor
   const projectRoot = getProjectRoot()
   const homeDir = os.homedir()
-  const gitRoot = findGitRoot({ cwd: projectRoot })
-  const showProjectPicker =
-    projectRoot === '/' || projectRoot === homeDir || gitRoot === null
+  const startCwd = process.cwd()
+  const showProjectPicker = shouldShowProjectPicker(startCwd, homeDir)
 
   // Initialize agent registry (loads user agents via SDK).
   // When --agent is provided, skip local .agents to avoid overrides.

cli/src/utils/project-picker.ts

@@ -0,0 +1,12 @@
+import path from 'path'
+
+export function shouldShowProjectPicker(
+  startCwd: string,
+  homeDir: string,
+): boolean {
+  const relativeToHome = path.relative(startCwd, homeDir)
+  return (
+    relativeToHome === '' ||
+    (!relativeToHome.startsWith('..') && !path.isAbsolute(relativeToHome))
+  )
+}