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>
2026-02-05 09:33:07 +00:00 · 2026-01-26 00:03:58 +01:00
32 changed files with 745 additions and 622 deletions
--- a/10
+++ b/10
@@ -118,7 +118,6 @@ RUN curl -fsSL https://opencode.ai/install | bash && \
    echo "=== Checking OpenCode CLI installation ===" && \
    ls -la /home/automaker/.local/bin/ && \
    (which opencode && opencode --version) || echo "opencode installed (may need auth setup)"
-
 USER root

 # Add PATH to profile so it's available in all interactive shells (for login shells)
@@ -148,15 +147,6 @@ COPY --from=server-builder /app/apps/server/package*.json ./apps/server/
 # Copy node_modules (includes symlinks to libs)
 COPY --from=server-builder /app/node_modules ./node_modules

-# Install Playwright Chromium browser for AI agent verification tests
-# This adds ~300MB to the image but enables automated testing mode out of the box
-# Using the locally installed playwright ensures we use the pinned version from package-lock.json
-USER automaker
-RUN ./node_modules/.bin/playwright install chromium && \
-    echo "=== Playwright Chromium installed ===" && \
-    ls -la /home/automaker/.cache/ms-playwright/ || echo "Playwright browsers installed"
-USER root
-
 # Create data and projects directories
 RUN mkdir -p /data /projects && chown automaker:automaker /data /projects

--- a/README.md
+++ b/README.md
@@ -338,42 +338,6 @@ services:

 The Docker image supports both AMD64 and ARM64 architectures. The GitHub CLI and Claude CLI are automatically downloaded for the correct architecture during build.

-##### Playwright for Automated Testing
-
-The Docker image includes **Playwright Chromium pre-installed** for AI agent verification tests. When agents implement features in automated testing mode, they use Playwright to verify the implementation works correctly.
-
-**No additional setup required** - Playwright verification works out of the box.
-
-#### Optional: Persist browsers for manual updates
-
-By default, Playwright Chromium is pre-installed in the Docker image. If you need to manually update browsers or want to persist browser installations across container restarts (not image rebuilds), you can mount a volume.
-
-**Important:** When you first add this volume mount to an existing setup, the empty volume will override the pre-installed browsers. You must re-install them:
-
-```bash
-# After adding the volume mount for the first time
-docker exec --user automaker -w /app automaker-server npx playwright install chromium
-```
-
-Add this to your `docker-compose.override.yml`:
-
-```yaml
-services:
-  server:
-    volumes:
-      - playwright-cache:/home/automaker/.cache/ms-playwright
-
-volumes:
-  playwright-cache:
-    name: automaker-playwright-cache
-```
-
-**Updating browsers manually:**
-
-```bash
-docker exec --user automaker -w /app automaker-server npx playwright install chromium
-```
-
 ### Testing

 #### End-to-End Tests (Playwright)
--- a/apps/server/src/routes/features/routes/create.ts
+++ b/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,
        });
      }
--- a/apps/server/src/routes/fs/routes/save-board-background.ts
+++ b/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
-      // e.g., data:image/gif;charset=utf-8;base64,R0lGOD...
-      const base64Data = data.replace(/^data:[^,]+,/, '');
+      const base64Data = data.replace(/^data:image\/\w+;base64,/, '');
      const buffer = Buffer.from(base64Data, 'base64');

      // Use a fixed filename for the board background (overwrite previous)
--- a/apps/server/src/routes/fs/routes/save-image.ts
+++ b/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
-      // e.g., data:image/gif;charset=utf-8;base64,R0lGOD...
-      const base64Data = data.replace(/^data:[^,]+,/, '');
+      const base64Data = data.replace(/^data:image\/\w+;base64,/, '');
      const buffer = Buffer.from(base64Data, 'base64');

      // Generate unique filename with timestamp
