refactor(store): Extract UI slice from app-store.ts

- Extract UI-related state and actions into store/slices/ui-slice.ts
- Add UISliceState and UISliceActions interfaces to store/types/ui-types.ts
- First implementation of Zustand slice pattern in the codebase
- Fix pre-existing bug: fontSans/fontMono -> fontFamilySans/fontFamilyMono
- Maintain backward compatibility through re-exports

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

apps/server/src/index.ts

@@ -121,89 +121,21 @@ const BOX_CONTENT_WIDTH = 67;
 // The Claude Agent SDK can use either ANTHROPIC_API_KEY or Claude Code CLI authentication
 (async () => {
   const hasAnthropicKey = !!process.env.ANTHROPIC_API_KEY;
-  const hasEnvOAuthToken = !!process.env.CLAUDE_CODE_OAUTH_TOKEN;
-
-  logger.debug('[CREDENTIAL_CHECK] Starting credential detection...');
-  logger.debug('[CREDENTIAL_CHECK] Environment variables:', {
-    hasAnthropicKey,
-    hasEnvOAuthToken,
-  });
 
   if (hasAnthropicKey) {
     logger.info('✓ ANTHROPIC_API_KEY detected');
     return;
   }
 
-  if (hasEnvOAuthToken) {
-    logger.info('✓ CLAUDE_CODE_OAUTH_TOKEN detected');
-    return;
-  }
-
   // Check for Claude Code CLI authentication
-  // Store indicators outside the try block so we can use them in the warning message
-  let cliAuthIndicators: Awaited<ReturnType<typeof getClaudeAuthIndicators>> | null = null;
-
   try {
-    cliAuthIndicators = await getClaudeAuthIndicators();
+    const indicators = await getClaudeAuthIndicators();
-    const indicators = cliAuthIndicators;
-
-    // Log detailed credential detection results
-    logger.debug('[CREDENTIAL_CHECK] Claude CLI auth indicators:', {
-      hasCredentialsFile: indicators.hasCredentialsFile,
-      hasSettingsFile: indicators.hasSettingsFile,
-      hasStatsCacheWithActivity: indicators.hasStatsCacheWithActivity,
-      hasProjectsSessions: indicators.hasProjectsSessions,
-      credentials: indicators.credentials,
-    });
-
-    logger.debug('[CREDENTIAL_CHECK] File check details:', {
-      settingsFile: {
-        path: indicators.checks.settingsFile.path,
-        exists: indicators.checks.settingsFile.exists,
-        readable: indicators.checks.settingsFile.readable,
-        error: indicators.checks.settingsFile.error,
-      },
-      statsCache: {
-        path: indicators.checks.statsCache.path,
-        exists: indicators.checks.statsCache.exists,
-        readable: indicators.checks.statsCache.readable,
-        hasDailyActivity: indicators.checks.statsCache.hasDailyActivity,
-        error: indicators.checks.statsCache.error,
-      },
-      projectsDir: {
-        path: indicators.checks.projectsDir.path,
-        exists: indicators.checks.projectsDir.exists,
-        readable: indicators.checks.projectsDir.readable,
-        entryCount: indicators.checks.projectsDir.entryCount,
-        error: indicators.checks.projectsDir.error,
-      },
-      credentialFiles: indicators.checks.credentialFiles.map((cf) => ({
-        path: cf.path,
-        exists: cf.exists,
-        readable: cf.readable,
-        error: cf.error,
-      })),
-    });
-
     const hasCliAuth =
       indicators.hasStatsCacheWithActivity ||
       (indicators.hasSettingsFile && indicators.hasProjectsSessions) ||
       (indicators.hasCredentialsFile &&
         (indicators.credentials?.hasOAuthToken || indicators.credentials?.hasApiKey));
 
-    logger.debug('[CREDENTIAL_CHECK] Auth determination:', {
-      hasCliAuth,
-      reason: hasCliAuth
-        ? indicators.hasStatsCacheWithActivity
-          ? 'stats cache with activity'
-          : indicators.hasSettingsFile && indicators.hasProjectsSessions
-            ? 'settings file + project sessions'
-            : indicators.credentials?.hasOAuthToken
-              ? 'credentials file with OAuth token'
-              : 'credentials file with API key'
-        : 'no valid credentials found',
-    });
-
     if (hasCliAuth) {
       logger.info('✓ Claude Code CLI authentication detected');
       return;
@@ -213,7 +145,7 @@ const BOX_CONTENT_WIDTH = 67;
     logger.warn('Error checking for Claude Code CLI authentication:', error);
   }
 
-  // No authentication found - show warning with paths that were checked
+  // No authentication found - show warning
   const wHeader = '⚠️  WARNING: No Claude authentication configured'.padEnd(BOX_CONTENT_WIDTH);
   const w1 = 'The Claude Agent SDK requires authentication to function.'.padEnd(BOX_CONTENT_WIDTH);
   const w2 = 'Options:'.padEnd(BOX_CONTENT_WIDTH);
@@ -226,33 +158,6 @@ const BOX_CONTENT_WIDTH = 67;
     BOX_CONTENT_WIDTH
   );
 
-  // Build paths checked summary from the indicators (if available)
-  let pathsCheckedInfo = '';
-  if (cliAuthIndicators) {
-    const pathsChecked: string[] = [];
-
-    // Collect paths that were checked
-    if (cliAuthIndicators.checks.settingsFile.path) {
-      pathsChecked.push(`Settings: ${cliAuthIndicators.checks.settingsFile.path}`);
-    }
-    if (cliAuthIndicators.checks.statsCache.path) {
-      pathsChecked.push(`Stats cache: ${cliAuthIndicators.checks.statsCache.path}`);
-    }
-    if (cliAuthIndicators.checks.projectsDir.path) {
-      pathsChecked.push(`Projects dir: ${cliAuthIndicators.checks.projectsDir.path}`);
-    }
-    for (const credFile of cliAuthIndicators.checks.credentialFiles) {
-      pathsChecked.push(`Credentials: ${credFile.path}`);
-    }
-
-    if (pathsChecked.length > 0) {
-      pathsCheckedInfo = `
-║                                                                     ║
-║  ${'Paths checked:'.padEnd(BOX_CONTENT_WIDTH)}║
-${pathsChecked.map((p) => `║    ${p.substring(0, BOX_CONTENT_WIDTH - 2).padEnd(BOX_CONTENT_WIDTH - 2)}  ║`).join('\n')}`;
-    }
-  }
-
   logger.warn(`
 ╔═════════════════════════════════════════════════════════════════════╗
 ║  ${wHeader}║
@@ -264,7 +169,7 @@ ${pathsChecked.map((p) => `║    ${p.substring(0, BOX_CONTENT_WIDTH - 2).padEnd
 ║  ${w3}║
 ║  ${w4}║
 ║  ${w5}║
-║  ${w6}║${pathsCheckedInfo}
+║  ${w6}║
 ║                                                                     ║
 ╚═════════════════════════════════════════════════════════════════════╝
 `);

apps/server/src/routes/features/routes/create.ts

@@ -43,7 +43,7 @@ export function createCreateHandler(featureLoader: FeatureLoader, events?: Event
       if (events) {
         events.emit('feature:created', {
           featureId: created.id,
-          featureName: created.title || 'Untitled Feature',
+          featureName: created.name,
           projectPath,
         });
       }

apps/server/src/routes/fs/routes/save-board-background.ts

@@ -31,9 +31,7 @@ export function createSaveBoardBackgroundHandler() {
       await secureFs.mkdir(boardDir, { recursive: true });
 
       // Decode base64 data (remove data URL prefix if present)
-      // Use a regex that handles all data URL formats including those with extra params
+      const base64Data = data.replace(/^data:image\/\w+;base64,/, '');
-      // e.g., data:image/gif;charset=utf-8;base64,R0lGOD...
-      const base64Data = data.replace(/^data:[^,]+,/, '');
       const buffer = Buffer.from(base64Data, 'base64');
 
       // Use a fixed filename for the board background (overwrite previous)

apps/server/src/routes/fs/routes/save-image.ts

@@ -31,9 +31,7 @@ export function createSaveImageHandler() {
       await secureFs.mkdir(imagesDir, { recursive: true });
 
       // Decode base64 data (remove data URL prefix if present)
-      // Use a regex that handles all data URL formats including those with extra params
+      const base64Data = data.replace(/^data:image\/\w+;base64,/, '');
-      // e.g., data:image/gif;charset=utf-8;base64,R0lGOD...
-      const base64Data = data.replace(/^data:[^,]+,/, '');
       const buffer = Buffer.from(base64Data, 'base64');
 
       // Generate unique filename with timestamp

apps/server/src/routes/setup/routes/verify-claude-auth.ts

@@ -320,28 +320,9 @@ export function createVerifyClaudeAuthHandler() {
         authMethod,
       });
 
-      // Determine specific auth type for success messages
-      let authType: 'oauth' | 'api_key' | 'cli' | undefined;
-      if (authenticated) {
-        if (authMethod === 'api_key') {
-          authType = 'api_key';
-        } else if (authMethod === 'cli') {
-          // Check if CLI auth is via OAuth (Claude Code subscription) or generic CLI
-          // OAuth tokens are stored in the credentials file by the Claude CLI
-          const { getClaudeAuthIndicators } = await import('@automaker/platform');
-          const indicators = await getClaudeAuthIndicators();
-          if (indicators.credentials?.hasOAuthToken) {
-            authType = 'oauth';
-          } else {
-            authType = 'cli';
-          }
-        }
-      }
-
       res.json({
         success: true,
         authenticated,
-        authType,
         error: errorMessage || undefined,
       });
     } catch (error) {

apps/server/src/routes/worktree/routes/init-git.ts

@@ -43,14 +43,10 @@ export function createInitGitHandler() {
         // .git doesn't exist, continue with initialization
       }
 
-      // Initialize git with 'main' as the default branch (matching GitHub's standard since 2020)
+      // Initialize git and create an initial empty commit
-      // and create an initial empty commit
+      await execAsync(`git init && git commit --allow-empty -m "Initial commit"`, {
-      await execAsync(
-        `git init --initial-branch=main && git commit --allow-empty -m "Initial commit"`,
-        {
         cwd: projectPath,
-        }
+      });
-      );
 
       res.json({
         success: true,

apps/server/src/services/auto-mode-service.ts

@@ -4597,54 +4597,21 @@ This mock response was generated because AUTOMAKER_MOCK_AGENT=true was set.
                           planVersion,
                         });
 
-                        // Build revision prompt using customizable template
+                        // Build revision prompt
-                        const revisionPrompts = await getPromptCustomization(
+                        let revisionPrompt = `The user has requested revisions to the plan/specification.
-                          this.settingsService,
-                          '[AutoMode]'
-                        );
 
-                        // Get task format example based on planning mode
+## Previous Plan (v${planVersion - 1})
-                        const taskFormatExample =
+${hasEdits ? approvalResult.editedPlan : currentPlanContent}
-                          planningMode === 'full'
-                            ? `\`\`\`tasks
-## Phase 1: Foundation
-- [ ] T001: [Description] | File: [path/to/file]
-- [ ] T002: [Description] | File: [path/to/file]
 
-## Phase 2: Core Implementation
+## User Feedback
-- [ ] T003: [Description] | File: [path/to/file]
+${approvalResult.feedback || 'Please revise the plan based on the edits above.'}
-- [ ] T004: [Description] | File: [path/to/file]
-\`\`\``
-                            : `\`\`\`tasks
-- [ ] T001: [Description] | File: [path/to/file]
-- [ ] T002: [Description] | File: [path/to/file]
-- [ ] T003: [Description] | File: [path/to/file]
-\`\`\``;
 
-                        let revisionPrompt = revisionPrompts.taskExecution.planRevisionTemplate;
+## Instructions
-                        revisionPrompt = revisionPrompt.replace(
+Please regenerate the specification incorporating the user's feedback.
-                          /\{\{planVersion\}\}/g,
+Keep the same format with the \`\`\`tasks block for task definitions.
-                          String(planVersion - 1)
+After generating the revised spec, output:
-                        );
+"[SPEC_GENERATED] Please review the revised specification above."
-                        revisionPrompt = revisionPrompt.replace(
+`;
-                          /\{\{previousPlan\}\}/g,
-                          hasEdits
-                            ? approvalResult.editedPlan || currentPlanContent
-                            : currentPlanContent
-                        );
-                        revisionPrompt = revisionPrompt.replace(
-                          /\{\{userFeedback\}\}/g,
-                          approvalResult.feedback ||
-                            'Please revise the plan based on the edits above.'
-                        );
-                        revisionPrompt = revisionPrompt.replace(
-                          /\{\{planningMode\}\}/g,
-                          planningMode
-                        );
-                        revisionPrompt = revisionPrompt.replace(
-                          /\{\{taskFormatExample\}\}/g,
-                          taskFormatExample
-                        );
 
                         // Update status to regenerating
                         await this.updateFeaturePlanSpec(projectPath, featureId, {
@@ -4696,26 +4663,6 @@ This mock response was generated because AUTOMAKER_MOCK_AGENT=true was set.
                         const revisedTasks = parseTasksFromSpec(currentPlanContent);
                         logger.info(`Revised plan has ${revisedTasks.length} tasks`);
 
-                        // Warn if no tasks found in spec/full mode - this may cause fallback to single-agent
-                        if (
-                          revisedTasks.length === 0 &&
-                          (planningMode === 'spec' || planningMode === 'full')
-                        ) {
-                          logger.warn(
-                            `WARNING: Revised plan in ${planningMode} mode has no tasks! ` +
-                              `This will cause fallback to single-agent execution. ` +
-                              `The AI may have omitted the required \`\`\`tasks block.`
-                          );
-                          this.emitAutoModeEvent('plan_revision_warning', {
-                            featureId,
-                            projectPath,
-                            branchName,
-                            planningMode,
-                            warning:
-                              'Revised plan missing tasks block - will use single-agent execution',
-                          });
-                        }
-
                         // Update planSpec with revised content
                         await this.updateFeaturePlanSpec(projectPath, featureId, {
                           status: 'generated',

apps/server/src/services/event-hook-service.ts

@@ -169,10 +169,9 @@ export class EventHookService {
     }
 
     // Build context for variable substitution
-    // Use loaded featureName (from feature.title) or fall back to payload.featureName
     const context: HookContext = {
       featureId: payload.featureId,
-      featureName: featureName || payload.featureName,
+      featureName: payload.featureName,
       projectPath: payload.projectPath,
       projectName: payload.projectPath ? this.extractProjectName(payload.projectPath) : undefined,
       error: payload.error || payload.message,

apps/server/tests/integration/helpers/git-test-repo.ts

@@ -20,8 +20,8 @@ export interface TestRepo {
 export async function createTestGitRepo(): Promise<TestRepo> {
   const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'automaker-test-'));
 
-  // Initialize git repo with 'main' as the default branch (matching GitHub's standard)
+  // Initialize git repo
-  await execAsync('git init --initial-branch=main', { cwd: tmpDir });
+  await execAsync('git init', { cwd: tmpDir });
 
   // Use environment variables instead of git config to avoid affecting user's git config
   // These env vars override git config without modifying it
@@ -38,6 +38,9 @@ export async function createTestGitRepo(): Promise<TestRepo> {
   await execAsync('git add .', { cwd: tmpDir, env: gitEnv });
   await execAsync('git commit -m "Initial commit"', { cwd: tmpDir, env: gitEnv });
 
+  // Create main branch explicitly
+  await execAsync('git branch -M main', { cwd: tmpDir });
+
   return {
     path: tmpDir,
     cleanup: async () => {

apps/server/tests/integration/routes/worktree/create.integration.test.ts

@@ -14,8 +14,7 @@ describe('worktree create route - repositories without commits', () => {
 
   async function initRepoWithoutCommit() {
     repoPath = await fs.mkdtemp(path.join(os.tmpdir(), 'automaker-no-commit-'));
-    // Initialize with 'main' as the default branch (matching GitHub's standard)
+    await execAsync('git init', { cwd: repoPath });
-    await execAsync('git init --initial-branch=main', { cwd: repoPath });
     // Don't set git config - use environment variables in commit operations instead
     // to avoid affecting user's git config
     // Intentionally skip creating an initial commit

apps/server/tests/unit/services/dev-server-service.test.ts

@@ -30,16 +30,11 @@ import net from 'net';
 
 describe('dev-server-service.ts', () => {
   let testDir: string;
-  let originalHostname: string | undefined;
 
   beforeEach(async () => {
     vi.clearAllMocks();
     vi.resetModules();
 
-    // Store and set HOSTNAME for consistent test behavior
-    originalHostname = process.env.HOSTNAME;
-    process.env.HOSTNAME = 'localhost';
-
     testDir = path.join(os.tmpdir(), `dev-server-test-${Date.now()}`);
     await fs.mkdir(testDir, { recursive: true });
 
@@ -61,13 +56,6 @@ describe('dev-server-service.ts', () => {
   });
 
   afterEach(async () => {
-    // Restore original HOSTNAME
-    if (originalHostname === undefined) {
-      delete process.env.HOSTNAME;
-    } else {
-      process.env.HOSTNAME = originalHostname;
-    }
-
     try {
       await fs.rm(testDir, { recursive: true, force: true });
     } catch {

apps/ui/scripts/prepare-server.mjs

@@ -7,8 +7,8 @@
  */
 
 import { execSync } from 'child_process';
-import { cpSync, existsSync, mkdirSync, rmSync, writeFileSync, readFileSync, lstatSync } from 'fs';
+import { cpSync, existsSync, mkdirSync, rmSync, writeFileSync, readFileSync } from 'fs';
-import { join, dirname, resolve } from 'path';
+import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -112,29 +112,6 @@ execSync('npm install --omit=dev', {
   },
 });
 
-// Step 6b: Replace symlinks for local packages with real copies
-// npm install creates symlinks for file: references, but these break when packaged by electron-builder
-console.log('🔗 Replacing symlinks with real directory copies...');
-const nodeModulesAutomaker = join(BUNDLE_DIR, 'node_modules', '@automaker');
-for (const pkgName of LOCAL_PACKAGES) {
-  const pkgDir = pkgName.replace('@automaker/', '');
-  const nmPkgPath = join(nodeModulesAutomaker, pkgDir);
-  try {
-    // lstatSync does not follow symlinks, allowing us to check for broken ones
-    if (lstatSync(nmPkgPath).isSymbolicLink()) {
-      const realPath = resolve(BUNDLE_DIR, 'libs', pkgDir);
-      rmSync(nmPkgPath);
-      cpSync(realPath, nmPkgPath, { recursive: true });
-      console.log(`   ✓ Replaced symlink: ${pkgName}`);
-    }
-  } catch (error) {
-    // If the path doesn't exist, lstatSync throws ENOENT. We can safely ignore this.
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
-}
-
 // Step 7: Rebuild native modules for current architecture
 // This is critical for modules like node-pty that have native bindings
 console.log('🔨 Rebuilding native modules for current architecture...');

apps/ui/src/components/dialogs/sandbox-risk-dialog.tsx

@@ -69,29 +69,6 @@ export function SandboxRiskDialog({ open, onConfirm, onDeny }: SandboxRiskDialog
                 For safer operation, consider running Automaker in Docker. See the README for
                 instructions.
               </p>
-
-              <div className="bg-muted/50 border border-border rounded-lg p-4 space-y-2">
-                <p className="text-sm font-medium text-foreground">
-                  Already running in Docker? Try these troubleshooting steps:
-                </p>
-                <ul className="text-sm text-muted-foreground list-disc list-inside space-y-1">
-                  <li>
-                    Ensure <code className="bg-muted px-1 rounded">IS_CONTAINERIZED=true</code> is
-                    set in your docker-compose environment
-                  </li>
-                  <li>
-                    Verify the server container has the environment variable:{' '}
-                    <code className="bg-muted px-1 rounded">
-                      docker exec automaker-server printenv IS_CONTAINERIZED
-                    </code>
-                  </li>
-                  <li>Rebuild and restart containers if you recently changed the configuration</li>
-                  <li>
-                    Check the server logs for startup messages:{' '}
-                    <code className="bg-muted px-1 rounded">docker-compose logs server</code>
-                  </li>
-                </ul>
-              </div>
             </div>
           </DialogDescription>
         </DialogHeader>

apps/ui/src/components/layout/project-switcher/components/edit-project-dialog.tsx

@@ -15,7 +15,6 @@ import { getAuthenticatedImageUrl } from '@/lib/api-fetch';
 import { getHttpApiClient } from '@/lib/http-api-client';
 import type { Project } from '@/lib/electron';
 import { IconPicker } from './icon-picker';
-import { toast } from 'sonner';
 
 interface EditProjectDialogProps {
   project: Project;
@@ -53,18 +52,11 @@ export function EditProjectDialog({ project, open, onOpenChange }: EditProjectDi
     // Validate file type
     const validTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
     if (!validTypes.includes(file.type)) {
-      toast.error(
-        `Invalid file type: ${file.type || 'unknown'}. Please use JPG, PNG, GIF or WebP.`
-      );
       return;
     }
 
-    // Validate file size (max 5MB for icons - allows animated GIFs)
+    // Validate file size (max 2MB for icons)
-    const maxSize = 5 * 1024 * 1024;
+    if (file.size > 2 * 1024 * 1024) {
-    if (file.size > maxSize) {
-      toast.error(
-        `File too large (${(file.size / 1024 / 1024).toFixed(2)} MB). Maximum size is 5 MB.`
-      );
       return;
     }
 
@@ -80,24 +72,15 @@ export function EditProjectDialog({ project, open, onOpenChange }: EditProjectDi
           file.type,
           project.path
         );
-
         if (result.success && result.path) {
           setCustomIconPath(result.path);
           // Clear the Lucide icon when custom icon is set
           setIcon(null);
-          toast.success('Icon uploaded successfully');
-        } else {
-          toast.error('Failed to upload icon');
         }
         setIsUploadingIcon(false);
       };
-      reader.onerror = () => {
-        toast.error('Failed to read file');
-        setIsUploadingIcon(false);
-      };
       reader.readAsDataURL(file);
     } catch {
-      toast.error('Failed to upload icon');
       setIsUploadingIcon(false);
     }
   };
@@ -179,7 +162,7 @@ export function EditProjectDialog({ project, open, onOpenChange }: EditProjectDi
                     {isUploadingIcon ? 'Uploading...' : 'Upload Custom Icon'}
                   </Button>
                   <p className="text-xs text-muted-foreground mt-1">
-                    PNG, JPG, GIF or WebP. Max 5MB.
+                    PNG, JPG, GIF or WebP. Max 2MB.
                   </p>
                 </div>
               </div>

apps/ui/src/components/layout/project-switcher/components/project-context-menu.tsx

@@ -59,7 +59,7 @@ interface ThemeButtonProps {
   /** Handler for pointer leave events (used to clear preview) */
   onPointerLeave: (e: React.PointerEvent) => void;
   /** Handler for click events (used to select theme) */
-  onClick: (e: React.MouseEvent) => void;
+  onClick: () => void;
 }
 
 /**
@@ -77,7 +77,6 @@ const ThemeButton = memo(function ThemeButton({
   const Icon = option.icon;
   return (
     <button
-      type="button"
       onPointerEnter={onPointerEnter}
       onPointerLeave={onPointerLeave}
       onClick={onClick}
@@ -146,10 +145,7 @@ const ThemeColumn = memo(function ThemeColumn({
             isSelected={selectedTheme === option.value}
             onPointerEnter={() => onPreviewEnter(option.value)}
             onPointerLeave={onPreviewLeave}
-            onClick={(e) => {
+            onClick={() => onSelect(option.value)}
-              e.stopPropagation();
-              onSelect(option.value);
-            }}
           />
         ))}
       </div>
@@ -197,6 +193,7 @@ export function ProjectContextMenu({
   const {
     moveProjectToTrash,
     theme: globalTheme,
+    setTheme,
     setProjectTheme,
     setPreviewTheme,
   } = useAppStore();
@@ -319,24 +316,13 @@ export function ProjectContextMenu({
 
   const handleThemeSelect = useCallback(
     (value: ThemeMode | typeof USE_GLOBAL_THEME) => {
-      // Clear any pending close timeout to prevent race conditions
-      if (closeTimeoutRef.current) {
-        clearTimeout(closeTimeoutRef.current);
-        closeTimeoutRef.current = null;
-      }
-
-      // Close menu first
-      setShowThemeSubmenu(false);
-      onClose();
-
-      // Then apply theme changes
       setPreviewTheme(null);
       const isUsingGlobal = value === USE_GLOBAL_THEME;
-      // Only set project theme - don't change global theme
+      setTheme(isUsingGlobal ? globalTheme : value);
-      // The UI uses getEffectiveTheme() which handles: previewTheme ?? projectTheme ?? globalTheme
       setProjectTheme(project.id, isUsingGlobal ? null : value);
+      setShowThemeSubmenu(false);
     },
-    [onClose, project.id, setPreviewTheme, setProjectTheme]
+    [globalTheme, project.id, setPreviewTheme, setProjectTheme, setTheme]
   );
 
   const handleConfirmRemove = useCallback(() => {
@@ -440,13 +426,9 @@ export function ProjectContextMenu({
                   <div className="p-2">
                     {/* Use Global Option */}
                     <button
-                      type="button"
                       onPointerEnter={() => handlePreviewEnter(globalTheme)}
                       onPointerLeave={handlePreviewLeave}
-                      onClick={(e) => {
+                      onClick={() => handleThemeSelect(USE_GLOBAL_THEME)}
-                        e.stopPropagation();
-                        handleThemeSelect(USE_GLOBAL_THEME);
-                      }}
                       className={cn(
                         'w-full flex items-center gap-2 px-3 py-2 rounded-md',
                         'text-sm font-medium text-left',

apps/ui/src/components/layout/project-switcher/components/project-switcher-item.tsx

@@ -1,4 +1,3 @@
-import { useState } from 'react';
 import { Folder, LucideIcon } from 'lucide-react';
 import * as LucideIcons from 'lucide-react';
 import { cn, sanitizeForTestId } from '@/lib/utils';
@@ -20,8 +19,6 @@ export function ProjectSwitcherItem({
   onClick,
   onContextMenu,
 }: ProjectSwitcherItemProps) {
-  const [imageError, setImageError] = useState(false);
-
   // Convert index to hotkey label: 0 -> "1", 1 -> "2", ..., 8 -> "9", 9 -> "0"
   const hotkeyLabel =
     hotkeyIndex !== undefined && hotkeyIndex >= 0 && hotkeyIndex <= 9
@@ -38,7 +35,7 @@ export function ProjectSwitcherItem({
   };
 
   const IconComponent = getIconComponent();
-  const hasCustomIcon = !!project.customIconPath && !imageError;
+  const hasCustomIcon = !!project.customIconPath;
 
   // Combine project.id with sanitized name for uniqueness and readability
   // Format: project-switcher-{id}-{sanitizedName}
@@ -77,7 +74,6 @@ export function ProjectSwitcherItem({
             'w-8 h-8 rounded-lg object-cover transition-all duration-200',
             isActive ? 'ring-1 ring-brand-500/50' : 'group-hover:scale-110'
           )}
-          onError={() => setImageError(true)}
         />
       ) : (
         <IconComponent

apps/ui/src/components/layout/project-switcher/project-switcher.tsx

@@ -1,7 +1,7 @@
 import { useState, useCallback, useEffect } from 'react';
 import { Plus, Bug, FolderOpen, BookOpen } from 'lucide-react';
 import { useNavigate, useLocation } from '@tanstack/react-router';
-import { cn, isMac } from '@/lib/utils';
+import { cn } from '@/lib/utils';
 import { useAppStore } from '@/store/app-store';
 import { useOSDetection } from '@/hooks/use-os-detection';
 import { ProjectSwitcherItem } from './components/project-switcher-item';
@@ -11,12 +11,9 @@ import { NotificationBell } from './components/notification-bell';
 import { NewProjectModal } from '@/components/dialogs/new-project-modal';
 import { OnboardingDialog } from '@/components/layout/sidebar/dialogs';
 import { useProjectCreation } from '@/components/layout/sidebar/hooks';
-import {
+import { SIDEBAR_FEATURE_FLAGS } from '@/components/layout/sidebar/constants';
-  MACOS_ELECTRON_TOP_PADDING_CLASS,
-  SIDEBAR_FEATURE_FLAGS,
-} from '@/components/layout/sidebar/constants';
 import type { Project } from '@/lib/electron';
-import { getElectronAPI, isElectron } from '@/lib/electron';
+import { getElectronAPI } from '@/lib/electron';
 import { initializeProject, hasAppSpec, hasAutomakerDir } from '@/lib/project-init';
 import { toast } from 'sonner';
 import { CreateSpecDialog } from '@/components/views/spec-view/dialogs';
@@ -282,12 +279,7 @@ export function ProjectSwitcher() {
         data-testid="project-switcher"
       >
         {/* Automaker Logo and Version */}
-        <div
+        <div className="flex flex-col items-center pt-3 pb-2 px-2">
-          className={cn(
-            'flex flex-col items-center pb-2 px-2',
-            isMac && isElectron() ? MACOS_ELECTRON_TOP_PADDING_CLASS : 'pt-3'
-          )}
-        >
           <button
             onClick={() => navigate({ to: '/dashboard' })}
             className="group flex flex-col items-center gap-0.5"

apps/ui/src/components/layout/sidebar/components/project-selector-with-options.tsx

@@ -100,8 +100,14 @@ export function ProjectSelectorWithOptions({
 
   const { sensors, handleDragEnd } = useDragAndDrop({ projects, reorderProjects });
 
-  const { globalTheme, setProjectTheme, setPreviewTheme, handlePreviewEnter, handlePreviewLeave } =
+  const {
-    useProjectTheme();
+    globalTheme,
+    setTheme,
+    setProjectTheme,
+    setPreviewTheme,
+    handlePreviewEnter,
+    handlePreviewLeave,
+  } = useProjectTheme();
 
   if (!sidebarOpen || projects.length === 0) {
     return null;
@@ -275,8 +281,11 @@ export function ProjectSelectorWithOptions({
                   onValueChange={(value) => {
                     if (currentProject) {
                       setPreviewTheme(null);
-                      // Only set project theme - don't change global theme
+                      if (value !== '') {
-                      // The UI uses getEffectiveTheme() which handles: previewTheme ?? projectTheme ?? globalTheme
+                        setTheme(value as ThemeMode);
+                      } else {
+                        setTheme(globalTheme);
+                      }
                       setProjectTheme(
                         currentProject.id,
                         value === '' ? null : (value as ThemeMode)

apps/ui/src/components/layout/sidebar/components/sidebar-header.tsx

@@ -6,7 +6,6 @@ import type { LucideIcon } from 'lucide-react';
 import { cn, isMac } from '@/lib/utils';
 import { formatShortcut } from '@/store/app-store';
 import { isElectron, type Project } from '@/lib/electron';
-import { MACOS_ELECTRON_TOP_PADDING_CLASS } from '../constants';
 import { getAuthenticatedImageUrl } from '@/lib/api-fetch';
 import { useAppStore } from '@/store/app-store';
 import {
@@ -90,7 +89,7 @@ export function SidebarHeader({
       <div
         className={cn(
           'shrink-0 flex flex-col items-center relative px-2 pt-3 pb-2',
-          isMac && isElectron() && MACOS_ELECTRON_TOP_PADDING_CLASS
+          isMac && isElectron() && 'pt-[10px]'
         )}
       >
         <Tooltip>
@@ -241,7 +240,7 @@ export function SidebarHeader({
     <div
       className={cn(
         'shrink-0 flex flex-col relative px-3 pt-3 pb-2',
-        isMac && isElectron() && MACOS_ELECTRON_TOP_PADDING_CLASS
+        isMac && isElectron() && 'pt-[10px]'
       )}
     >
       {/* Header with logo and project dropdown */}

apps/ui/src/components/layout/sidebar/components/sidebar-navigation.tsx

@@ -1,13 +1,8 @@
 import { useCallback, useEffect, useRef } from 'react';
 import type { NavigateOptions } from '@tanstack/react-router';
-import { ChevronDown, Wrench, Github, Folder } from 'lucide-react';
+import { ChevronDown, Wrench, Github } from 'lucide-react';
-import * as LucideIcons from 'lucide-react';
+import { cn } from '@/lib/utils';
-import type { LucideIcon } from 'lucide-react';
-import { cn, isMac } from '@/lib/utils';
-import { isElectron } from '@/lib/electron';
-import { MACOS_ELECTRON_TOP_PADDING_CLASS } from '../constants';
 import { formatShortcut, useAppStore } from '@/store/app-store';
-import { getAuthenticatedImageUrl } from '@/lib/api-fetch';
 import type { NavSection } from '../types';
 import type { Project } from '@/lib/electron';
 import type { SidebarStyle } from '@automaker/types';
@@ -102,52 +97,15 @@ export function SidebarNavigation({
     return !!currentProject;
   });
 
-  // Get the icon component for the current project
-  const getProjectIcon = (): LucideIcon => {
-    if (currentProject?.icon && currentProject.icon in LucideIcons) {
-      return (LucideIcons as unknown as Record<string, LucideIcon>)[currentProject.icon];
-    }
-    return Folder;
-  };
-
-  const ProjectIcon = getProjectIcon();
-  const hasCustomIcon = !!currentProject?.customIconPath;
-
   return (
     <nav
       ref={navRef}
       className={cn(
         'flex-1 overflow-y-auto scrollbar-hide px-3 pb-2',
         // Add top padding in discord mode since there's no header
-        // Extra padding for macOS Electron to avoid traffic light overlap
+        sidebarStyle === 'discord' ? 'pt-3' : 'mt-1'
-        sidebarStyle === 'discord'
-          ? isMac && isElectron()
-            ? MACOS_ELECTRON_TOP_PADDING_CLASS
-            : 'pt-3'
-          : 'mt-1'
       )}
     >
-      {/* Project name display for classic/discord mode */}
-      {sidebarStyle === 'discord' && currentProject && sidebarOpen && (
-        <div className="mb-3">
-          <div className="flex items-center gap-2.5 px-3 py-2">
-            {hasCustomIcon ? (
-              <img
-                src={getAuthenticatedImageUrl(currentProject.customIconPath!, currentProject.path)}
-                alt={currentProject.name}
-                className="w-5 h-5 rounded object-cover"
-              />
-            ) : (
-              <ProjectIcon className="w-5 h-5 text-brand-500 shrink-0" />
-            )}
-            <span className="text-sm font-medium text-foreground truncate">
-              {currentProject.name}
-            </span>
-          </div>
-          <div className="h-px bg-border/40 mx-1 mt-1" />
-        </div>
-      )}
-
       {/* Navigation sections */}
       {visibleSections.map((section, sectionIdx) => {
         const isCollapsed = section.label ? collapsedNavSections[section.label] : false;

apps/ui/src/components/layout/sidebar/components/theme-menu-item.tsx

@@ -9,15 +9,19 @@ export const ThemeMenuItem = memo(function ThemeMenuItem({
 }: ThemeMenuItemProps) {
   const Icon = option.icon;
   return (
+    <div
+      key={option.value}
+      onPointerEnter={() => onPreviewEnter(option.value)}
+      onPointerLeave={onPreviewLeave}
+    >
       <DropdownMenuRadioItem
         value={option.value}
         data-testid={`project-theme-${option.value}`}
         className="text-xs py-1.5"
-      onPointerEnter={() => onPreviewEnter(option.value)}
-      onPointerLeave={onPreviewLeave}
       >
         <Icon className="w-3.5 h-3.5 mr-1.5" style={{ color: option.color }} />
         <span>{option.label}</span>
       </DropdownMenuRadioItem>
+    </div>
   );
 });

apps/ui/src/components/layout/sidebar/constants.ts

@@ -1,11 +1,5 @@
 import { darkThemes, lightThemes } from '@/config/theme-options';
 
-/**
- * Tailwind class for top padding on macOS Electron to avoid overlapping with traffic light window controls.
- * This padding is applied conditionally when running on macOS in Electron.
- */
-export const MACOS_ELECTRON_TOP_PADDING_CLASS = 'pt-[38px]';
-
 /**
  * Shared constants for theme submenu positioning and layout.
  * Used across project-context-menu and project-selector-with-options components

apps/ui/src/components/ui/provider-icon.tsx

@@ -116,8 +116,9 @@ const PROVIDER_ICON_DEFINITIONS: Record<ProviderIconKey, ProviderIconDefinition>
   },
   copilot: {
     viewBox: '0 0 98 96',
-    // Official GitHub Octocat logo mark (theme-aware via currentColor)
+    // Official GitHub Octocat logo mark
     path: 'M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z',
+    fill: '#ffffff',
   },
 };
 

apps/ui/src/components/views/board-view.tsx

@@ -1275,10 +1275,8 @@ export function BoardView() {
         maxConcurrency={maxConcurrency}
         runningAgentsCount={runningAutoTasks.length}
         onConcurrencyChange={(newMaxConcurrency) => {
-          if (currentProject) {
+          if (currentProject && selectedWorktree) {
-            // If selectedWorktree is undefined or it's the main worktree, branchName will be null.
+            const branchName = selectedWorktree.isMain ? null : selectedWorktree.branch;
-            // Otherwise, use the branch name.
-            const branchName = selectedWorktree?.isMain === false ? selectedWorktree.branch : null;
             setMaxConcurrencyForWorktree(currentProject.id, branchName, newMaxConcurrency);
 
             // Persist to server settings so capacity checks use the correct value

apps/ui/src/components/views/project-settings-view/project-identity-section.tsx

@@ -68,10 +68,10 @@ export function ProjectIdentitySection({ project }: ProjectIdentitySectionProps)
       return;
     }
 
-    // Validate file size (max 5MB for icons - allows animated GIFs)
+    // Validate file size (max 2MB for icons)
-    if (file.size > 5 * 1024 * 1024) {
+    if (file.size > 2 * 1024 * 1024) {
       toast.error('File too large', {
-        description: 'Please upload an image smaller than 5MB.',
+        description: 'Please upload an image smaller than 2MB.',
       });
       return;
     }
@@ -208,7 +208,7 @@ export function ProjectIdentitySection({ project }: ProjectIdentitySectionProps)
                   {isUploadingIcon ? 'Uploading...' : 'Upload Custom Icon'}
                 </Button>
                 <p className="text-xs text-muted-foreground mt-1">
-                  PNG, JPG, GIF or WebP. Max 5MB.
+                  PNG, JPG, GIF or WebP. Max 2MB.
                 </p>
               </div>
             </div>

apps/ui/src/components/views/settings-view/event-hooks/event-history-view.tsx

@@ -19,7 +19,6 @@ import type { StoredEventSummary, StoredEvent, EventHookTrigger } from '@automak
 import { EVENT_HOOK_TRIGGER_LABELS } from '@automaker/types';
 import { getHttpApiClient } from '@/lib/http-api-client';
 import { ConfirmDialog } from '@/components/ui/confirm-dialog';
-import { toast } from 'sonner';
 
 export function EventHistoryView() {
   const currentProject = useAppStore((state) => state.currentProject);
@@ -86,18 +85,16 @@ export function EventHistoryView() {
         const failCount = hookResults.filter((r) => !r.success).length;
 
         if (hooksTriggered === 0) {
-          toast.info('No matching hooks found for this event trigger.');
+          alert('No matching hooks found for this event trigger.');
         } else if (failCount === 0) {
-          toast.success(`Successfully ran ${successCount} hook(s).`);
+          alert(`Successfully ran ${successCount} hook(s).`);
         } else {
-          toast.warning(
+          alert(`Ran ${hooksTriggered} hook(s): ${successCount} succeeded, ${failCount} failed.`);
-            `Ran ${hooksTriggered} hook(s): ${successCount} succeeded, ${failCount} failed.`
-          );
         }
       }
     } catch (error) {
       console.error('Failed to replay event:', error);
-      toast.error('Failed to replay event. Check console for details.');
+      alert('Failed to replay event. Check console for details.');
     } finally {
       setReplayingEvent(null);
     }

apps/ui/src/components/views/setup-view/steps/claude-setup-step.tsx

@@ -59,7 +59,6 @@ export function ClaudeSetupStep({ onNext, onBack, onSkip }: ClaudeSetupStepProps
   // CLI Verification state
   const [cliVerificationStatus, setCliVerificationStatus] = useState<VerificationStatus>('idle');
   const [cliVerificationError, setCliVerificationError] = useState<string | null>(null);
-  const [cliAuthType, setCliAuthType] = useState<'oauth' | 'cli' | null>(null);
 
   // API Key Verification state
   const [apiKeyVerificationStatus, setApiKeyVerificationStatus] =
@@ -120,7 +119,6 @@ export function ClaudeSetupStep({ onNext, onBack, onSkip }: ClaudeSetupStepProps
   const verifyCliAuth = useCallback(async () => {
     setCliVerificationStatus('verifying');
     setCliVerificationError(null);
-    setCliAuthType(null);
 
     try {
       const api = getElectronAPI();
@@ -140,21 +138,12 @@ export function ClaudeSetupStep({ onNext, onBack, onSkip }: ClaudeSetupStepProps
 
       if (result.authenticated && !hasLimitReachedError) {
         setCliVerificationStatus('verified');
-        // Store the auth type for displaying specific success message
-        const authType = result.authType === 'oauth' ? 'oauth' : 'cli';
-        setCliAuthType(authType);
         setClaudeAuthStatus({
           authenticated: true,
-          method: authType === 'oauth' ? 'oauth_token' : 'cli_authenticated',
+          method: 'cli_authenticated',
           hasCredentialsFile: claudeAuthStatus?.hasCredentialsFile || false,
-          oauthTokenValid: authType === 'oauth',
         });
-        // Show specific success message based on auth type
-        if (authType === 'oauth') {
-          toast.success('Claude Code subscription detected and verified!');
-        } else {
         toast.success('Claude CLI authentication verified!');
-        }
       } else {
         setCliVerificationStatus('error');
         setCliVerificationError(
@@ -447,15 +436,9 @@ export function ClaudeSetupStep({ onNext, onBack, onSkip }: ClaudeSetupStepProps
                   <div className="flex items-center gap-3 p-4 rounded-lg bg-green-500/10 border border-green-500/20">
                     <CheckCircle2 className="w-5 h-5 text-green-500" />
                     <div>
-                      <p className="font-medium text-foreground">
+                      <p className="font-medium text-foreground">CLI Authentication verified!</p>
-                        {cliAuthType === 'oauth'
-                          ? 'Claude Code subscription verified!'
-                          : 'CLI Authentication verified!'}
-                      </p>
                       <p className="text-sm text-muted-foreground">
-                        {cliAuthType === 'oauth'
+                        Your Claude CLI is working correctly.
-                          ? 'Your Claude Code subscription is active and ready to use.'
-                          : 'Your Claude CLI is working correctly.'}
                       </p>
                     </div>
                   </div>

apps/ui/src/lib/electron.ts

@@ -1442,7 +1442,6 @@ interface SetupAPI {
   verifyClaudeAuth: (authMethod?: 'cli' | 'api_key') => Promise<{
     success: boolean;
     authenticated: boolean;
-    authType?: 'oauth' | 'api_key' | 'cli';
     error?: string;
   }>;
   getGhStatus?: () => Promise<{

apps/ui/src/lib/http-api-client.ts

@@ -946,7 +946,7 @@ export class HttpApiClient implements ElectronAPI {
     return response.json();
   }
 
-  async get<T>(endpoint: string): Promise<T> {
+  private async get<T>(endpoint: string): Promise<T> {
     // Ensure API key is initialized before making request
     await waitForApiKeyInit();
     const response = await fetch(`${this.serverUrl}${endpoint}`, {
@@ -976,7 +976,7 @@ export class HttpApiClient implements ElectronAPI {
     return response.json();
   }
 
-  async put<T>(endpoint: string, body?: unknown): Promise<T> {
+  private async put<T>(endpoint: string, body?: unknown): Promise<T> {
     // Ensure API key is initialized before making request
     await waitForApiKeyInit();
     const response = await fetch(`${this.serverUrl}${endpoint}`, {
@@ -1350,7 +1350,6 @@ export class HttpApiClient implements ElectronAPI {
     ): Promise<{
       success: boolean;
       authenticated: boolean;
-      authType?: 'oauth' | 'api_key' | 'cli';
       error?: string;
     }> => this.post('/api/setup/verify-claude-auth', { authMethod, apiKey }),
 

apps/ui/src/store/app-store.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 // Note: persist middleware removed - settings now sync via API (use-settings-sync.ts)
 import type { Project, TrashedProject } from '@/lib/electron';
-import { saveProjects, saveTrashedProjects } from '@/lib/electron';
+import { getElectronAPI } from '@/lib/electron';
 import { getHttpApiClient } from '@/lib/http-api-client';
 import { createLogger } from '@automaker/utils/logger';
 // Note: setItem/getItem moved to ./utils/theme-utils.ts
@@ -60,6 +60,8 @@ import {
   type ShortcutKey,
   type KeyboardShortcuts,
   type BackgroundSettings,
+  type UISliceState,
+  type UISliceActions,
   // Settings types
   type ApiKeys,
   // Chat types
@@ -109,16 +111,13 @@ import {
 } from './utils';
 
 // Import default values from modular defaults files
-import { defaultBackgroundSettings, defaultTerminalState, MAX_INIT_OUTPUT_LINES } from './defaults';
+import { defaultTerminalState, MAX_INIT_OUTPUT_LINES } from './defaults';
+
+// Import UI slice
+import { createUISlice, initialUIState } from './slices';
 
 // Import internal theme utils (not re-exported publicly)
-import {
+import { persistEffectiveThemeForProject } from './utils/theme-utils';
-  getEffectiveFont,
-  saveThemeToStorage,
-  saveFontSansToStorage,
-  saveFontMonoToStorage,
-  persistEffectiveThemeForProject,
-} from './utils/theme-utils';
 
 const logger = createLogger('AppStore');
 const OPENCODE_BEDROCK_PROVIDER_ID = 'amazon-bedrock';
@@ -146,6 +145,8 @@ export type {
   ShortcutKey,
   KeyboardShortcuts,
   BackgroundSettings,
+  UISliceState,
+  UISliceActions,
   ApiKeys,
   ImageAttachment,
   TextFileAttachment,
@@ -213,56 +214,72 @@ export { defaultBackgroundSettings, defaultTerminalState, MAX_INIT_OUTPUT_LINES
 // - defaultTerminalState (./defaults/terminal-defaults.ts)
 
 const initialState: AppState = {
+  // Spread UI slice state first
+  ...initialUIState,
+
+  // Project state
   projects: [],
   currentProject: null,
   trashedProjects: [],
   projectHistory: [],
   projectHistoryIndex: -1,
-  currentView: 'welcome',
+
-  sidebarOpen: true,
+  // Agent Session state
-  sidebarStyle: 'unified',
-  collapsedNavSections: {},
-  mobileSidebarHidden: false,
   lastSelectedSessionByProject: {},
-  theme: getStoredTheme() || 'dark',
+
-  fontFamilySans: getStoredFontSans(),
+  // Features/Kanban
-  fontFamilyMono: getStoredFontMono(),
   features: [],
+
+  // App spec
   appSpec: '',
+
+  // IPC status
   ipcConnected: false,
+
+  // API Keys
   apiKeys: {
     anthropic: '',
     google: '',
     openai: '',
   },
+
+  // Chat Sessions
   chatSessions: [],
   currentChatSession: null,
-  chatHistoryOpen: false,
+
+  // Auto Mode
   autoModeByWorktree: {},
   autoModeActivityLog: [],
   maxConcurrency: DEFAULT_MAX_CONCURRENCY,
-  boardViewMode: 'kanban',
+
+  // Feature Default Settings
   defaultSkipTests: true,
   enableDependencyBlocking: true,
   skipVerificationInAutoMode: false,
   enableAiCommitMessages: true,
   planUseSelectedWorktreeBranch: true,
   addFeatureUseSelectedWorktreeBranch: false,
+
+  // Worktree Settings
   useWorktrees: true,
   currentWorktreeByProject: {},
   worktreesByProject: {},
-  keyboardShortcuts: DEFAULT_KEYBOARD_SHORTCUTS,
+
-  muteDoneSound: false,
+  // Server Settings
-  disableSplashScreen: false,
   serverLogLevel: 'info',
   enableRequestLogging: true,
-  showQueryDevtools: true,
+
+  // Model Settings
   enhancementModel: 'claude-sonnet',
   validationModel: 'claude-opus',
   phaseModels: DEFAULT_PHASE_MODELS,
   favoriteModels: [],
+
+  // Cursor CLI Settings
   enabledCursorModels: getAllCursorModelIds(),
   cursorDefaultModel: 'cursor-auto',
+
+  // Codex CLI Settings
   enabledCodexModels: getAllCodexModelIds(),
   codexDefaultModel: 'codex-gpt-5.2-codex',
   codexAutoLoadAgents: false,
@@ -270,6 +287,8 @@ const initialState: AppState = {
   codexApprovalPolicy: 'on-request',
   codexEnableWebSearch: false,
   codexEnableImages: false,
+
+  // OpenCode CLI Settings
   enabledOpencodeModels: getAllOpencodeModelIds(),
   opencodeDefaultModel: DEFAULT_OPENCODE_MODEL,
   dynamicOpencodeModels: [],
@@ -279,61 +298,101 @@ const initialState: AppState = {
   opencodeModelsError: null,
   opencodeModelsLastFetched: null,
   opencodeModelsLastFailedAt: null,
+
+  // Gemini CLI Settings
   enabledGeminiModels: getAllGeminiModelIds(),
   geminiDefaultModel: DEFAULT_GEMINI_MODEL,
+
+  // Copilot SDK Settings
   enabledCopilotModels: getAllCopilotModelIds(),
   copilotDefaultModel: DEFAULT_COPILOT_MODEL,
+
+  // Provider Settings
   disabledProviders: [],
+
+  // Claude Agent SDK Settings
   autoLoadClaudeMd: false,
   skipSandboxWarning: false,
+
+  // MCP Servers
   mcpServers: [],
+
+  // Editor Configuration
   defaultEditorCommand: null,
+
+  // Terminal Configuration
   defaultTerminalId: null,
+
+  // Skills Configuration
   enableSkills: true,
   skillsSources: ['user', 'project'] as Array<'user' | 'project'>,
+
+  // Subagents Configuration
   enableSubagents: true,
   subagentsSources: ['user', 'project'] as Array<'user' | 'project'>,
+
+  // Prompt Customization
   promptCustomization: {},
+
+  // Event Hooks
   eventHooks: [],
+
+  // Claude-Compatible Providers
   claudeCompatibleProviders: [],
   claudeApiProfiles: [],
   activeClaudeApiProfileId: null,
+
+  // Project Analysis
   projectAnalysis: null,
   isAnalyzing: false,
-  boardBackgroundByProject: {},
+
-  previewTheme: null,
+  // Terminal state
   terminalState: defaultTerminalState,
   terminalLayoutByProject: {},
+
+  // Spec Creation
   specCreatingForProject: null,
+
+  // Planning
   defaultPlanningMode: 'skip' as PlanningMode,
   defaultRequirePlanApproval: false,
   defaultFeatureModel: DEFAULT_GLOBAL_SETTINGS.defaultFeatureModel,
   pendingPlanApproval: null,
+
+  // Claude Usage Tracking
   claudeRefreshInterval: 60,
   claudeUsage: null,
   claudeUsageLastUpdated: null,
+
+  // Codex Usage Tracking
   codexUsage: null,
   codexUsageLastUpdated: null,
+
+  // Codex Models
   codexModels: [],
   codexModelsLoading: false,
   codexModelsError: null,
   codexModelsLastFetched: null,
   codexModelsLastFailedAt: null,
+
+  // Pipeline Configuration
   pipelineConfigByProject: {},
-  worktreePanelVisibleByProject: {},
+
-  showInitScriptIndicatorByProject: {},
+  // Project-specific Worktree Settings
   defaultDeleteBranchByProject: {},
-  autoDismissInitScriptIndicatorByProject: {},
   useWorktreesByProject: {},
-  worktreePanelCollapsed: false,
+
-  lastProjectDir: '',
+  // Init Script State
-  recentFolders: [],
   initScriptState: {},
 };
 
-export const useAppStore = create<AppState & AppActions>()((set, get) => ({
+export const useAppStore = create<AppState & AppActions>()((set, get, store) => ({
+  // Spread initial non-UI state
   ...initialState,
 
+  // Spread UI slice (includes UI state and actions)
+  ...createUISlice(set, get, store),
+
   // Project actions
   setProjects: (projects) => set({ projects }),
 
@@ -360,7 +419,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
 
     const trashedProject: TrashedProject = {
       ...project,
-      trashedAt: new Date().toISOString(),
+      trashedAt: Date.now(),
     };
 
     set((state) => ({
@@ -369,9 +428,12 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       currentProject: state.currentProject?.id === projectId ? null : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
-    saveTrashedProjects(get().trashedProjects);
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+      electronAPI.projects.setTrashedProjects(get().trashedProjects);
+    }
   },
 
   restoreTrashedProject: (projectId: string) => {
@@ -387,9 +449,12 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       trashedProjects: state.trashedProjects.filter((p) => p.id !== projectId),
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
-    saveTrashedProjects(get().trashedProjects);
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+      electronAPI.projects.setTrashedProjects(get().trashedProjects);
+    }
   },
 
   deleteTrashedProject: (projectId: string) => {
@@ -397,15 +462,21 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       trashedProjects: state.trashedProjects.filter((p) => p.id !== projectId),
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveTrashedProjects(get().trashedProjects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setTrashedProjects(get().trashedProjects);
+    }
   },
 
   emptyTrash: () => {
     set({ trashedProjects: [] });
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveTrashedProjects([]);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setTrashedProjects([]);
+    }
   },
 
   setCurrentProject: (project) => {
@@ -462,10 +533,14 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     get().addProject(newProject);
     get().setCurrentProject(newProject);
 
-    // Persist to storage (small delay to ensure state is updated)
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      // Small delay to ensure state is updated before persisting
       setTimeout(() => {
-      saveProjects(get().projects);
+        electronAPI.projects.setProjects(get().projects);
       }, 0);
+    }
 
     return newProject;
   },
@@ -548,8 +623,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       ),
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   setProjectIcon: (projectId: string, icon: string | null) => {
@@ -557,31 +635,27 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       projects: state.projects.map((p) =>
         p.id === projectId ? { ...p, icon: icon ?? undefined } : p
       ),
-      // Also update currentProject if it's the one being modified
-      currentProject:
-        state.currentProject?.id === projectId
-          ? { ...state.currentProject, icon: icon ?? undefined }
-          : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   setProjectCustomIcon: (projectId: string, customIconPath: string | null) => {
     set((state) => ({
       projects: state.projects.map((p) =>
-        p.id === projectId ? { ...p, customIconPath: customIconPath ?? undefined } : p
+        p.id === projectId ? { ...p, customIcon: customIconPath ?? undefined } : p
       ),
-      // Also update currentProject if it's the one being modified
-      currentProject:
-        state.currentProject?.id === projectId
-          ? { ...state.currentProject, customIconPath: customIconPath ?? undefined }
-          : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   setProjectName: (projectId: string, name: string) => {
@@ -594,32 +668,16 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
           : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
-  // View actions
+  // View actions - provided by UI slice
-  setCurrentView: (view) => set({ currentView: view }),
-  toggleSidebar: () => set((state) => ({ sidebarOpen: !state.sidebarOpen })),
-  setSidebarOpen: (open) => set({ sidebarOpen: open }),
-  setSidebarStyle: (style) => set({ sidebarStyle: style }),
-  setCollapsedNavSections: (sections) => set({ collapsedNavSections: sections }),
-  toggleNavSection: (sectionLabel) =>
-    set((state) => ({
-      collapsedNavSections: {
-        ...state.collapsedNavSections,
-        [sectionLabel]: !state.collapsedNavSections[sectionLabel],
-      },
-    })),
-  toggleMobileSidebarHidden: () =>
-    set((state) => ({ mobileSidebarHidden: !state.mobileSidebarHidden })),
-  setMobileSidebarHidden: (hidden) => set({ mobileSidebarHidden: hidden }),
 
-  // Theme actions
+  // Theme actions (setTheme, getEffectiveTheme, setPreviewTheme provided by UI slice)
-  setTheme: (theme) => {
-    set({ theme });
-    saveThemeToStorage(theme);
-  },
   setProjectTheme: (projectId: string, theme: ThemeMode | null) => {
     set((state) => ({
       projects: state.projects.map((p) =>
@@ -641,67 +699,49 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       );
     }
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
-  getEffectiveTheme: () => {
-    const state = get();
-    // If there's a preview theme, use it (for hover preview)
-    if (state.previewTheme) return state.previewTheme;
-    // Otherwise, use project theme if set, or fall back to global theme
-    const projectTheme = state.currentProject?.theme as ThemeMode | undefined;
-    return projectTheme ?? state.theme;
-  },
-  setPreviewTheme: (theme) => set({ previewTheme: theme }),
 
-  // Font actions
+  // Font actions (setFontSans, setFontMono, getEffectiveFontSans, getEffectiveFontMono provided by UI slice)
-  setFontSans: (fontFamily) => {
-    set({ fontFamilySans: fontFamily });
-    saveFontSansToStorage(fontFamily);
-  },
-  setFontMono: (fontFamily) => {
-    set({ fontFamilyMono: fontFamily });
-    saveFontMonoToStorage(fontFamily);
-  },
   setProjectFontSans: (projectId: string, fontFamily: string | null) => {
     set((state) => ({
       projects: state.projects.map((p) =>
-        p.id === projectId ? { ...p, fontSans: fontFamily ?? undefined } : p
+        p.id === projectId ? { ...p, fontFamilySans: fontFamily ?? undefined } : p
       ),
       // Also update currentProject if it's the one being changed
       currentProject:
         state.currentProject?.id === projectId
-          ? { ...state.currentProject, fontSans: fontFamily ?? undefined }
+          ? { ...state.currentProject, fontFamilySans: fontFamily ?? undefined }
           : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
   setProjectFontMono: (projectId: string, fontFamily: string | null) => {
     set((state) => ({
       projects: state.projects.map((p) =>
-        p.id === projectId ? { ...p, fontMono: fontFamily ?? undefined } : p
+        p.id === projectId ? { ...p, fontFamilyMono: fontFamily ?? undefined } : p
       ),
       // Also update currentProject if it's the one being changed
       currentProject:
         state.currentProject?.id === projectId
-          ? { ...state.currentProject, fontMono: fontFamily ?? undefined }
+          ? { ...state.currentProject, fontFamilyMono: fontFamily ?? undefined }
           : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
-  },
+    if (electronAPI) {
-  getEffectiveFontSans: () => {
+      electronAPI.projects.setProjects(get().projects);
-    const state = get();
+    }
-    const projectFont = state.currentProject?.fontFamilySans;
-    return getEffectiveFont(projectFont, state.fontFamilySans, UI_SANS_FONT_OPTIONS);
-  },
-  getEffectiveFontMono: () => {
-    const state = get();
-    const projectFont = state.currentProject?.fontFamilyMono;
-    return getEffectiveFont(projectFont, state.fontFamilyMono, UI_MONO_FONT_OPTIONS);
   },
 
   // Claude API Profile actions (per-project override)
@@ -717,8 +757,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
           : state.currentProject,
     }));
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   // Project Phase Model Overrides
@@ -751,8 +794,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       };
     });
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   clearAllProjectPhaseModelOverrides: (projectId: string) => {
@@ -771,8 +817,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       };
     });
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   // Project Default Feature Model Override
@@ -794,8 +843,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       };
     });
 
-    // Persist to storage
+    // Persist to Electron store if available
-    saveProjects(get().projects);
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
   },
 
   // Feature actions
@@ -806,7 +858,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     })),
   addFeature: (feature) => {
     const id = feature.id ?? `feature-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    const newFeature = { ...feature, id } as Feature;
+    const newFeature: Feature = { ...feature, id };
     set((state) => ({ features: [...state.features, newFeature] }));
     return newFeature;
   },
@@ -886,8 +938,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       currentChatSession:
         state.currentChatSession?.id === sessionId ? null : state.currentChatSession,
     })),
-  setChatHistoryOpen: (open) => set({ chatHistoryOpen: open }),
+  // setChatHistoryOpen and toggleChatHistory - provided by UI slice
-  toggleChatHistory: () => set((state) => ({ chatHistoryOpen: !state.chatHistoryOpen })),
 
   // Auto Mode actions (per-worktree)
   getWorktreeKey: (projectId: string, branchName: string | null) =>
@@ -1018,8 +1069,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     }));
   },
 
-  // Kanban Card Settings actions
+  // Kanban Card Settings actions - setBoardViewMode provided by UI slice
-  setBoardViewMode: (mode) => set({ boardViewMode: mode }),
 
   // Feature Default Settings actions
   setDefaultSkipTests: (skip) => set({ defaultSkipTests: skip }),
@@ -1094,29 +1144,17 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     return mainWorktree?.branch ?? null;
   },
 
-  // Keyboard Shortcuts actions
+  // Keyboard Shortcuts actions - provided by UI slice
-  setKeyboardShortcut: (key, value) =>
-    set((state) => ({
-      keyboardShortcuts: { ...state.keyboardShortcuts, [key]: value },
-    })),
-  setKeyboardShortcuts: (shortcuts) =>
-    set((state) => ({
-      keyboardShortcuts: { ...state.keyboardShortcuts, ...shortcuts },
-    })),
-  resetKeyboardShortcuts: () => set({ keyboardShortcuts: DEFAULT_KEYBOARD_SHORTCUTS }),
 
-  // Audio Settings actions
+  // Audio Settings actions - setMuteDoneSound provided by UI slice
-  setMuteDoneSound: (muted) => set({ muteDoneSound: muted }),
 
-  // Splash Screen actions
+  // Splash Screen actions - setDisableSplashScreen provided by UI slice
-  setDisableSplashScreen: (disabled) => set({ disableSplashScreen: disabled }),
 
   // Server Log Level actions
   setServerLogLevel: (level) => set({ serverLogLevel: level }),
   setEnableRequestLogging: (enabled) => set({ enableRequestLogging: enabled }),
 
-  // Developer Tools actions
+  // Developer Tools actions - setShowQueryDevtools provided by UI slice
-  setShowQueryDevtools: (show) => set({ showQueryDevtools: show }),
 
   // Enhancement Model actions
   setEnhancementModel: (model) => set({ enhancementModel: model }),
@@ -1486,96 +1524,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     })),
   getLastSelectedSession: (projectPath) => get().lastSelectedSessionByProject[projectPath] ?? null,
 
-  // Board Background actions
+  // Board Background actions - provided by UI slice
-  setBoardBackground: (projectPath, imagePath) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          imagePath,
-          imageVersion: Date.now(), // Bust cache on image change
-        },
-      },
-    })),
-  setCardOpacity: (projectPath, opacity) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          cardOpacity: opacity,
-        },
-      },
-    })),
-  setColumnOpacity: (projectPath, opacity) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          columnOpacity: opacity,
-        },
-      },
-    })),
-  setColumnBorderEnabled: (projectPath, enabled) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          columnBorderEnabled: enabled,
-        },
-      },
-    })),
-  getBoardBackground: (projectPath) =>
-    get().boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings,
-  setCardGlassmorphism: (projectPath, enabled) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          cardGlassmorphism: enabled,
-        },
-      },
-    })),
-  setCardBorderEnabled: (projectPath, enabled) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          cardBorderEnabled: enabled,
-        },
-      },
-    })),
-  setCardBorderOpacity: (projectPath, opacity) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          cardBorderOpacity: opacity,
-        },
-      },
-    })),
-  setHideScrollbar: (projectPath, hide) =>
-    set((state) => ({
-      boardBackgroundByProject: {
-        ...state.boardBackgroundByProject,
-        [projectPath]: {
-          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
-          hideScrollbar: hide,
-        },
-      },
-    })),
-  clearBoardBackground: (projectPath) =>
-    set((state) => {
-      const newBackgrounds = { ...state.boardBackgroundByProject };
-      delete newBackgrounds[projectPath];
-      return { boardBackgroundByProject: newBackgrounds };
-    }),
 
   // Terminal actions
   setTerminalUnlocked: (unlocked, token) =>
@@ -2325,27 +2274,9 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
       };
     }),
 
-  // Worktree Panel Visibility actions
+  // Worktree Panel Visibility actions - provided by UI slice
-  setWorktreePanelVisible: (projectPath, visible) =>
-    set((state) => ({
-      worktreePanelVisibleByProject: {
-        ...state.worktreePanelVisibleByProject,
-        [projectPath]: visible,
-      },
-    })),
-  getWorktreePanelVisible: (projectPath) =>
-    get().worktreePanelVisibleByProject[projectPath] ?? true,
 
-  // Init Script Indicator Visibility actions
+  // Init Script Indicator Visibility actions - provided by UI slice
-  setShowInitScriptIndicator: (projectPath, visible) =>
-    set((state) => ({
-      showInitScriptIndicatorByProject: {
-        ...state.showInitScriptIndicatorByProject,
-        [projectPath]: visible,
-      },
-    })),
-  getShowInitScriptIndicator: (projectPath) =>
-    get().showInitScriptIndicatorByProject[projectPath] ?? true,
 
   // Default Delete Branch actions
   setDefaultDeleteBranch: (projectPath, deleteBranch) =>
@@ -2357,16 +2288,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     })),
   getDefaultDeleteBranch: (projectPath) => get().defaultDeleteBranchByProject[projectPath] ?? false,
 
-  // Auto-dismiss Init Script Indicator actions
+  // Auto-dismiss Init Script Indicator actions - provided by UI slice
-  setAutoDismissInitScriptIndicator: (projectPath, autoDismiss) =>
-    set((state) => ({
-      autoDismissInitScriptIndicatorByProject: {
-        ...state.autoDismissInitScriptIndicatorByProject,
-        [projectPath]: autoDismiss,
-      },
-    })),
-  getAutoDismissInitScriptIndicator: (projectPath) =>
-    get().autoDismissInitScriptIndicatorByProject[projectPath] ?? true,
 
   // Use Worktrees Override actions
   setProjectUseWorktrees: (projectPath, useWorktrees) =>
@@ -2382,15 +2304,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
     return projectOverride !== undefined ? projectOverride : get().useWorktrees;
   },
 
-  // UI State actions
+  // UI State actions - provided by UI slice
-  setWorktreePanelCollapsed: (collapsed) => set({ worktreePanelCollapsed: collapsed }),
-  setLastProjectDir: (dir) => set({ lastProjectDir: dir }),
-  setRecentFolders: (folders) => set({ recentFolders: folders }),
-  addRecentFolder: (folder) =>
-    set((state) => {
-      const filtered = state.recentFolders.filter((f) => f !== folder);
-      return { recentFolders: [folder, ...filtered].slice(0, 10) };
-    }),
 
   // Claude Usage Tracking actions
   setClaudeRefreshInterval: (interval) => set({ claudeRefreshInterval: interval }),
@@ -2432,7 +2346,8 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
 
     try {
       const httpApi = getHttpApiClient();
-      const data = await httpApi.get<{
+      const response = await httpApi.get('/api/codex/models');
+      const data = response.data as {
         success: boolean;
         models?: Array<{
           id: string;
@@ -2444,7 +2359,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
           isDefault: boolean;
         }>;
         error?: string;
-      }>('/api/codex/models');
+      };
 
       if (data.success && data.models) {
         set({
@@ -2502,7 +2417,8 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
 
     try {
       const httpApi = getHttpApiClient();
-      const data = await httpApi.get<{
+      const response = await httpApi.get('/api/opencode/models');
+      const data = response.data as {
         success: boolean;
         models?: ModelDefinition[];
         providers?: Array<{
@@ -2512,7 +2428,7 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
           authMethod?: string;
         }>;
         error?: string;
-      }>('/api/setup/opencode/models');
+      };
 
       if (data.success && data.models) {
         // Filter out Bedrock models

apps/ui/src/store/slices/index.ts

@@ -0,0 +1 @@
+export { createUISlice, initialUIState, type UISlice } from './ui-slice';

apps/ui/src/store/slices/ui-slice.ts

@@ -0,0 +1,343 @@
+import type { StateCreator } from 'zustand';
+import { UI_SANS_FONT_OPTIONS, UI_MONO_FONT_OPTIONS } from '@/config/ui-font-options';
+import type { SidebarStyle } from '@automaker/types';
+import type {
+  ViewMode,
+  ThemeMode,
+  BoardViewMode,
+  KeyboardShortcuts,
+  BackgroundSettings,
+  UISliceState,
+  UISliceActions,
+} from '../types/ui-types';
+import type { AppState, AppActions } from '../types/state-types';
+import {
+  getStoredTheme,
+  getStoredFontSans,
+  getStoredFontMono,
+  DEFAULT_KEYBOARD_SHORTCUTS,
+} from '../utils';
+import { defaultBackgroundSettings } from '../defaults';
+import {
+  getEffectiveFont,
+  saveThemeToStorage,
+  saveFontSansToStorage,
+  saveFontMonoToStorage,
+} from '../utils/theme-utils';
+
+/**
+ * UI Slice
+ * Contains all UI-related state and actions extracted from the main app store.
+ * This is the first slice pattern implementation in the codebase.
+ */
+export type UISlice = UISliceState & UISliceActions;
+
+/**
+ * Initial UI state values
+ */
+export const initialUIState: UISliceState = {
+  // Core UI State
+  currentView: 'welcome',
+  sidebarOpen: true,
+  sidebarStyle: 'unified',
+  collapsedNavSections: {},
+  mobileSidebarHidden: false,
+
+  // Theme State
+  theme: getStoredTheme() || 'dark',
+  previewTheme: null,
+
+  // Font State
+  fontFamilySans: getStoredFontSans(),
+  fontFamilyMono: getStoredFontMono(),
+
+  // Board UI State
+  boardViewMode: 'kanban',
+  boardBackgroundByProject: {},
+
+  // Settings UI State
+  keyboardShortcuts: DEFAULT_KEYBOARD_SHORTCUTS,
+  muteDoneSound: false,
+  disableSplashScreen: false,
+  showQueryDevtools: true,
+  chatHistoryOpen: false,
+
+  // Panel Visibility State
+  worktreePanelCollapsed: false,
+  worktreePanelVisibleByProject: {},
+  showInitScriptIndicatorByProject: {},
+  autoDismissInitScriptIndicatorByProject: {},
+
+  // File Picker UI State
+  lastProjectDir: '',
+  recentFolders: [],
+};
+
+/**
+ * Creates the UI slice for the Zustand store.
+ *
+ * Uses the StateCreator pattern to allow the slice to access other parts
+ * of the combined store state (e.g., currentProject for theme resolution).
+ */
+export const createUISlice: StateCreator<AppState & AppActions, [], [], UISlice> = (set, get) => ({
+  // Spread initial state
+  ...initialUIState,
+
+  // ============================================================================
+  // View Actions
+  // ============================================================================
+
+  setCurrentView: (view: ViewMode) => set({ currentView: view }),
+
+  toggleSidebar: () => set((state) => ({ sidebarOpen: !state.sidebarOpen })),
+
+  setSidebarOpen: (open: boolean) => set({ sidebarOpen: open }),
+
+  setSidebarStyle: (style: SidebarStyle) => set({ sidebarStyle: style }),
+
+  setCollapsedNavSections: (sections: Record<string, boolean>) =>
+    set({ collapsedNavSections: sections }),
+
+  toggleNavSection: (sectionLabel: string) =>
+    set((state) => ({
+      collapsedNavSections: {
+        ...state.collapsedNavSections,
+        [sectionLabel]: !state.collapsedNavSections[sectionLabel],
+      },
+    })),
+
+  toggleMobileSidebarHidden: () =>
+    set((state) => ({ mobileSidebarHidden: !state.mobileSidebarHidden })),
+
+  setMobileSidebarHidden: (hidden: boolean) => set({ mobileSidebarHidden: hidden }),
+
+  // ============================================================================
+  // Theme Actions
+  // ============================================================================
+
+  setTheme: (theme: ThemeMode) => {
+    set({ theme });
+    saveThemeToStorage(theme);
+  },
+
+  getEffectiveTheme: (): ThemeMode => {
+    const state = get();
+    // If there's a preview theme, use it (for hover preview)
+    if (state.previewTheme) return state.previewTheme;
+    // Otherwise, use project theme if set, or fall back to global theme
+    const projectTheme = state.currentProject?.theme as ThemeMode | undefined;
+    return projectTheme ?? state.theme;
+  },
+
+  setPreviewTheme: (theme: ThemeMode | null) => set({ previewTheme: theme }),
+
+  // ============================================================================
+  // Font Actions
+  // ============================================================================
+
+  setFontSans: (fontFamily: string | null) => {
+    set({ fontFamilySans: fontFamily });
+    saveFontSansToStorage(fontFamily);
+  },
+
+  setFontMono: (fontFamily: string | null) => {
+    set({ fontFamilyMono: fontFamily });
+    saveFontMonoToStorage(fontFamily);
+  },
+
+  getEffectiveFontSans: (): string | null => {
+    const state = get();
+    const projectFont = state.currentProject?.fontFamilySans;
+    return getEffectiveFont(projectFont, state.fontFamilySans, UI_SANS_FONT_OPTIONS);
+  },
+
+  getEffectiveFontMono: (): string | null => {
+    const state = get();
+    const projectFont = state.currentProject?.fontFamilyMono;
+    return getEffectiveFont(projectFont, state.fontFamilyMono, UI_MONO_FONT_OPTIONS);
+  },
+
+  // ============================================================================
+  // Board View Actions
+  // ============================================================================
+
+  setBoardViewMode: (mode: BoardViewMode) => set({ boardViewMode: mode }),
+
+  setBoardBackground: (projectPath: string, imagePath: string | null) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          imagePath,
+          imageVersion: Date.now(), // Bust cache on image change
+        },
+      },
+    })),
+
+  setCardOpacity: (projectPath: string, opacity: number) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          cardOpacity: opacity,
+        },
+      },
+    })),
+
+  setColumnOpacity: (projectPath: string, opacity: number) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          columnOpacity: opacity,
+        },
+      },
+    })),
+
+  setColumnBorderEnabled: (projectPath: string, enabled: boolean) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          columnBorderEnabled: enabled,
+        },
+      },
+    })),
+
+  setCardGlassmorphism: (projectPath: string, enabled: boolean) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          cardGlassmorphism: enabled,
+        },
+      },
+    })),
+
+  setCardBorderEnabled: (projectPath: string, enabled: boolean) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          cardBorderEnabled: enabled,
+        },
+      },
+    })),
+
+  setCardBorderOpacity: (projectPath: string, opacity: number) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          cardBorderOpacity: opacity,
+        },
+      },
+    })),
+
+  setHideScrollbar: (projectPath: string, hide: boolean) =>
+    set((state) => ({
+      boardBackgroundByProject: {
+        ...state.boardBackgroundByProject,
+        [projectPath]: {
+          ...(state.boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings),
+          hideScrollbar: hide,
+        },
+      },
+    })),
+
+  getBoardBackground: (projectPath: string): BackgroundSettings =>
+    get().boardBackgroundByProject[projectPath] ?? defaultBackgroundSettings,
+
+  clearBoardBackground: (projectPath: string) =>
+    set((state) => {
+      const newBackgrounds = { ...state.boardBackgroundByProject };
+      delete newBackgrounds[projectPath];
+      return { boardBackgroundByProject: newBackgrounds };
+    }),
+
+  // ============================================================================
+  // Settings UI Actions
+  // ============================================================================
+
+  setKeyboardShortcut: (key: keyof KeyboardShortcuts, value: string) =>
+    set((state) => ({
+      keyboardShortcuts: { ...state.keyboardShortcuts, [key]: value },
+    })),
+
+  setKeyboardShortcuts: (shortcuts: Partial<KeyboardShortcuts>) =>
+    set((state) => ({
+      keyboardShortcuts: { ...state.keyboardShortcuts, ...shortcuts },
+    })),
+
+  resetKeyboardShortcuts: () => set({ keyboardShortcuts: DEFAULT_KEYBOARD_SHORTCUTS }),
+
+  setMuteDoneSound: (muted: boolean) => set({ muteDoneSound: muted }),
+
+  setDisableSplashScreen: (disabled: boolean) => set({ disableSplashScreen: disabled }),
+
+  setShowQueryDevtools: (show: boolean) => set({ showQueryDevtools: show }),
+
+  setChatHistoryOpen: (open: boolean) => set({ chatHistoryOpen: open }),
+
+  toggleChatHistory: () => set((state) => ({ chatHistoryOpen: !state.chatHistoryOpen })),
+
+  // ============================================================================
+  // Panel Visibility Actions
+  // ============================================================================
+
+  setWorktreePanelCollapsed: (collapsed: boolean) => set({ worktreePanelCollapsed: collapsed }),
+
+  setWorktreePanelVisible: (projectPath: string, visible: boolean) =>
+    set((state) => ({
+      worktreePanelVisibleByProject: {
+        ...state.worktreePanelVisibleByProject,
+        [projectPath]: visible,
+      },
+    })),
+
+  getWorktreePanelVisible: (projectPath: string): boolean =>
+    get().worktreePanelVisibleByProject[projectPath] ?? true,
+
+  setShowInitScriptIndicator: (projectPath: string, visible: boolean) =>
+    set((state) => ({
+      showInitScriptIndicatorByProject: {
+        ...state.showInitScriptIndicatorByProject,
+        [projectPath]: visible,
+      },
+    })),
+
+  getShowInitScriptIndicator: (projectPath: string): boolean =>
+    get().showInitScriptIndicatorByProject[projectPath] ?? true,
+
+  setAutoDismissInitScriptIndicator: (projectPath: string, autoDismiss: boolean) =>
+    set((state) => ({
+      autoDismissInitScriptIndicatorByProject: {
+        ...state.autoDismissInitScriptIndicatorByProject,
+        [projectPath]: autoDismiss,
+      },
+    })),
+
+  getAutoDismissInitScriptIndicator: (projectPath: string): boolean =>
+    get().autoDismissInitScriptIndicatorByProject[projectPath] ?? true,
+
+  // ============================================================================
+  // File Picker UI Actions
+  // ============================================================================
+
+  setLastProjectDir: (dir: string) => set({ lastProjectDir: dir }),
+
+  setRecentFolders: (folders: string[]) => set({ recentFolders: folders }),
+
+  addRecentFolder: (folder: string) =>
+    set((state) => {
+      const filtered = state.recentFolders.filter((f) => f !== folder);
+      return { recentFolders: [folder, ...filtered].slice(0, 10) };
+    }),
+});

apps/ui/src/store/types/ui-types.ts

@@ -117,3 +117,112 @@ export interface KeyboardShortcuts {
   closeTerminal: string;
   newTerminalTab: string;
 }
+
+// Import SidebarStyle from @automaker/types for UI slice
+import type { SidebarStyle } from '@automaker/types';
+
+/**
+ * UI Slice State
+ * Contains all UI-related state that is extracted into the UI slice.
+ */
+export interface UISliceState {
+  // Core UI State
+  currentView: ViewMode;
+  sidebarOpen: boolean;
+  sidebarStyle: SidebarStyle;
+  collapsedNavSections: Record<string, boolean>;
+  mobileSidebarHidden: boolean;
+
+  // Theme State
+  theme: ThemeMode;
+  previewTheme: ThemeMode | null;
+
+  // Font State
+  fontFamilySans: string | null;
+  fontFamilyMono: string | null;
+
+  // Board UI State
+  boardViewMode: BoardViewMode;
+  boardBackgroundByProject: Record<string, BackgroundSettings>;
+
+  // Settings UI State
+  keyboardShortcuts: KeyboardShortcuts;
+  muteDoneSound: boolean;
+  disableSplashScreen: boolean;
+  showQueryDevtools: boolean;
+  chatHistoryOpen: boolean;
+
+  // Panel Visibility State
+  worktreePanelCollapsed: boolean;
+  worktreePanelVisibleByProject: Record<string, boolean>;
+  showInitScriptIndicatorByProject: Record<string, boolean>;
+  autoDismissInitScriptIndicatorByProject: Record<string, boolean>;
+
+  // File Picker UI State
+  lastProjectDir: string;
+  recentFolders: string[];
+}
+
+/**
+ * UI Slice Actions
+ * Contains all UI-related actions that are extracted into the UI slice.
+ */
+export interface UISliceActions {
+  // View Actions
+  setCurrentView: (view: ViewMode) => void;
+  toggleSidebar: () => void;
+  setSidebarOpen: (open: boolean) => void;
+  setSidebarStyle: (style: SidebarStyle) => void;
+  setCollapsedNavSections: (sections: Record<string, boolean>) => void;
+  toggleNavSection: (sectionLabel: string) => void;
+  toggleMobileSidebarHidden: () => void;
+  setMobileSidebarHidden: (hidden: boolean) => void;
+
+  // Theme Actions (Pure UI only - project theme actions stay in main store)
+  setTheme: (theme: ThemeMode) => void;
+  getEffectiveTheme: () => ThemeMode;
+  setPreviewTheme: (theme: ThemeMode | null) => void;
+
+  // Font Actions (Pure UI only - project font actions stay in main store)
+  setFontSans: (fontFamily: string | null) => void;
+  setFontMono: (fontFamily: string | null) => void;
+  getEffectiveFontSans: () => string | null;
+  getEffectiveFontMono: () => string | null;
+
+  // Board View Actions
+  setBoardViewMode: (mode: BoardViewMode) => void;
+  setBoardBackground: (projectPath: string, imagePath: string | null) => void;
+  setCardOpacity: (projectPath: string, opacity: number) => void;
+  setColumnOpacity: (projectPath: string, opacity: number) => void;
+  setColumnBorderEnabled: (projectPath: string, enabled: boolean) => void;
+  setCardGlassmorphism: (projectPath: string, enabled: boolean) => void;
+  setCardBorderEnabled: (projectPath: string, enabled: boolean) => void;
+  setCardBorderOpacity: (projectPath: string, opacity: number) => void;
+  setHideScrollbar: (projectPath: string, hide: boolean) => void;
+  getBoardBackground: (projectPath: string) => BackgroundSettings;
+  clearBoardBackground: (projectPath: string) => void;
+
+  // Settings UI Actions
+  setKeyboardShortcut: (key: keyof KeyboardShortcuts, value: string) => void;
+  setKeyboardShortcuts: (shortcuts: Partial<KeyboardShortcuts>) => void;
+  resetKeyboardShortcuts: () => void;
+  setMuteDoneSound: (muted: boolean) => void;
+  setDisableSplashScreen: (disabled: boolean) => void;
+  setShowQueryDevtools: (show: boolean) => void;
+  setChatHistoryOpen: (open: boolean) => void;
+  toggleChatHistory: () => void;
+
+  // Panel Visibility Actions
+  setWorktreePanelCollapsed: (collapsed: boolean) => void;
+  setWorktreePanelVisible: (projectPath: string, visible: boolean) => void;
+  getWorktreePanelVisible: (projectPath: string) => boolean;
+  setShowInitScriptIndicator: (projectPath: string, visible: boolean) => void;
+  getShowInitScriptIndicator: (projectPath: string) => boolean;
+  setAutoDismissInitScriptIndicator: (projectPath: string, autoDismiss: boolean) => void;
+  getAutoDismissInitScriptIndicator: (projectPath: string) => boolean;
+
+  // File Picker UI Actions
+  setLastProjectDir: (dir: string) => void;
+  setRecentFolders: (folders: string[]) => void;
+  addRecentFolder: (folder: string) => void;
+}

libs/platform/src/index.ts

@@ -134,8 +134,6 @@ export {
   findClaudeCliPath,
   getClaudeAuthIndicators,
   type ClaudeAuthIndicators,
-  type FileCheckResult,
-  type DirectoryCheckResult,
   findCodexCliPath,
   getCodexAuthIndicators,
   type CodexAuthIndicators,

libs/platform/src/system-paths.ts

@@ -750,9 +750,6 @@ export function electronUserDataWriteFileSync(
     throw new Error('[SystemPaths] Electron userData path not initialized');
   }
   const fullPath = path.join(electronUserDataPath, relativePath);
-  // Ensure parent directory exists (may not exist on first launch)
-  const dir = path.dirname(fullPath);
-  fsSync.mkdirSync(dir, { recursive: true });
   fsSync.writeFileSync(fullPath, data, options);
 }
 
@@ -976,27 +973,6 @@ export async function findGitBashPath(): Promise<string | null> {
   return findFirstExistingPath(getGitBashPaths());
 }
 
-/**
- * Details about a file check performed during auth detection
- */
-export interface FileCheckResult {
-  path: string;
-  exists: boolean;
-  readable: boolean;
-  error?: string;
-}
-
-/**
- * Details about a directory check performed during auth detection
- */
-export interface DirectoryCheckResult {
-  path: string;
-  exists: boolean;
-  readable: boolean;
-  entryCount: number;
-  error?: string;
-}
-
 /**
  * Get Claude authentication status by checking various indicators
  */
@@ -1009,165 +985,67 @@ export interface ClaudeAuthIndicators {
     hasOAuthToken: boolean;
     hasApiKey: boolean;
   } | null;
-  /** Detailed information about what was checked */
-  checks: {
-    settingsFile: FileCheckResult;
-    statsCache: FileCheckResult & { hasDailyActivity?: boolean };
-    projectsDir: DirectoryCheckResult;
-    credentialFiles: FileCheckResult[];
-  };
 }
 
 export async function getClaudeAuthIndicators(): Promise<ClaudeAuthIndicators> {
-  const settingsPath = getClaudeSettingsPath();
-  const statsCachePath = getClaudeStatsCachePath();
-  const projectsDir = getClaudeProjectsDir();
-  const credentialPaths = getClaudeCredentialPaths();
-
-  // Initialize checks with paths
-  const settingsFileCheck: FileCheckResult = {
-    path: settingsPath,
-    exists: false,
-    readable: false,
-  };
-
-  const statsCacheCheck: FileCheckResult & { hasDailyActivity?: boolean } = {
-    path: statsCachePath,
-    exists: false,
-    readable: false,
-  };
-
-  const projectsDirCheck: DirectoryCheckResult = {
-    path: projectsDir,
-    exists: false,
-    readable: false,
-    entryCount: 0,
-  };
-
-  const credentialFileChecks: FileCheckResult[] = credentialPaths.map((p) => ({
-    path: p,
-    exists: false,
-    readable: false,
-  }));
-
   const result: ClaudeAuthIndicators = {
     hasCredentialsFile: false,
     hasSettingsFile: false,
     hasStatsCacheWithActivity: false,
     hasProjectsSessions: false,
     credentials: null,
-    checks: {
-      settingsFile: settingsFileCheck,
-      statsCache: statsCacheCheck,
-      projectsDir: projectsDirCheck,
-      credentialFiles: credentialFileChecks,
-    },
   };
 
   // Check settings file
-  // First check existence, then try to read to confirm it's actually readable
   try {
-    if (await systemPathAccess(settingsPath)) {
+    if (await systemPathAccess(getClaudeSettingsPath())) {
-      settingsFileCheck.exists = true;
-      // Try to actually read the file to confirm read permissions
-      try {
-        await systemPathReadFile(settingsPath);
-        settingsFileCheck.readable = true;
       result.hasSettingsFile = true;
-      } catch (readErr) {
-        // File exists but cannot be read (permission denied, etc.)
-        settingsFileCheck.readable = false;
-        settingsFileCheck.error = `Cannot read: ${readErr instanceof Error ? readErr.message : String(readErr)}`;
     }
-    }
+  } catch {
-  } catch (err) {
+    // Ignore errors
-    settingsFileCheck.error = err instanceof Error ? err.message : String(err);
   }
 
   // Check stats cache for recent activity
   try {
-    const statsContent = await systemPathReadFile(statsCachePath);
+    const statsContent = await systemPathReadFile(getClaudeStatsCachePath());
-    statsCacheCheck.exists = true;
-    statsCacheCheck.readable = true;
-    try {
     const stats = JSON.parse(statsContent);
     if (stats.dailyActivity && stats.dailyActivity.length > 0) {
-        statsCacheCheck.hasDailyActivity = true;
       result.hasStatsCacheWithActivity = true;
-      } else {
-        statsCacheCheck.hasDailyActivity = false;
-      }
-    } catch (parseErr) {
-      statsCacheCheck.error = `JSON parse error: ${parseErr instanceof Error ? parseErr.message : String(parseErr)}`;
-    }
-  } catch (err) {
-    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-      statsCacheCheck.exists = false;
-    } else {
-      statsCacheCheck.error = err instanceof Error ? err.message : String(err);
     }
+  } catch {
+    // Ignore errors
   }
 
   // Check for sessions in projects directory
   try {
-    const sessions = await systemPathReaddir(projectsDir);
+    const sessions = await systemPathReaddir(getClaudeProjectsDir());
-    projectsDirCheck.exists = true;
-    projectsDirCheck.readable = true;
-    projectsDirCheck.entryCount = sessions.length;
     if (sessions.length > 0) {
       result.hasProjectsSessions = true;
     }
-  } catch (err) {
+  } catch {
-    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
+    // Ignore errors
-      projectsDirCheck.exists = false;
-    } else {
-      projectsDirCheck.error = err instanceof Error ? err.message : String(err);
-    }
   }
 
   // Check credentials files
-  // We iterate through all credential paths and only stop when we find a file
+  const credentialPaths = getClaudeCredentialPaths();
-  // that contains actual credentials (OAuth tokens or API keys). An empty or
+  for (const credPath of credentialPaths) {
-  // token-less file should not prevent checking subsequent credential paths.
-  for (let i = 0; i < credentialPaths.length; i++) {
-    const credPath = credentialPaths[i];
-    const credCheck = credentialFileChecks[i];
     try {
       const content = await systemPathReadFile(credPath);
-      credCheck.exists = true;
-      credCheck.readable = true;
-      try {
       const credentials = JSON.parse(content);
+      result.hasCredentialsFile = true;
       // Support multiple credential formats:
       // 1. Claude Code CLI format: { claudeAiOauth: { accessToken, refreshToken } }
       // 2. Legacy format: { oauth_token } or { access_token }
       // 3. API key format: { api_key }
       const hasClaudeOauth = !!credentials.claudeAiOauth?.accessToken;
       const hasLegacyOauth = !!(credentials.oauth_token || credentials.access_token);
-        const hasOAuthToken = hasClaudeOauth || hasLegacyOauth;
-        const hasApiKey = !!credentials.api_key;
-
-        // Only consider this a valid credentials file if it actually contains tokens
-        // An empty JSON file ({}) or file without tokens should not stop us from
-        // checking subsequent credential paths
-        if (hasOAuthToken || hasApiKey) {
-          result.hasCredentialsFile = true;
       result.credentials = {
-            hasOAuthToken,
+        hasOAuthToken: hasClaudeOauth || hasLegacyOauth,
-            hasApiKey,
+        hasApiKey: !!credentials.api_key,
       };
-          break; // Found valid credentials, stop searching
+      break;
-        }
+    } catch {
-        // File exists and is valid JSON but contains no tokens - continue checking other paths
+      // Continue to next path
-      } catch (parseErr) {
-        credCheck.error = `JSON parse error: ${parseErr instanceof Error ? parseErr.message : String(parseErr)}`;
-      }
-    } catch (err) {
-      if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-        credCheck.exists = false;
-      } else {
-        credCheck.error = err instanceof Error ? err.message : String(err);
-      }
     }
   }
 

libs/platform/tests/oauth-credential-detection.test.ts

@@ -1,761 +0,0 @@
-/**
- * Unit tests for OAuth credential detection scenarios
- *
- * Tests the various Claude credential detection formats including:
- * - Claude Code CLI OAuth format (claudeAiOauth)
- * - Legacy OAuth token format (oauth_token, access_token)
- * - API key format (api_key)
- * - Invalid/malformed credential files
- *
- * These tests use real temp directories to avoid complex fs mocking issues.
- */
-
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'fs/promises';
-import path from 'path';
-import os from 'os';
-
-describe('OAuth Credential Detection', () => {
-  let tempDir: string;
-  let originalHomedir: () => string;
-  let mockClaudeDir: string;
-  let mockCodexDir: string;
-  let mockOpenCodeDir: string;
-
-  beforeEach(async () => {
-    // Reset modules to get fresh state
-    vi.resetModules();
-
-    // Create a temporary directory
-    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'oauth-detection-test-'));
-
-    // Create mock home directory structure
-    mockClaudeDir = path.join(tempDir, '.claude');
-    mockCodexDir = path.join(tempDir, '.codex');
-    mockOpenCodeDir = path.join(tempDir, '.local', 'share', 'opencode');
-
-    await fs.mkdir(mockClaudeDir, { recursive: true });
-    await fs.mkdir(mockCodexDir, { recursive: true });
-    await fs.mkdir(mockOpenCodeDir, { recursive: true });
-
-    // Mock os.homedir to return our temp directory
-    originalHomedir = os.homedir;
-    vi.spyOn(os, 'homedir').mockReturnValue(tempDir);
-  });
-
-  afterEach(async () => {
-    vi.restoreAllMocks();
-    // Clean up temp directory
-    try {
-      await fs.rm(tempDir, { recursive: true, force: true });
-    } catch {
-      // Ignore cleanup errors
-    }
-  });
-
-  describe('getClaudeAuthIndicators', () => {
-    it('should detect Claude Code CLI OAuth format (claudeAiOauth)', async () => {
-      const credentialsContent = JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-access-token-12345',
-          refreshToken: 'oauth-refresh-token-67890',
-          expiresAt: Date.now() + 3600000,
-        },
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials).not.toBeNull();
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(false);
-    });
-
-    it('should detect legacy OAuth token format (oauth_token)', async () => {
-      const credentialsContent = JSON.stringify({
-        oauth_token: 'legacy-oauth-token-abcdef',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(false);
-    });
-
-    it('should detect legacy access_token format', async () => {
-      const credentialsContent = JSON.stringify({
-        access_token: 'legacy-access-token-xyz',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(false);
-    });
-
-    it('should detect API key format', async () => {
-      const credentialsContent = JSON.stringify({
-        api_key: 'sk-ant-api03-xxxxxxxxxxxx',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(false);
-      expect(indicators.credentials?.hasApiKey).toBe(true);
-    });
-
-    it('should detect both OAuth and API key when present', async () => {
-      const credentialsContent = JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          refreshToken: 'refresh-token',
-        },
-        api_key: 'sk-ant-api03-xxxxxxxxxxxx',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(true);
-    });
-
-    it('should handle missing credentials file gracefully', async () => {
-      // No credentials file created
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-      expect(indicators.checks.credentialFiles).toBeDefined();
-      expect(indicators.checks.credentialFiles.length).toBeGreaterThan(0);
-      expect(indicators.checks.credentialFiles[0].exists).toBe(false);
-    });
-
-    it('should handle malformed JSON in credentials file', async () => {
-      const malformedContent = '{ invalid json }';
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), malformedContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // File exists but parsing fails
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-      expect(indicators.checks.credentialFiles[0].exists).toBe(true);
-      expect(indicators.checks.credentialFiles[0].error).toContain('JSON parse error');
-    });
-
-    it('should handle empty credentials file', async () => {
-      const emptyContent = JSON.stringify({});
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), emptyContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Empty credentials file ({}) should NOT be treated as having credentials
-      // because it contains no actual tokens. This allows the system to continue
-      // checking subsequent credential paths that might have valid tokens.
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-      // But the file should still show as existing and readable in the checks
-      expect(indicators.checks.credentialFiles[0].exists).toBe(true);
-      expect(indicators.checks.credentialFiles[0].readable).toBe(true);
-    });
-
-    it('should handle credentials file with null values', async () => {
-      const nullContent = JSON.stringify({
-        claudeAiOauth: null,
-        api_key: null,
-        oauth_token: null,
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), nullContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // File with all null values should NOT be treated as having credentials
-      // because null values are not valid tokens
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-    });
-
-    it('should handle credentials with empty string values', async () => {
-      const emptyStrings = JSON.stringify({
-        claudeAiOauth: {
-          accessToken: '',
-          refreshToken: '',
-        },
-        api_key: '',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), emptyStrings);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Empty strings should NOT be treated as having credentials
-      // This allows checking subsequent credential paths for valid tokens
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-    });
-
-    it('should detect settings file presence', async () => {
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'settings.json'),
-        JSON.stringify({ theme: 'dark' })
-      );
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasSettingsFile).toBe(true);
-      expect(indicators.checks.settingsFile.exists).toBe(true);
-      expect(indicators.checks.settingsFile.readable).toBe(true);
-    });
-
-    it('should detect stats cache with activity', async () => {
-      const statsContent = JSON.stringify({
-        dailyActivity: [
-          { date: '2025-01-15', messagesCount: 10 },
-          { date: '2025-01-16', messagesCount: 5 },
-        ],
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, 'stats-cache.json'), statsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasStatsCacheWithActivity).toBe(true);
-      expect(indicators.checks.statsCache.exists).toBe(true);
-      expect(indicators.checks.statsCache.hasDailyActivity).toBe(true);
-    });
-
-    it('should detect stats cache without activity', async () => {
-      const statsContent = JSON.stringify({
-        dailyActivity: [],
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, 'stats-cache.json'), statsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasStatsCacheWithActivity).toBe(false);
-      expect(indicators.checks.statsCache.exists).toBe(true);
-      expect(indicators.checks.statsCache.hasDailyActivity).toBe(false);
-    });
-
-    it('should detect project sessions', async () => {
-      const projectsDir = path.join(mockClaudeDir, 'projects');
-      await fs.mkdir(projectsDir, { recursive: true });
-      await fs.mkdir(path.join(projectsDir, 'session-1'));
-      await fs.mkdir(path.join(projectsDir, 'session-2'));
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasProjectsSessions).toBe(true);
-      expect(indicators.checks.projectsDir.exists).toBe(true);
-      expect(indicators.checks.projectsDir.entryCount).toBe(2);
-    });
-
-    it('should return comprehensive check details', async () => {
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Verify all check detail objects are present
-      expect(indicators.checks).toBeDefined();
-      expect(indicators.checks.settingsFile).toBeDefined();
-      expect(indicators.checks.settingsFile.path).toContain('settings.json');
-      expect(indicators.checks.statsCache).toBeDefined();
-      expect(indicators.checks.statsCache.path).toContain('stats-cache.json');
-      expect(indicators.checks.projectsDir).toBeDefined();
-      expect(indicators.checks.projectsDir.path).toContain('projects');
-      expect(indicators.checks.credentialFiles).toBeDefined();
-      expect(Array.isArray(indicators.checks.credentialFiles)).toBe(true);
-    });
-
-    it('should try both .credentials.json and credentials.json paths', async () => {
-      // Write to credentials.json (without leading dot)
-      const credentialsContent = JSON.stringify({
-        api_key: 'sk-test-key',
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, 'credentials.json'), credentialsContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Should find credentials in the second path
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(true);
-    });
-
-    it('should prefer first credentials file if both exist', async () => {
-      // Write OAuth to .credentials.json (first path checked)
-      await fs.writeFile(
-        path.join(mockClaudeDir, '.credentials.json'),
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'oauth-token',
-            refreshToken: 'refresh-token',
-          },
-        })
-      );
-
-      // Write API key to credentials.json (second path)
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'credentials.json'),
-        JSON.stringify({
-          api_key: 'sk-test-key',
-        })
-      );
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Should use first file (.credentials.json) which has OAuth
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(false);
-    });
-
-    it('should check second credentials file if first file has no tokens', async () => {
-      // Write empty/token-less content to .credentials.json (first path checked)
-      // This tests the bug fix: previously, an empty JSON file would stop the search
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), JSON.stringify({}));
-
-      // Write actual credentials to credentials.json (second path)
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'credentials.json'),
-        JSON.stringify({
-          api_key: 'sk-test-key-from-second-file',
-        })
-      );
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Should find credentials in second file since first file has no tokens
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(true);
-    });
-  });
-
-  describe('getCodexAuthIndicators', () => {
-    it('should detect OAuth token in Codex auth file', async () => {
-      const authContent = JSON.stringify({
-        access_token: 'codex-oauth-token-12345',
-      });
-
-      await fs.writeFile(path.join(mockCodexDir, 'auth.json'), authContent);
-
-      const { getCodexAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getCodexAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-      expect(indicators.hasApiKey).toBe(false);
-    });
-
-    it('should detect API key in Codex auth file', async () => {
-      const authContent = JSON.stringify({
-        OPENAI_API_KEY: 'sk-xxxxxxxxxxxxxxxx',
-      });
-
-      await fs.writeFile(path.join(mockCodexDir, 'auth.json'), authContent);
-
-      const { getCodexAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getCodexAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(false);
-      expect(indicators.hasApiKey).toBe(true);
-    });
-
-    it('should detect nested tokens in Codex auth file', async () => {
-      const authContent = JSON.stringify({
-        tokens: {
-          oauth_token: 'nested-oauth-token',
-        },
-      });
-
-      await fs.writeFile(path.join(mockCodexDir, 'auth.json'), authContent);
-
-      const { getCodexAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getCodexAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-    });
-
-    it('should handle missing Codex auth file', async () => {
-      // No auth file created
-      const { getCodexAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getCodexAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(false);
-      expect(indicators.hasOAuthToken).toBe(false);
-      expect(indicators.hasApiKey).toBe(false);
-    });
-
-    it('should detect api_key field in Codex auth', async () => {
-      const authContent = JSON.stringify({
-        api_key: 'sk-api-key-value',
-      });
-
-      await fs.writeFile(path.join(mockCodexDir, 'auth.json'), authContent);
-
-      const { getCodexAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getCodexAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasApiKey).toBe(true);
-    });
-  });
-
-  describe('getOpenCodeAuthIndicators', () => {
-    it('should detect provider-specific OAuth credentials', async () => {
-      const authContent = JSON.stringify({
-        anthropic: {
-          type: 'oauth',
-          access: 'oauth-access-token',
-          refresh: 'oauth-refresh-token',
-        },
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-      expect(indicators.hasApiKey).toBe(false);
-    });
-
-    it('should detect GitHub Copilot refresh token as OAuth', async () => {
-      const authContent = JSON.stringify({
-        'github-copilot': {
-          type: 'oauth',
-          access: '', // Empty access token
-          refresh: 'gh-refresh-token', // But has refresh token
-        },
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-    });
-
-    it('should detect provider-specific API key credentials', async () => {
-      const authContent = JSON.stringify({
-        openai: {
-          type: 'api_key',
-          key: 'sk-xxxxxxxxxxxx',
-        },
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(false);
-      expect(indicators.hasApiKey).toBe(true);
-    });
-
-    it('should detect multiple providers', async () => {
-      const authContent = JSON.stringify({
-        anthropic: {
-          type: 'oauth',
-          access: 'anthropic-token',
-          refresh: 'refresh-token',
-        },
-        openai: {
-          type: 'api_key',
-          key: 'sk-xxxxxxxxxxxx',
-        },
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-      expect(indicators.hasApiKey).toBe(true);
-    });
-
-    it('should handle missing OpenCode auth file', async () => {
-      // No auth file created
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(false);
-      expect(indicators.hasOAuthToken).toBe(false);
-      expect(indicators.hasApiKey).toBe(false);
-    });
-
-    it('should handle legacy top-level OAuth keys', async () => {
-      const authContent = JSON.stringify({
-        access_token: 'legacy-access-token',
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-    });
-
-    it('should detect copilot provider OAuth', async () => {
-      const authContent = JSON.stringify({
-        copilot: {
-          type: 'oauth',
-          access: 'copilot-access-token',
-          refresh: 'copilot-refresh-token',
-        },
-      });
-
-      await fs.writeFile(path.join(mockOpenCodeDir, 'auth.json'), authContent);
-
-      const { getOpenCodeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getOpenCodeAuthIndicators();
-
-      expect(indicators.hasAuthFile).toBe(true);
-      expect(indicators.hasOAuthToken).toBe(true);
-    });
-  });
-
-  describe('Credential path helpers', () => {
-    it('should return correct Claude credential paths', async () => {
-      const { getClaudeCredentialPaths, getClaudeConfigDir } = await import('../src/system-paths');
-
-      const configDir = getClaudeConfigDir();
-      expect(configDir).toContain('.claude');
-
-      const credPaths = getClaudeCredentialPaths();
-      expect(credPaths.length).toBeGreaterThan(0);
-      expect(credPaths.some((p) => p.includes('.credentials.json'))).toBe(true);
-      expect(credPaths.some((p) => p.includes('credentials.json'))).toBe(true);
-    });
-
-    it('should return correct Codex auth path', async () => {
-      const { getCodexAuthPath, getCodexConfigDir } = await import('../src/system-paths');
-
-      const configDir = getCodexConfigDir();
-      expect(configDir).toContain('.codex');
-
-      const authPath = getCodexAuthPath();
-      expect(authPath).toContain('.codex');
-      expect(authPath).toContain('auth.json');
-    });
-
-    it('should return correct OpenCode auth path', async () => {
-      const { getOpenCodeAuthPath, getOpenCodeConfigDir } = await import('../src/system-paths');
-
-      const configDir = getOpenCodeConfigDir();
-      expect(configDir).toContain('opencode');
-
-      const authPath = getOpenCodeAuthPath();
-      expect(authPath).toContain('opencode');
-      expect(authPath).toContain('auth.json');
-    });
-  });
-
-  describe('Edge cases for credential detection', () => {
-    it('should handle credentials file with unexpected structure', async () => {
-      const unexpectedContent = JSON.stringify({
-        someUnexpectedKey: 'value',
-        nested: {
-          deeply: {
-            unexpected: true,
-          },
-        },
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), unexpectedContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // File with unexpected structure but no valid tokens should NOT be treated as having credentials
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-    });
-
-    it('should handle array instead of object in credentials', async () => {
-      const arrayContent = JSON.stringify(['token1', 'token2']);
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), arrayContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Array is valid JSON but wrong structure - no valid tokens, so not treated as credentials file
-      expect(indicators.hasCredentialsFile).toBe(false);
-      expect(indicators.credentials).toBeNull();
-    });
-
-    it('should handle numeric values in credential fields', async () => {
-      const numericContent = JSON.stringify({
-        api_key: 12345,
-        oauth_token: 67890,
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), numericContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Note: Current implementation uses JavaScript truthiness which accepts numbers
-      // This documents the actual behavior - ideally would validate string type
-      expect(indicators.hasCredentialsFile).toBe(true);
-      // The implementation checks truthiness, not strict string type
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-      expect(indicators.credentials?.hasApiKey).toBe(true);
-    });
-
-    it('should handle boolean values in credential fields', async () => {
-      const booleanContent = JSON.stringify({
-        api_key: true,
-        oauth_token: false,
-      });
-
-      await fs.writeFile(path.join(mockClaudeDir, '.credentials.json'), booleanContent);
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      // Note: Current implementation uses JavaScript truthiness
-      // api_key: true is truthy, oauth_token: false is falsy
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(false); // false is falsy
-      expect(indicators.credentials?.hasApiKey).toBe(true); // true is truthy
-    });
-
-    it('should handle malformed stats-cache.json gracefully', async () => {
-      await fs.writeFile(path.join(mockClaudeDir, 'stats-cache.json'), '{ invalid json }');
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasStatsCacheWithActivity).toBe(false);
-      expect(indicators.checks.statsCache.exists).toBe(true);
-      expect(indicators.checks.statsCache.error).toBeDefined();
-    });
-
-    it('should handle empty projects directory', async () => {
-      const projectsDir = path.join(mockClaudeDir, 'projects');
-      await fs.mkdir(projectsDir, { recursive: true });
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasProjectsSessions).toBe(false);
-      expect(indicators.checks.projectsDir.exists).toBe(true);
-      expect(indicators.checks.projectsDir.entryCount).toBe(0);
-    });
-  });
-
-  describe('Combined authentication scenarios', () => {
-    it('should detect CLI authenticated state with settings + sessions', async () => {
-      // Create settings file
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'settings.json'),
-        JSON.stringify({ theme: 'dark' })
-      );
-
-      // Create projects directory with sessions
-      const projectsDir = path.join(mockClaudeDir, 'projects');
-      await fs.mkdir(projectsDir, { recursive: true });
-      await fs.mkdir(path.join(projectsDir, 'session-1'));
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasSettingsFile).toBe(true);
-      expect(indicators.hasProjectsSessions).toBe(true);
-    });
-
-    it('should detect recent activity indicating working auth', async () => {
-      // Create stats cache with recent activity
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'stats-cache.json'),
-        JSON.stringify({
-          dailyActivity: [{ date: new Date().toISOString().split('T')[0], messagesCount: 10 }],
-        })
-      );
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasStatsCacheWithActivity).toBe(true);
-    });
-
-    it('should handle complete auth setup', async () => {
-      // Create all auth indicators
-      await fs.writeFile(
-        path.join(mockClaudeDir, '.credentials.json'),
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'token',
-            refreshToken: 'refresh',
-          },
-        })
-      );
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'settings.json'),
-        JSON.stringify({ theme: 'dark' })
-      );
-      await fs.writeFile(
-        path.join(mockClaudeDir, 'stats-cache.json'),
-        JSON.stringify({ dailyActivity: [{ date: '2025-01-15', messagesCount: 5 }] })
-      );
-      const projectsDir = path.join(mockClaudeDir, 'projects');
-      await fs.mkdir(projectsDir, { recursive: true });
-      await fs.mkdir(path.join(projectsDir, 'session-1'));
-
-      const { getClaudeAuthIndicators } = await import('../src/system-paths');
-      const indicators = await getClaudeAuthIndicators();
-
-      expect(indicators.hasCredentialsFile).toBe(true);
-      expect(indicators.hasSettingsFile).toBe(true);
-      expect(indicators.hasStatsCacheWithActivity).toBe(true);
-      expect(indicators.hasProjectsSessions).toBe(true);
-      expect(indicators.credentials?.hasOAuthToken).toBe(true);
-    });
-  });
-});

libs/prompts/src/defaults.ts

@@ -965,20 +965,8 @@ export const DEFAULT_PLAN_REVISION_TEMPLATE = `The user has requested revisions
 
 ## Instructions
 Please regenerate the specification incorporating the user's feedback.
-**Current planning mode: {{planningMode}}**
+Keep the same format with the \`\`\`tasks block for task definitions.
-
+After generating the revised spec, output:
-**CRITICAL REQUIREMENT**: Your revised specification MUST include a \`\`\`tasks code block containing task definitions in the EXACT format shown below. This is MANDATORY - without the tasks block, the system cannot track or execute tasks properly.
-
-### Required Task Format
-{{taskFormatExample}}
-
-**IMPORTANT**:
-1. The \`\`\`tasks block must appear in your response
-2. Each task MUST start with "- [ ] T###:" where ### is a sequential number (T001, T002, T003, etc.)
-3. Each task MUST include "| File:" followed by the primary file path
-4. Tasks should be ordered by dependencies (foundational tasks first)
-
-After generating the revised spec with the tasks block, output:
 "[SPEC_GENERATED] Please review the revised specification above."`;
 
 export const DEFAULT_CONTINUATION_AFTER_APPROVAL_TEMPLATE = `The plan/specification has been approved. Now implement it.