diff --git a/CLAUDE.md b/CLAUDE.md
index 6566174b..0445ba0f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -21,7 +21,7 @@ Key capabilities:
 100% free, open source. No API keys. No configuration. Runs entirely locally.
 
 ## Tech Stack
-Electron 28.x, React 18.x, TypeScript 5.x, Tailwind CSS 3.x, Zustand 4.x
+Electron 40.x, React 19.x, TypeScript 5.x, Tailwind CSS 3.x, Zustand 4.x
 
 ## Commands
 Always use pnpm (not npm/yarn) for this project.
diff --git a/src/main/services/discovery/ProjectScanner.ts b/src/main/services/discovery/ProjectScanner.ts
index a4a7ae60..3227604d 100644
--- a/src/main/services/discovery/ProjectScanner.ts
+++ b/src/main/services/discovery/ProjectScanner.ts
@@ -15,6 +15,18 @@
  * - SessionSearcher: Search functionality
  */
 
+import {
+  AUTO_CLAUDE_DIR,
+  CCSWITCH_DIR,
+  CLAUDE_CODE_DIR,
+  CLAUDE_WORKTREES_DIR,
+  CONDUCTOR_DIR,
+  CURSOR_DIR,
+  TWENTYFIRST_DIR,
+  VIBE_KANBAN_DIR,
+  WORKSPACES_DIR,
+  WORKTREES_DIR,
+} from '@main/constants/worktreePatterns';
 import {
   type PaginatedSessionsResult,
   type Project,
@@ -46,19 +58,7 @@ import {
 import { createLogger } from '@shared/utils/logger';
 import * as path from 'path';
 
-import {
-  AUTO_CLAUDE_DIR,
-  CCSWITCH_DIR,
-  CLAUDE_CODE_DIR,
-  CLAUDE_WORKTREES_DIR,
-  CONDUCTOR_DIR,
-  CURSOR_DIR,
-  TWENTYFIRST_DIR,
-  VIBE_KANBAN_DIR,
-  WORKSPACES_DIR,
-  WORKTREES_DIR,
-} from '@main/constants/worktreePatterns';
-
+import { configManager } from '../infrastructure/ConfigManager';
 import { LocalFileSystemProvider } from '../infrastructure/LocalFileSystemProvider';
 
 import { ProjectPathResolver } from './ProjectPathResolver';
@@ -310,7 +310,6 @@ export class ProjectScanner {
       });
 
       // 3. Merge custom project paths from config (persisted "Select Folder" picks)
-      const { configManager } = await import('../infrastructure/ConfigManager');
       const customPaths = configManager.getCustomProjectPaths();
       const existingPaths = new Set(groups.flatMap((g) => g.worktrees.map((w) => w.path)));
 
diff --git a/src/main/utils/cliEnv.ts b/src/main/utils/cliEnv.ts
index c6ac68f6..6ad5ca15 100644
--- a/src/main/utils/cliEnv.ts
+++ b/src/main/utils/cliEnv.ts
@@ -8,11 +8,10 @@
  * can find the tools they need and authenticate properly.
  */
 
-import { userInfo } from 'os';
-
 import { buildMergedCliPath } from '@main/utils/cliPathMerge';
 import { getClaudeBasePath } from '@main/utils/pathDecoder';
 import { getCachedShellEnv, getShellPreferredHome } from '@main/utils/shellEnv';
+import { userInfo } from 'os';
 
 export function buildEnrichedEnv(binaryPath?: string | null): NodeJS.ProcessEnv {
   const shellEnv = getCachedShellEnv();