--- a/apps/server/src/routes/worktree/routes/init-git.ts
+++ b/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)
-      // and create an initial empty commit
-      await execAsync(
-        `git init --initial-branch=main && git commit --allow-empty -m "Initial commit"`,
-        {
+      // Initialize git and create an initial empty commit
+      await execAsync(`git init && git commit --allow-empty -m "Initial commit"`, {
        cwd: projectPath,
-        }
-      );
+      });

      res.json({
        success: true,
--- a/apps/server/src/services/auto-mode-service.ts
+++ b/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
-                        const revisionPrompts = await getPromptCustomization(
-                          this.settingsService,
-                          '[AutoMode]'
-                        );
+                        // Build revision prompt
+                        let revisionPrompt = `The user has requested revisions to the plan/specification.

-                        // Get task format example based on planning mode
-                        const taskFormatExample =
-                          planningMode === 'full'
-                            ? `\`\`\`tasks
-## Phase 1: Foundation
- [ ] T001: [Description] | File: [path/to/file]
- [ ] T002: [Description] | File: [path/to/file]
+## Previous Plan (v${planVersion - 1})
+${hasEdits ? approvalResult.editedPlan : currentPlanContent}

-## Phase 2: Core Implementation
- [ ] T003: [Description] | File: [path/to/file]
- [ ] 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]
-\`\`\``;
+## User Feedback
+${approvalResult.feedback || 'Please revise the plan based on the edits above.'}

-                        let revisionPrompt = revisionPrompts.taskExecution.planRevisionTemplate;
-                        revisionPrompt = revisionPrompt.replace(
-                          /\{\{planVersion\}\}/g,
-                          String(planVersion - 1)
-                        );
-                        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
-                        );
+## Instructions
+Please regenerate the specification incorporating the user's feedback.
+Keep the same format with the \`\`\`tasks block for task definitions.
+After generating the revised spec, output:
+"[SPEC_GENERATED] Please review the revised specification above."
+`;

                        // 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',
--- a/apps/server/src/services/event-hook-service.ts
+++ b/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,
--- a/apps/server/tests/integration/helpers/git-test-repo.ts
+++ b/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)
-  await execAsync('git init --initial-branch=main', { cwd: tmpDir });
+  // Initialize git repo
+  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 () => {
--- a/apps/server/tests/integration/routes/worktree/create.integration.test.ts
+++ b/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 --initial-branch=main', { cwd: repoPath });
+    await execAsync('git init', { 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
--- a/apps/server/tests/unit/services/dev-server-service.test.ts
+++ b/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 {
--- a/apps/ui/scripts/prepare-server.mjs
+++ b/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 { join, dirname, resolve } from 'path';
+import { cpSync, existsSync, mkdirSync, rmSync, writeFileSync, readFileSync } from 'fs';
+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...');
--- a/apps/ui/src/components/layout/project-switcher/components/edit-project-dialog.tsx
+++ b/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)
-    const maxSize = 5 * 1024 * 1024;
-    if (file.size > maxSize) {
-      toast.error(
-        `File too large (${(file.size / 1024 / 1024).toFixed(2)} MB). Maximum size is 5 MB.`
-      );
+    // Validate file size (max 2MB for icons)
+    if (file.size > 2 * 1024 * 1024) {
      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>
--- a/apps/ui/src/components/layout/project-switcher/components/project-context-menu.tsx
+++ b/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) => {
-              e.stopPropagation();
-              onSelect(option.value);
-            }}
+            onClick={() => 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
-      // The UI uses getEffectiveTheme() which handles: previewTheme ?? projectTheme ?? globalTheme
+      setTheme(isUsingGlobal ? globalTheme : value);
      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) => {
-                        e.stopPropagation();
-                        handleThemeSelect(USE_GLOBAL_THEME);
-                      }}
+                      onClick={() => 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',
--- a/apps/ui/src/components/layout/project-switcher/components/project-switcher-item.tsx
+++ b/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
--- a/apps/ui/src/components/layout/project-switcher/project-switcher.tsx
+++ b/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 {
-  MACOS_ELECTRON_TOP_PADDING_CLASS,
-  SIDEBAR_FEATURE_FLAGS,
-} from '@/components/layout/sidebar/constants';
+import { 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
-          className={cn(
-            'flex flex-col items-center pb-2 px-2',
-            isMac && isElectron() ? MACOS_ELECTRON_TOP_PADDING_CLASS : 'pt-3'
-          )}
-        >
+        <div className="flex flex-col items-center pt-3 pb-2 px-2">
          <button
            onClick={() => navigate({ to: '/dashboard' })}
            className="group flex flex-col items-center gap-0.5"
--- a/apps/ui/src/components/layout/sidebar/components/project-selector-with-options.tsx
+++ b/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 } =
-    useProjectTheme();
+  const {
+    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
-                      // The UI uses getEffectiveTheme() which handles: previewTheme ?? projectTheme ?? globalTheme
+                      if (value !== '') {
+                        setTheme(value as ThemeMode);
+                      } else {
+                        setTheme(globalTheme);
+                      }
                      setProjectTheme(
                        currentProject.id,
                        value === '' ? null : (value as ThemeMode)
--- a/apps/ui/src/components/layout/sidebar/components/sidebar-header.tsx
+++ b/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 */}
--- a/apps/ui/src/components/layout/sidebar/components/sidebar-navigation.tsx
+++ b/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 * as LucideIcons from 'lucide-react';
-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 { ChevronDown, Wrench, Github } from 'lucide-react';
+import { cn } from '@/lib/utils';
 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'
-          ? isMac && isElectron()
-            ? MACOS_ELECTRON_TOP_PADDING_CLASS
-            : 'pt-3'
-          : 'mt-1'
+        sidebarStyle === 'discord' ? '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;
--- a/apps/ui/src/components/layout/sidebar/components/theme-menu-item.tsx
+++ b/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>
  );
 });
--- a/apps/ui/src/components/layout/sidebar/constants.ts
+++ b/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
--- a/apps/ui/src/components/ui/provider-icon.tsx
+++ b/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',
  },
 };

--- a/apps/ui/src/components/views/project-settings-view/project-identity-section.tsx
+++ b/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)
-    if (file.size > 5 * 1024 * 1024) {
+    // Validate file size (max 2MB for icons)
+    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>
--- a/apps/ui/src/components/views/settings-view/event-hooks/event-history-view.tsx
+++ b/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(
-            `Ran ${hooksTriggered} hook(s): ${successCount} succeeded, ${failCount} failed.`
-          );
+          alert(`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);
    }
--- a/apps/ui/src/lib/http-api-client.ts
+++ b/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}`, {
--- a/apps/ui/src/store/app-store.ts
+++ b/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 {
-  getEffectiveFont,
-  saveThemeToStorage,
-  saveFontSansToStorage,
-  saveFontMonoToStorage,
-  persistEffectiveThemeForProject,
-} from './utils/theme-utils';
+import { 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,
-  sidebarStyle: 'unified',
-  collapsedNavSections: {},
-  mobileSidebarHidden: false,
+
+  // Agent Session state
  lastSelectedSessionByProject: {},
-  theme: getStoredTheme() || 'dark',
-  fontFamilySans: getStoredFontSans(),
-  fontFamilyMono: getStoredFontMono(),
+
+  // Features/Kanban
  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,
-  disableSplashScreen: false,
+
+  // Server Settings
  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: '',
-  recentFolders: [],
+
+  // Init Script State
  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
-    saveProjects(get().projects);
-    saveTrashedProjects(get().trashedProjects);
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    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
-    saveProjects(get().projects);
-    saveTrashedProjects(get().trashedProjects);
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    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
-    saveTrashedProjects(get().trashedProjects);
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setTrashedProjects(get().trashedProjects);
+    }
  },

  emptyTrash: () => {
    set({ trashedProjects: [] });

-    // Persist to storage
-    saveTrashedProjects([]);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
  },

-  // View actions
-  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 }),
+  // View actions - provided by UI slice

-  // Theme actions
-  setTheme: (theme) => {
-    set({ theme });
-    saveThemeToStorage(theme);
-  },
+  // Theme actions (setTheme, getEffectiveTheme, setPreviewTheme provided by UI slice)
  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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-  setFontSans: (fontFamily) => {
-    set({ fontFamilySans: fontFamily });
-    saveFontSansToStorage(fontFamily);
-  },
-  setFontMono: (fontFamily) => {
-    set({ fontFamilyMono: fontFamily });
-    saveFontMonoToStorage(fontFamily);
-  },
+  // Font actions (setFontSans, setFontMono, getEffectiveFontSans, getEffectiveFontMono provided by UI slice)
  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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
-  },
-  getEffectiveFontSans: () => {
-    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);
+    // Persist to Electron store if available
+    const electronAPI = getElectronAPI();
+    if (electronAPI) {
+      electronAPI.projects.setProjects(get().projects);
+    }
  },

  // Claude API Profile actions (per-project override)
@@ -717,8 +757,11 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
          : state.currentProject,
    }));

-    // Persist to storage
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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
-    saveProjects(get().projects);
+    // Persist to Electron store if available
+    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 }),
-  toggleChatHistory: () => set((state) => ({ chatHistoryOpen: !state.chatHistoryOpen })),
+  // setChatHistoryOpen and toggleChatHistory - provided by UI slice

  // 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
-  setBoardViewMode: (mode) => set({ boardViewMode: mode }),
+  // Kanban Card Settings actions - setBoardViewMode provided by UI slice

  // 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
-  setKeyboardShortcut: (key, value) =>
-    set((state) => ({
-      keyboardShortcuts: { ...state.keyboardShortcuts, [key]: value },
-    })),
-  setKeyboardShortcuts: (shortcuts) =>
-    set((state) => ({
-      keyboardShortcuts: { ...state.keyboardShortcuts, ...shortcuts },
-    })),
-  resetKeyboardShortcuts: () => set({ keyboardShortcuts: DEFAULT_KEYBOARD_SHORTCUTS }),
+  // Keyboard Shortcuts actions - provided by UI slice

-  // Audio Settings actions
-  setMuteDoneSound: (muted) => set({ muteDoneSound: muted }),
+  // Audio Settings actions - setMuteDoneSound provided by UI slice

-  // Splash Screen actions
-  setDisableSplashScreen: (disabled) => set({ disableSplashScreen: disabled }),
+  // Splash Screen actions - setDisableSplashScreen provided by UI slice

  // Server Log Level actions
  setServerLogLevel: (level) => set({ serverLogLevel: level }),
  setEnableRequestLogging: (enabled) => set({ enableRequestLogging: enabled }),

-  // Developer Tools actions
-  setShowQueryDevtools: (show) => set({ showQueryDevtools: show }),
+  // Developer Tools actions - setShowQueryDevtools provided by UI slice

  // 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
-  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 };
-    }),
+  // Board Background actions - provided by UI slice

  // Terminal actions
  setTerminalUnlocked: (unlocked, token) =>
@@ -2325,27 +2274,9 @@ export const useAppStore = create<AppState & AppActions>()((set, get) => ({
      };
    }),

-  // Worktree Panel Visibility actions
-  setWorktreePanelVisible: (projectPath, visible) =>
-    set((state) => ({
-      worktreePanelVisibleByProject: {
-        ...state.worktreePanelVisibleByProject,
-        [projectPath]: visible,
-      },
-    })),
-  getWorktreePanelVisible: (projectPath) =>
-    get().worktreePanelVisibleByProject[projectPath] ?? true,
+  // Worktree Panel Visibility actions - provided by UI slice

-  // Init Script Indicator Visibility actions
-  setShowInitScriptIndicator: (projectPath, visible) =>
-    set((state) => ({
-      showInitScriptIndicatorByProject: {
-        ...state.showInitScriptIndicatorByProject,
-        [projectPath]: visible,
-      },
-    })),
-  getShowInitScriptIndicator: (projectPath) =>
-    get().showInitScriptIndicatorByProject[projectPath] ?? true,
+  // Init Script Indicator Visibility actions - provided by UI slice

  // 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
-  setAutoDismissInitScriptIndicator: (projectPath, autoDismiss) =>
-    set((state) => ({
-      autoDismissInitScriptIndicatorByProject: {
-        ...state.autoDismissInitScriptIndicatorByProject,
-        [projectPath]: autoDismiss,
-      },
-    })),
-  getAutoDismissInitScriptIndicator: (projectPath) =>
-    get().autoDismissInitScriptIndicatorByProject[projectPath] ?? true,
+  // Auto-dismiss Init Script Indicator actions - provided by UI slice

  // 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
-  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) };
-    }),
+  // UI State actions - provided by UI slice

  // 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
--- a/apps/ui/src/store/slices/index.ts
+++ b/apps/ui/src/store/slices/index.ts
@@ -0,0 +1 @@
+export { createUISlice, initialUIState, type UISlice } from './ui-slice';
--- a/apps/ui/src/store/slices/ui-slice.ts
+++ b/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) };
+    }),
+});
--- a/apps/ui/src/store/types/ui-types.ts
+++ b/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;
+}
--- a/docker-compose.override.yml.example
+++ b/docker-compose.override.yml.example
@@ -21,13 +21,9 @@ services:
      # - ~/.local/share/opencode:/home/automaker/.local/share/opencode
      # - ~/.config/opencode:/home/automaker/.config/opencode

-      # ===== Playwright Browser Cache (Optional) =====
-      # Playwright Chromium is PRE-INSTALLED in the Docker image for automated testing.
-      # Uncomment below to persist browser cache across container rebuilds (saves ~300MB download):
+      # Playwright browser cache - persists installed browsers across container restarts
+      # Run 'npx playwright install --with-deps chromium' once, and it will persist
      # - playwright-cache:/home/automaker/.cache/ms-playwright
-      #
-      # To update Playwright browsers manually:
-      #   docker exec --user automaker -w /app automaker-server npx playwright install chromium
    environment:
      # Set root directory for all projects and file operations
      # Users can only create/open projects within this directory
@@ -41,7 +37,6 @@ services:
      # - CURSOR_API_KEY=${CURSOR_API_KEY:-}

 volumes:
-  # Playwright cache volume - optional, persists browser updates across container rebuilds
-  # Uncomment if you mounted the playwright-cache volume above
+  # Playwright cache volume (persists Chromium installs)
  # playwright-cache:
  #   name: automaker-playwright-cache
--- a/libs/platform/src/system-paths.ts
+++ b/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);
 }

--- a/libs/prompts/src/defaults.ts
+++ b/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}}**
-
-**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:
+Keep the same format with the \`\`\`tasks block for task definitions.
+After generating the revised spec, 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.
				`@@ -0,0 +1 @@`
				`export { createUISlice, initialUIState, type UISlice } from './ui-slice';`