Merge pull request #99 from AutoMaker-Org/feat/ai-profiles-view-enhancement

Enhanced AI profiles view with better UX and comprehensive test coverage.

.automaker/app_spec.txt

@@ -1,202 +0,0 @@
-<project_specification>
-  <project_name>Automaker - Autonomous AI Development Studio</project_name>
-
-  <overview>
-    Automaker is a sophisticated desktop application that empowers developers to build software autonomously through AI-powered agents. Built with Electron and Next.js, it provides an intelligent GUI for project management, feature tracking via Kanban boards, and autonomous code generation. The application leverages multiple AI models (Claude, GPT) and supports complex workflows including git worktree isolation, testing automation, and multi-model agent execution. It acts as a complete development orchestrator, managing the entire lifecycle from specification to verified implementation.
-  </overview>
-
-  <technology_stack>
-    <frontend>
-      <framework>Next.js 16.0.7 (App Router)</framework>
-      <ui_library>shadcn/ui with Radix UI primitives</ui_library>
-      <styling>Tailwind CSS 4.0</styling>
-      <state_management>Zustand with persistence</state_management>
-      <drag_drop>@dnd-kit for Kanban board</drag_drop>
-      <icons>Lucide React</icons>
-      <query_client>TanStack Query for server state</query_client>
-    </frontend>
-    <desktop_shell>
-      <framework>Electron 39.2.6</framework>
-      <language>TypeScript 5.x</language>
-      <inter_process_communication>Electron IPC with security sandboxing</inter_process_communication>
-      <file_system>Node.js fs/promises with path validation</file_system>
-    </desktop_shell>
-    <ai_engine>
-      <primary_model>Claude 3.5 (Opus, Sonnet, Haiku) via Anthropic Claude Agent SDK</primary_model>
-      <secondary_model>GPT-5.1 Codex family via OpenAI CLI</secondary_model>
-      <orchestration>Custom Agent Service with streaming responses</orchestration>
-      <model_registry>Dynamic model provider system with CLI detection</model_registry>
-    </ai_engine>
-    <testing>
-      <framework>Playwright for E2E testing</framework>
-      <unit>Jest/Vitest compatible</unit>
-      <integration>Agent-driven test execution and verification</integration>
-    </testing>
-    <version_control>
-      <system>Git with worktree isolation support</system>
-      <branching>Feature branch management</branching>
-      <workflow>Automated commit and merge capabilities</workflow>
-    </version_control>
-  </technology_stack>
-
-  <core_capabilities>
-    <project_management>
-      - Open and manage multiple local projects
-      - Project-specific themes and configurations
-      - Session management with project context
-      - Recently used project cycling (Q/E shortcuts)
-      - Project search and type-ahead selection
-      - Trash and restore functionality for projects
-    </project_management>
-
-    <intelligent_analysis>
-      - Auto-generation and updating of app_spec.txt
-      - Feature extraction from existing codebases
-      - Technology stack detection and documentation
-      - Project structure analysis with file tree visualization - "Project Ingestion": Analyzes existing codebases to understand structure
-      - Auto-generation of `.automaker/app_spec.txt` based on codebase analysis
-      - Auto-generation of features in `.automaker/features/{id}/feature.json`:
-        - Scans code for implemented features
-        - Creates test cases for existing features
-        - Marks existing features as "passes": true automatically
-    </intelligent_analysis>
-
-    <kanban_workflow>
-      - Visual representation of features from `.automaker/features/` folder
-      - Drag-and-drop interface to reprioritize tasks
-      - direct editing of feature details (steps, description) from the card
-      - Visual Kanban board with drag-and-drop functionality
-      - Multiple status columns: Backlog, In Progress, Waiting Approval, Verified
-      - Feature cards with detailed information display (3 detail levels)
-      - Real-time status updates during agent execution
-      - Search and filtering capabilities
-      - Category management and autocomplete
-      - Image attachment support for feature descriptions
-    </kanban_workflow>
-
-    <autonomous_agent_engine>
-      - Multi-model agent system with profile-based execution
-      - Streaming agent output with real-time logs
-      - Git worktree isolation for safe feature development
-      - Automatic testing and verification workflows
-      - Context-aware prompt generation
-      - Agent memory and learning capabilities
-      - Concurrent feature processing with configurable limits
-      - Follow-up and resume capabilities
-    </autonomous_agent_engine>
-
-    <advanced_workflows>
-      - Git worktree management for isolated development
-      - Feature-specific branching and merging
-      - Automated commit generation with file tracking
-      - Test-driven development support
-      - Code review and approval workflows
-      - Revert and rollback capabilities
-    </advanced_workflows>
-
-    <user_interface>
-      - Dark/Light theme support with 12 custom themes
-      - Per-project theme configurations
-      - Comprehensive keyboard shortcut system
-      - Sidebar navigation with project switching
-      - Multi-view architecture (Board, Spec, Agent, Context, Settings)
-      - Setup wizard for first-time configuration
-      - CLI integration status monitoring
-    </user_interface>
-
-    <extensibility>
-      - AI Profile system for model/thinking level presets
-      - Keyboard shortcut customization
-      - Model provider plugin architecture
-      - Context file management for agent guidance
-      - Feature suggestion generation
-      - Spec regeneration workflows
-    </extensibility>
-  </core_capabilities>
-
-  <ui_layout>
-    <window_structure>
-      - Sidebar: Project List, Settings, Logs, Plugins
-      - Main Content:
-        - **Spec View**: Split editor for `.automaker/app_spec.txt`
-        - **Board View**: Kanban board for `.automaker/features/` folder
-        - **Code View**: Read-only Monaco editor to see what the agent is writing
-        - **Agent View**: Chat-like interface showing agent thought process and tool usage. Also used for the "New Project Interview".
-    </window_structure>
-    <theme>
-      - Dark/Light mode support (system sync)
-      - "Hacker" aesthetic option (terminal-like)
-      - Professional/Clean default
-    </theme>
-  </ui_layout>
-
-  <development_workflow>
-    <local_testing>
-      - "Browser Mode": Run the Next.js frontend in a standard browser with mocked Electron IPC for rapid UI iteration.
-      - "Electron Mode": Full desktop app testing.
-      - Hot Reloading for both Main and Renderer processes.
-    </local_testing>
-  </development_workflow>
-
-  <implemented_features>
-    - Complete Kanban board with drag-and-drop functionality
-    - Multi-model AI agent execution (Claude + GPT/Codex)
-    - Git worktree isolation for features
-    - Real-time agent output streaming and logging
-    - Project management with session persistence
-    - Theme system with 12 themes + per-project themes
-    - Comprehensive settings panel with all configurations
-    - Feature image attachment and context system
-    - Agent profiles with model/thinking level presets
-    - Keyboard shortcut system with customization
-    - CLI integration detection (Claude Code + Codex CLI)
-    - Auto mode for autonomous feature processing
-    - Feature suggestions generation
-    - Spec regeneration and project analysis
-    - Context file management
-    - Chat history and session management
-    - File diff viewing and git integration
-    - Search and filtering across all features
-    - Category management and autocomplete
-    - Test automation and verification workflows
-  </implemented_features>
-
-  <implementation_roadmap>
-    <phase_1_foundation>
-      - Enhanced error handling and recovery mechanisms
-      - Performance optimization for large projects
-      - Improved memory management for long-running sessions
-      - Advanced logging and debugging capabilities
-    </phase_1_foundation>
-    
-    <phase_2_core_logic>
-      - Plugin system for custom model providers
-      - Advanced workflow customization engine
-      - Team collaboration features
-      - Cloud synchronization capabilities
-      - Advanced project templates and scaffolding
-    </phase_2_core_logic>
-
-    <phase_3_kanban_and_interaction>
-      - Build Kanban board with drag-and-drop
-      - Connect Kanban state to `.automaker/features/` filesystem
-      - Implement "Run Feature" capability
-      - Integrate standard prompts library
-    </phase_3_kanban_and_interaction>
-
-    <phase_3_polish>
-      - Enhanced accessibility features
-      - Advanced theme customization
-      - Performance monitoring and analytics
-      - Documentation generation automation
-      - Integration with external development tools
-      - Advanced security auditing and sandboxing
-    </phase_3_polish>
-
-    <phase_4_polish>
-      - Advanced terminal integration
-      - Settings & Extensibility
-      - UI refinement
-    </phase_4_polish>
-  </implementation_roadmap>
-</project_specification>

.automaker/categories.json

@@ -1,9 +0,0 @@
-[
-  "Agent Runner",
-  "Core",
-  "Kanban",
-  "Other",
-  "Settings",
-  "Uncategorized",
-  "ka"
-]

.automaker/context/clean-code.md

@@ -1,474 +0,0 @@
-# Clean Code Guidelines
-
-## Overview
-
-This document serves as a comprehensive guide for writing clean, maintainable, and extensible code. It outlines principles and practices that ensure code quality, reusability, and long-term maintainability. When writing or reviewing code, follow these guidelines to create software that is easy to understand, modify, and extend. This file is used by LLMs to understand and enforce coding standards throughout the codebase.
-
----
-
-## Core Principles
-
-### 1. DRY (Don't Repeat Yourself)
-
-**Principle**: Every piece of knowledge should have a single, unambiguous representation within a system.
-
-**Practices**:
-
-- Extract repeated logic into reusable functions, classes, or modules
-- Use constants for repeated values
-- Create shared utilities for common operations
-- Avoid copy-pasting code blocks
-- When you find yourself writing similar code more than twice, refactor it
-
-**Example - Bad**:
-
-```typescript
-// Repeated validation logic
-if (email.includes("@") && email.length > 5) {
-  // ...
-}
-if (email.includes("@") && email.length > 5) {
-  // ...
-}
-```
-
-**Example - Good**:
-
-```typescript
-function isValidEmail(email: string): boolean {
-  return email.includes("@") && email.length > 5;
-}
-
-if (isValidEmail(email)) {
-  // ...
-}
-```
-
----
-
-### 2. Code Reusability
-
-**Principle**: Write code that can be used in multiple contexts without modification or with minimal adaptation.
-
-**Practices**:
-
-- Create generic, parameterized functions instead of specific ones
-- Use composition over inheritance where appropriate
-- Design functions to be pure (no side effects) when possible
-- Create utility libraries for common operations
-- Use dependency injection to make components reusable
-- Design APIs that are flexible and configurable
-
-**Example - Bad**:
-
-```typescript
-function calculateUserTotal(userId: string) {
-  const user = getUser(userId);
-  return user.items.reduce((sum, item) => sum + item.price, 0);
-}
-```
-
-**Example - Good**:
-
-```typescript
-function calculateTotal<T extends { price: number }>(items: T[]): number {
-  return items.reduce((sum, item) => sum + item.price, 0);
-}
-
-function calculateUserTotal(userId: string) {
-  const user = getUser(userId);
-  return calculateTotal(user.items);
-}
-```
-
----
-
-### 3. Abstract Functions and Abstractions
-
-**Principle**: Create abstractions that hide implementation details and provide clear, simple interfaces.
-
-**Practices**:
-
-- Use interfaces and abstract classes to define contracts
-- Create abstraction layers between different concerns
-- Hide complex implementation behind simple function signatures
-- Use dependency inversion - depend on abstractions, not concretions
-- Create factory functions/classes for object creation
-- Use strategy pattern for interchangeable algorithms
-
-**Example - Bad**:
-
-```typescript
-function processPayment(amount: number, cardNumber: string, cvv: string) {
-  // Direct implementation tied to specific payment processor
-  fetch("https://stripe.com/api/charge", {
-    method: "POST",
-    body: JSON.stringify({ amount, cardNumber, cvv }),
-  });
-}
-```
-
-**Example - Good**:
-
-```typescript
-interface PaymentProcessor {
-  processPayment(
-    amount: number,
-    details: PaymentDetails
-  ): Promise<PaymentResult>;
-}
-
-class StripeProcessor implements PaymentProcessor {
-  async processPayment(
-    amount: number,
-    details: PaymentDetails
-  ): Promise<PaymentResult> {
-    // Implementation
-  }
-}
-
-function processPayment(
-  processor: PaymentProcessor,
-  amount: number,
-  details: PaymentDetails
-) {
-  return processor.processPayment(amount, details);
-}
-```
-
----
-
-### 4. Extensibility
-
-**Principle**: Design code that can be easily extended with new features without modifying existing code.
-
-**Practices**:
-
-- Follow the Open/Closed Principle: open for extension, closed for modification
-- Use plugin architectures and hooks for extensibility
-- Design with future requirements in mind (but don't over-engineer)
-- Use configuration over hardcoding
-- Create extension points through interfaces and callbacks
-- Use composition and dependency injection
-- Design APIs that can accommodate new parameters/options
-
-**Example - Bad**:
-
-```typescript
-function sendNotification(user: User, type: string) {
-  if (type === "email") {
-    sendEmail(user.email);
-  } else if (type === "sms") {
-    sendSMS(user.phone);
-  }
-  // Adding new notification types requires modifying this function
-}
-```
-
-**Example - Good**:
-
-```typescript
-interface NotificationChannel {
-  send(user: User): Promise<void>;
-}
-
-class EmailChannel implements NotificationChannel {
-  async send(user: User): Promise<void> {
-    // Implementation
-  }
-}
-
-class SMSChannel implements NotificationChannel {
-  async send(user: User): Promise<void> {
-    // Implementation
-  }
-}
-
-class NotificationService {
-  constructor(private channels: NotificationChannel[]) {}
-
-  async send(user: User): Promise<void> {
-    await Promise.all(this.channels.map((channel) => channel.send(user)));
-  }
-}
-// New notification types can be added without modifying existing code
-```
-
----
-
-### 5. Avoid Magic Numbers and Strings
-
-**Principle**: Use named constants instead of hardcoded values to improve readability and maintainability.
-
-**Practices**:
-
-- Extract all magic numbers into named constants
-- Use enums for related constants
-- Create configuration objects for settings
-- Use constants for API endpoints, timeouts, limits, etc.
-- Document why specific values are used
-
-**Example - Bad**:
-
-```typescript
-if (user.age >= 18) {
-  // What does 18 mean?
-}
-
-setTimeout(() => {
-  // What does 3000 mean?
-}, 3000);
-
-if (status === "active") {
-  // What are the valid statuses?
-}
-```
-
-**Example - Good**:
-
-```typescript
-const MINIMUM_AGE_FOR_ADULTS = 18;
-const SESSION_TIMEOUT_MS = 3000;
-
-enum UserStatus {
-  ACTIVE = "active",
-  INACTIVE = "inactive",
-  SUSPENDED = "suspended",
-}
-
-if (user.age >= MINIMUM_AGE_FOR_ADULTS) {
-  // Clear intent
-}
-
-setTimeout(() => {
-  // Clear intent
-}, SESSION_TIMEOUT_MS);
-
-if (status === UserStatus.ACTIVE) {
-  // Type-safe and clear
-}
-```
-
----
-
-## Additional Best Practices
-
-### 6. Single Responsibility Principle
-
-Each function, class, or module should have one reason to change.
-
-**Example**:
-
-```typescript
-// Bad: Multiple responsibilities
-class User {
-  save() {
-    /* database logic */
-  }
-  sendEmail() {
-    /* email logic */
-  }
-  validate() {
-    /* validation logic */
-  }
-}
-
-// Good: Single responsibility
-class User {
-  validate() {
-    /* validation only */
-  }
-}
-
-class UserRepository {
-  save(user: User) {
-    /* database logic */
-  }
-}
-
-class EmailService {
-  sendToUser(user: User) {
-    /* email logic */
-  }
-}
-```
-
-### 7. Meaningful Names
-
-- Use descriptive names that reveal intent
-- Avoid abbreviations unless they're widely understood
-- Use verbs for functions, nouns for classes
-- Be consistent with naming conventions
-
-**Example**:
-
-```typescript
-// Bad
-const d = new Date();
-const u = getUser();
-function calc(x, y) {}
-
-// Good
-const currentDate = new Date();
-const currentUser = getUser();
-function calculateTotal(price: number, quantity: number): number {}
-```
-
-### 8. Small Functions
-
-- Functions should do one thing and do it well
-- Keep functions short (ideally under 20 lines)
-- Extract complex logic into separate functions
-- Use descriptive function names instead of comments
-
-### 9. Error Handling
-
-- Handle errors explicitly
-- Use appropriate error types
-- Provide meaningful error messages
-- Don't swallow errors silently
-- Use try-catch appropriately
-
-**Example**:
-
-```typescript
-// Bad
-function divide(a: number, b: number) {
-  return a / b; // Can throw division by zero
-}
-
-// Good
-function divide(a: number, b: number): number {
-  if (b === 0) {
-    throw new Error("Division by zero is not allowed");
-  }
-  return a / b;
-}
-```
-
-### 10. Comments and Documentation
-
-- Write self-documenting code (code should explain itself)
-- Use comments to explain "why", not "what"
-- Document complex algorithms or business logic
-- Keep comments up-to-date with code changes
-- Use JSDoc/TSDoc for public APIs
-
-### 11. Type Safety
-
-- Use TypeScript types/interfaces effectively
-- Avoid `any` type unless absolutely necessary
-- Use union types and discriminated unions
-- Leverage type inference where appropriate
-- Create custom types for domain concepts
-
-**Example**:
-
-```typescript
-// Bad
-function processUser(data: any) {
-  return data.name;
-}
-
-// Good
-interface User {
-  id: string;
-  name: string;
-  email: string;
-}
-
-function processUser(user: User): string {
-  return user.name;
-}
-```
-
-### 12. Testing Considerations
-
-- Write testable code (pure functions, dependency injection)
-- Keep functions small and focused
-- Avoid hidden dependencies
-- Use mocks and stubs appropriately
-- Design for testability from the start
-
-### 13. Performance vs. Readability
-
-- Prefer readability over premature optimization
-- Profile before optimizing
-- Use clear algorithms first, optimize if needed
-- Document performance-critical sections
-- Balance between clean code and performance requirements
-
-### 14. Code Organization
-
-- Group related functionality together
-- Use modules/packages to organize code
-- Follow consistent file and folder structures
-- Separate concerns (UI, business logic, data access)
-- Use barrel exports (index files) appropriately
-
-### 15. Configuration Management
-
-- Externalize configuration values
-- Use environment variables for environment-specific settings
-- Create configuration objects/interfaces
-- Validate configuration at startup
-- Provide sensible defaults
-
-**Example**:
-
-```typescript
-// Bad
-const apiUrl = "https://api.example.com";
-const timeout = 5000;
-
-// Good
-interface Config {
-  apiUrl: string;
-  timeout: number;
-  maxRetries: number;
-}
-
-const config: Config = {
-  apiUrl: process.env.API_URL || "https://api.example.com",
-  timeout: parseInt(process.env.TIMEOUT || "5000"),
-  maxRetries: parseInt(process.env.MAX_RETRIES || "3"),
-};
-```
-
----
-
-## Code Review Checklist
-
-When reviewing code, check for:
-
-- [ ] No code duplication (DRY principle)
-- [ ] Meaningful variable and function names
-- [ ] No magic numbers or strings
-- [ ] Functions are small and focused
-- [ ] Proper error handling
-- [ ] Type safety maintained
-- [ ] Code is testable
-- [ ] Documentation where needed
-- [ ] Consistent code style
-- [ ] Proper abstraction levels
-- [ ] Extensibility considered
-- [ ] Single responsibility principle followed
-
----
-
-## Summary
-
-Clean code is:
-
-- **Readable**: Easy to understand at a glance
-- **Maintainable**: Easy to modify and update
-- **Testable**: Easy to write tests for
-- **Extensible**: Easy to add new features
-- **Reusable**: Can be used in multiple contexts
-- **Well-documented**: Clear intent and purpose
-- **Type-safe**: Leverages type system effectively
-- **DRY**: No unnecessary repetition
-- **Abstracted**: Proper separation of concerns
-- **Configurable**: Uses constants and configuration over hardcoding
-
-Remember: Code is read far more often than it is written. Write code for your future self and your teammates.

.automaker/context/gemini.md

@@ -1,70 +0,0 @@
-You are a very strong reasoner and planner. Use these critical instructions to structure your plans, thoughts, and responses.
-
-Before taking any action (either tool calls or responses to the user), you must proactively, methodically, and independently plan and reason about:
-
-1. Logical dependencies and constraints:
-
-Analyze the intended action against the following factors. Resolve conflicts in order of importance:
-
-1.1) Policy-based rules, mandatory prerequisites, and constraints.
-1.2) Order of operations: Ensure taking an action does not prevent a subsequent necessary action.
- 1.2.1) The user may request actions in a random order, but you may need to reorder operations to maximize successful completion of the task.
-1.3) Other prerequisites (information and/or actions needed).
-1.4) Explicit user constraints or preferences.
-
-2. Risk assessment:
-
-What are the consequences of taking the action? Will the new state cause any future issues?
-
-2.1) For exploratory tasks (like searches), missing optional parameters is a LOW risk.
-Prefer calling the tool with the available information over asking the user, unless your Rule 1 (Logical Dependencies) reasoning determines that optional information is required for a later step in your plan.
-
-3. Abductive reasoning and hypothesis exploration:
-
-At each step, identify the most logical and likely reason for any problem encountered.
-
-3.1) Look beyond immediate or obvious causes. The most likely reason may not be the simplest and may require deeper inference.
-3.2) Hypotheses may require additional research. Each hypothesis may take multiple steps to test.
-3.3) Prioritize hypotheses based on likelihood, but do not discard less likely ones prematurely. A low-probability event may still be the root cause.
-
-4. Outcome evaluation and adaptability:
-
-Does the previous observation require any changes to your plan?
-
-4.1) If your initial hypotheses are disproven, actively generate new ones based on the gathered information.
-
-5. Information availability:
-
-Incorporate all applicable and alternative sources of information, including:
-
-5.1) Using available tools and their capabilities
-5.2) All policies, rules, checklists, and constraints
-5.3) Previous observations and conversation history
-5.4) Information only available by asking the user
-
-6. Precision and Grounding:
-
-Ensure your reasoning is extremely precise and relevant to each exact ongoing situation.
-
-6.1) Verify your claims by quoting the exact applicable information (including policies) when referring to them.
-
-7. Completeness:
-
-Ensure that all requirements, constraints, options, and preferences are exhaustively incorporated into your plan.
-
-7.1) Resolve conflicts using the order of importance in #1.
-7.2) Avoid premature conclusions: There may be multiple relevant options for a given situation.
- 7.2.1) To check for whether an option is relevant, reason about all information sources from #5.
- 7.2.2) You may need to consult the user to even know whether something is applicable. Do not assume it is not applicable without checking.
-7.3) Review applicable sources of information from #5 to confirm which are relevant to the current state.
-
-8. Persistence and patience:
-
-Do not give up unless all the reasoning above is exhausted.
-
-8.1) Don't be dissuaded by time taken or user frustration.
-8.2) This persistence must be intelligent: On transient errors (e.g. please try again), you must retry unless an explicit retry limit (e.g., max x tries) has been reached. If such a limit is hit, you must stop. On other errors, you must change your strategy or arguments, not repeat the same failed call.
-
-9. Inhibit your response:
-
-Only take an action after all the above reasoning is completed. Once you've taken an action, you cannot take it back.

.automaker/features/feature-1765426941179-om12nlapa/agent-output.md

@@ -1,53 +0,0 @@
-📋 Planning implementation for: move the report bug request button to top in header next to the automaker logo
-⚡ Executing implementation for: move the report bug request button to top in header next to the automaker logo
-Starting code implementation...
-
-🔧 Tool: TodoWrite
-Let me start by exploring the header component and understanding the current structure.
-🔧 Tool: Glob
-
-🔧 Tool: Grep
-
-🔧 Tool: Read
-
-🔧 Tool: Glob
-
-🔧 Tool: TodoWrite
-I found the sidebar component. The "Report Bug / Feature Request" button is currently in the bottom section of the sidebar (lines 1150-1180). The feature request is to move this button to the top header, next to the Automaker logo.
-
-Looking at the current structure:
-1. The logo section is at lines 742-770
-2. The bug report button is in the bottom section at lines 1150-1180
-
-I'll move the bug report button to be next to the logo in the header area. Let me make this change:
-🔧 Tool: Edit
-Now I need to remove the old bug report button from the bottom section:
-🔧 Tool: Edit
-The change is complete. Let me verify the build compiles correctly:
-🔧 Tool: Bash
-
-🔧 Tool: Bash
-
-🔧 Tool: Bash
-
-🔧 Tool: Bash
-The TypeScript check passed with no errors. Let me mark the task as completed and update the feature status:
-🔧 Tool: TodoWrite
-
-🔧 Tool: mcp__automaker-tools__UpdateFeatureStatus
-
-🔧 Tool: TodoWrite
-I've completed the feature implementation. Here's a summary of what was done:
-
-**Changes Made:**
-
-1. **Modified `app/src/components/layout/sidebar.tsx`:**
-   - Moved the "Report Bug / Feature Request" button from the bottom sidebar section (between Running Agents and Settings) to the header area, next to the AutoMaker logo
-   - Changed the header container from `justify-center` to `justify-between` to accommodate the new button placement
-   - The button is now a compact icon-only button with a tooltip on hover
-   - Kept the same test ID (`bug-report-link`) for consistency
-   - Removed the old button from the bottom section
-
-The bug report button now appears as a small bug icon in the header, right next to the AutoMaker logo, making it more accessible and visible to users.✅ Verifying implementation for: move the report bug request button to top in header next to the automaker logo
-Verifying implementation and checking test results...
-✓ Verification successful: All tests passed

.automaker/features/feature-1765426941179-om12nlapa/feature.json

@@ -1,14 +0,0 @@
-{
-  "category": "Uncategorized",
-  "description": "move the report bug request button to top in header next to the automaker logo",
-  "steps": [],
-  "status": "waiting_approval",
-  "images": [],
-  "imagePaths": [],
-  "skipTests": true,
-  "model": "opus",
-  "thinkingLevel": "none",
-  "id": "feature-1765426941179-om12nlapa",
-  "startedAt": "2025-12-11T04:22:21.750Z",
-  "summary": "Moved the Report Bug / Feature Request button from the bottom sidebar section to the header, next to the AutoMaker logo. Modified: app/src/components/layout/sidebar.tsx. The button now appears as a compact icon button in the header area."
-}

.automaker/features/feature-1765426941179-om12nlapa/git-state.json

@@ -1,11 +0,0 @@
-{
-  "timestamp": "2025-12-11T04:22:21.809Z",
-  "modifiedFiles": [
-    "app/src/components/views/analysis-view.tsx",
-    "app/src/components/views/interview-view.tsx"
-  ],
-  "untrackedFiles": [
-    ".automaker/features/feature-1765426941179-om12nlapa/feature.json",
-    "marketing/index.html"
-  ]
-}

.automaker/memory.md

@@ -1,172 +0,0 @@
-# Agent Memory - Lessons Learned
-
-This file documents issues encountered by previous agents and their solutions. Read this before starting work to avoid repeating mistakes.
-
-## Testing Issues
-
-### Issue: Mock project setup not navigating to board view
-
-**Problem:** Setting `currentProject` in localStorage didn't automatically show the board view - app stayed on welcome view.
-**Fix:** The `currentView` state is not persisted in localStorage. Instead of trying to set it, have tests click on the recent project from the welcome view to trigger `setCurrentProject()` which handles the view transition properly.
-
-```typescript
-// Don't do this:
-await setupMockProject(page); // Sets localStorage
-await page.goto("/");
-await waitForElement(page, "board-view"); // ❌ Fails - still on welcome view
-
-// Do this instead:
-await setupMockProject(page);
-await page.goto("/");
-await waitForElement(page, "welcome-view");
-const recentProject = page.locator(
-  '[data-testid="recent-project-test-project-1"]'
-);
-await recentProject.click(); // ✅ Triggers proper view transition
-await waitForElement(page, "board-view");
-```
-
-### Issue: View output button test IDs are conditional
-
-**Problem:** Tests failed looking for `view-output-inprogress-${featureId}` when the actual button had `view-output-${featureId}`.
-**Fix:** The button test ID depends on whether the feature is actively running:
-
-- `view-output-${featureId}` - shown when feature is in `runningAutoTasks` (actively running)
-- `view-output-inprogress-${featureId}` - shown when status is "in_progress" but NOT actively running
-
-After dragging a feature to in_progress, wait for the `auto_mode_feature_start` event to fire before looking for the button:
-
-```typescript
-// Wait for feature to start running
-const viewOutputButton = page
-  .locator(
-    `[data-testid="view-output-${featureId}"], [data-testid="view-output-inprogress-${featureId}"]`
-  )
-  .first();
-await expect(viewOutputButton).toBeVisible({ timeout: 8000 });
-```
-
-### Issue: Elements not appearing due to async event timing
-
-**Problem:** Tests checked for UI elements before async events (like `auto_mode_feature_start`) had fired and updated the UI.
-**Fix:** Add appropriate timeouts when waiting for elements that depend on async events. The mock auto mode takes ~2.4 seconds to complete, so allow sufficient time:
-
-```typescript
-// Mock auto mode timing: ~2.4s + 1.5s delay = ~4s total
-await waitForAgentOutputModalHidden(page, { timeout: 10000 });
-```
-
-### Issue: Slider interaction testing
-
-**Problem:** Clicking on slider track didn't reliably set specific values.
-**Fix:** Use the slider's keyboard interaction or calculate the exact click position on the track. For max value, click on the rightmost edge of the track.
-
-### Issue: Port binding blocked in sandbox mode
-
-**Problem:** Playwright tests couldn't bind to port in sandbox mode.
-**Fix:** Tests don't need sandbox disabled - the issue was TEST_REUSE_SERVER environment variable. Make sure to start the dev server separately or let Playwright's webServer config handle it.
-
-## Code Architecture
-
-### Issue: Understanding store state persistence
-
-**Problem:** Not all store state is persisted to localStorage.
-**Fix:** Check the `partialize` function in `app-store.ts` to see which state is persisted:
-
-```typescript
-partialize: (state) => ({
-  projects: state.projects,
-  currentProject: state.currentProject,
-  theme: state.theme,
-  sidebarOpen: state.sidebarOpen,
-  apiKeys: state.apiKeys,
-  chatSessions: state.chatSessions,
-  chatHistoryOpen: state.chatHistoryOpen,
-  maxConcurrency: state.maxConcurrency, // Added for concurrency feature
-});
-```
-
-Note: `currentView` is NOT persisted - it's managed through actions.
-
-### Issue: Auto mode task lifecycle
-
-**Problem:** Confusion about when features are considered "running" vs "in_progress".
-**Fix:** Understand the task lifecycle:
-
-1. Feature dragged to "in_progress" column → status becomes "in_progress"
-2. `auto_mode_feature_start` event fires → feature added to `runningAutoTasks`
-3. Agent works on feature → periodic events sent
-4. `auto_mode_feature_complete` event fires → feature removed from `runningAutoTasks`
-5. If `passes: true` → status becomes "verified", if `passes: false` → stays "in_progress"
-
-### Issue: waiting_approval features not draggable when skipTests=true
-
-**Problem:** Features in `waiting_approval` status couldn't be dragged to `verified` column, even though the code appeared to handle it.
-**Fix:** The order of condition checks in `handleDragEnd` matters. The `skipTests` check was catching `waiting_approval` features before the `waiting_approval` status check could handle them. Move the `waiting_approval` status check **before** the `skipTests` check in `board-view.tsx`:
-
-```typescript
-// Correct order in handleDragEnd:
-if (draggedFeature.status === "backlog") {
-  // ...
-} else if (draggedFeature.status === "waiting_approval") {
-  // Handle waiting_approval BEFORE skipTests check
-  // because waiting_approval features often have skipTests=true
-} else if (draggedFeature.skipTests) {
-  // Handle other skipTests features
-}
-```
-
-## Best Practices Discovered
-
-### Testing utilities are critical
-
-Create comprehensive testing utilities in `tests/utils.ts` to avoid repeating selector logic:
-
-- `waitForElement` - waits for elements to appear
-- `waitForElementHidden` - waits for elements to disappear
-- `setupMockProject` - sets up mock localStorage state
-- `navigateToBoard` - handles navigation from welcome to board view
-
-### Always add data-testid attributes
-
-When implementing features, immediately add `data-testid` attributes to key UI elements. This makes tests more reliable and easier to write.
-
-### Test timeouts should be generous but not excessive
-
-- Default timeout: 30s (set in playwright.config.ts)
-- Element waits: 5-15s for critical elements
-- Auto mode completion: 10s (accounts for ~4s mock duration)
-- Don't increase timeouts past 10s for individual operations
-
-### Mock auto mode timing
-
-The mock auto mode in `electron.ts` has predictable timing:
-
-- Total duration: ~2.4 seconds (300+500+300+300+500+500ms)
-- Plus 1.5s delay before auto-closing modals
-- Total: ~4 seconds from start to completion
-
-### Issue: HotkeyButton conflicting with useKeyboardShortcuts
-
-**Problem:** Adding `HotkeyButton` with a simple key (like "N") to buttons that already had keyboard shortcuts registered via `useKeyboardShortcuts` caused the hotkey to stop working. Both registered duplicate listeners, and the HotkeyButton's `stopPropagation()` call could interfere.
-**Fix:** When a simple single-key hotkey is already handled by `useKeyboardShortcuts`, set `hotkeyActive={false}` on the `HotkeyButton` so it only displays the indicator badge without registering a duplicate listener:
-
-```tsx
-// In views that already use useKeyboardShortcuts for the "N" key:
-<HotkeyButton
-  onClick={() => setShowAddDialog(true)}
-  hotkey={shortcuts.addFeature}
-  hotkeyActive={false}  // <-- Important! Prevents duplicate listener
->
-  Add Feature
-</HotkeyButton>
-
-// HotkeyButton should only actively listen when it's the sole handler (e.g., Cmd+Enter in dialogs)
-<HotkeyButton
-  onClick={handleSubmit}
-  hotkey={{ key: "Enter", cmdCtrl: true }}
-  hotkeyActive={isDialogOpen}  // Active when dialog is open
->
-  Submit
-</HotkeyButton>
-```

.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dir \"C:\\Users\\Ben\\Desktop\\appdev\\git\\automaker\\apps\\app\\public\")"
+    ]
+  }
+}

.github/scripts/upload-to-r2.js

@@ -0,0 +1,394 @@
+const {
+  S3Client,
+  PutObjectCommand,
+  GetObjectCommand,
+} = require("@aws-sdk/client-s3");
+const fs = require("fs");
+const path = require("path");
+const https = require("https");
+const { pipeline } = require("stream/promises");
+
+const s3Client = new S3Client({
+  region: "auto",
+  endpoint: process.env.R2_ENDPOINT,
+  credentials: {
+    accessKeyId: process.env.R2_ACCESS_KEY_ID,
+    secretAccessKey: process.env.R2_SECRET_ACCESS_KEY,
+  },
+});
+
+const BUCKET = process.env.R2_BUCKET_NAME;
+const PUBLIC_URL = process.env.R2_PUBLIC_URL;
+const VERSION = process.env.RELEASE_VERSION;
+const RELEASE_TAG = process.env.RELEASE_TAG || `v${VERSION}`;
+const GITHUB_REPO = process.env.GITHUB_REPOSITORY;
+
+async function fetchExistingReleases() {
+  try {
+    const response = await s3Client.send(
+      new GetObjectCommand({
+        Bucket: BUCKET,
+        Key: "releases.json",
+      })
+    );
+    const body = await response.Body.transformToString();
+    return JSON.parse(body);
+  } catch (error) {
+    if (error.name === "NoSuchKey" || error.$metadata?.httpStatusCode === 404) {
+      console.log("No existing releases.json found, creating new one");
+      return { latestVersion: null, releases: [] };
+    }
+    throw error;
+  }
+}
+
+async function uploadFile(localPath, r2Key, contentType) {
+  const fileBuffer = fs.readFileSync(localPath);
+  const stats = fs.statSync(localPath);
+
+  await s3Client.send(
+    new PutObjectCommand({
+      Bucket: BUCKET,
+      Key: r2Key,
+      Body: fileBuffer,
+      ContentType: contentType,
+    })
+  );
+
+  console.log(`Uploaded: ${r2Key} (${stats.size} bytes)`);
+  return stats.size;
+}
+
+function findArtifacts(dir, pattern) {
+  if (!fs.existsSync(dir)) return [];
+  const files = fs.readdirSync(dir);
+  return files.filter((f) => pattern.test(f)).map((f) => path.join(dir, f));
+}
+
+async function checkUrlAccessible(url, maxRetries = 10, initialDelay = 1000) {
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      const result = await new Promise((resolve, reject) => {
+        const request = https.get(url, { timeout: 10000 }, (response) => {
+          const statusCode = response.statusCode;
+
+          // Follow redirects
+          if (
+            statusCode === 302 ||
+            statusCode === 301 ||
+            statusCode === 307 ||
+            statusCode === 308
+          ) {
+            const redirectUrl = response.headers.location;
+            response.destroy();
+            if (!redirectUrl) {
+              resolve({
+                accessible: false,
+                statusCode,
+                error: "Redirect without location header",
+              });
+              return;
+            }
+            // Follow the redirect URL
+            return https
+              .get(redirectUrl, { timeout: 10000 }, (redirectResponse) => {
+                const redirectStatus = redirectResponse.statusCode;
+                const contentType =
+                  redirectResponse.headers["content-type"] || "";
+                // Check if it's actually a file (zip/tar.gz) and not HTML
+                const isFile =
+                  contentType.includes("application/zip") ||
+                  contentType.includes("application/gzip") ||
+                  contentType.includes("application/x-gzip") ||
+                  contentType.includes("application/x-tar") ||
+                  redirectUrl.includes(".zip") ||
+                  redirectUrl.includes(".tar.gz");
+                const isGood =
+                  redirectStatus >= 200 && redirectStatus < 300 && isFile;
+                redirectResponse.destroy();
+                resolve({
+                  accessible: isGood,
+                  statusCode: redirectStatus,
+                  finalUrl: redirectUrl,
+                  contentType,
+                });
+              })
+              .on("error", (error) => {
+                resolve({
+                  accessible: false,
+                  statusCode,
+                  error: error.message,
+                });
+              })
+              .on("timeout", function () {
+                this.destroy();
+                resolve({
+                  accessible: false,
+                  statusCode,
+                  error: "Timeout following redirect",
+                });
+              });
+          }
+
+          // Check if status is good (200-299 range) and it's actually a file
+          const contentType = response.headers["content-type"] || "";
+          const isFile =
+            contentType.includes("application/zip") ||
+            contentType.includes("application/gzip") ||
+            contentType.includes("application/x-gzip") ||
+            contentType.includes("application/x-tar") ||
+            url.includes(".zip") ||
+            url.includes(".tar.gz");
+          const isGood = statusCode >= 200 && statusCode < 300 && isFile;
+          response.destroy();
+          resolve({ accessible: isGood, statusCode, contentType });
+        });
+
+        request.on("error", (error) => {
+          resolve({
+            accessible: false,
+            statusCode: null,
+            error: error.message,
+          });
+        });
+
+        request.on("timeout", () => {
+          request.destroy();
+          resolve({
+            accessible: false,
+            statusCode: null,
+            error: "Request timeout",
+          });
+        });
+      });
+
+      if (result.accessible) {
+        if (attempt > 0) {
+          console.log(
+            `✓ URL ${url} is now accessible after ${attempt} retries (status: ${result.statusCode})`
+          );
+        } else {
+          console.log(
+            `✓ URL ${url} is accessible (status: ${result.statusCode})`
+          );
+        }
+        return result.finalUrl || url; // Return the final URL (after redirects) if available
+      } else {
+        const errorMsg = result.error ? ` - ${result.error}` : "";
+        const statusMsg = result.statusCode
+          ? ` (status: ${result.statusCode})`
+          : "";
+        const contentTypeMsg = result.contentType
+          ? ` [content-type: ${result.contentType}]`
+          : "";
+        console.log(
+          `✗ URL ${url} not accessible${statusMsg}${contentTypeMsg}${errorMsg}`
+        );
+      }
+    } catch (error) {
+      console.log(`✗ URL ${url} check failed: ${error.message}`);
+    }
+
+    if (attempt < maxRetries - 1) {
+      const delay = initialDelay * Math.pow(2, attempt);
+      console.log(
+        `  Retrying in ${delay}ms... (attempt ${attempt + 1}/${maxRetries})`
+      );
+      await new Promise((resolve) => setTimeout(resolve, delay));
+    }
+  }
+
+  throw new Error(`URL ${url} is not accessible after ${maxRetries} attempts`);
+}
+
+async function downloadFromGitHub(url, outputPath) {
+  return new Promise((resolve, reject) => {
+    const request = https.get(url, { timeout: 30000 }, (response) => {
+      const statusCode = response.statusCode;
+
+      // Follow redirects (all redirect types)
+      if (
+        statusCode === 301 ||
+        statusCode === 302 ||
+        statusCode === 307 ||
+        statusCode === 308
+      ) {
+        const redirectUrl = response.headers.location;
+        response.destroy();
+        if (!redirectUrl) {
+          reject(new Error(`Redirect without location header for ${url}`));
+          return;
+        }
+        // Resolve relative redirects
+        const finalRedirectUrl = redirectUrl.startsWith("http")
+          ? redirectUrl
+          : new URL(redirectUrl, url).href;
+        console.log(`  Following redirect: ${finalRedirectUrl}`);
+        return downloadFromGitHub(finalRedirectUrl, outputPath)
+          .then(resolve)
+          .catch(reject);
+      }
+
+      if (statusCode !== 200) {
+        response.destroy();
+        reject(
+          new Error(
+            `Failed to download ${url}: ${statusCode} ${response.statusMessage}`
+          )
+        );
+        return;
+      }
+
+      const fileStream = fs.createWriteStream(outputPath);
+      response.pipe(fileStream);
+      fileStream.on("finish", () => {
+        fileStream.close();
+        resolve();
+      });
+      fileStream.on("error", (error) => {
+        response.destroy();
+        reject(error);
+      });
+    });
+
+    request.on("error", reject);
+    request.on("timeout", () => {
+      request.destroy();
+      reject(new Error(`Request timeout for ${url}`));
+    });
+  });
+}
+
+async function main() {
+  const artifactsDir = "artifacts";
+  const tempDir = path.join(artifactsDir, "temp");
+
+  // Create temp directory for downloaded GitHub archives
+  if (!fs.existsSync(tempDir)) {
+    fs.mkdirSync(tempDir, { recursive: true });
+  }
+
+  // Download source archives from GitHub
+  const githubZipUrl = `https://github.com/${GITHUB_REPO}/archive/refs/tags/${RELEASE_TAG}.zip`;
+  const githubTarGzUrl = `https://github.com/${GITHUB_REPO}/archive/refs/tags/${RELEASE_TAG}.tar.gz`;
+
+  const sourceZipPath = path.join(tempDir, `automaker-${VERSION}.zip`);
+  const sourceTarGzPath = path.join(tempDir, `automaker-${VERSION}.tar.gz`);
+
+  console.log(`Waiting for source archives to be available on GitHub...`);
+  console.log(`  ZIP: ${githubZipUrl}`);
+  console.log(`  TAR.GZ: ${githubTarGzUrl}`);
+
+  // Wait for archives to be accessible with exponential backoff
+  // This returns the final URL after following redirects
+  const finalZipUrl = await checkUrlAccessible(githubZipUrl);
+  const finalTarGzUrl = await checkUrlAccessible(githubTarGzUrl);
+
+  console.log(`Downloading source archives from GitHub...`);
+  await downloadFromGitHub(finalZipUrl, sourceZipPath);
+  await downloadFromGitHub(finalTarGzUrl, sourceTarGzPath);
+
+  console.log(`Downloaded source archives successfully`);
+
+  // Find all artifacts
+  const artifacts = {
+    windows: findArtifacts(path.join(artifactsDir, "windows-builds"), /\.exe$/),
+    macos: findArtifacts(path.join(artifactsDir, "macos-builds"), /-x64\.dmg$/),
+    macosArm: findArtifacts(
+      path.join(artifactsDir, "macos-builds"),
+      /-arm64\.dmg$/
+    ),
+    linux: findArtifacts(
+      path.join(artifactsDir, "linux-builds"),
+      /\.AppImage$/
+    ),
+    sourceZip: [sourceZipPath],
+    sourceTarGz: [sourceTarGzPath],
+  };
+
+  console.log("Found artifacts:");
+  for (const [platform, files] of Object.entries(artifacts)) {
+    console.log(
+      `  ${platform}: ${
+        files.length > 0
+          ? files.map((f) => path.basename(f)).join(", ")
+          : "none"
+      }`
+    );
+  }
+
+  // Upload each artifact to R2
+  const assets = {};
+  const contentTypes = {
+    windows: "application/x-msdownload",
+    macos: "application/x-apple-diskimage",
+    macosArm: "application/x-apple-diskimage",
+    linux: "application/x-executable",
+    sourceZip: "application/zip",
+    sourceTarGz: "application/gzip",
+  };
+
+  for (const [platform, files] of Object.entries(artifacts)) {
+    if (files.length === 0) {
+      console.warn(`Warning: No artifact found for ${platform}`);
+      continue;
+    }
+
+    // Use the first matching file for each platform
+    const localPath = files[0];
+    const filename = path.basename(localPath);
+    const r2Key = `releases/${VERSION}/${filename}`;
+    const size = await uploadFile(localPath, r2Key, contentTypes[platform]);
+
+    assets[platform] = {
+      url: `${PUBLIC_URL}/releases/${VERSION}/${filename}`,
+      filename,
+      size,
+      arch:
+        platform === "macosArm"
+          ? "arm64"
+          : platform === "sourceZip" || platform === "sourceTarGz"
+          ? "source"
+          : "x64",
+    };
+  }
+
+  // Fetch and update releases.json
+  const releasesData = await fetchExistingReleases();
+
+  const newRelease = {
+    version: VERSION,
+    date: new Date().toISOString(),
+    assets,
+    githubReleaseUrl: `https://github.com/${GITHUB_REPO}/releases/tag/${RELEASE_TAG}`,
+  };
+
+  // Remove existing entry for this version if re-running
+  releasesData.releases = releasesData.releases.filter(
+    (r) => r.version !== VERSION
+  );
+
+  // Prepend new release
+  releasesData.releases.unshift(newRelease);
+  releasesData.latestVersion = VERSION;
+
+  // Upload updated releases.json
+  await s3Client.send(
+    new PutObjectCommand({
+      Bucket: BUCKET,
+      Key: "releases.json",
+      Body: JSON.stringify(releasesData, null, 2),
+      ContentType: "application/json",
+      CacheControl: "public, max-age=60",
+    })
+  );
+
+  console.log("Successfully updated releases.json");
+  console.log(`Latest version: ${VERSION}`);
+  console.log(`Total releases: ${releasesData.releases.length}`);
+}
+
+main().catch((err) => {
+  console.error("Failed to upload to R2:", err);
+  process.exit(1);
+});

.github/workflows/e2e-tests.yml

@@ -0,0 +1,91 @@
+name: E2E Tests
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: Install dependencies
+        # Use npm install instead of npm ci to correctly resolve platform-specific
+        # optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
+        run: npm install
+
+      - name: Install Linux native bindings
+        # Workaround for npm optional dependencies bug (npm/cli#4828)
+        # Explicitly install Linux bindings needed for build tools
+        run: |
+          npm install --no-save --force \
+            @rollup/rollup-linux-x64-gnu@4.53.3 \
+            @tailwindcss/oxide-linux-x64-gnu@4.1.17
+
+      - name: Install Playwright browsers
+        run: npx playwright install --with-deps chromium
+        working-directory: apps/app
+
+      - name: Build server
+        run: npm run build --workspace=apps/server
+
+      - name: Start backend server
+        run: npm run start --workspace=apps/server &
+        env:
+          PORT: 3008
+          NODE_ENV: test
+
+      - name: Wait for backend server
+        run: |
+          echo "Waiting for backend server to be ready..."
+          for i in {1..30}; do
+            if curl -s http://localhost:3008/api/health > /dev/null 2>&1; then
+              echo "Backend server is ready!"
+              exit 0
+            fi
+            echo "Waiting... ($i/30)"
+            sleep 1
+          done
+          echo "Backend server failed to start!"
+          exit 1
+
+      - name: Run E2E tests
+        # Playwright automatically starts the Next.js frontend via webServer config
+        # (see apps/app/playwright.config.ts) - no need to start it manually
+        run: npm run test --workspace=apps/app
+        env:
+          CI: true
+          NEXT_PUBLIC_SERVER_URL: http://localhost:3008
+          NEXT_PUBLIC_SKIP_SETUP: "true"
+
+      - name: Upload Playwright report
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report
+          path: apps/app/playwright-report/
+          retention-days: 7
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results
+          path: apps/app/test-results/
+          retention-days: 7

.github/workflows/pr-check.yml

@@ -29,5 +29,13 @@ jobs:
         # optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
         run: npm install
 
+      - name: Install Linux native bindings
+        # Workaround for npm optional dependencies bug (npm/cli#4828)
+        # Explicitly install Linux bindings needed for build tools
+        run: |
+          npm install --no-save --force \
+            @rollup/rollup-linux-x64-gnu@4.53.3 \
+            @tailwindcss/oxide-linux-x64-gnu@4.1.17
+
       - name: Run build:electron
         run: npm run build:electron

.github/workflows/release.yml

@@ -19,10 +19,13 @@ jobs:
         include:
           - os: macos-latest
             name: macOS
+            artifact-name: macos-builds
           - os: windows-latest
             name: Windows
+            artifact-name: windows-builds
           - os: ubuntu-latest
             name: Linux
+            artifact-name: linux-builds
 
     runs-on: ${{ matrix.os }}
 
@@ -45,6 +48,30 @@ jobs:
         # optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
         run: npm install
 
+      - name: Install Linux native bindings
+        # Workaround for npm optional dependencies bug (npm/cli#4828)
+        # Only needed on Linux - macOS and Windows get their bindings automatically
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          npm install --no-save --force \
+            @rollup/rollup-linux-x64-gnu@4.53.3 \
+            @tailwindcss/oxide-linux-x64-gnu@4.1.17
+
+      - name: Extract and set version
+        id: version
+        shell: bash
+        run: |
+          VERSION_TAG="${{ github.event.inputs.version || github.ref_name }}"
+          # Remove 'v' prefix if present (e.g., v1.0.0 -> 1.0.0)
+          VERSION="${VERSION_TAG#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Extracted version: $VERSION from tag: $VERSION_TAG"
+          # Update the app's package.json version
+          cd apps/app
+          npm version $VERSION --no-git-tag-version
+          cd ../..
+          echo "Updated apps/app/package.json to version $VERSION"
+
       - name: Build Electron App (macOS)
         if: matrix.os == 'macos-latest'
         env:
@@ -78,3 +105,71 @@ jobs:
           prerelease: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload macOS artifacts for R2
+        if: matrix.os == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: apps/app/dist/*.dmg
+          retention-days: 1
+
+      - name: Upload Windows artifacts for R2
+        if: matrix.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: apps/app/dist/*.exe
+          retention-days: 1
+
+      - name: Upload Linux artifacts for R2
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: apps/app/dist/*.AppImage
+          retention-days: 1
+
+  upload-to-r2:
+    needs: build-and-release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Install AWS SDK
+        run: npm install @aws-sdk/client-s3
+
+      - name: Extract version
+        id: version
+        shell: bash
+        run: |
+          VERSION_TAG="${{ github.event.inputs.version || github.ref_name }}"
+          # Remove 'v' prefix if present (e.g., v1.0.0 -> 1.0.0)
+          VERSION="${VERSION_TAG#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "version_tag=$VERSION_TAG" >> $GITHUB_OUTPUT
+          echo "Extracted version: $VERSION from tag: $VERSION_TAG"
+
+      - name: Upload to R2 and update releases.json
+        env:
+          R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }}
+          R2_PUBLIC_URL: ${{ secrets.R2_PUBLIC_URL }}
+          RELEASE_VERSION: ${{ steps.version.outputs.version }}
+          RELEASE_TAG: ${{ steps.version.outputs.version_tag }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: node .github/scripts/upload-to-r2.js

.github/workflows/test.yml

@@ -0,0 +1,53 @@
+name: Test Suite
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: Install dependencies
+        # Use npm install instead of npm ci to correctly resolve platform-specific
+        # optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
+        run: npm install
+
+      - name: Install Linux native bindings
+        # Workaround for npm optional dependencies bug (npm/cli#4828)
+        # Explicitly install Linux bindings needed for build tools
+        run: |
+          npm install --no-save --force \
+            @rollup/rollup-linux-x64-gnu@4.53.3 \
+            @tailwindcss/oxide-linux-x64-gnu@4.1.17
+
+      - name: Run server tests with coverage
+        run: npm run test:server:coverage
+        env:
+          NODE_ENV: test
+
+      # - name: Upload coverage reports
+      #   uses: codecov/codecov-action@v4
+      #   if: always()
+      #   with:
+      #     files: ./apps/server/coverage/coverage-final.json
+      #     flags: server
+      #     name: server-coverage
+      #   env:
+      #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -7,3 +7,9 @@ node_modules/
 # Build outputs
 dist/
 .next/
+.automaker/images/
+.automaker/
+/.automaker/*
+/.automaker/
+
+/logs

.npmrc

@@ -8,3 +8,9 @@
 #
 # In CI/CD: Use "npm install" instead of "npm ci" to allow npm to resolve
 # the correct platform-specific binaries at install time.
+
+# Include bindings for all platforms in package-lock.json to support CI/CD
+# This ensures Linux, macOS, and Windows bindings are all present
+# NOTE: Only enable when regenerating package-lock.json, then comment out to keep installs fast
+# supportedArchitectures.os=linux,darwin,win32
+# supportedArchitectures.cpu=x64,arm64

DISCLAIMER.md

@@ -19,9 +19,11 @@ While we have made efforts to review this codebase for security vulnerabilities
 ## Recommendations
 
 ### 1. Review the Code First
+
 Before running Automaker, we strongly recommend reviewing the source code yourself to understand what operations it performs and ensure you are comfortable with its behavior.
 
 ### 2. Use Sandboxing (Highly Recommended)
+
 **We do not recommend running Automaker directly on your local computer** due to the risk of AI agents having access to your entire file system. Instead, consider:
 
 - **Docker**: Run Automaker in a Docker container to isolate it from your host system
@@ -29,20 +31,25 @@ Before running Automaker, we strongly recommend reviewing the source code yourse
 - **Cloud Development Environment**: Use a cloud-based development environment that provides isolation
 
 ### 3. Limit Access
+
 If you must run locally:
+
 - Create a dedicated user account with limited permissions
 - Only grant access to specific project directories
 - Avoid running with administrator/root privileges
 - Keep sensitive files and credentials outside of project directories
 
 ### 4. Monitor Activity
+
 - Review the agent's actions in the output logs
 - Pay attention to file modifications and command executions
 - Stop the agent immediately if you notice unexpected behavior
 
-## No Warranty
+## No Warranty & Limitation of Liability
 
-This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.
+THE SOFTWARE UTILIZES ARTIFICIAL INTELLIGENCE TO GENERATE CODE, EXECUTE COMMANDS, AND INTERACT WITH YOUR FILE SYSTEM. YOU ACKNOWLEDGE THAT AI SYSTEMS CAN BE UNPREDICTABLE, MAY GENERATE INCORRECT, INSECURE, OR DESTRUCTIVE CODE, AND MAY TAKE ACTIONS THAT COULD DAMAGE YOUR SYSTEM, FILES, OR HARDWARE.
+
+This software is provided "as is", without warranty of any kind, express or implied. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, including but not limited to hardware damage, data loss, financial loss, or business interruption, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.
 
 ## Acknowledgment
 

LICENSE

@@ -1,208 +1,141 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-Version 3, 19 November 2007
+AUTOMAKER LICENSE AGREEMENT
 
-Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+This License Agreement ("Agreement") is entered into between you ("Licensee") and the copyright holders of Automaker ("Licensor"). By using, copying, modifying, downloading, cloning, or distributing the Software (as defined below), you agree to be bound by the terms of this Agreement.
 
-Preamble
-The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+1. DEFINITIONS
 
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.
+"Software" means the Automaker software, including all source code, object code, documentation, and related materials.
 
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+"Generated Files" means files created by the Software during normal operation to store internal state, configuration, or working data, including but not limited to app_spec.txt, feature.json, and similar files generated by the Software. Generated Files are not considered part of the Software for the purposes of this license and are not subject to the restrictions herein.
 
-Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+"Derivative Work" means any work that is based on, derived from, or incorporates the Software or any substantial portion of it, including but not limited to modifications, forks, adaptations, translations, or any altered version of the Software.
 
-A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+"Monetization" means any activity that generates revenue, income, or commercial benefit from the Software itself or any Derivative Work, including but not limited to:
 
-The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+- Reselling, redistributing, or sublicensing the Software, any Derivative Work, or any substantial portion thereof
+- Including the Software, any Derivative Work, or substantial portions thereof in a product or service that you sell or distribute
+- Offering the Software, any Derivative Work, or substantial portions thereof as a standalone product or service for sale
+- Hosting the Software or any Derivative Work as a service (whether free or paid) for use by others, including cloud hosting, Software-as-a-Service (SaaS), or any other form of hosted access for third parties
+- Extracting, reselling, redistributing, or sublicensing any prompts, context, or other instructional content bundled within the Software
+- Creating, distributing, or selling modified versions, forks, or Derivative Works of the Software
 
-An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+Monetization does NOT include:
 
-The precise terms and conditions for copying, distribution and modification follow.
+- Using the Software internally within your organization, regardless of whether your organization is for-profit
+- Using the Software to build products or services that generate revenue, as long as you are not reselling or redistributing the Software itself
+- Using the Software to provide services for which fees are charged, as long as the Software itself is not being resold or redistributed
+- Hosting the Software anywhere for personal use by a single developer, as long as the Software is not made accessible to others
 
-TERMS AND CONDITIONS 0. Definitions.
-"This License" refers to version 3 of the GNU Affero General Public License.
+"Core Contributors" means the following individuals who are granted perpetual, royalty-free licenses:
 
-"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+- Cody Seibert (webdevcody)
+- SuperComboGamer (SCG)
+- Kacper Lachowicz (Shironex, Shirone)
+- Ben Scott (trueheads)
 
-"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
+2. GRANT OF LICENSE
 
-To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
+Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee a non-exclusive, non-transferable license to use, copy, modify, and distribute the Software, provided that:
 
-A "covered work" means either the unmodified Program or a work based on the Program.
+a) Licensee may freely clone, install, and use the Software locally or within an organization for the purpose of building, developing, and maintaining other products, software, or services. There are no restrictions on the products you build _using_ the Software.
 
-To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+b) Licensee may run the Software on personal or organizational infrastructure for internal use.
 
-To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+c) Core Contributors are each individually granted a perpetual, worldwide, royalty-free, non-exclusive license to use, copy, modify, distribute, and sublicense the Software for any purpose, including Monetization, without payment of any fees or royalties. Each Core Contributor may exercise these rights independently and does not require permission, consent, or approval from any other Core Contributor to Monetize the Software in any way they see fit.
 
-An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+d) Commercial licenses for the Software may be discussed and issued to external parties or companies seeking to use the Software for financial gain or Monetization purposes. Core Contributors already have full rights under section 2(c) and do not require commercial licenses. Any commercial license issued to external parties shall require a unanimous vote by all Core Contributors and shall be granted in writing and signed by all Core Contributors.
 
-1. Source Code.
-   The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
+e) The list of individuals defined as "Core Contributors" in Section 1 shall be amended to reflect any revocation or reinstatement of status made under this section.
 
-A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+3. RESTRICTIONS
 
-The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+Licensee may NOT:
 
-The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+- Engage in any Monetization of the Software or any Derivative Work without explicit written permission from all Core Contributors
+- Resell, redistribute, or sublicense the Software, any Derivative Work, or any substantial portion thereof
+- Create, distribute, or sell modified versions, forks, or Derivative Works of the Software for any commercial purpose
+- Include the Software, any Derivative Work, or substantial portions thereof in a product or service that you sell or distribute
+- Offer the Software, any Derivative Work, or substantial portions thereof as a standalone product or service for sale
+- Extract, resell, redistribute, or sublicense any prompts, context, or other instructional content bundled within the Software
+- Host the Software or any Derivative Work as a service (whether free or paid) for use by others (except Core Contributors)
+- Remove or alter any copyright notices or license terms
+- Use the Software in any manner that violates applicable laws or regulations
 
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+Licensee MAY:
 
-The Corresponding Source for a work in source code form is that same work.
+- Use the Software internally within their organization (commercial or non-profit)
+- Use the Software to build other commercial products (products that do NOT contain the Software or Derivative Works)
+- Modify the Software for internal use within their organization (commercial or non-profit)
 
-2. Basic Permissions.
-   All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+4. CORE CONTRIBUTOR STATUS MANAGEMENT
 
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+a) Core Contributor status may be revoked indefinitely by the remaining Core Contributors if:
 
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+- A Core Contributor cannot be reached for a period of one (1) month through reasonable means of communication (including but not limited to email, Discord, GitHub, or other project communication channels)
+- AND the Core Contributor has not contributed to the project during that one-month period. For purposes of this section, "contributed" means at least one of the following activities:
+  - Discussing the Software through project communication channels
+  - Committing code changes to the project repository
+  - Submitting bug fixes or patches
+  - Participating in project-related discussions or decision-making
 
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-   No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+b) Revocation of Core Contributor status requires a unanimous vote by all other Core Contributors (excluding the Core Contributor whose status is being considered for revocation).
 
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+c) Upon revocation of Core Contributor status, the individual shall no longer be considered a Core Contributor and shall lose the rights granted under section 2(c) of this Agreement. However, any Contributions made prior to revocation shall remain subject to the terms of section 5 (CONTRIBUTIONS AND RIGHTS ASSIGNMENT).
 
-4. Conveying Verbatim Copies.
-   You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+d) A revoked Core Contributor may be reinstated to Core Contributor status with a unanimous vote by all current Core Contributors. Upon reinstatement, the individual shall regain all rights granted under section 2(c) of this Agreement.
 
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. CONTRIBUTIONS AND RIGHTS ASSIGNMENT
 
-5. Conveying Modified Source Versions.
-   You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+By submitting, pushing, or contributing any code, documentation, pull requests, issues, or other materials ("Contributions") to the Automaker project, you agree to the following terms without reservation:
 
-a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+a) **Full Ownership Transfer & Rights Grant:** You hereby assign to the Core Contributors all right, title, and interest in and to your Contributions, including all copyrights, patents, and other intellectual property rights. If such assignment is not effective under applicable law, you grant the Core Contributors an unrestricted, perpetual, worldwide, non-exclusive, royalty-free, fully paid-up, irrevocable, sublicensable, and transferable license to use, reproduce, modify, adapt, publish, translate, create derivative works from, distribute, perform, display, and otherwise exploit your Contributions in any manner they see fit, including for any commercial purpose or Monetization.
 
-6. Conveying Non-Source Forms.
-   You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+b) **No Take-Backs:** You understand and agree that this grant of rights is irrevocable ("no take-backs"). You cannot revoke, rescind, or terminate this grant of rights once your Contribution has been submitted.
 
-a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+c) **Waiver of Moral Rights:** You waive any "moral rights" or other rights with respect to attribution of authorship or integrity of materials regarding your Contributions that you may have under any applicable law.
 
-A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+d) **Right to Contribute:** You represent and warrant that you are the original author of the Contributions, or that you have sufficient rights to grant the rights conveyed by this section, and that your Contributions do not infringe upon the rights of any third party.
 
-"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+6. TERMINATION
 
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+This license will terminate automatically if Licensee breaches any term of this Agreement. Upon termination, Licensee must immediately cease all use of the Software and destroy all copies in their possession.
 
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+7. HIGH RISK DISCLAIMER AND LIMITATION OF LIABILITY
 
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+a) **AI RISKS:** THE SOFTWARE UTILIZES ARTIFICIAL INTELLIGENCE TO GENERATE CODE, EXECUTE COMMANDS, AND INTERACT WITH YOUR FILE SYSTEM. YOU ACKNOWLEDGE THAT AI SYSTEMS CAN BE UNPREDICTABLE, MAY GENERATE INCORRECT, INSECURE, OR DESTRUCTIVE CODE, AND MAY TAKE ACTIONS THAT COULD DAMAGE YOUR SYSTEM, FILES, OR HARDWARE.
 
-7. Additional Terms.
-   "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+b) **USE AT YOUR OWN RISK:** YOU AGREE THAT YOUR USE OF THE SOFTWARE IS SOLELY AT YOUR OWN RISK. THE CORE CONTRIBUTORS AND LICENSOR DO NOT GUARANTEE THAT THE SOFTWARE OR ANY CODE GENERATED BY IT WILL BE SAFE, BUG-FREE, OR FUNCTIONAL.
 
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+c) **NO WARRANTY:** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT.
 
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+d) **LIMITATION OF LIABILITY:** IN NO EVENT SHALL THE CORE CONTRIBUTORS, LICENSORS, OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE, INCLUDING BUT NOT LIMITED TO:
 
-a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+- DAMAGE TO HARDWARE OR COMPUTER SYSTEMS
+- DATA LOSS OR CORRUPTION
+- GENERATION OF BAD, VULNERABLE, OR MALICIOUS CODE
+- FINANCIAL LOSSES
+- BUSINESS INTERRUPTION
 
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+8. LICENSE AMENDMENTS
 
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+Any amendment, modification, or update to this License Agreement must be agreed upon unanimously by all Core Contributors. No changes to this Agreement shall be effective unless all Core Contributors have provided their written consent or approval through a unanimous vote.
 
-8. Termination.
-   You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+9. CONTACT
 
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+For inquiries regarding this license or permissions for Monetization, please contact the Core Contributors through the official project channels:
 
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+- Agentic Jumpstart Discord: https://discord.gg/JUDWZDN3VT
+- Website: https://automaker.app
+- Email: automakerapp@gmail.com
 
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+Any permission for Monetization requires the unanimous written consent of all Core Contributors.
 
-9. Acceptance Not Required for Having Copies.
-   You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. GOVERNING LAW
 
-10. Automatic Licensing of Downstream Recipients.
-    Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+This Agreement shall be governed by and construed in accordance with the laws of the State of Tennessee, USA, without regard to conflict of law principles.
 
-An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+By using the Software, you acknowledge that you have read this Agreement, understand it, and agree to be bound by its terms and conditions.
 
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+---
 
-11. Patents.
-    A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-    If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-13. Remote Network Interaction; Use with the GNU General Public License.
-    Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
-
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-    The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-15. Disclaimer of Warranty.
-    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-    If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
-
-You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
+Copyright (c) 2025 Automaker Core Contributors

README.md

@@ -1,6 +1,36 @@
+> **[!TIP]**
+>
+> **Learn more about Agentic Coding!**
+>
+> Automaker itself was built by a group of engineers using AI and agentic coding techniques to build features faster than ever. By leveraging tools like Cursor IDE and Claude Code CLI, the team orchestrated AI agents to implement complex functionality in days instead of weeks.
+>
+> **Learn how:** Master these same techniques and workflows in the [Agentic Jumpstart course](https://agenticjumpstart.com/?utm=automaker).
+
 # Automaker
 
-Automaker is an autonomous AI development studio that helps you build software faster using AI-powered agents. It provides a visual Kanban board interface to manage features, automatically assigns AI agents to implement them, and tracks progress through an intuitive workflow from backlog to verified completion.
+**Stop typing code. Start directing AI agents.**
+
+Automaker is an autonomous AI development studio that transforms how you build software. Instead of manually writing every line of code, you describe features on a Kanban board and watch as AI agents powered by Claude Code automatically implement them.
+
+## What Makes Automaker Different?
+
+Traditional development tools help you write code. Automaker helps you **orchestrate AI agents** to build entire features autonomously. Think of it as having a team of AI developers working for you—you define what needs to be built, and Automaker handles the implementation.
+
+### The Workflow
+
+1. **Add Features** - Describe features you want built (with text, images, or screenshots)
+2. **Move to "In Progress"** - Automaker automatically assigns an AI agent to implement the feature
+3. **Watch It Build** - See real-time progress as the agent writes code, runs tests, and makes changes
+4. **Review & Verify** - Review the changes, run tests, and approve when ready
+5. **Ship Faster** - Build entire applications in days, not weeks
+
+### Powered by Claude Code
+
+Automaker leverages the [Claude Agent SDK](https://docs.anthropic.com/en/docs/claude-code) to give AI agents full access to your codebase. Agents can read files, write code, execute commands, run tests, and make git commits—all while working in isolated git worktrees to keep your main branch safe.
+
+### Why This Matters
+
+The future of software development is **agentic coding**—where developers become architects directing AI agents rather than manual coders. Automaker puts this future in your hands today, letting you experience what it's like to build software 10x faster with AI agents handling the implementation while you focus on architecture and business logic.
 
 ---
 
@@ -36,25 +66,90 @@ cd automaker
 # 2. Install dependencies
 npm install
 
-# 3. Get your Claude Code OAuth token
-claude setup-token
-# ⚠️ This prints your token - don't share your screen!
+# 3. Run Automaker (pick your mode)
+npm run dev
+# Then choose your run mode when prompted, or use specific commands below
+```
 
-# 4. Set the token and run
-export CLAUDE_CODE_OAUTH_TOKEN="sk-ant-oat01-..."
+## How to Run
+
+### Development Mode
+
+Start Automaker in development mode:
+
+```bash
+npm run dev
+```
+
+This will prompt you to choose your run mode, or you can specify a mode directly:
+
+#### Electron Desktop App (Recommended)
+
+```bash
+# Standard development mode
 npm run dev:electron
+
+# With DevTools open automatically
+npm run dev:electron:debug
+
+# For WSL (Windows Subsystem for Linux)
+npm run dev:electron:wsl
+
+# For WSL with GPU acceleration
+npm run dev:electron:wsl:gpu
+```
+
+#### Web Browser Mode
+
+```bash
+# Run in web browser (http://localhost:3007)
+npm run dev:web
+```
+
+### Building for Production
+
+```bash
+# Build Next.js app
+npm run build
+
+# Build Electron app for distribution
+npm run build:electron
+```
+
+### Running Production Build
+
+```bash
+# Start production Next.js server
+npm run start
+```
+
+### Testing
+
+```bash
+# Run tests headless
+npm run test
+
+# Run tests with browser visible
+npm run test:headed
+```
+
+### Linting
+
+```bash
+# Run ESLint
+npm run lint
 ```
 
 ### Authentication Options
 
 Automaker supports multiple authentication methods (in order of priority):
 
-| Method | Environment Variable | Description |
-|--------|---------------------|-------------|
-| OAuth Token (env) | `CLAUDE_CODE_OAUTH_TOKEN` | From `claude setup-token` - uses your Claude subscription |
-| OAuth Token (stored) | — | Stored in app credentials file |
-| API Key (stored) | — | Anthropic API key stored in app |
-| API Key (env) | `ANTHROPIC_API_KEY` | Pay-per-use API key |
+| Method               | Environment Variable      | Description                                               |
+| -------------------- | ------------------------- | --------------------------------------------------------- |
+| OAuth Token (env)    | `CLAUDE_CODE_OAUTH_TOKEN` | From `claude setup-token` - uses your Claude subscription |
+| OAuth Token (stored) | —                         | Stored in app credentials file                            |
+| API Key (stored)     | —                         | Anthropic API key stored in app                           |
+| API Key (env)        | `ANTHROPIC_API_KEY`       | Pay-per-use API key                                       |
 
 **Recommended:** Use `CLAUDE_CODE_OAUTH_TOKEN` if you have a Claude subscription.
 
@@ -105,4 +200,27 @@ To learn more about Next.js, take a look at the following resources:
 
 ## License
 
-See [LICENSE](../LICENSE) for details.
+This project is licensed under the **Automaker License Agreement**. See [LICENSE](LICENSE) for the full text.
+
+**Summary of Terms:**
+
+- **Allowed:**
+
+  - **Build Anything:** You can clone and use Automaker locally or in your organization to build ANY product (commercial or free).
+  - **Internal Use:** You can use it internally within your company (commercial or non-profit) without restriction.
+  - **Modify:** You can modify the code for internal use within your organization (commercial or non-profit).
+
+- **Restricted (The "No Monetization of the Tool" Rule):**
+
+  - **No Resale:** You cannot resell Automaker itself.
+  - **No SaaS:** You cannot host Automaker as a service for others.
+  - **No Monetizing Mods:** You cannot distribute modified versions of Automaker for money.
+
+- **Liability:**
+
+  - **Use at Own Risk:** This tool uses AI. We are **NOT** responsible if it breaks your computer, deletes your files, or generates bad code. You assume all risk.
+
+- **Contributing:**
+  - By contributing to this repository, you grant the Core Contributors full, irrevocable rights to your code (copyright assignment).
+
+**Core Contributors** (Cody Seibert (webdevcody), SuperComboGamer (SCG), Kacper Lachowicz (Shironex, Shirone), and Ben Scott (trueheads)) are granted perpetual, royalty-free licenses for any use, including monetization.

apps/app/.gitignore

@@ -48,3 +48,4 @@ next-env.d.ts
 
 # Electron
 /dist/
+/server-bundle/

apps/app/electron/agent-service.js

@@ -1,682 +0,0 @@
-const { query, AbortError } = require("@anthropic-ai/claude-agent-sdk");
-const path = require("path");
-const fs = require("fs/promises");
-
-/**
- * Agent Service - Runs Claude agents in the Electron main process
- * This service survives Next.js restarts and maintains conversation state
- */
-class AgentService {
-  constructor() {
-    this.sessions = new Map(); // sessionId -> { messages, isRunning, abortController }
-    this.stateDir = null; // Will be set when app is ready
-  }
-
-  /**
-   * Initialize the service with app data directory
-   */
-  async initialize(appDataPath) {
-    this.stateDir = path.join(appDataPath, "agent-sessions");
-    this.metadataFile = path.join(appDataPath, "sessions-metadata.json");
-    await fs.mkdir(this.stateDir, { recursive: true });
-  }
-
-  /**
-   * Start or resume a conversation
-   */
-  async startConversation({ sessionId, workingDirectory }) {
-
-    // Initialize session if it doesn't exist
-    if (!this.sessions.has(sessionId)) {
-      const messages = await this.loadSession(sessionId);
-
-      this.sessions.set(sessionId, {
-        messages,
-        isRunning: false,
-        abortController: null,
-        workingDirectory: workingDirectory || process.cwd(),
-      });
-    }
-
-    const session = this.sessions.get(sessionId);
-    return {
-      success: true,
-      messages: session.messages,
-      sessionId,
-    };
-  }
-
-  /**
-   * Send a message to the agent and stream responses
-   */
-  async sendMessage({
-    sessionId,
-    message,
-    workingDirectory,
-    imagePaths,
-    sendToRenderer,
-  }) {
-    const session = this.sessions.get(sessionId);
-    if (!session) {
-      throw new Error(`Session ${sessionId} not found`);
-    }
-
-    if (session.isRunning) {
-      throw new Error("Agent is already processing a message");
-    }
-
-    // Read images from temp files and convert to base64 for storage
-    const images = [];
-    if (imagePaths && imagePaths.length > 0) {
-      const fs = require("fs/promises");
-      const path = require("path");
-
-      for (const imagePath of imagePaths) {
-        try {
-          const imageBuffer = await fs.readFile(imagePath);
-          const base64Data = imageBuffer.toString("base64");
-
-          // Determine media type from file extension
-          const ext = path.extname(imagePath).toLowerCase();
-          const mimeTypeMap = {
-            ".jpg": "image/jpeg",
-            ".jpeg": "image/jpeg",
-            ".png": "image/png",
-            ".gif": "image/gif",
-            ".webp": "image/webp",
-          };
-          const mediaType = mimeTypeMap[ext] || "image/png";
-
-          images.push({
-            data: base64Data,
-            mimeType: mediaType,
-            filename: path.basename(imagePath),
-          });
-
-          console.log(
-            `[AgentService] Loaded image from ${imagePath} for storage`
-          );
-        } catch (error) {
-          console.error(
-            `[AgentService] Failed to load image from ${imagePath}:`,
-            error
-          );
-        }
-      }
-    }
-
-    // Add user message to conversation with base64 images
-    const userMessage = {
-      id: this.generateId(),
-      role: "user",
-      content: message,
-      images: images.length > 0 ? images : undefined,
-      timestamp: new Date().toISOString(),
-    };
-
-    session.messages.push(userMessage);
-    session.isRunning = true;
-    session.abortController = new AbortController();
-
-    // Send initial user message to renderer
-    sendToRenderer({
-      type: "message",
-      message: userMessage,
-    });
-
-    // Save state with base64 images
-    await this.saveSession(sessionId, session.messages);
-
-    try {
-      // Configure Claude Agent SDK options
-      const options = {
-        // model: "claude-sonnet-4-20250514",
-        model: "claude-opus-4-5-20251101",
-        systemPrompt: this.getSystemPrompt(),
-        maxTurns: 20,
-        cwd: workingDirectory || session.workingDirectory,
-        allowedTools: [
-          "Read",
-          "Write",
-          "Edit",
-          "Glob",
-          "Grep",
-          "Bash",
-          "WebSearch",
-          "WebFetch",
-        ],
-        permissionMode: "acceptEdits",
-        sandbox: {
-          enabled: true,
-          autoAllowBashIfSandboxed: true,
-        },
-        abortController: session.abortController,
-      };
-
-      // Build prompt content with text and images
-      let promptContent = message;
-
-      // If there are images, create a content array
-      if (imagePaths && imagePaths.length > 0) {
-        const contentBlocks = [];
-
-        // Add text block
-        if (message && message.trim()) {
-          contentBlocks.push({
-            type: "text",
-            text: message,
-          });
-        }
-
-        // Add image blocks
-        const fs = require("fs");
-        for (const imagePath of imagePaths) {
-          try {
-            const imageBuffer = fs.readFileSync(imagePath);
-            const base64Data = imageBuffer.toString("base64");
-            const ext = path.extname(imagePath).toLowerCase();
-            const mimeTypeMap = {
-              ".jpg": "image/jpeg",
-              ".jpeg": "image/jpeg",
-              ".png": "image/png",
-              ".gif": "image/gif",
-              ".webp": "image/webp",
-            };
-            const mediaType = mimeTypeMap[ext] || "image/png";
-
-            contentBlocks.push({
-              type: "image",
-              source: {
-                type: "base64",
-                media_type: mediaType,
-                data: base64Data,
-              },
-            });
-          } catch (error) {
-            console.error(
-              `[AgentService] Failed to load image ${imagePath}:`,
-              error
-            );
-          }
-        }
-
-        // Use content blocks if we have images
-        if (
-          contentBlocks.length > 1 ||
-          (contentBlocks.length === 1 && contentBlocks[0].type === "image")
-        ) {
-          promptContent = contentBlocks;
-        }
-      }
-
-      // Build payload for the SDK
-      const promptPayload = Array.isArray(promptContent)
-        ? (async function* () {
-            yield {
-              type: "user",
-              session_id: "",
-              message: {
-                role: "user",
-                content: promptContent,
-              },
-              parent_tool_use_id: null,
-            };
-          })()
-        : promptContent;
-
-      // Send the query via the SDK (conversation state handled by the SDK)
-      const stream = query({ prompt: promptPayload, options });
-
-      let currentAssistantMessage = null;
-      let responseText = "";
-      const toolUses = [];
-
-      // Stream responses from the SDK
-      for await (const msg of stream) {
-        if (msg.type === "assistant") {
-          if (msg.message.content) {
-            for (const block of msg.message.content) {
-              if (block.type === "text") {
-                responseText += block.text;
-
-                // Create or update assistant message
-                if (!currentAssistantMessage) {
-                  currentAssistantMessage = {
-                    id: this.generateId(),
-                    role: "assistant",
-                    content: responseText,
-                    timestamp: new Date().toISOString(),
-                  };
-                  session.messages.push(currentAssistantMessage);
-                } else {
-                  currentAssistantMessage.content = responseText;
-                }
-
-                // Stream to renderer
-                sendToRenderer({
-                  type: "stream",
-                  messageId: currentAssistantMessage.id,
-                  content: responseText,
-                  isComplete: false,
-                });
-              } else if (block.type === "tool_use") {
-                const toolUse = {
-                  name: block.name,
-                  input: block.input,
-                };
-                toolUses.push(toolUse);
-
-                // Send tool use notification
-                sendToRenderer({
-                  type: "tool_use",
-                  tool: toolUse,
-                });
-              }
-            }
-          }
-        } else if (msg.type === "result") {
-          if (msg.subtype === "success" && msg.result) {
-            // Use the final result
-            if (currentAssistantMessage) {
-              currentAssistantMessage.content = msg.result;
-              responseText = msg.result;
-            }
-          }
-
-          // Send completion
-          sendToRenderer({
-            type: "complete",
-            messageId: currentAssistantMessage?.id,
-            content: responseText,
-            toolUses,
-          });
-        }
-      }
-
-      // Save final state
-      await this.saveSession(sessionId, session.messages);
-
-      session.isRunning = false;
-      session.abortController = null;
-
-      return {
-        success: true,
-        message: currentAssistantMessage,
-      };
-    } catch (error) {
-      if (error instanceof AbortError || error?.name === "AbortError") {
-        // Query aborted
-        session.isRunning = false;
-        session.abortController = null;
-        return { success: false, aborted: true };
-      }
-
-      console.error("[AgentService] Error:", error);
-
-      session.isRunning = false;
-      session.abortController = null;
-
-      // Add error message
-      const errorMessage = {
-        id: this.generateId(),
-        role: "assistant",
-        content: `Error: ${error.message}`,
-        timestamp: new Date().toISOString(),
-        isError: true,
-      };
-
-      session.messages.push(errorMessage);
-      await this.saveSession(sessionId, session.messages);
-
-      sendToRenderer({
-        type: "error",
-        error: error.message,
-        message: errorMessage,
-      });
-
-      throw error;
-    }
-  }
-
-  /**
-   * Get conversation history
-   */
-  getHistory(sessionId) {
-    const session = this.sessions.get(sessionId);
-    if (!session) {
-      return { success: false, error: "Session not found" };
-    }
-
-    return {
-      success: true,
-      messages: session.messages,
-      isRunning: session.isRunning,
-    };
-  }
-
-  /**
-   * Stop current agent execution
-   */
-  async stopExecution(sessionId) {
-    const session = this.sessions.get(sessionId);
-    if (!session) {
-      return { success: false, error: "Session not found" };
-    }
-
-    if (session.abortController) {
-      session.abortController.abort();
-      session.isRunning = false;
-      session.abortController = null;
-    }
-
-    return { success: true };
-  }
-
-  /**
-   * Clear conversation history
-   */
-  async clearSession(sessionId) {
-    const session = this.sessions.get(sessionId);
-    if (session) {
-      session.messages = [];
-      session.isRunning = false;
-      await this.saveSession(sessionId, []);
-    }
-
-    return { success: true };
-  }
-
-  /**
-   * Load session from disk
-   */
-  async loadSession(sessionId) {
-    if (!this.stateDir) return [];
-
-    const sessionFile = path.join(this.stateDir, `${sessionId}.json`);
-
-    try {
-      const data = await fs.readFile(sessionFile, "utf-8");
-      const parsed = JSON.parse(data);
-      console.log(
-        `[AgentService] Loaded ${parsed.length} messages for ${sessionId}`
-      );
-      return parsed;
-    } catch (error) {
-      // Session doesn't exist yet
-      return [];
-    }
-  }
-
-  /**
-   * Save session to disk
-   */
-  async saveSession(sessionId, messages) {
-    if (!this.stateDir) return;
-
-    const sessionFile = path.join(this.stateDir, `${sessionId}.json`);
-
-    try {
-      await fs.writeFile(
-        sessionFile,
-        JSON.stringify(messages, null, 2),
-        "utf-8"
-      );
-      console.log(
-        `[AgentService] Saved ${messages.length} messages for ${sessionId}`
-      );
-
-      // Update timestamp
-      await this.updateSessionTimestamp(sessionId);
-    } catch (error) {
-      console.error("[AgentService] Failed to save session:", error);
-    }
-  }
-
-  /**
-   * Get system prompt
-   */
-  getSystemPrompt() {
-    return `You are an AI assistant helping users build software. You are part of the Automaker application,
-which is designed to help developers plan, design, and implement software projects autonomously.
-
-**Feature Storage:**
-Features are stored in .automaker/features/{id}/feature.json - each feature has its own folder.
-Use the UpdateFeatureStatus tool to manage features, not direct file edits.
-
-Your role is to:
-- Help users define their project requirements and specifications
-- Ask clarifying questions to better understand their needs
-- Suggest technical approaches and architectures
-- Guide them through the development process
-- Be conversational and helpful
-- Write, edit, and modify code files as requested
-- Execute commands and tests
-- Search and analyze the codebase
-
-When discussing projects, help users think through:
-- Core functionality and features
-- Technical stack choices
-- Data models and architecture
-- User experience considerations
-- Testing strategies
-
-You have full access to the codebase and can:
-- Read files to understand existing code
-- Write new files
-- Edit existing files
-- Run bash commands
-- Search for code patterns
-- Execute tests and builds
-
-IMPORTANT: When making file changes, be aware that the Next.js development server may restart.
-This is normal and expected. Your conversation state is preserved across these restarts.`;
-  }
-
-  /**
-   * Generate unique ID
-   */
-  generateId() {
-    return `msg_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
-  }
-
-  // ============================================================================
-  // Session Management
-  // ============================================================================
-
-  /**
-   * Load all session metadata
-   */
-  async loadMetadata() {
-    if (!this.metadataFile) return {};
-
-    try {
-      const data = await fs.readFile(this.metadataFile, "utf-8");
-      return JSON.parse(data);
-    } catch (error) {
-      return {};
-    }
-  }
-
-  /**
-   * Save session metadata
-   */
-  async saveMetadata(metadata) {
-    if (!this.metadataFile) return;
-
-    try {
-      await fs.writeFile(
-        this.metadataFile,
-        JSON.stringify(metadata, null, 2),
-        "utf-8"
-      );
-    } catch (error) {
-      console.error("[AgentService] Failed to save metadata:", error);
-    }
-  }
-
-  /**
-   * List all sessions
-   */
-  async listSessions({ includeArchived = false } = {}) {
-    const metadata = await this.loadMetadata();
-    const sessions = [];
-
-    for (const [sessionId, meta] of Object.entries(metadata)) {
-      if (!includeArchived && meta.isArchived) continue;
-
-      const messages = await this.loadSession(sessionId);
-      const lastMessage = messages[messages.length - 1];
-
-      sessions.push({
-        id: sessionId,
-        name: meta.name || sessionId,
-        projectPath: meta.projectPath || "",
-        createdAt: meta.createdAt,
-        updatedAt: meta.updatedAt,
-        messageCount: messages.length,
-        isArchived: meta.isArchived || false,
-        tags: meta.tags || [],
-        preview: lastMessage?.content.substring(0, 100) || "",
-      });
-    }
-
-    // Sort by most recently updated
-    sessions.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt));
-
-    return sessions;
-  }
-
-  /**
-   * Create a new session
-   */
-  async createSession({ name, projectPath, workingDirectory }) {
-    const sessionId = `session_${Date.now()}_${Math.random()
-      .toString(36)
-      .substring(2, 11)}`;
-
-    const metadata = await this.loadMetadata();
-    metadata[sessionId] = {
-      name,
-      projectPath,
-      createdAt: new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-      isArchived: false,
-      tags: [],
-    };
-
-    await this.saveMetadata(metadata);
-
-    this.sessions.set(sessionId, {
-      messages: [],
-      isRunning: false,
-      abortController: null,
-      workingDirectory: workingDirectory || projectPath,
-    });
-
-    await this.saveSession(sessionId, []);
-
-    return {
-      success: true,
-      sessionId,
-      session: metadata[sessionId],
-    };
-  }
-
-  /**
-   * Update session metadata
-   */
-  async updateSession({ sessionId, name, tags }) {
-    const metadata = await this.loadMetadata();
-
-    if (!metadata[sessionId]) {
-      return { success: false, error: "Session not found" };
-    }
-
-    if (name !== undefined) metadata[sessionId].name = name;
-    if (tags !== undefined) metadata[sessionId].tags = tags;
-    metadata[sessionId].updatedAt = new Date().toISOString();
-
-    await this.saveMetadata(metadata);
-
-    return { success: true };
-  }
-
-  /**
-   * Archive a session
-   */
-  async archiveSession(sessionId) {
-    const metadata = await this.loadMetadata();
-
-    if (!metadata[sessionId]) {
-      return { success: false, error: "Session not found" };
-    }
-
-    metadata[sessionId].isArchived = true;
-    metadata[sessionId].updatedAt = new Date().toISOString();
-
-    await this.saveMetadata(metadata);
-
-    return { success: true };
-  }
-
-  /**
-   * Unarchive a session
-   */
-  async unarchiveSession(sessionId) {
-    const metadata = await this.loadMetadata();
-
-    if (!metadata[sessionId]) {
-      return { success: false, error: "Session not found" };
-    }
-
-    metadata[sessionId].isArchived = false;
-    metadata[sessionId].updatedAt = new Date().toISOString();
-
-    await this.saveMetadata(metadata);
-
-    return { success: true };
-  }
-
-  /**
-   * Delete a session permanently
-   */
-  async deleteSession(sessionId) {
-    const metadata = await this.loadMetadata();
-
-    if (!metadata[sessionId]) {
-      return { success: false, error: "Session not found" };
-    }
-
-    // Remove from metadata
-    delete metadata[sessionId];
-    await this.saveMetadata(metadata);
-
-    // Remove from memory
-    this.sessions.delete(sessionId);
-
-    // Delete session file
-    const sessionFile = path.join(this.stateDir, `${sessionId}.json`);
-    try {
-      await fs.unlink(sessionFile);
-    } catch (error) {
-      console.warn("[AgentService] Failed to delete session file:", error);
-    }
-
-    return { success: true };
-  }
-
-  /**
-   * Update session metadata when messages change
-   */
-  async updateSessionTimestamp(sessionId) {
-    const metadata = await this.loadMetadata();
-
-    if (metadata[sessionId]) {
-      metadata[sessionId].updatedAt = new Date().toISOString();
-      await this.saveMetadata(metadata);
-    }
-  }
-}
-
-// Export singleton instance
-module.exports = new AgentService();

apps/app/electron/preload.js

@@ -1,404 +1,37 @@
+/**
+ * Simplified Electron preload script
+ *
+ * Only exposes native features (dialogs, shell) and server URL.
+ * All other operations go through HTTP API.
+ */
+
 const { contextBridge, ipcRenderer } = require("electron");
 
-// Expose protected methods that allow the renderer process to use
-// the ipcRenderer without exposing the entire object
+// Expose minimal API for native features
 contextBridge.exposeInMainWorld("electronAPI", {
-  // IPC test
+  // Platform info
+  platform: process.platform,
+  isElectron: true,
+
+  // Connection check
   ping: () => ipcRenderer.invoke("ping"),
 
-  // Shell APIs
-  openExternalLink: (url) => ipcRenderer.invoke("shell:openExternal", url),
+  // Get server URL for HTTP client
+  getServerUrl: () => ipcRenderer.invoke("server:getUrl"),
 
-  // Dialog APIs
+  // Native dialogs - better UX than prompt()
   openDirectory: () => ipcRenderer.invoke("dialog:openDirectory"),
   openFile: (options) => ipcRenderer.invoke("dialog:openFile", options),
+  saveFile: (options) => ipcRenderer.invoke("dialog:saveFile", options),
 
-  // File system APIs
-  readFile: (filePath) => ipcRenderer.invoke("fs:readFile", filePath),
-  writeFile: (filePath, content) =>
-    ipcRenderer.invoke("fs:writeFile", filePath, content),
-  mkdir: (dirPath) => ipcRenderer.invoke("fs:mkdir", dirPath),
-  readdir: (dirPath) => ipcRenderer.invoke("fs:readdir", dirPath),
-  exists: (filePath) => ipcRenderer.invoke("fs:exists", filePath),
-  stat: (filePath) => ipcRenderer.invoke("fs:stat", filePath),
-  deleteFile: (filePath) => ipcRenderer.invoke("fs:deleteFile", filePath),
-  trashItem: (filePath) => ipcRenderer.invoke("fs:trashItem", filePath),
+  // Shell operations
+  openExternalLink: (url) => ipcRenderer.invoke("shell:openExternal", url),
+  openPath: (filePath) => ipcRenderer.invoke("shell:openPath", filePath),
 
-  // App APIs
+  // App info
   getPath: (name) => ipcRenderer.invoke("app:getPath", name),
-  saveImageToTemp: (data, filename, mimeType, projectPath) =>
-    ipcRenderer.invoke("app:saveImageToTemp", {
-      data,
-      filename,
-      mimeType,
-      projectPath,
-    }),
-
-  // Agent APIs
-  agent: {
-    // Start or resume a conversation
-    start: (sessionId, workingDirectory) =>
-      ipcRenderer.invoke("agent:start", { sessionId, workingDirectory }),
-
-    // Send a message to the agent
-    send: (sessionId, message, workingDirectory, imagePaths) =>
-      ipcRenderer.invoke("agent:send", {
-        sessionId,
-        message,
-        workingDirectory,
-        imagePaths,
-      }),
-
-    // Get conversation history
-    getHistory: (sessionId) =>
-      ipcRenderer.invoke("agent:getHistory", { sessionId }),
-
-    // Stop current execution
-    stop: (sessionId) => ipcRenderer.invoke("agent:stop", { sessionId }),
-
-    // Clear conversation
-    clear: (sessionId) => ipcRenderer.invoke("agent:clear", { sessionId }),
-
-    // Subscribe to streaming events
-    onStream: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("agent:stream", subscription);
-      // Return unsubscribe function
-      return () => ipcRenderer.removeListener("agent:stream", subscription);
-    },
-  },
-
-  // Session Management APIs
-  sessions: {
-    // List all sessions
-    list: (includeArchived) =>
-      ipcRenderer.invoke("sessions:list", { includeArchived }),
-
-    // Create a new session
-    create: (name, projectPath, workingDirectory) =>
-      ipcRenderer.invoke("sessions:create", {
-        name,
-        projectPath,
-        workingDirectory,
-      }),
-
-    // Update session metadata
-    update: (sessionId, name, tags) =>
-      ipcRenderer.invoke("sessions:update", { sessionId, name, tags }),
-
-    // Archive a session
-    archive: (sessionId) =>
-      ipcRenderer.invoke("sessions:archive", { sessionId }),
-
-    // Unarchive a session
-    unarchive: (sessionId) =>
-      ipcRenderer.invoke("sessions:unarchive", { sessionId }),
-
-    // Delete a session permanently
-    delete: (sessionId) => ipcRenderer.invoke("sessions:delete", { sessionId }),
-  },
-
-  // Auto Mode API
-  autoMode: {
-    // Start auto mode for a specific project
-    start: (projectPath, maxConcurrency) =>
-      ipcRenderer.invoke("auto-mode:start", { projectPath, maxConcurrency }),
-
-    // Stop auto mode for a specific project
-    stop: (projectPath) => ipcRenderer.invoke("auto-mode:stop", { projectPath }),
-
-    // Get auto mode status (optionally for a specific project)
-    status: (projectPath) => ipcRenderer.invoke("auto-mode:status", { projectPath }),
-
-    // Run a specific feature
-    runFeature: (projectPath, featureId, useWorktrees) =>
-      ipcRenderer.invoke("auto-mode:run-feature", {
-        projectPath,
-        featureId,
-        useWorktrees,
-      }),
-
-    // Verify a specific feature by running its tests
-    verifyFeature: (projectPath, featureId) =>
-      ipcRenderer.invoke("auto-mode:verify-feature", {
-        projectPath,
-        featureId,
-      }),
-
-    // Resume a specific feature with previous context
-    resumeFeature: (projectPath, featureId) =>
-      ipcRenderer.invoke("auto-mode:resume-feature", {
-        projectPath,
-        featureId,
-      }),
-
-    // Check if context file exists for a feature
-    contextExists: (projectPath, featureId) =>
-      ipcRenderer.invoke("auto-mode:context-exists", {
-        projectPath,
-        featureId,
-      }),
-
-    // Analyze a new project - kicks off an agent to analyze codebase
-    analyzeProject: (projectPath) =>
-      ipcRenderer.invoke("auto-mode:analyze-project", { projectPath }),
-
-    // Stop a specific feature
-    stopFeature: (featureId) =>
-      ipcRenderer.invoke("auto-mode:stop-feature", { featureId }),
-
-    // Follow-up on a feature with additional prompt
-    followUpFeature: (projectPath, featureId, prompt, imagePaths) =>
-      ipcRenderer.invoke("auto-mode:follow-up-feature", {
-        projectPath,
-        featureId,
-        prompt,
-        imagePaths,
-      }),
-
-    // Commit changes for a feature
-    commitFeature: (projectPath, featureId) =>
-      ipcRenderer.invoke("auto-mode:commit-feature", {
-        projectPath,
-        featureId,
-      }),
-
-    // Listen for auto mode events
-    onEvent: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("auto-mode:event", subscription);
-
-      // Return unsubscribe function
-      return () => {
-        ipcRenderer.removeListener("auto-mode:event", subscription);
-      };
-    },
-  },
-
-  // Claude CLI Detection API
-  checkClaudeCli: () => ipcRenderer.invoke("claude:check-cli"),
-
-  // Codex CLI Detection API
-  checkCodexCli: () => ipcRenderer.invoke("codex:check-cli"),
-
-  // Model Management APIs
-  model: {
-    // Get all available models from all providers
-    getAvailable: () => ipcRenderer.invoke("model:get-available"),
-
-    // Check all provider installation status
-    checkProviders: () => ipcRenderer.invoke("model:check-providers"),
-  },
-
-  // OpenAI API
-  testOpenAIConnection: (apiKey) =>
-    ipcRenderer.invoke("openai:test-connection", { apiKey }),
-
-  // Worktree Management APIs
-  worktree: {
-    // Revert feature changes by removing the worktree
-    revertFeature: (projectPath, featureId) =>
-      ipcRenderer.invoke("worktree:revert-feature", { projectPath, featureId }),
-
-    // Merge feature worktree changes back to main branch
-    mergeFeature: (projectPath, featureId, options) =>
-      ipcRenderer.invoke("worktree:merge-feature", {
-        projectPath,
-        featureId,
-        options,
-      }),
-
-    // Get worktree info for a feature
-    getInfo: (projectPath, featureId) =>
-      ipcRenderer.invoke("worktree:get-info", { projectPath, featureId }),
-
-    // Get worktree status (changed files, commits)
-    getStatus: (projectPath, featureId) =>
-      ipcRenderer.invoke("worktree:get-status", { projectPath, featureId }),
-
-    // List all feature worktrees
-    list: (projectPath) => ipcRenderer.invoke("worktree:list", { projectPath }),
-
-    // Get file diffs for a feature worktree
-    getDiffs: (projectPath, featureId) =>
-      ipcRenderer.invoke("worktree:get-diffs", { projectPath, featureId }),
-
-    // Get diff for a specific file in a worktree
-    getFileDiff: (projectPath, featureId, filePath) =>
-      ipcRenderer.invoke("worktree:get-file-diff", {
-        projectPath,
-        featureId,
-        filePath,
-      }),
-  },
-
-  // Git Operations APIs (for non-worktree operations)
-  git: {
-    // Get file diffs for the main project
-    getDiffs: (projectPath) =>
-      ipcRenderer.invoke("git:get-diffs", { projectPath }),
-
-    // Get diff for a specific file in the main project
-    getFileDiff: (projectPath, filePath) =>
-      ipcRenderer.invoke("git:get-file-diff", { projectPath, filePath }),
-  },
-
-  // Feature Suggestions API
-  suggestions: {
-    // Generate feature suggestions
-    // suggestionType can be: "features", "refactoring", "security", "performance"
-    generate: (projectPath, suggestionType = "features") =>
-      ipcRenderer.invoke("suggestions:generate", { projectPath, suggestionType }),
-
-    // Stop generating suggestions
-    stop: () => ipcRenderer.invoke("suggestions:stop"),
-
-    // Get suggestions status
-    status: () => ipcRenderer.invoke("suggestions:status"),
-
-    // Listen for suggestions events
-    onEvent: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("suggestions:event", subscription);
-
-      // Return unsubscribe function
-      return () => {
-        ipcRenderer.removeListener("suggestions:event", subscription);
-      };
-    },
-  },
-
-  // Spec Regeneration API
-  specRegeneration: {
-    // Create initial app spec for a new project
-    create: (projectPath, projectOverview, generateFeatures = true) =>
-      ipcRenderer.invoke("spec-regeneration:create", {
-        projectPath,
-        projectOverview,
-        generateFeatures,
-      }),
-
-    // Regenerate the app spec
-    generate: (projectPath, projectDefinition) =>
-      ipcRenderer.invoke("spec-regeneration:generate", {
-        projectPath,
-        projectDefinition,
-      }),
-
-    // Generate features from existing app_spec.txt
-    generateFeatures: (projectPath) =>
-      ipcRenderer.invoke("spec-regeneration:generate-features", {
-        projectPath,
-      }),
-
-    // Stop regenerating spec
-    stop: () => ipcRenderer.invoke("spec-regeneration:stop"),
-
-    // Get regeneration status
-    status: () => ipcRenderer.invoke("spec-regeneration:status"),
-
-    // Listen for regeneration events
-    onEvent: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("spec-regeneration:event", subscription);
-
-      // Return unsubscribe function
-      return () => {
-        ipcRenderer.removeListener("spec-regeneration:event", subscription);
-      };
-    },
-  },
-
-  // Setup & CLI Management API
-  setup: {
-    // Get comprehensive Claude CLI status
-    getClaudeStatus: () => ipcRenderer.invoke("setup:claude-status"),
-
-    // Get comprehensive Codex CLI status
-    getCodexStatus: () => ipcRenderer.invoke("setup:codex-status"),
-
-    // Install Claude CLI
-    installClaude: () => ipcRenderer.invoke("setup:install-claude"),
-
-    // Install Codex CLI
-    installCodex: () => ipcRenderer.invoke("setup:install-codex"),
-
-    // Authenticate Claude CLI
-    authClaude: () => ipcRenderer.invoke("setup:auth-claude"),
-
-    // Authenticate Codex CLI with optional API key
-    authCodex: (apiKey) => ipcRenderer.invoke("setup:auth-codex", { apiKey }),
-
-    // Store API key securely
-    storeApiKey: (provider, apiKey) =>
-      ipcRenderer.invoke("setup:store-api-key", { provider, apiKey }),
-
-    // Get stored API keys status
-    getApiKeys: () => ipcRenderer.invoke("setup:get-api-keys"),
-
-    // Configure Codex MCP server for a project
-    configureCodexMcp: (projectPath) =>
-      ipcRenderer.invoke("setup:configure-codex-mcp", { projectPath }),
-
-    // Get platform information
-    getPlatform: () => ipcRenderer.invoke("setup:get-platform"),
-
-    // Listen for installation progress
-    onInstallProgress: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("setup:install-progress", subscription);
-      return () => {
-        ipcRenderer.removeListener("setup:install-progress", subscription);
-      };
-    },
-
-    // Listen for auth progress
-    onAuthProgress: (callback) => {
-      const subscription = (_, data) => callback(data);
-      ipcRenderer.on("setup:auth-progress", subscription);
-      return () => {
-        ipcRenderer.removeListener("setup:auth-progress", subscription);
-      };
-    },
-  },
-
-  // Features API
-  features: {
-    // Get all features for a project
-    getAll: (projectPath) =>
-      ipcRenderer.invoke("features:getAll", { projectPath }),
-
-    // Get a single feature by ID
-    get: (projectPath, featureId) =>
-      ipcRenderer.invoke("features:get", { projectPath, featureId }),
-
-    // Create a new feature
-    create: (projectPath, feature) =>
-      ipcRenderer.invoke("features:create", { projectPath, feature }),
-
-    // Update a feature (partial updates supported)
-    update: (projectPath, featureId, updates) =>
-      ipcRenderer.invoke("features:update", {
-        projectPath,
-        featureId,
-        updates,
-      }),
-
-    // Delete a feature and its folder
-    delete: (projectPath, featureId) =>
-      ipcRenderer.invoke("features:delete", { projectPath, featureId }),
-
-    // Get agent output for a feature
-    getAgentOutput: (projectPath, featureId) =>
-      ipcRenderer.invoke("features:getAgentOutput", { projectPath, featureId }),
-  },
-
-  // Running Agents API
-  runningAgents: {
-    // Get all running agents across all projects
-    getAll: () => ipcRenderer.invoke("running-agents:getAll"),
-  },
+  getVersion: () => ipcRenderer.invoke("app:getVersion"),
+  isPackaged: () => ipcRenderer.invoke("app:isPackaged"),
 });
 
-// Also expose a flag to detect if we're in Electron
-contextBridge.exposeInMainWorld("isElectron", true);
+console.log("[Preload] Electron API exposed (simplified mode)");

apps/app/electron/services/claude-cli-detector.js

@@ -1,721 +0,0 @@
-const { execSync, spawn } = require("child_process");
-const fs = require("fs");
-const path = require("path");
-const os = require("os");
-
-let runPtyCommand = null;
-try {
-  ({ runPtyCommand } = require("./pty-runner"));
-} catch (error) {
-  console.warn(
-    "[ClaudeCliDetector] node-pty unavailable, will fall back to external terminal:",
-    error?.message || error
-  );
-}
-
-const ANSI_REGEX =
-  // eslint-disable-next-line no-control-regex
-  /\u001b\[[0-9;?]*[ -/]*[@-~]|\u001b[@-_]|\u001b\][^\u0007]*\u0007/g;
-
-const stripAnsi = (text = "") => text.replace(ANSI_REGEX, "");
-
-/**
- * Claude CLI Detector
- *
- * Authentication options:
- * 1. OAuth Token (Subscription): User runs `claude setup-token` and provides the token to the app
- * 2. API Key (Pay-per-use): User provides their Anthropic API key directly
- */
-class ClaudeCliDetector {
-  /**
-   * Check if Claude Code CLI is installed and accessible
-   * @returns {Object} { installed: boolean, path: string|null, version: string|null, method: 'cli'|'none' }
-   */
-  /**
-   * Try to get updated PATH from shell config files
-   * This helps detect CLI installations that modify shell config but haven't updated the current process PATH
-   */
-  static getUpdatedPathFromShellConfig() {
-    const homeDir = os.homedir();
-    const shell = process.env.SHELL || "/bin/bash";
-    const shellName = path.basename(shell);
-
-    const configFiles = [];
-    if (shellName.includes("zsh")) {
-      configFiles.push(path.join(homeDir, ".zshrc"));
-      configFiles.push(path.join(homeDir, ".zshenv"));
-      configFiles.push(path.join(homeDir, ".zprofile"));
-    } else if (shellName.includes("bash")) {
-      configFiles.push(path.join(homeDir, ".bashrc"));
-      configFiles.push(path.join(homeDir, ".bash_profile"));
-      configFiles.push(path.join(homeDir, ".profile"));
-    }
-
-    const commonPaths = [
-      path.join(homeDir, ".local", "bin"),
-      path.join(homeDir, ".cargo", "bin"),
-      "/usr/local/bin",
-      "/opt/homebrew/bin",
-      path.join(homeDir, "bin"),
-    ];
-
-    for (const configFile of configFiles) {
-      if (fs.existsSync(configFile)) {
-        try {
-          const content = fs.readFileSync(configFile, "utf-8");
-          const pathMatches = content.match(
-            /export\s+PATH=["']?([^"'\n]+)["']?/g
-          );
-          if (pathMatches) {
-            for (const match of pathMatches) {
-              const pathValue = match
-                .replace(/export\s+PATH=["']?/, "")
-                .replace(/["']?$/, "");
-              const paths = pathValue
-                .split(":")
-                .filter((p) => p && !p.includes("$"));
-              commonPaths.push(...paths);
-            }
-          }
-        } catch (error) {
-          // Ignore errors reading config files
-        }
-      }
-    }
-
-    return [...new Set(commonPaths)];
-  }
-
-  static detectClaudeInstallation() {
-    try {
-      // Check if 'claude' command is in PATH (Unix)
-      if (process.platform !== "win32") {
-        try {
-          const claudePath = execSync("which claude 2>/dev/null", {
-            encoding: "utf-8",
-          }).trim();
-          if (claudePath) {
-            const version = this.getClaudeVersion(claudePath);
-            return {
-              installed: true,
-              path: claudePath,
-              version: version,
-              method: "cli",
-            };
-          }
-        } catch (error) {
-          // CLI not in PATH
-        }
-      }
-
-      // Check Windows path
-      if (process.platform === "win32") {
-        try {
-          const claudePath = execSync("where claude 2>nul", {
-            encoding: "utf-8",
-          })
-            .trim()
-            .split("\n")[0];
-          if (claudePath) {
-            const version = this.getClaudeVersion(claudePath);
-            return {
-              installed: true,
-              path: claudePath,
-              version: version,
-              method: "cli",
-            };
-          }
-        } catch (error) {
-          // Not found on Windows
-        }
-      }
-
-      // Check for local installation
-      const localClaudePath = path.join(
-        os.homedir(),
-        ".claude",
-        "local",
-        "claude"
-      );
-      if (fs.existsSync(localClaudePath)) {
-        const version = this.getClaudeVersion(localClaudePath);
-        return {
-          installed: true,
-          path: localClaudePath,
-          version: version,
-          method: "cli-local",
-        };
-      }
-
-      // Check common installation locations
-      const commonPaths = this.getUpdatedPathFromShellConfig();
-      const binaryNames = ["claude", "claude-code"];
-
-      for (const basePath of commonPaths) {
-        for (const binaryName of binaryNames) {
-          const claudePath = path.join(basePath, binaryName);
-          if (fs.existsSync(claudePath)) {
-            try {
-              const version = this.getClaudeVersion(claudePath);
-              return {
-                installed: true,
-                path: claudePath,
-                version: version,
-                method: "cli",
-              };
-            } catch (error) {
-              // File exists but can't get version
-            }
-          }
-        }
-      }
-
-      // Try to source shell config and check PATH again (Unix)
-      if (process.platform !== "win32") {
-        try {
-          const shell = process.env.SHELL || "/bin/bash";
-          const shellName = path.basename(shell);
-          const homeDir = os.homedir();
-
-          let sourceCmd = "";
-          if (shellName.includes("zsh")) {
-            sourceCmd = `source ${homeDir}/.zshrc 2>/dev/null && which claude`;
-          } else if (shellName.includes("bash")) {
-            sourceCmd = `source ${homeDir}/.bashrc 2>/dev/null && which claude`;
-          }
-
-          if (sourceCmd) {
-            const claudePath = execSync(`bash -c "${sourceCmd}"`, {
-              encoding: "utf-8",
-              timeout: 2000,
-            }).trim();
-            if (claudePath && claudePath.startsWith("/")) {
-              const version = this.getClaudeVersion(claudePath);
-              return {
-                installed: true,
-                path: claudePath,
-                version: version,
-                method: "cli",
-              };
-            }
-          }
-        } catch (error) {
-          // Failed to source shell config
-        }
-      }
-
-      return {
-        installed: false,
-        path: null,
-        version: null,
-        method: "none",
-      };
-    } catch (error) {
-      return {
-        installed: false,
-        path: null,
-        version: null,
-        method: "none",
-        error: error.message,
-      };
-    }
-  }
-
-  /**
-   * Get Claude CLI version
-   * @param {string} claudePath Path to claude executable
-   * @returns {string|null} Version string or null
-   */
-  static getClaudeVersion(claudePath) {
-    try {
-      const version = execSync(`"${claudePath}" --version 2>/dev/null`, {
-        encoding: "utf-8",
-        timeout: 5000,
-      }).trim();
-      return version || null;
-    } catch (error) {
-      return null;
-    }
-  }
-
-  /**
-   * Get authentication status
-   * Checks for:
-   * 1. OAuth token stored in app's credentials (from `claude setup-token`)
-   * 2. API key stored in app's credentials
-   * 3. API key in environment variable
-   *
-   * @param {string} appCredentialsPath Path to app's credentials.json
-   * @returns {Object} Authentication status
-   */
-  static getAuthStatus(appCredentialsPath) {
-    const envApiKey = process.env.ANTHROPIC_API_KEY;
-    const envOAuthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN;
-
-    let storedOAuthToken = null;
-    let storedApiKey = null;
-
-    if (appCredentialsPath && fs.existsSync(appCredentialsPath)) {
-      try {
-        const content = fs.readFileSync(appCredentialsPath, "utf-8");
-        const credentials = JSON.parse(content);
-        storedOAuthToken = credentials.anthropic_oauth_token || null;
-        storedApiKey =
-          credentials.anthropic || credentials.anthropic_api_key || null;
-      } catch (error) {
-        // Ignore credential read errors
-      }
-    }
-
-    // Authentication priority (highest to lowest):
-    // 1. Environment OAuth Token (CLAUDE_CODE_OAUTH_TOKEN)
-    // 2. Stored OAuth Token (from credentials file)
-    // 3. Stored API Key (from credentials file)
-    // 4. Environment API Key (ANTHROPIC_API_KEY)
-    let authenticated = false;
-    let method = "none";
-
-    if (envOAuthToken) {
-      authenticated = true;
-      method = "oauth_token_env";
-    } else if (storedOAuthToken) {
-      authenticated = true;
-      method = "oauth_token";
-    } else if (storedApiKey) {
-      authenticated = true;
-      method = "api_key";
-    } else if (envApiKey) {
-      authenticated = true;
-      method = "api_key_env";
-    }
-
-    return {
-      authenticated,
-      method,
-      hasStoredOAuthToken: !!storedOAuthToken,
-      hasStoredApiKey: !!storedApiKey,
-      hasEnvApiKey: !!envApiKey,
-      hasEnvOAuthToken: !!envOAuthToken,
-    };
-  }
-  /**
-   * Get installation info (installation status only, no auth)
-   * @returns {Object} Installation info with status property
-   */
-  static getInstallationInfo() {
-    const installation = this.detectClaudeInstallation();
-    return {
-      status: installation.installed ? "installed" : "not_installed",
-      installed: installation.installed,
-      path: installation.path,
-      version: installation.version,
-      method: installation.method,
-    };
-  }
-
-  /**
-   * Get full status including installation and auth
-   * @param {string} appCredentialsPath Path to app's credentials.json
-   * @returns {Object} Full status
-   */
-  static getFullStatus(appCredentialsPath) {
-    const installation = this.detectClaudeInstallation();
-    const auth = this.getAuthStatus(appCredentialsPath);
-
-    return {
-      success: true,
-      status: installation.installed ? "installed" : "not_installed",
-      installed: installation.installed,
-      path: installation.path,
-      version: installation.version,
-      method: installation.method,
-      auth,
-    };
-  }
-
-  /**
-   * Get installation info and recommendations
-   * @returns {Object} Installation status and recommendations
-   */
-  static getInstallationInfo() {
-    const detection = this.detectClaudeInstallation();
-
-    if (detection.installed) {
-      return {
-        status: 'installed',
-        method: detection.method,
-        version: detection.version,
-        path: detection.path,
-        recommendation: 'Claude Code CLI is ready for ultrathink'
-      };
-    }
-
-    return {
-      status: 'not_installed',
-      recommendation: 'Install Claude Code CLI for optimal ultrathink performance',
-      installCommands: this.getInstallCommands()
-    };
-  }
-
-  /**
-   * Get installation commands for different platforms
-   * @returns {Object} Installation commands
-   */
-  static getInstallCommands() {
-    return {
-      macos: "curl -fsSL https://claude.ai/install.sh | bash",
-      windows: "irm https://claude.ai/install.ps1 | iex",
-      linux: "curl -fsSL https://claude.ai/install.sh | bash",
-    };
-  }
-
-  /**
-   * Install Claude CLI using the official script
-   * @param {Function} onProgress Callback for progress updates
-   * @returns {Promise<Object>} Installation result
-   */
-  static async installCli(onProgress) {
-    return new Promise((resolve, reject) => {
-      const platform = process.platform;
-      let command, args;
-
-      if (platform === "win32") {
-        command = "powershell";
-        args = ["-Command", "irm https://claude.ai/install.ps1 | iex"];
-      } else {
-        command = "bash";
-        args = ["-c", "curl -fsSL https://claude.ai/install.sh | bash"];
-      }
-
-      console.log("[ClaudeCliDetector] Installing Claude CLI...");
-
-      const proc = spawn(command, args, {
-        stdio: ["pipe", "pipe", "pipe"],
-        shell: false,
-      });
-
-      let output = "";
-      let errorOutput = "";
-
-      proc.stdout.on("data", (data) => {
-        const text = data.toString();
-        output += text;
-        if (onProgress) {
-          onProgress({ type: "stdout", data: text });
-        }
-      });
-
-      proc.stderr.on("data", (data) => {
-        const text = data.toString();
-        errorOutput += text;
-        if (onProgress) {
-          onProgress({ type: "stderr", data: text });
-        }
-      });
-
-      proc.on("close", (code) => {
-        if (code === 0) {
-          console.log(
-            "[ClaudeCliDetector] Installation completed successfully"
-          );
-          resolve({
-            success: true,
-            output,
-            message: "Claude CLI installed successfully",
-          });
-        } else {
-          console.error(
-            "[ClaudeCliDetector] Installation failed with code:",
-            code
-          );
-          reject({
-            success: false,
-            error: errorOutput || `Installation failed with code ${code}`,
-            output,
-          });
-        }
-      });
-
-      proc.on("error", (error) => {
-        console.error("[ClaudeCliDetector] Installation error:", error);
-        reject({
-          success: false,
-          error: error.message,
-          output,
-        });
-      });
-    });
-  }
-
-  /**
-   * Get instructions for setup-token command
-   * @returns {Object} Setup token instructions
-   */
-  static getSetupTokenInstructions() {
-    const detection = this.detectClaudeInstallation();
-
-    if (!detection.installed) {
-      return {
-        success: false,
-        error: "Claude CLI is not installed. Please install it first.",
-        installCommands: this.getInstallCommands(),
-      };
-    }
-
-    return {
-      success: true,
-      command: "claude setup-token",
-      instructions: [
-        "1. Open your terminal",
-        "2. Run: claude setup-token",
-        "3. Follow the prompts to authenticate",
-        "4. Copy the token that is displayed",
-        "5. Paste the token in the field below",
-      ],
-      note: "This token is from your Claude subscription and allows you to use Claude without API charges.",
-    };
-  }
-
-  /**
-   * Extract OAuth token from command output
-   * Tries multiple patterns to find the token
-   * @param {string} output The command output
-   * @returns {string|null} Extracted token or null
-   */
-  static extractTokenFromOutput(output) {
-    // Pattern 1: CLAUDE_CODE_OAUTH_TOKEN=<token> or CLAUDE_CODE_OAUTH_TOKEN: <token>
-    const envMatch = output.match(
-      /CLAUDE_CODE_OAUTH_TOKEN[=:]\s*["']?([a-zA-Z0-9_\-\.]+)["']?/i
-    );
-    if (envMatch) return envMatch[1];
-
-    // Pattern 2: "Token: <token>" or "token: <token>"
-    const tokenLabelMatch = output.match(
-      /\btoken[:\s]+["']?([a-zA-Z0-9_\-\.]{40,})["']?/i
-    );
-    if (tokenLabelMatch) return tokenLabelMatch[1];
-
-    // Pattern 3: Look for token after success/authenticated message
-    const successMatch = output.match(
-      /(?:success|authenticated|generated|token is)[^\n]*\n\s*([a-zA-Z0-9_\-\.]{40,})/i
-    );
-    if (successMatch) return successMatch[1];
-
-    // Pattern 4: Standalone long alphanumeric string on its own line (last resort)
-    // This catches tokens that are printed on their own line
-    const lines = output.split("\n");
-    for (const line of lines) {
-      const trimmed = line.trim();
-      // Token should be 40+ chars, alphanumeric with possible hyphens/underscores/dots
-      if (/^[a-zA-Z0-9_\-\.]{40,}$/.test(trimmed)) {
-        return trimmed;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Run claude setup-token command to generate OAuth token
-   * Opens an external terminal window since Claude CLI requires TTY for its Ink-based UI
-   * @param {Function} onProgress Callback for progress updates
-   * @returns {Promise<Object>} Result indicating terminal was opened
-   */
-  static async runSetupToken(onProgress) {
-    const detection = this.detectClaudeInstallation();
-
-    if (!detection.installed) {
-      throw {
-        success: false,
-        error: "Claude CLI is not installed. Please install it first.",
-        requiresManualAuth: false,
-      };
-    }
-
-    const claudePath = detection.path;
-    const platform = process.platform;
-    const preferPty =
-      (platform === "win32" ||
-        platform === "darwin" ||
-        process.env.CLAUDE_AUTH_FORCE_PTY === "1") &&
-      process.env.CLAUDE_AUTH_DISABLE_PTY !== "1";
-
-    const send = (data) => {
-      if (onProgress && data) {
-        onProgress({ type: "stdout", data });
-      }
-    };
-
-    if (preferPty && runPtyCommand) {
-      try {
-        send("Starting in-app terminal session for Claude auth...\n");
-        send("If your browser opens, complete sign-in and return here.\n\n");
-
-        const ptyResult = await runPtyCommand(claudePath, ["setup-token"], {
-          cols: 120,
-          rows: 30,
-          onData: (chunk) => send(chunk),
-          env: {
-            FORCE_COLOR: "1",
-          },
-        });
-
-        const cleanedOutput = stripAnsi(ptyResult.output || "");
-        const token = this.extractTokenFromOutput(cleanedOutput);
-
-        if (ptyResult.success && token) {
-          send("\nCaptured token automatically.\n");
-          return {
-            success: true,
-            token,
-            requiresManualAuth: false,
-            terminalOpened: false,
-          };
-        }
-
-        if (ptyResult.success && !token) {
-          send(
-            "\nCLI completed but token was not detected automatically. You can copy it above or retry.\n"
-          );
-          return {
-            success: true,
-            requiresManualAuth: true,
-            terminalOpened: false,
-            error: "Could not capture token automatically",
-            output: cleanedOutput,
-          };
-        }
-
-        send(
-          `\nClaude CLI exited with code ${ptyResult.exitCode}. Falling back to manual copy.\n`
-        );
-        return {
-          success: false,
-          error: `Claude CLI exited with code ${ptyResult.exitCode}`,
-          requiresManualAuth: true,
-          output: cleanedOutput,
-        };
-      } catch (error) {
-        console.error("[ClaudeCliDetector] PTY auth failed, falling back:", error);
-        send(
-          `In-app terminal failed (${error?.message || "unknown error"}). Falling back to external terminal...\n`
-        );
-      }
-    }
-
-    // Fallback: external terminal window
-    if (preferPty && !runPtyCommand) {
-      send("In-app terminal unavailable (node-pty not loaded).");
-    } else if (!preferPty) {
-      send("Using system terminal for authentication on this platform.");
-    }
-    send("Opening system terminal for authentication...\n");
-
-    // Helper function to check if a command exists asynchronously
-    const commandExists = (cmd) => {
-      return new Promise((resolve) => {
-        require("child_process").exec(
-          `which ${cmd}`,
-          { timeout: 1000 },
-          (error) => {
-            resolve(!error);
-          }
-        );
-      });
-    };
-
-    // For Linux, find available terminal first (async)
-    let linuxTerminal = null;
-    if (platform !== "win32" && platform !== "darwin") {
-      const terminals = [
-        ["gnome-terminal", ["--", claudePath, "setup-token"]],
-        ["konsole", ["-e", claudePath, "setup-token"]],
-        ["xterm", ["-e", claudePath, "setup-token"]],
-        ["x-terminal-emulator", ["-e", `${claudePath} setup-token`]],
-      ];
-
-      for (const [term, termArgs] of terminals) {
-        const exists = await commandExists(term);
-        if (exists) {
-          linuxTerminal = { command: term, args: termArgs };
-          break;
-        }
-      }
-    }
-
-    return new Promise((resolve, reject) => {
-      // Open command in external terminal since Claude CLI requires TTY
-      let command, args;
-
-      if (platform === "win32") {
-        // Windows: Open new cmd window that stays open
-        command = "cmd";
-        args = ["/c", "start", "cmd", "/k", `"${claudePath}" setup-token`];
-      } else if (platform === "darwin") {
-        // macOS: Open Terminal.app
-        command = "osascript";
-        args = [
-          "-e",
-          `tell application "Terminal" to do script "${claudePath} setup-token"`,
-          "-e",
-          'tell application "Terminal" to activate',
-        ];
-      } else {
-        // Linux: Use the terminal we found earlier
-        if (!linuxTerminal) {
-          reject({
-            success: false,
-            error:
-              "Could not find a terminal emulator. Please run 'claude setup-token' manually in your terminal.",
-            requiresManualAuth: true,
-          });
-          return;
-        }
-        command = linuxTerminal.command;
-        args = linuxTerminal.args;
-      }
-
-      console.log(
-        "[ClaudeCliDetector] Spawning terminal:",
-        command,
-        args.join(" ")
-      );
-
-      const proc = spawn(command, args, {
-        detached: true,
-        stdio: "ignore",
-        shell: platform === "win32",
-      });
-
-      proc.unref();
-
-      proc.on("error", (error) => {
-        console.error("[ClaudeCliDetector] Failed to open terminal:", error);
-        reject({
-          success: false,
-          error: `Failed to open terminal: ${error.message}`,
-          requiresManualAuth: true,
-        });
-      });
-
-      // Give the terminal a moment to open
-      setTimeout(() => {
-        send("Terminal window opened!\n\n");
-        send("1. Complete the sign-in in your browser\n");
-        send("2. Copy the token from the terminal\n");
-        send("3. Paste it below\n");
-
-        // Resolve with manual auth required since we can't capture from external terminal
-        resolve({
-          success: true,
-          requiresManualAuth: true,
-          terminalOpened: true,
-          message:
-            "Terminal opened. Complete authentication and paste the token below.",
-        });
-      }, 500);
-    });
-  }
-}
-
-module.exports = ClaudeCliDetector;

apps/app/electron/services/codex-cli-detector.js

@@ -1,566 +0,0 @@
-const { execSync, spawn } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-/**
- * Codex CLI Detector - Checks if OpenAI Codex CLI is installed
- *
- * Codex CLI is OpenAI's agent CLI tool that allows users to use
- * GPT-5.1 Codex models (gpt-5.1-codex-max, gpt-5.1-codex, etc.)
- * for code generation and agentic tasks.
- */
-class CodexCliDetector {
-  /**
-   * Get the path to Codex config directory
-   * @returns {string} Path to .codex directory
-   */
-  static getConfigDir() {
-    return path.join(os.homedir(), '.codex');
-  }
-
-  /**
-   * Get the path to Codex auth file
-   * @returns {string} Path to auth.json
-   */
-  static getAuthPath() {
-    return path.join(this.getConfigDir(), 'auth.json');
-  }
-
-  /**
-   * Check Codex authentication status
-   * @returns {Object} Authentication status
-   */
-  static checkAuth() {
-    try {
-      const authPath = this.getAuthPath();
-      const envApiKey = process.env.OPENAI_API_KEY;
-
-      // Try to verify authentication using codex CLI command if available
-      try {
-        const detection = this.detectCodexInstallation();
-        if (detection.installed) {
-          try {
-            const statusOutput = execSync(`"${detection.path || 'codex'}" login status 2>/dev/null`, {
-              encoding: 'utf-8',
-              timeout: 5000
-            });
-
-            if (statusOutput && (statusOutput.includes('Logged in') || statusOutput.includes('Authenticated'))) {
-              return {
-                authenticated: true,
-                method: 'cli_verified',
-                hasAuthFile: fs.existsSync(authPath),
-                hasEnvKey: !!envApiKey,
-                authPath
-              };
-            }
-          } catch (statusError) {
-            // status command failed, continue with file-based check
-          }
-        }
-      } catch (verifyError) {
-        // CLI verification failed, continue with file-based check
-      }
-
-      // Check if auth file exists
-      if (fs.existsSync(authPath)) {
-        let auth = null;
-        try {
-          const content = fs.readFileSync(authPath, 'utf-8');
-          auth = JSON.parse(content);
-
-          // Check for token object structure
-          if (auth.token && typeof auth.token === 'object') {
-            const token = auth.token;
-            if (token.Id_token || token.access_token || token.refresh_token || token.id_token) {
-              return {
-                authenticated: true,
-                method: 'cli_tokens',
-                hasAuthFile: true,
-                hasEnvKey: !!envApiKey,
-                authPath
-              };
-            }
-          }
-
-          // Check for tokens at root level
-          if (auth.access_token || auth.refresh_token || auth.Id_token || auth.id_token) {
-            return {
-              authenticated: true,
-              method: 'cli_tokens',
-              hasAuthFile: true,
-              hasEnvKey: !!envApiKey,
-              authPath
-            };
-          }
-
-          // Check for API key fields
-          if (auth.api_key || auth.openai_api_key || auth.apiKey) {
-            return {
-              authenticated: true,
-              method: 'auth_file',
-              hasAuthFile: true,
-              hasEnvKey: !!envApiKey,
-              authPath
-            };
-          }
-        } catch (error) {
-          return {
-            authenticated: false,
-            method: 'none',
-            hasAuthFile: false,
-            hasEnvKey: !!envApiKey,
-            authPath
-          };
-        }
-
-        if (!auth) {
-          return {
-            authenticated: false,
-            method: 'none',
-            hasAuthFile: true,
-            hasEnvKey: !!envApiKey,
-            authPath
-          };
-        }
-
-        const keys = Object.keys(auth);
-        if (keys.length > 0) {
-          const hasTokens = keys.some(key =>
-            key.toLowerCase().includes('token') ||
-            key.toLowerCase().includes('refresh') ||
-            (auth[key] && typeof auth[key] === 'object' && (
-              auth[key].access_token || auth[key].refresh_token || auth[key].Id_token || auth[key].id_token
-            ))
-          );
-
-          if (hasTokens) {
-            return {
-              authenticated: true,
-              method: 'cli_tokens',
-              hasAuthFile: true,
-              hasEnvKey: !!envApiKey,
-              authPath
-            };
-          }
-
-          // File exists and has content - check if it's tokens or API key
-          const likelyTokens = keys.some(key => key.toLowerCase().includes('token') || key.toLowerCase().includes('refresh'));
-          return {
-            authenticated: true,
-            method: likelyTokens ? 'cli_tokens' : 'auth_file',
-            hasAuthFile: true,
-            hasEnvKey: !!envApiKey,
-            authPath
-          };
-        }
-      }
-
-      // Check environment variable
-      if (envApiKey) {
-        return {
-          authenticated: true,
-          method: 'env_var',
-          hasAuthFile: false,
-          hasEnvKey: true,
-          authPath
-        };
-      }
-
-      return {
-        authenticated: false,
-        method: 'none',
-        hasAuthFile: false,
-        hasEnvKey: false,
-        authPath
-      };
-    } catch (error) {
-      return {
-        authenticated: false,
-        method: 'none',
-        error: error.message
-      };
-    }
-  }
-  /**
-   * Check if Codex CLI is installed and accessible
-   * @returns {Object} { installed: boolean, path: string|null, version: string|null, method: 'cli'|'npm'|'brew'|'none' }
-   */
-  static detectCodexInstallation() {
-    try {
-      // Method 1: Check if 'codex' command is in PATH
-      try {
-        const codexPath = execSync('which codex 2>/dev/null', { encoding: 'utf-8' }).trim();
-        if (codexPath) {
-          const version = this.getCodexVersion(codexPath);
-          return {
-            installed: true,
-            path: codexPath,
-            version: version,
-            method: 'cli'
-          };
-        }
-      } catch (error) {
-        // CLI not in PATH, continue checking other methods
-      }
-
-      // Method 2: Check for npm global installation
-      try {
-        const npmListOutput = execSync('npm list -g @openai/codex --depth=0 2>/dev/null', { encoding: 'utf-8' });
-        if (npmListOutput && npmListOutput.includes('@openai/codex')) {
-          // Get the path from npm bin
-          const npmBinPath = execSync('npm bin -g', { encoding: 'utf-8' }).trim();
-          const codexPath = path.join(npmBinPath, 'codex');
-          const version = this.getCodexVersion(codexPath);
-          return {
-            installed: true,
-            path: codexPath,
-            version: version,
-            method: 'npm'
-          };
-        }
-      } catch (error) {
-        // npm global not found
-      }
-
-      // Method 3: Check for Homebrew installation on macOS
-      if (process.platform === 'darwin') {
-        try {
-          const brewList = execSync('brew list --formula 2>/dev/null', { encoding: 'utf-8' });
-          if (brewList.includes('codex')) {
-            const brewPrefixOutput = execSync('brew --prefix codex 2>/dev/null', { encoding: 'utf-8' }).trim();
-            const codexPath = path.join(brewPrefixOutput, 'bin', 'codex');
-            const version = this.getCodexVersion(codexPath);
-            return {
-              installed: true,
-              path: codexPath,
-              version: version,
-              method: 'brew'
-            };
-          }
-        } catch (error) {
-          // Homebrew not found or codex not installed via brew
-        }
-      }
-
-      // Method 4: Check Windows path
-      if (process.platform === 'win32') {
-        try {
-          const codexPath = execSync('where codex 2>nul', { encoding: 'utf-8' }).trim().split('\n')[0];
-          if (codexPath) {
-            const version = this.getCodexVersion(codexPath);
-            return {
-              installed: true,
-              path: codexPath,
-              version: version,
-              method: 'cli'
-            };
-          }
-        } catch (error) {
-          // Not found on Windows
-        }
-      }
-
-      // Method 5: Check common installation paths
-      const commonPaths = [
-        path.join(os.homedir(), '.local', 'bin', 'codex'),
-        path.join(os.homedir(), '.npm-global', 'bin', 'codex'),
-        '/usr/local/bin/codex',
-        '/opt/homebrew/bin/codex',
-      ];
-
-      for (const checkPath of commonPaths) {
-        if (fs.existsSync(checkPath)) {
-          const version = this.getCodexVersion(checkPath);
-          return {
-            installed: true,
-            path: checkPath,
-            version: version,
-            method: 'cli'
-          };
-        }
-      }
-
-      // Method 6: Check if OPENAI_API_KEY is set (can use Codex API directly)
-      if (process.env.OPENAI_API_KEY) {
-        return {
-          installed: false,
-          path: null,
-          version: null,
-          method: 'api-key-only',
-          hasApiKey: true
-        };
-      }
-
-      return {
-        installed: false,
-        path: null,
-        version: null,
-        method: 'none'
-      };
-    } catch (error) {
-      // Error detecting Codex installation
-      return {
-        installed: false,
-        path: null,
-        version: null,
-        method: 'none',
-        error: error.message
-      };
-    }
-  }
-
-  /**
-   * Get Codex CLI version from executable path
-   * @param {string} codexPath Path to codex executable
-   * @returns {string|null} Version string or null
-   */
-  static getCodexVersion(codexPath) {
-    try {
-      const version = execSync(`"${codexPath}" --version 2>/dev/null`, { encoding: 'utf-8' }).trim();
-      return version || null;
-    } catch (error) {
-      return null;
-    }
-  }
-
-  /**
-   * Get installation info and recommendations
-   * @returns {Object} Installation status and recommendations
-   */
-  static getInstallationInfo() {
-    const detection = this.detectCodexInstallation();
-
-    if (detection.installed) {
-      return {
-        status: 'installed',
-        method: detection.method,
-        version: detection.version,
-        path: detection.path,
-        recommendation: detection.method === 'cli'
-          ? 'Using Codex CLI - ready for GPT-5.1 Codex models'
-          : `Using Codex CLI via ${detection.method} - ready for GPT-5.1 Codex models`
-      };
-    }
-
-    // Not installed but has API key
-    if (detection.method === 'api-key-only') {
-      return {
-        status: 'api_key_only',
-        method: 'api-key-only',
-        recommendation: 'OPENAI_API_KEY detected but Codex CLI not installed. Install Codex CLI for full agentic capabilities.',
-        installCommands: this.getInstallCommands()
-      };
-    }
-
-    return {
-      status: 'not_installed',
-      recommendation: 'Install OpenAI Codex CLI to use GPT-5.1 Codex models for agentic tasks',
-      installCommands: this.getInstallCommands()
-    };
-  }
-
-  /**
-   * Get installation commands for different platforms
-   * @returns {Object} Installation commands by platform
-   */
-  static getInstallCommands() {
-    return {
-      npm: 'npm install -g @openai/codex@latest',
-      macos: 'brew install codex',
-      linux: 'npm install -g @openai/codex@latest',
-      windows: 'npm install -g @openai/codex@latest'
-    };
-  }
-
-  /**
-   * Check if Codex CLI supports a specific model
-   * @param {string} model Model name to check
-   * @returns {boolean} Whether the model is supported
-   */
-  static isModelSupported(model) {
-    const supportedModels = [
-      'gpt-5.1-codex-max',
-      'gpt-5.1-codex',
-      'gpt-5.1-codex-mini',
-      'gpt-5.1'
-    ];
-    return supportedModels.includes(model);
-  }
-
-  /**
-   * Get default model for Codex CLI
-   * @returns {string} Default model name
-   */
-  static getDefaultModel() {
-    return 'gpt-5.1-codex-max';
-  }
-
-  /**
-   * Get comprehensive installation info including auth status
-   * @returns {Object} Full status object
-   */
-  static getFullStatus() {
-    const installation = this.detectCodexInstallation();
-    const auth = this.checkAuth();
-    const info = this.getInstallationInfo();
-
-    return {
-      ...info,
-      auth,
-      installation
-    };
-  }
-
-  /**
-   * Install Codex CLI using npm
-   * @param {Function} onProgress Callback for progress updates
-   * @returns {Promise<Object>} Installation result
-   */
-  static async installCli(onProgress) {
-    return new Promise((resolve, reject) => {
-      const command = 'npm';
-      const args = ['install', '-g', '@openai/codex@latest'];
-
-      const proc = spawn(command, args, {
-        stdio: ['pipe', 'pipe', 'pipe'],
-        shell: true
-      });
-
-      let output = '';
-      let errorOutput = '';
-
-      proc.stdout.on('data', (data) => {
-        const text = data.toString();
-        output += text;
-        if (onProgress) {
-          onProgress({ type: 'stdout', data: text });
-        }
-      });
-
-      proc.stderr.on('data', (data) => {
-        const text = data.toString();
-        errorOutput += text;
-        // npm often outputs progress to stderr
-        if (onProgress) {
-          onProgress({ type: 'stderr', data: text });
-        }
-      });
-
-      proc.on('close', (code) => {
-        if (code === 0) {
-          resolve({
-            success: true,
-            output,
-            message: 'Codex CLI installed successfully'
-          });
-        } else {
-          reject({
-            success: false,
-            error: errorOutput || `Installation failed with code ${code}`,
-            output
-          });
-        }
-      });
-
-      proc.on('error', (error) => {
-        reject({
-          success: false,
-          error: error.message,
-          output
-        });
-      });
-    });
-  }
-
-  /**
-   * Authenticate Codex CLI - opens browser for OAuth or stores API key
-   * @param {string} apiKey Optional API key to store
-   * @param {Function} onProgress Callback for progress updates
-   * @returns {Promise<Object>} Authentication result
-   */
-  static async authenticate(apiKey, onProgress) {
-    return new Promise((resolve, reject) => {
-      const detection = this.detectCodexInstallation();
-
-      if (!detection.installed) {
-        reject({
-          success: false,
-          error: 'Codex CLI is not installed'
-        });
-        return;
-      }
-
-      const codexPath = detection.path || 'codex';
-
-      if (apiKey) {
-        // Store API key directly using codex auth command
-        const proc = spawn(codexPath, ['auth', 'login', '--api-key', apiKey], {
-          stdio: ['pipe', 'pipe', 'pipe'],
-          shell: false
-        });
-
-        let output = '';
-        let errorOutput = '';
-
-        proc.stdout.on('data', (data) => {
-          const text = data.toString();
-          output += text;
-          if (onProgress) {
-            onProgress({ type: 'stdout', data: text });
-          }
-        });
-
-        proc.stderr.on('data', (data) => {
-          const text = data.toString();
-          errorOutput += text;
-          if (onProgress) {
-            onProgress({ type: 'stderr', data: text });
-          }
-        });
-
-        proc.on('close', (code) => {
-          if (code === 0) {
-            resolve({
-              success: true,
-              output,
-              message: 'Codex CLI authenticated successfully'
-            });
-          } else {
-            reject({
-              success: false,
-              error: errorOutput || `Authentication failed with code ${code}`,
-              output
-            });
-          }
-        });
-
-        proc.on('error', (error) => {
-          reject({
-            success: false,
-            error: error.message,
-            output
-          });
-        });
-      } else {
-        // Require manual authentication
-        if (onProgress) {
-          onProgress({
-            type: 'info',
-            data: 'Please run the following command in your terminal to authenticate:\n\ncodex auth login\n\nThen return here to continue setup.'
-          });
-        }
-
-        resolve({
-          success: true,
-          requiresManualAuth: true,
-          command: `${codexPath} auth login`,
-          message: 'Please authenticate Codex CLI manually'
-        });
-      }
-    });
-  }
-}
-
-module.exports = CodexCliDetector;

apps/app/electron/services/codex-config-manager.js

@@ -1,353 +0,0 @@
-/**
- * Codex TOML Configuration Manager
- * 
- * Manages Codex CLI's TOML configuration file to add/update MCP server settings.
- * Codex CLI looks for config at:
- * - ~/.codex/config.toml (user-level)
- * - .codex/config.toml (project-level, takes precedence)
- */
-
-const fs = require('fs/promises');
-const path = require('path');
-const os = require('os');
-
-class CodexConfigManager {
-  constructor() {
-    this.userConfigPath = path.join(os.homedir(), '.codex', 'config.toml');
-    this.projectConfigPath = null; // Will be set per project
-  }
-
-  /**
-   * Set the project path for project-level config
-   */
-  setProjectPath(projectPath) {
-    this.projectConfigPath = path.join(projectPath, '.codex', 'config.toml');
-  }
-
-  /**
-   * Get the effective config path (project-level if exists, otherwise user-level)
-   */
-  async getConfigPath() {
-    if (this.projectConfigPath) {
-      try {
-        await fs.access(this.projectConfigPath);
-        return this.projectConfigPath;
-      } catch (e) {
-        // Project config doesn't exist, fall back to user config
-      }
-    }
-    
-    // Ensure user config directory exists
-    const userConfigDir = path.dirname(this.userConfigPath);
-    try {
-      await fs.mkdir(userConfigDir, { recursive: true });
-    } catch (e) {
-      // Directory might already exist
-    }
-    
-    return this.userConfigPath;
-  }
-
-  /**
-   * Read existing TOML config (simple parser for our needs)
-   */
-  async readConfig(configPath) {
-    try {
-      const content = await fs.readFile(configPath, 'utf-8');
-      return this.parseToml(content);
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return {};
-      }
-      throw e;
-    }
-  }
-
-  /**
-   * Simple TOML parser for our specific use case
-   * This is a minimal parser that handles the MCP server config structure
-   */
-  parseToml(content) {
-    const config = {};
-    let currentSection = null;
-    let currentSubsection = null;
-    
-    const lines = content.split('\n');
-    
-    for (const line of lines) {
-      const trimmed = line.trim();
-      
-      // Skip comments and empty lines
-      if (!trimmed || trimmed.startsWith('#')) {
-        continue;
-      }
-      
-      // Section header: [section]
-      const sectionMatch = trimmed.match(/^\[([^\]]+)\]$/);
-      if (sectionMatch) {
-        const sectionName = sectionMatch[1];
-        const parts = sectionName.split('.');
-        
-        if (parts.length === 1) {
-          currentSection = parts[0];
-          currentSubsection = null;
-          if (!config[currentSection]) {
-            config[currentSection] = {};
-          }
-        } else if (parts.length === 2) {
-          currentSection = parts[0];
-          currentSubsection = parts[1];
-          if (!config[currentSection]) {
-            config[currentSection] = {};
-          }
-          if (!config[currentSection][currentSubsection]) {
-            config[currentSection][currentSubsection] = {};
-          }
-        }
-        continue;
-      }
-      
-      // Key-value pair: key = value
-      const kvMatch = trimmed.match(/^([^=]+)=(.+)$/);
-      if (kvMatch) {
-        const key = kvMatch[1].trim();
-        let value = kvMatch[2].trim();
-        
-        // Remove quotes if present
-        if ((value.startsWith('"') && value.endsWith('"')) ||
-            (value.startsWith("'") && value.endsWith("'"))) {
-          value = value.slice(1, -1);
-        }
-        
-        // Parse boolean
-        if (value === 'true') value = true;
-        else if (value === 'false') value = false;
-        // Parse number
-        else if (/^-?\d+$/.test(value)) value = parseInt(value, 10);
-        else if (/^-?\d+\.\d+$/.test(value)) value = parseFloat(value);
-        
-        if (currentSubsection) {
-          if (!config[currentSection][currentSubsection]) {
-            config[currentSection][currentSubsection] = {};
-          }
-          config[currentSection][currentSubsection][key] = value;
-        } else if (currentSection) {
-          if (!config[currentSection]) {
-            config[currentSection] = {};
-          }
-          config[currentSection][key] = value;
-        } else {
-          config[key] = value;
-        }
-      }
-    }
-    
-    return config;
-  }
-
-  /**
-   * Convert config object back to TOML format
-   */
-  stringifyToml(config, indent = 0) {
-    const indentStr = ' '.repeat(indent);
-    let result = '';
-    
-    for (const [key, value] of Object.entries(config)) {
-      if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-        // Section
-        result += `${indentStr}[${key}]\n`;
-        result += this.stringifyToml(value, indent);
-      } else {
-        // Key-value
-        let valueStr = value;
-        if (typeof value === 'string') {
-          // Escape quotes and wrap in quotes if needed
-          if (value.includes('"') || value.includes("'") || value.includes(' ')) {
-            valueStr = `"${value.replace(/"/g, '\\"')}"`;
-          }
-        } else if (typeof value === 'boolean') {
-          valueStr = value.toString();
-        }
-        result += `${indentStr}${key} = ${valueStr}\n`;
-      }
-    }
-    
-    return result;
-  }
-
-  /**
-   * Configure the automaker-tools MCP server
-   */
-  async configureMcpServer(projectPath, mcpServerScriptPath) {
-    this.setProjectPath(projectPath);
-    const configPath = await this.getConfigPath();
-    
-    // Read existing config
-    const config = await this.readConfig(configPath);
-    
-    // Ensure mcp_servers section exists
-    if (!config.mcp_servers) {
-      config.mcp_servers = {};
-    }
-    
-    // Configure automaker-tools server
-    config.mcp_servers['automaker-tools'] = {
-      command: 'node',
-      args: [mcpServerScriptPath],
-      env: {
-        AUTOMAKER_PROJECT_PATH: projectPath
-      },
-      startup_timeout_sec: 10,
-      tool_timeout_sec: 60,
-      enabled_tools: ['UpdateFeatureStatus']
-    };
-    
-    // Ensure experimental_use_rmcp_client is enabled (if needed)
-    if (!config.experimental_use_rmcp_client) {
-      config.experimental_use_rmcp_client = true;
-    }
-    
-    // Write config back
-    await this.writeConfig(configPath, config);
-    
-    console.log(`[CodexConfigManager] Configured automaker-tools MCP server in ${configPath}`);
-    return configPath;
-  }
-
-  /**
-   * Write config to TOML file
-   */
-  async writeConfig(configPath, config) {
-    let content = '';
-    
-    // Write top-level keys first (preserve existing non-MCP config)
-    for (const [key, value] of Object.entries(config)) {
-      if (key === 'mcp_servers' || key === 'experimental_use_rmcp_client') {
-        continue; // Handle these separately
-      }
-      if (typeof value !== 'object') {
-        content += `${key} = ${this.formatValue(value)}\n`;
-      }
-    }
-    
-    // Write experimental flag if enabled
-    if (config.experimental_use_rmcp_client) {
-      if (content && !content.endsWith('\n\n')) {
-        content += '\n';
-      }
-      content += `experimental_use_rmcp_client = true\n`;
-    }
-    
-    // Write mcp_servers section
-    if (config.mcp_servers && Object.keys(config.mcp_servers).length > 0) {
-      if (content && !content.endsWith('\n\n')) {
-        content += '\n';
-      }
-      
-      for (const [serverName, serverConfig] of Object.entries(config.mcp_servers)) {
-        content += `\n[mcp_servers.${serverName}]\n`;
-        
-        // Write command first
-        if (serverConfig.command) {
-          content += `command = "${this.escapeTomlString(serverConfig.command)}"\n`;
-        }
-        
-        // Write args
-        if (serverConfig.args && Array.isArray(serverConfig.args)) {
-          const argsStr = serverConfig.args.map(a => `"${this.escapeTomlString(a)}"`).join(', ');
-          content += `args = [${argsStr}]\n`;
-        }
-        
-        // Write timeouts (must be before env subsection)
-        if (serverConfig.startup_timeout_sec !== undefined) {
-          content += `startup_timeout_sec = ${serverConfig.startup_timeout_sec}\n`;
-        }
-        
-        if (serverConfig.tool_timeout_sec !== undefined) {
-          content += `tool_timeout_sec = ${serverConfig.tool_timeout_sec}\n`;
-        }
-        
-        // Write enabled_tools (must be before env subsection - at server level, not env level)
-        if (serverConfig.enabled_tools && Array.isArray(serverConfig.enabled_tools)) {
-          const toolsStr = serverConfig.enabled_tools.map(t => `"${this.escapeTomlString(t)}"`).join(', ');
-          content += `enabled_tools = [${toolsStr}]\n`;
-        }
-        
-        // Write env section last (as a separate subsection)
-        // IMPORTANT: In TOML, once we start [mcp_servers.server_name.env], 
-        // everything after belongs to that subsection until a new section starts
-        if (serverConfig.env && typeof serverConfig.env === 'object' && Object.keys(serverConfig.env).length > 0) {
-          content += `\n[mcp_servers.${serverName}.env]\n`;
-          for (const [envKey, envValue] of Object.entries(serverConfig.env)) {
-            content += `${envKey} = "${this.escapeTomlString(String(envValue))}"\n`;
-          }
-        }
-      }
-    }
-    
-    // Ensure directory exists
-    const configDir = path.dirname(configPath);
-    await fs.mkdir(configDir, { recursive: true });
-    
-    // Write file
-    await fs.writeFile(configPath, content, 'utf-8');
-  }
-
-  /**
-   * Escape special characters in TOML strings
-   */
-  escapeTomlString(str) {
-    return str
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/\t/g, '\\t');
-  }
-
-  /**
-   * Format a value for TOML output
-   */
-  formatValue(value) {
-    if (typeof value === 'string') {
-      // Escape quotes
-      const escaped = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-      return `"${escaped}"`;
-    } else if (typeof value === 'boolean') {
-      return value.toString();
-    } else if (typeof value === 'number') {
-      return value.toString();
-    }
-    return `"${String(value)}"`;
-  }
-
-  /**
-   * Remove automaker-tools MCP server configuration
-   */
-  async removeMcpServer(projectPath) {
-    this.setProjectPath(projectPath);
-    const configPath = await this.getConfigPath();
-    
-    try {
-      const config = await this.readConfig(configPath);
-      
-      if (config.mcp_servers && config.mcp_servers['automaker-tools']) {
-        delete config.mcp_servers['automaker-tools'];
-        
-        // If no more MCP servers, remove the section
-        if (Object.keys(config.mcp_servers).length === 0) {
-          delete config.mcp_servers;
-        }
-        
-        await this.writeConfig(configPath, config);
-        console.log(`[CodexConfigManager] Removed automaker-tools MCP server from ${configPath}`);
-      }
-    } catch (e) {
-      console.error(`[CodexConfigManager] Error removing MCP server config:`, e);
-    }
-  }
-}
-
-module.exports = new CodexConfigManager();
-
-

apps/app/electron/services/codex-executor.js

@@ -1,610 +0,0 @@
-/**
- * Codex CLI Execution Wrapper
- *
- * This module handles spawning and managing Codex CLI processes
- * for executing OpenAI model queries.
- */
-
-const { spawn } = require('child_process');
-const { EventEmitter } = require('events');
-const readline = require('readline');
-const path = require('path');
-const CodexCliDetector = require('./codex-cli-detector');
-const codexConfigManager = require('./codex-config-manager');
-
-/**
- * Message types from Codex CLI JSON output
- */
-const CODEX_EVENT_TYPES = {
-  THREAD_STARTED: 'thread.started',
-  ITEM_STARTED: 'item.started',
-  ITEM_COMPLETED: 'item.completed',
-  THREAD_COMPLETED: 'thread.completed',
-  ERROR: 'error'
-};
-
-/**
- * Codex Executor - Manages Codex CLI process execution
- */
-class CodexExecutor extends EventEmitter {
-  constructor() {
-    super();
-    this.currentProcess = null;
-    this.codexPath = null;
-  }
-
-  /**
-   * Find and cache the Codex CLI path
-   * @returns {string|null} Path to codex executable
-   */
-  findCodexPath() {
-    if (this.codexPath) {
-      return this.codexPath;
-    }
-
-    const installation = CodexCliDetector.detectCodexInstallation();
-    if (installation.installed && installation.path) {
-      this.codexPath = installation.path;
-      return this.codexPath;
-    }
-
-    return null;
-  }
-
-  /**
-   * Execute a Codex CLI query
-   * @param {Object} options Execution options
-   * @param {string} options.prompt The prompt to execute
-   * @param {string} options.model Model to use (default: gpt-5.1-codex-max)
-   * @param {string} options.cwd Working directory
-   * @param {string} options.systemPrompt System prompt (optional, will be prepended to prompt)
-   * @param {number} options.maxTurns Not used - Codex CLI doesn't support this parameter
-   * @param {string[]} options.allowedTools Not used - Codex CLI doesn't support this parameter
-   * @param {Object} options.env Environment variables
-   * @param {Object} options.mcpServers MCP servers configuration (for configuring Codex TOML)
-   * @returns {AsyncGenerator} Generator yielding messages
-   */
-  async *execute(options) {
-    const {
-      prompt,
-      model = 'gpt-5.1-codex-max',
-      cwd = process.cwd(),
-      systemPrompt,
-      maxTurns, // Not used by Codex CLI
-      allowedTools, // Not used by Codex CLI
-      env = {},
-      mcpServers = null
-    } = options;
-
-    const codexPath = this.findCodexPath();
-    if (!codexPath) {
-      yield {
-        type: 'error',
-        error: 'Codex CLI not found. Please install it with: npm install -g @openai/codex@latest'
-      };
-      return;
-    }
-
-    // Configure MCP server if provided
-    if (mcpServers && mcpServers['automaker-tools']) {
-      try {
-        // Get the absolute path to the MCP server script
-        const mcpServerScriptPath = path.resolve(__dirname, 'mcp-server-stdio.js');
-        
-        // Verify the script exists
-        const fs = require('fs');
-        if (!fs.existsSync(mcpServerScriptPath)) {
-          console.warn(`[CodexExecutor] MCP server script not found at ${mcpServerScriptPath}, skipping MCP configuration`);
-        } else {
-          // Configure Codex TOML to use the MCP server
-          await codexConfigManager.configureMcpServer(cwd, mcpServerScriptPath);
-          console.log('[CodexExecutor] Configured automaker-tools MCP server for Codex CLI');
-        }
-      } catch (error) {
-        console.error('[CodexExecutor] Failed to configure MCP server:', error);
-        // Continue execution even if MCP config fails - Codex will work without MCP tools
-      }
-    }
-
-    // Combine system prompt with main prompt if provided
-    // Codex CLI doesn't support --system-prompt argument, so we prepend it to the prompt
-    let combinedPrompt = prompt;
-    console.log('[CodexExecutor] Original prompt length:', prompt?.length || 0);
-    if (systemPrompt) {
-      combinedPrompt = `${systemPrompt}\n\n---\n\n${prompt}`;
-      console.log('[CodexExecutor] System prompt prepended to main prompt');
-      console.log('[CodexExecutor] System prompt length:', systemPrompt.length);
-      console.log('[CodexExecutor] Combined prompt length:', combinedPrompt.length);
-    }
-
-    // Build command arguments
-    // Note: maxTurns and allowedTools are not supported by Codex CLI
-    console.log('[CodexExecutor] Building command arguments...');
-    const args = this.buildArgs({
-      prompt: combinedPrompt,
-      model
-    });
-
-    console.log('[CodexExecutor] Executing command:', codexPath);
-    console.log('[CodexExecutor] Number of args:', args.length);
-    console.log('[CodexExecutor] Args (without prompt):', args.slice(0, -1).join(' '));
-    console.log('[CodexExecutor] Prompt length in args:', args[args.length - 1]?.length || 0);
-    console.log('[CodexExecutor] Prompt preview (first 200 chars):', args[args.length - 1]?.substring(0, 200));
-    console.log('[CodexExecutor] Working directory:', cwd);
-
-    // Spawn the process
-    const processEnv = {
-      ...process.env,
-      ...env,
-      // Ensure OPENAI_API_KEY is available
-      OPENAI_API_KEY: env.OPENAI_API_KEY || process.env.OPENAI_API_KEY
-    };
-
-    // Log API key status (without exposing the key)
-    if (processEnv.OPENAI_API_KEY) {
-      console.log('[CodexExecutor] OPENAI_API_KEY is set (length:', processEnv.OPENAI_API_KEY.length, ')');
-    } else {
-      console.warn('[CodexExecutor] WARNING: OPENAI_API_KEY is not set!');
-    }
-
-    console.log('[CodexExecutor] Spawning process...');
-    const proc = spawn(codexPath, args, {
-      cwd,
-      env: processEnv,
-      stdio: ['pipe', 'pipe', 'pipe']
-    });
-
-    this.currentProcess = proc;
-    console.log('[CodexExecutor] Process spawned with PID:', proc.pid);
-
-    // Track process events
-    proc.on('error', (error) => {
-      console.error('[CodexExecutor] Process error:', error);
-    });
-
-    proc.on('spawn', () => {
-      console.log('[CodexExecutor] Process spawned successfully');
-    });
-
-    // Collect stderr output as it comes in
-    let stderr = '';
-    let hasOutput = false;
-    let stdoutChunks = [];
-    let stderrChunks = [];
-    
-    proc.stderr.on('data', (data) => {
-      const errorText = data.toString();
-      stderr += errorText;
-      stderrChunks.push(errorText);
-      hasOutput = true;
-      console.error('[CodexExecutor] stderr chunk received (', data.length, 'bytes):', errorText.substring(0, 200));
-    });
-
-    proc.stderr.on('end', () => {
-      console.log('[CodexExecutor] stderr stream ended. Total chunks:', stderrChunks.length, 'Total length:', stderr.length);
-    });
-
-    proc.stdout.on('data', (data) => {
-      const text = data.toString();
-      stdoutChunks.push(text);
-      hasOutput = true;
-      console.log('[CodexExecutor] stdout chunk received (', data.length, 'bytes):', text.substring(0, 200));
-    });
-
-    proc.stdout.on('end', () => {
-      console.log('[CodexExecutor] stdout stream ended. Total chunks:', stdoutChunks.length);
-    });
-
-    // Create readline interface for parsing JSONL output
-    console.log('[CodexExecutor] Creating readline interface...');
-    const rl = readline.createInterface({
-      input: proc.stdout,
-      crlfDelay: Infinity
-    });
-
-    // Track accumulated content for converting to Claude format
-    let accumulatedText = '';
-    let toolUses = [];
-    let lastOutputTime = Date.now();
-    const OUTPUT_TIMEOUT = 30000; // 30 seconds timeout for no output
-    let lineCount = 0;
-    let jsonParseErrors = 0;
-
-    // Set up timeout check
-    const checkTimeout = setInterval(() => {
-      const timeSinceLastOutput = Date.now() - lastOutputTime;
-      if (timeSinceLastOutput > OUTPUT_TIMEOUT && !hasOutput) {
-        console.warn('[CodexExecutor] No output received for', timeSinceLastOutput, 'ms. Process still alive:', !proc.killed);
-      }
-    }, 5000);
-
-    console.log('[CodexExecutor] Starting to read lines from stdout...');
-
-    // Process stdout line by line (JSONL format)
-    try {
-      for await (const line of rl) {
-        hasOutput = true;
-        lastOutputTime = Date.now();
-        lineCount++;
-        
-        console.log('[CodexExecutor] Line', lineCount, 'received (length:', line.length, '):', line.substring(0, 100));
-        
-        if (!line.trim()) {
-          console.log('[CodexExecutor] Skipping empty line');
-          continue;
-        }
-
-        try {
-          const event = JSON.parse(line);
-          console.log('[CodexExecutor] Successfully parsed JSON event. Type:', event.type, 'Keys:', Object.keys(event));
-          
-          const convertedMsg = this.convertToClaudeFormat(event);
-          console.log('[CodexExecutor] Converted message:', convertedMsg ? { type: convertedMsg.type } : 'null');
-
-          if (convertedMsg) {
-            // Accumulate text content
-            if (convertedMsg.type === 'assistant' && convertedMsg.message?.content) {
-              for (const block of convertedMsg.message.content) {
-                if (block.type === 'text') {
-                  accumulatedText += block.text;
-                  console.log('[CodexExecutor] Accumulated text block (total length:', accumulatedText.length, ')');
-                } else if (block.type === 'tool_use') {
-                  toolUses.push(block);
-                  console.log('[CodexExecutor] Tool use detected:', block.name);
-                }
-              }
-            }
-            console.log('[CodexExecutor] Yielding message of type:', convertedMsg.type);
-            yield convertedMsg;
-          } else {
-            console.log('[CodexExecutor] Converted message is null, skipping');
-          }
-        } catch (parseError) {
-          jsonParseErrors++;
-          // Non-JSON output, yield as text
-          console.log('[CodexExecutor] JSON parse error (', jsonParseErrors, 'total):', parseError.message);
-          console.log('[CodexExecutor] Non-JSON line content:', line.substring(0, 200));
-          yield {
-            type: 'assistant',
-            message: {
-              content: [{ type: 'text', text: line + '\n' }]
-            }
-          };
-        }
-      }
-      
-      console.log('[CodexExecutor] Finished reading all lines. Total lines:', lineCount, 'JSON errors:', jsonParseErrors);
-    } catch (readError) {
-      console.error('[CodexExecutor] Error reading from readline:', readError);
-      throw readError;
-    } finally {
-      clearInterval(checkTimeout);
-      console.log('[CodexExecutor] Cleaned up timeout checker');
-    }
-
-    // Handle process completion
-    console.log('[CodexExecutor] Waiting for process to close...');
-    const exitCode = await new Promise((resolve) => {
-      proc.on('close', (code, signal) => {
-        console.log('[CodexExecutor] Process closed with code:', code, 'signal:', signal);
-        resolve(code);
-      });
-    });
-
-    this.currentProcess = null;
-    console.log('[CodexExecutor] Process completed. Exit code:', exitCode, 'Has output:', hasOutput, 'Stderr length:', stderr.length);
-
-    // Wait a bit for any remaining stderr data to be collected
-    console.log('[CodexExecutor] Waiting 200ms for any remaining stderr data...');
-    await new Promise(resolve => setTimeout(resolve, 200));
-    console.log('[CodexExecutor] Final stderr length:', stderr.length, 'Final stdout chunks:', stdoutChunks.length);
-
-    if (exitCode !== 0) {
-      const errorMessage = stderr.trim() 
-        ? `Codex CLI exited with code ${exitCode}.\n\nError output:\n${stderr}`
-        : `Codex CLI exited with code ${exitCode}. No error output captured.`;
-      
-      console.error('[CodexExecutor] Process failed with exit code', exitCode);
-      console.error('[CodexExecutor] Error message:', errorMessage);
-      console.error('[CodexExecutor] Stderr chunks:', stderrChunks.length, 'Stdout chunks:', stdoutChunks.length);
-      
-      yield {
-        type: 'error',
-        error: errorMessage
-      };
-    } else if (!hasOutput && !stderr) {
-      // Process exited successfully but produced no output - might be API key issue
-      const warningMessage = 'Codex CLI completed but produced no output. This might indicate:\n' +
-        '- Missing or invalid OPENAI_API_KEY\n' +
-        '- Codex CLI configuration issue\n' +
-        '- The process completed without generating any response\n\n' +
-        `Debug info: Exit code ${exitCode}, stdout chunks: ${stdoutChunks.length}, stderr chunks: ${stderrChunks.length}, lines read: ${lineCount}`;
-      
-      console.warn('[CodexExecutor] No output detected:', warningMessage);
-      console.warn('[CodexExecutor] Stdout chunks:', stdoutChunks);
-      console.warn('[CodexExecutor] Stderr chunks:', stderrChunks);
-      
-      yield {
-        type: 'error',
-        error: warningMessage
-      };
-    } else {
-      console.log('[CodexExecutor] Process completed successfully. Exit code:', exitCode, 'Lines processed:', lineCount);
-    }
-  }
-
-  /**
-   * Build command arguments for Codex CLI
-   * Only includes supported arguments based on Codex CLI help:
-   * - --model: Model to use
-   * - --json: JSON output format
-   * - --full-auto: Non-interactive automatic execution
-   * 
-   * Note: Codex CLI does NOT support:
-   * - --system-prompt (system prompt is prepended to main prompt)
-   * - --max-turns (not available in CLI)
-   * - --tools (not available in CLI)
-   * 
-   * @param {Object} options Options
-   * @returns {string[]} Command arguments
-   */
-  buildArgs(options) {
-    const { prompt, model } = options;
-
-    console.log('[CodexExecutor] buildArgs called with model:', model, 'prompt length:', prompt?.length || 0);
-
-    const args = ['exec'];
-
-    // Add model (required for most use cases)
-    if (model) {
-      args.push('--model', model);
-      console.log('[CodexExecutor] Added model argument:', model);
-    }
-
-    // Add JSON output flag for structured parsing
-    args.push('--json');
-    console.log('[CodexExecutor] Added --json flag');
-
-    // Add full-auto mode (non-interactive)
-    // This enables automatic execution with workspace-write sandbox
-    args.push('--full-auto');
-    console.log('[CodexExecutor] Added --full-auto flag');
-
-    // Add the prompt at the end
-    args.push(prompt);
-    console.log('[CodexExecutor] Added prompt (length:', prompt?.length || 0, ')');
-
-    console.log('[CodexExecutor] Final args count:', args.length);
-    return args;
-  }
-
-  /**
-   * Map Claude tool names to Codex tool names
-   * @param {string[]} tools Array of tool names
-   * @returns {string[]} Mapped tool names
-   */
-  mapToolsToCodex(tools) {
-    const toolMap = {
-      'Read': 'read',
-      'Write': 'write',
-      'Edit': 'edit',
-      'Bash': 'bash',
-      'Glob': 'glob',
-      'Grep': 'grep',
-      'WebSearch': 'web-search',
-      'WebFetch': 'web-fetch'
-    };
-
-    return tools
-      .map(tool => toolMap[tool] || tool.toLowerCase())
-      .filter(tool => tool); // Remove undefined
-  }
-
-  /**
-   * Convert Codex JSONL event to Claude SDK message format
-   * @param {Object} event Codex event object
-   * @returns {Object|null} Claude-format message or null
-   */
-  convertToClaudeFormat(event) {
-    console.log('[CodexExecutor] Converting event:', JSON.stringify(event).substring(0, 200));
-    const { type, data, item, thread_id } = event;
-
-    switch (type) {
-      case CODEX_EVENT_TYPES.THREAD_STARTED:
-      case 'thread.started':
-        // Session initialization
-        return {
-          type: 'session_start',
-          sessionId: thread_id || data?.thread_id || event.thread_id
-        };
-
-      case CODEX_EVENT_TYPES.ITEM_COMPLETED:
-      case 'item.completed':
-        // Codex uses 'item' field, not 'data'
-        return this.convertItemCompleted(item || data);
-
-      case CODEX_EVENT_TYPES.ITEM_STARTED:
-      case 'item.started':
-        // Convert item.started events - these indicate tool/command usage
-        const startedItem = item || data;
-        if (startedItem?.type === 'command_execution' && startedItem?.command) {
-          return {
-            type: 'assistant',
-            message: {
-              content: [{
-                type: 'tool_use',
-                name: 'bash',
-                input: { command: startedItem.command }
-              }]
-            }
-          };
-        }
-        // For other item.started types, return null (we'll show the completed version)
-        return null;
-
-      case CODEX_EVENT_TYPES.THREAD_COMPLETED:
-      case 'thread.completed':
-        return {
-          type: 'complete',
-          sessionId: thread_id || data?.thread_id || event.thread_id
-        };
-
-      case CODEX_EVENT_TYPES.ERROR:
-      case 'error':
-        return {
-          type: 'error',
-          error: data?.message || item?.message || event.message || 'Unknown error from Codex CLI'
-        };
-
-      case 'turn.started':
-        // Turn started - just a marker, no need to convert
-        return null;
-
-      default:
-        // Pass through other events
-        console.log('[CodexExecutor] Unhandled event type:', type);
-        return null;
-    }
-  }
-
-  /**
-   * Convert item.completed event to Claude format
-   * @param {Object} item Event item data
-   * @returns {Object|null} Claude-format message
-   */
-  convertItemCompleted(item) {
-    if (!item) {
-      console.log('[CodexExecutor] convertItemCompleted: item is null/undefined');
-      return null;
-    }
-
-    const itemType = item.type || item.item_type;
-    console.log('[CodexExecutor] convertItemCompleted: itemType =', itemType, 'item keys:', Object.keys(item));
-
-    switch (itemType) {
-      case 'reasoning':
-        // Thinking/reasoning output - Codex uses 'text' field
-        const reasoningText = item.text || item.content || '';
-        console.log('[CodexExecutor] Converting reasoning, text length:', reasoningText.length);
-        return {
-          type: 'assistant',
-          message: {
-            content: [{
-              type: 'thinking',
-              thinking: reasoningText
-            }]
-          }
-        };
-
-      case 'agent_message':
-      case 'message':
-        // Assistant text message
-        const messageText = item.content || item.text || '';
-        console.log('[CodexExecutor] Converting message, text length:', messageText.length);
-        return {
-          type: 'assistant',
-          message: {
-            content: [{
-              type: 'text',
-              text: messageText
-            }]
-          }
-        };
-
-      case 'command_execution':
-        // Command execution - show both the command and its output
-        const command = item.command || '';
-        const output = item.aggregated_output || item.output || '';
-        console.log('[CodexExecutor] Converting command_execution, command:', command.substring(0, 50), 'output length:', output.length);
-        
-        // Return as text message showing the command and output
-        return {
-          type: 'assistant',
-          message: {
-            content: [{
-              type: 'text',
-              text: `\`\`\`bash\n${command}\n\`\`\`\n\n${output}`
-            }]
-          }
-        };
-
-      case 'tool_use':
-        // Tool use
-        return {
-          type: 'assistant',
-          message: {
-            content: [{
-              type: 'tool_use',
-              name: item.tool || item.command || 'unknown',
-              input: item.input || item.args || {}
-            }]
-          }
-        };
-
-      case 'tool_result':
-        // Tool result
-        return {
-          type: 'tool_result',
-          tool_use_id: item.tool_use_id,
-          content: item.output || item.result
-        };
-
-      case 'todo_list':
-        // Todo list - convert to text format
-        const todos = item.items || [];
-        const todoText = todos.map((t, i) => `${i + 1}. ${t.text || t}`).join('\n');
-        console.log('[CodexExecutor] Converting todo_list, items:', todos.length);
-        return {
-          type: 'assistant',
-          message: {
-            content: [{
-              type: 'text',
-              text: `**Todo List:**\n${todoText}`
-            }]
-          }
-        };
-
-      default:
-        // Generic text output
-        const text = item.text || item.content || item.aggregated_output;
-        if (text) {
-          console.log('[CodexExecutor] Converting default item type, text length:', text.length);
-          return {
-            type: 'assistant',
-            message: {
-              content: [{
-                type: 'text',
-                text: String(text)
-              }]
-            }
-          };
-        }
-        console.log('[CodexExecutor] convertItemCompleted: No text content found, returning null');
-        return null;
-    }
-  }
-
-  /**
-   * Abort current execution
-   */
-  abort() {
-    if (this.currentProcess) {
-      console.log('[CodexExecutor] Aborting current process');
-      this.currentProcess.kill('SIGTERM');
-      this.currentProcess = null;
-    }
-  }
-
-  /**
-   * Check if execution is in progress
-   * @returns {boolean} Whether execution is in progress
-   */
-  isRunning() {
-    return this.currentProcess !== null;
-  }
-}
-
-// Singleton instance
-const codexExecutor = new CodexExecutor();
-
-module.exports = codexExecutor;

apps/app/electron/services/context-manager.js

@@ -1,452 +0,0 @@
-const path = require("path");
-const fs = require("fs/promises");
-
-/**
- * Context Manager - Handles reading, writing, and deleting context files for features
- */
-class ContextManager {
-  /**
-   * Write output to feature context file
-   */
-  async writeToContextFile(projectPath, featureId, content) {
-    if (!projectPath) return;
-
-    try {
-      const featureDir = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId
-      );
-
-      // Ensure feature directory exists
-      try {
-        await fs.access(featureDir);
-      } catch {
-        await fs.mkdir(featureDir, { recursive: true });
-      }
-
-      const filePath = path.join(featureDir, "agent-output.md");
-
-      // Append to existing file or create new one
-      try {
-        const existing = await fs.readFile(filePath, "utf-8");
-        await fs.writeFile(filePath, existing + content, "utf-8");
-      } catch {
-        await fs.writeFile(filePath, content, "utf-8");
-      }
-    } catch (error) {
-      console.error("[ContextManager] Failed to write to context file:", error);
-    }
-  }
-
-  /**
-   * Read context file for a feature
-   */
-  async readContextFile(projectPath, featureId) {
-    try {
-      const contextPath = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId,
-        "agent-output.md"
-      );
-      const content = await fs.readFile(contextPath, "utf-8");
-      return content;
-    } catch (error) {
-      console.log(`[ContextManager] No context file found for ${featureId}`);
-      return null;
-    }
-  }
-
-  /**
-   * Delete agent context file for a feature
-   */
-  async deleteContextFile(projectPath, featureId) {
-    if (!projectPath) return;
-
-    try {
-      const contextPath = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId,
-        "agent-output.md"
-      );
-      await fs.unlink(contextPath);
-      console.log(
-        `[ContextManager] Deleted agent context for feature ${featureId}`
-      );
-    } catch (error) {
-      // File might not exist, which is fine
-      if (error.code !== "ENOENT") {
-        console.error("[ContextManager] Failed to delete context file:", error);
-      }
-    }
-  }
-
-  /**
-   * Read the memory.md file containing lessons learned and common issues
-   * Returns formatted string to inject into prompts
-   */
-  async getMemoryContent(projectPath) {
-    if (!projectPath) return "";
-
-    try {
-      const memoryPath = path.join(projectPath, ".automaker", "memory.md");
-
-      // Check if file exists
-      try {
-        await fs.access(memoryPath);
-      } catch {
-        // File doesn't exist, return empty string
-        return "";
-      }
-
-      const content = await fs.readFile(memoryPath, "utf-8");
-
-      if (!content.trim()) {
-        return "";
-      }
-
-      return `
-**🧠 Agent Memory - Previous Lessons Learned:**
-
-The following memory file contains lessons learned from previous agent runs, including common issues and their solutions. Review this carefully to avoid repeating past mistakes.
-
-<agent-memory>
-${content}
-</agent-memory>
-
-**IMPORTANT:** If you encounter a new issue that took significant debugging effort to resolve, add it to the memory file at \`.automaker/memory.md\` in a concise format:
-- Issue title
-- Problem description (1-2 sentences)
-- Solution/fix (with code example if helpful)
-
-This helps future agent runs avoid the same pitfalls.
-`;
-    } catch (error) {
-      console.error("[ContextManager] Failed to read memory file:", error);
-      return "";
-    }
-  }
-
-  /**
-   * List context files from .automaker/context/ directory and get previews
-   * Returns a formatted string with file names and first 50 lines of each file
-   */
-  async getContextFilesPreview(projectPath) {
-    if (!projectPath) return "";
-
-    try {
-      const contextDir = path.join(projectPath, ".automaker", "context");
-
-      // Check if directory exists
-      try {
-        await fs.access(contextDir);
-      } catch {
-        // Directory doesn't exist, return empty string
-        return "";
-      }
-
-      // Read directory contents
-      const entries = await fs.readdir(contextDir, { withFileTypes: true });
-      const files = entries
-        .filter((entry) => entry.isFile())
-        .map((entry) => entry.name)
-        .sort();
-
-      if (files.length === 0) {
-        return "";
-      }
-
-      // Build preview string
-      const previews = [];
-      previews.push(`\n**📁 Context Files Available:**\n`);
-      previews.push(
-        `The following context files are available in \`.automaker/context/\` directory.`
-      );
-      previews.push(
-        `These files contain additional context that may be relevant to your work.`
-      );
-      previews.push(
-        `You can read them in full using the Read tool if needed.\n`
-      );
-
-      for (const fileName of files) {
-        try {
-          const filePath = path.join(contextDir, fileName);
-          const content = await fs.readFile(filePath, "utf-8");
-          const lines = content.split("\n");
-          const previewLines = lines.slice(0, 50);
-          const preview = previewLines.join("\n");
-          const hasMore = lines.length > 50;
-
-          previews.push(`\n**File: ${fileName}**`);
-          if (hasMore) {
-            previews.push(
-              `(Showing first 50 of ${lines.length} lines - use Read tool to see full content)`
-            );
-          }
-          previews.push(`\`\`\``);
-          previews.push(preview);
-          previews.push(`\`\`\`\n`);
-        } catch (error) {
-          console.error(
-            `[ContextManager] Failed to read context file ${fileName}:`,
-            error
-          );
-          previews.push(`\n**File: ${fileName}** (Error reading file)\n`);
-        }
-      }
-
-      return previews.join("\n");
-    } catch (error) {
-      console.error("[ContextManager] Failed to list context files:", error);
-      return "";
-    }
-  }
-
-  /**
-   * Save the initial git state before a feature starts executing
-   * This captures all files that were already modified before the AI agent started
-   * @param {string} projectPath - Path to the project
-   * @param {string} featureId - Feature ID
-   * @returns {Promise<{modifiedFiles: string[], untrackedFiles: string[]}>}
-   */
-  async saveInitialGitState(projectPath, featureId) {
-    if (!projectPath) return { modifiedFiles: [], untrackedFiles: [] };
-
-    try {
-      const { execSync } = require("child_process");
-      const featureDir = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId
-      );
-
-      // Ensure feature directory exists
-      try {
-        await fs.access(featureDir);
-      } catch {
-        await fs.mkdir(featureDir, { recursive: true });
-      }
-
-      // Get list of modified files (both staged and unstaged)
-      let modifiedFiles = [];
-      try {
-        const modifiedOutput = execSync("git diff --name-only HEAD", {
-          cwd: projectPath,
-          encoding: "utf-8",
-        }).trim();
-        if (modifiedOutput) {
-          modifiedFiles = modifiedOutput.split("\n").filter(Boolean);
-        }
-      } catch (error) {
-        console.log(
-          "[ContextManager] No modified files or git error:",
-          error.message
-        );
-      }
-
-      // Get list of untracked files
-      let untrackedFiles = [];
-      try {
-        const untrackedOutput = execSync(
-          "git ls-files --others --exclude-standard",
-          {
-            cwd: projectPath,
-            encoding: "utf-8",
-          }
-        ).trim();
-        if (untrackedOutput) {
-          untrackedFiles = untrackedOutput.split("\n").filter(Boolean);
-        }
-      } catch (error) {
-        console.log(
-          "[ContextManager] Error getting untracked files:",
-          error.message
-        );
-      }
-
-      // Save the initial state to a JSON file
-      const stateFile = path.join(featureDir, "git-state.json");
-      const state = {
-        timestamp: new Date().toISOString(),
-        modifiedFiles,
-        untrackedFiles,
-      };
-
-      await fs.writeFile(stateFile, JSON.stringify(state, null, 2), "utf-8");
-      console.log(
-        `[ContextManager] Saved initial git state for ${featureId}:`,
-        {
-          modifiedCount: modifiedFiles.length,
-          untrackedCount: untrackedFiles.length,
-        }
-      );
-
-      return state;
-    } catch (error) {
-      console.error(
-        "[ContextManager] Failed to save initial git state:",
-        error
-      );
-      return { modifiedFiles: [], untrackedFiles: [] };
-    }
-  }
-
-  /**
-   * Get the initial git state saved before a feature started executing
-   * @param {string} projectPath - Path to the project
-   * @param {string} featureId - Feature ID
-   * @returns {Promise<{modifiedFiles: string[], untrackedFiles: string[], timestamp: string} | null>}
-   */
-  async getInitialGitState(projectPath, featureId) {
-    if (!projectPath) return null;
-
-    try {
-      const stateFile = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId,
-        "git-state.json"
-      );
-      const content = await fs.readFile(stateFile, "utf-8");
-      return JSON.parse(content);
-    } catch (error) {
-      console.log(
-        `[ContextManager] No initial git state found for ${featureId}`
-      );
-      return null;
-    }
-  }
-
-  /**
-   * Delete the git state file for a feature
-   * @param {string} projectPath - Path to the project
-   * @param {string} featureId - Feature ID
-   */
-  async deleteGitStateFile(projectPath, featureId) {
-    if (!projectPath) return;
-
-    try {
-      const stateFile = path.join(
-        projectPath,
-        ".automaker",
-        "features",
-        featureId,
-        "git-state.json"
-      );
-      await fs.unlink(stateFile);
-      console.log(`[ContextManager] Deleted git state file for ${featureId}`);
-    } catch (error) {
-      // File might not exist, which is fine
-      if (error.code !== "ENOENT") {
-        console.error(
-          "[ContextManager] Failed to delete git state file:",
-          error
-        );
-      }
-    }
-  }
-
-  /**
-   * Calculate which files were changed during the AI session
-   * by comparing current git state with the saved initial state
-   * @param {string} projectPath - Path to the project
-   * @param {string} featureId - Feature ID
-   * @returns {Promise<{newFiles: string[], modifiedFiles: string[]}>}
-   */
-  async getFilesChangedDuringSession(projectPath, featureId) {
-    if (!projectPath) return { newFiles: [], modifiedFiles: [] };
-
-    try {
-      const { execSync } = require("child_process");
-
-      // Get initial state
-      const initialState = await this.getInitialGitState(
-        projectPath,
-        featureId
-      );
-
-      // Get current state
-      let currentModified = [];
-      try {
-        const modifiedOutput = execSync("git diff --name-only HEAD", {
-          cwd: projectPath,
-          encoding: "utf-8",
-        }).trim();
-        if (modifiedOutput) {
-          currentModified = modifiedOutput.split("\n").filter(Boolean);
-        }
-      } catch (error) {
-        console.log("[ContextManager] No modified files or git error");
-      }
-
-      let currentUntracked = [];
-      try {
-        const untrackedOutput = execSync(
-          "git ls-files --others --exclude-standard",
-          {
-            cwd: projectPath,
-            encoding: "utf-8",
-          }
-        ).trim();
-        if (untrackedOutput) {
-          currentUntracked = untrackedOutput.split("\n").filter(Boolean);
-        }
-      } catch (error) {
-        console.log("[ContextManager] Error getting untracked files");
-      }
-
-      if (!initialState) {
-        // No initial state - all current changes are considered from this session
-        console.log(
-          "[ContextManager] No initial state found, returning all current changes"
-        );
-        return {
-          newFiles: currentUntracked,
-          modifiedFiles: currentModified,
-        };
-      }
-
-      // Calculate files that are new since the session started
-      const initialModifiedSet = new Set(initialState.modifiedFiles || []);
-      const initialUntrackedSet = new Set(initialState.untrackedFiles || []);
-
-      // New files = current untracked - initial untracked
-      const newFiles = currentUntracked.filter(
-        (f) => !initialUntrackedSet.has(f)
-      );
-
-      // Modified files = current modified - initial modified
-      const modifiedFiles = currentModified.filter(
-        (f) => !initialModifiedSet.has(f)
-      );
-
-      console.log(
-        `[ContextManager] Files changed during session for ${featureId}:`,
-        {
-          newFilesCount: newFiles.length,
-          modifiedFilesCount: modifiedFiles.length,
-          newFiles,
-          modifiedFiles,
-        }
-      );
-
-      return { newFiles, modifiedFiles };
-    } catch (error) {
-      console.error(
-        "[ContextManager] Failed to calculate changed files:",
-        error
-      );
-      return { newFiles: [], modifiedFiles: [] };
-    }
-  }
-}
-
-module.exports = new ContextManager();

apps/app/electron/services/feature-loader.js

@@ -1,500 +0,0 @@
-const path = require("path");
-const fs = require("fs/promises");
-
-/**
- * Feature Loader - Handles loading and managing features from individual feature folders
- * Each feature is stored in .automaker/features/{featureId}/feature.json
- */
-class FeatureLoader {
-  /**
-   * Get the features directory path
-   */
-  getFeaturesDir(projectPath) {
-    return path.join(projectPath, ".automaker", "features");
-  }
-
-  /**
-   * Get the path to a specific feature folder
-   */
-  getFeatureDir(projectPath, featureId) {
-    return path.join(this.getFeaturesDir(projectPath), featureId);
-  }
-
-  /**
-   * Get the path to a feature's feature.json file
-   */
-  getFeatureJsonPath(projectPath, featureId) {
-    return path.join(
-      this.getFeatureDir(projectPath, featureId),
-      "feature.json"
-    );
-  }
-
-  /**
-   * Get the path to a feature's agent-output.md file
-   */
-  getAgentOutputPath(projectPath, featureId) {
-    return path.join(
-      this.getFeatureDir(projectPath, featureId),
-      "agent-output.md"
-    );
-  }
-
-  /**
-   * Generate a new feature ID
-   */
-  generateFeatureId() {
-    return `feature-${Date.now()}-${Math.random()
-      .toString(36)
-      .substring(2, 11)}`;
-  }
-
-  /**
-   * Ensure all image paths for a feature are stored within the feature directory
-   */
-  async ensureFeatureImages(projectPath, featureId, feature) {
-    if (
-      !feature ||
-      !Array.isArray(feature.imagePaths) ||
-      feature.imagePaths.length === 0
-    ) {
-      return;
-    }
-
-    const featureDir = this.getFeatureDir(projectPath, featureId);
-    const featureImagesDir = path.join(featureDir, "images");
-    await fs.mkdir(featureImagesDir, { recursive: true });
-
-    const updatedImagePaths = [];
-
-    for (const entry of feature.imagePaths) {
-      const isStringEntry = typeof entry === "string";
-      const currentPathValue = isStringEntry ? entry : entry.path;
-
-      if (!currentPathValue) {
-        updatedImagePaths.push(entry);
-        continue;
-      }
-
-      let resolvedCurrentPath = currentPathValue;
-      if (!path.isAbsolute(resolvedCurrentPath)) {
-        resolvedCurrentPath = path.join(projectPath, resolvedCurrentPath);
-      }
-      resolvedCurrentPath = path.normalize(resolvedCurrentPath);
-
-      // Skip if file doesn't exist
-      try {
-        await fs.access(resolvedCurrentPath);
-      } catch {
-        console.warn(
-          `[FeatureLoader] Image file missing for ${featureId}: ${resolvedCurrentPath}`
-        );
-        updatedImagePaths.push(entry);
-        continue;
-      }
-
-      const relativeToFeatureImages = path.relative(
-        featureImagesDir,
-        resolvedCurrentPath
-      );
-      const alreadyInFeatureDir =
-        relativeToFeatureImages === "" ||
-        (!relativeToFeatureImages.startsWith("..") &&
-          !path.isAbsolute(relativeToFeatureImages));
-
-      let finalPath = resolvedCurrentPath;
-
-      if (!alreadyInFeatureDir) {
-        const originalName = path.basename(resolvedCurrentPath);
-        let targetPath = path.join(featureImagesDir, originalName);
-
-        // Avoid overwriting files by appending a counter if needed
-        let counter = 1;
-        while (true) {
-          try {
-            await fs.access(targetPath);
-            const parsed = path.parse(originalName);
-            targetPath = path.join(
-              featureImagesDir,
-              `${parsed.name}-${counter}${parsed.ext}`
-            );
-            counter += 1;
-          } catch {
-            break;
-          }
-        }
-
-        try {
-          await fs.rename(resolvedCurrentPath, targetPath);
-          finalPath = targetPath;
-        } catch (error) {
-          console.warn(
-            `[FeatureLoader] Failed to move image ${resolvedCurrentPath}: ${error.message}`
-          );
-          updatedImagePaths.push(entry);
-          continue;
-        }
-      }
-
-      updatedImagePaths.push(
-        isStringEntry ? finalPath : { ...entry, path: finalPath }
-      );
-    }
-
-    feature.imagePaths = updatedImagePaths;
-  }
-
-  /**
-   * Get all features for a project
-   */
-  async getAll(projectPath) {
-    try {
-      const featuresDir = this.getFeaturesDir(projectPath);
-
-      // Check if features directory exists
-      try {
-        await fs.access(featuresDir);
-      } catch {
-        // Directory doesn't exist, return empty array
-        return [];
-      }
-
-      // Read all feature directories
-      const entries = await fs.readdir(featuresDir, { withFileTypes: true });
-      const featureDirs = entries.filter((entry) => entry.isDirectory());
-
-      // Load each feature
-      const features = [];
-      for (const dir of featureDirs) {
-        const featureId = dir.name;
-        const featureJsonPath = this.getFeatureJsonPath(projectPath, featureId);
-
-        try {
-          // Read feature.json directly - handle ENOENT in catch block
-          // This avoids TOCTOU race condition from checking with fs.access first
-          const content = await fs.readFile(featureJsonPath, "utf-8");
-          const feature = JSON.parse(content);
-          
-          // Validate that the feature has required fields
-          if (!feature.id) {
-            console.warn(
-              `[FeatureLoader] Feature ${featureId} missing required 'id' field, skipping`
-            );
-            continue;
-          }
-          
-          features.push(feature);
-        } catch (error) {
-          // Handle different error types appropriately
-          if (error.code === "ENOENT") {
-            // File doesn't exist - this is expected for incomplete feature directories
-            // Skip silently (feature.json not yet created or was removed)
-            continue;
-          } else if (error instanceof SyntaxError) {
-            // JSON parse error - log as warning since file exists but is malformed
-            console.warn(
-              `[FeatureLoader] Failed to parse feature.json for ${featureId}: ${error.message}`
-            );
-          } else {
-            // Other errors - log as error
-            console.error(
-              `[FeatureLoader] Failed to load feature ${featureId}:`,
-              error.message || error
-            );
-          }
-          // Continue loading other features
-        }
-      }
-
-      // Sort by creation order (feature IDs contain timestamp)
-      features.sort((a, b) => {
-        const aTime = a.id ? parseInt(a.id.split("-")[1] || "0") : 0;
-        const bTime = b.id ? parseInt(b.id.split("-")[1] || "0") : 0;
-        return aTime - bTime;
-      });
-
-      return features;
-    } catch (error) {
-      console.error("[FeatureLoader] Failed to get all features:", error);
-      return [];
-    }
-  }
-
-  /**
-   * Get a single feature by ID
-   */
-  async get(projectPath, featureId) {
-    try {
-      const featureJsonPath = this.getFeatureJsonPath(projectPath, featureId);
-      const content = await fs.readFile(featureJsonPath, "utf-8");
-      return JSON.parse(content);
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        return null;
-      }
-      console.error(
-        `[FeatureLoader] Failed to get feature ${featureId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Create a new feature
-   */
-  async create(projectPath, featureData) {
-    const featureId = featureData.id || this.generateFeatureId();
-    const featureDir = this.getFeatureDir(projectPath, featureId);
-    const featureJsonPath = this.getFeatureJsonPath(projectPath, featureId);
-
-    // Ensure features directory exists
-    const featuresDir = this.getFeaturesDir(projectPath);
-    await fs.mkdir(featuresDir, { recursive: true });
-
-    // Create feature directory
-    await fs.mkdir(featureDir, { recursive: true });
-
-    // Ensure feature has an ID
-    const feature = { ...featureData, id: featureId };
-
-    // Move any uploaded images into the feature directory
-    await this.ensureFeatureImages(projectPath, featureId, feature);
-
-    // Write feature.json
-    await fs.writeFile(
-      featureJsonPath,
-      JSON.stringify(feature, null, 2),
-      "utf-8"
-    );
-
-    console.log(`[FeatureLoader] Created feature ${featureId}`);
-    return feature;
-  }
-
-  /**
-   * Update a feature (partial updates supported)
-   */
-  async update(projectPath, featureId, updates) {
-    try {
-      const feature = await this.get(projectPath, featureId);
-      if (!feature) {
-        throw new Error(`Feature ${featureId} not found`);
-      }
-
-      // Merge updates
-      const updatedFeature = { ...feature, ...updates };
-
-      // Move any new images into the feature directory
-      await this.ensureFeatureImages(projectPath, featureId, updatedFeature);
-
-      // Write back to file
-      const featureJsonPath = this.getFeatureJsonPath(projectPath, featureId);
-      await fs.writeFile(
-        featureJsonPath,
-        JSON.stringify(updatedFeature, null, 2),
-        "utf-8"
-      );
-
-      console.log(`[FeatureLoader] Updated feature ${featureId}`);
-      return updatedFeature;
-    } catch (error) {
-      console.error(
-        `[FeatureLoader] Failed to update feature ${featureId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Delete a feature and its entire folder
-   */
-  async delete(projectPath, featureId) {
-    try {
-      const featureDir = this.getFeatureDir(projectPath, featureId);
-      await fs.rm(featureDir, { recursive: true, force: true });
-      console.log(`[FeatureLoader] Deleted feature ${featureId}`);
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        // Feature doesn't exist, that's fine
-        return;
-      }
-      console.error(
-        `[FeatureLoader] Failed to delete feature ${featureId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Get agent output for a feature
-   */
-  async getAgentOutput(projectPath, featureId) {
-    try {
-      const agentOutputPath = this.getAgentOutputPath(projectPath, featureId);
-      const content = await fs.readFile(agentOutputPath, "utf-8");
-      return content;
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        return null;
-      }
-      console.error(
-        `[FeatureLoader] Failed to get agent output for ${featureId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  // ============================================================================
-  // Legacy methods for backward compatibility (used by backend services)
-  // ============================================================================
-
-  /**
-   * Load all features for a project (legacy API)
-   * Features are stored in .automaker/features/{id}/feature.json
-   */
-  async loadFeatures(projectPath) {
-    return await this.getAll(projectPath);
-  }
-
-  /**
-   * Update feature status (legacy API)
-   * Features are stored in .automaker/features/{id}/feature.json
-   * Creates the feature if it doesn't exist.
-   * @param {string} featureId - The ID of the feature to update
-   * @param {string} status - The new status
-   * @param {string} projectPath - Path to the project
-   * @param {Object} options - Options object for optional parameters
-   * @param {string} [options.summary] - Optional summary of what was done
-   * @param {string} [options.error] - Optional error message if feature errored
-   * @param {string} [options.description] - Optional detailed description
-   * @param {string} [options.category] - Optional category/phase
-   * @param {string[]} [options.steps] - Optional array of implementation steps
-   */
-  async updateFeatureStatus(featureId, status, projectPath, options = {}) {
-    const { summary, error, description, category, steps } = options;
-    // Check if feature exists
-    const existingFeature = await this.get(projectPath, featureId);
-    
-    if (!existingFeature) {
-      // Feature doesn't exist - create it with all required fields
-      console.log(`[FeatureLoader] Feature ${featureId} not found - creating new feature`);
-      const newFeature = {
-        id: featureId,
-        title: featureId.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' '),
-        description: description || summary || '', // Use provided description, fall back to summary
-        category: category || "Uncategorized",
-        steps: steps || [],
-        status: status,
-        images: [],
-        imagePaths: [],
-        skipTests: false, // Auto-generated features should run tests by default
-        model: "sonnet",
-        thinkingLevel: "none",
-        summary: summary || description || '',
-        createdAt: new Date().toISOString(),
-      };
-      if (error !== undefined) {
-        newFeature.error = error;
-      }
-      await this.create(projectPath, newFeature);
-      console.log(
-        `[FeatureLoader] Created feature ${featureId}: status=${status}, category=${category || "Uncategorized"}, steps=${steps?.length || 0}${
-          summary ? `, summary="${summary}"` : ""
-        }`
-      );
-      return;
-    }
-
-    // Feature exists - update it
-    const updates = { status };
-    if (summary !== undefined) {
-      updates.summary = summary;
-      // Also update description if it's empty or not set
-      if (!existingFeature.description) {
-        updates.description = summary;
-      }
-    }
-    if (description !== undefined) {
-      updates.description = description;
-    }
-    if (category !== undefined) {
-      updates.category = category;
-    }
-    if (steps !== undefined && Array.isArray(steps)) {
-      updates.steps = steps;
-    }
-    if (error !== undefined) {
-      updates.error = error;
-    } else {
-      // Clear error if not provided
-      if (existingFeature.error) {
-        updates.error = undefined;
-      }
-    }
-    
-    // Ensure required fields exist (for features created before this fix)
-    if (!existingFeature.category && !updates.category) updates.category = "Uncategorized";
-    if (!existingFeature.steps && !updates.steps) updates.steps = [];
-    if (!existingFeature.images) updates.images = [];
-    if (!existingFeature.imagePaths) updates.imagePaths = [];
-    if (existingFeature.skipTests === undefined) updates.skipTests = false;
-    if (!existingFeature.model) updates.model = "sonnet";
-    if (!existingFeature.thinkingLevel) updates.thinkingLevel = "none";
-
-    await this.update(projectPath, featureId, updates);
-    console.log(
-      `[FeatureLoader] Updated feature ${featureId}: status=${status}${
-        category ? `, category="${category}"` : ""
-      }${steps ? `, steps=${steps.length}` : ""}${
-        summary ? `, summary="${summary}"` : ""
-      }`
-    );
-  }
-
-  /**
-   * Select the next feature to implement
-   * Prioritizes: earlier features in the list that are not verified or waiting_approval
-   */
-  selectNextFeature(features) {
-    // Find first feature that is in backlog or in_progress status
-    // Skip verified and waiting_approval (which needs user input)
-    return features.find(
-      (f) => f.status !== "verified" && f.status !== "waiting_approval"
-    );
-  }
-
-  /**
-   * Update worktree info for a feature (legacy API)
-   * Features are stored in .automaker/features/{id}/feature.json
-   * @param {string} featureId - The ID of the feature to update
-   * @param {string} projectPath - Path to the project
-   * @param {string|null} worktreePath - Path to the worktree (null to clear)
-   * @param {string|null} branchName - Name of the feature branch (null to clear)
-   */
-  async updateFeatureWorktree(
-    featureId,
-    projectPath,
-    worktreePath,
-    branchName
-  ) {
-    const updates = {};
-    if (worktreePath) {
-      updates.worktreePath = worktreePath;
-      updates.branchName = branchName;
-    } else {
-      updates.worktreePath = null;
-      updates.branchName = null;
-    }
-
-    await this.update(projectPath, featureId, updates);
-    console.log(
-      `[FeatureLoader] Updated feature ${featureId}: worktreePath=${worktreePath}, branchName=${branchName}`
-    );
-  }
-}
-
-module.exports = new FeatureLoader();

apps/app/electron/services/feature-suggestions-service.js

@@ -1,379 +0,0 @@
-const { query, AbortError } = require("@anthropic-ai/claude-agent-sdk");
-const promptBuilder = require("./prompt-builder");
-
-/**
- * Feature Suggestions Service - Analyzes project and generates feature suggestions
- */
-class FeatureSuggestionsService {
-  constructor() {
-    this.runningAnalysis = null;
-  }
-
-  /**
-   * Generate feature suggestions by analyzing the project
-   * @param {string} projectPath - Path to the project
-   * @param {Function} sendToRenderer - Function to send events to renderer
-   * @param {Object} execution - Execution context with abort controller
-   * @param {string} suggestionType - Type of suggestions: "features", "refactoring", "security", "performance"
-   */
-  async generateSuggestions(projectPath, sendToRenderer, execution, suggestionType = "features") {
-    console.log(
-      `[FeatureSuggestions] Generating ${suggestionType} suggestions for: ${projectPath}`
-    );
-
-    try {
-      const abortController = new AbortController();
-      execution.abortController = abortController;
-
-      const options = {
-        model: "claude-sonnet-4-20250514",
-        systemPrompt: this.getSystemPrompt(suggestionType),
-        maxTurns: 50,
-        cwd: projectPath,
-        allowedTools: ["Read", "Glob", "Grep", "Bash"],
-        permissionMode: "acceptEdits",
-        sandbox: {
-          enabled: true,
-          autoAllowBashIfSandboxed: true,
-        },
-        abortController: abortController,
-      };
-
-      const prompt = this.buildAnalysisPrompt(suggestionType);
-
-      sendToRenderer({
-        type: "suggestions_progress",
-        content: "Starting project analysis...\n",
-      });
-
-      const currentQuery = query({ prompt, options });
-      execution.query = currentQuery;
-
-      let fullResponse = "";
-      for await (const msg of currentQuery) {
-        if (!execution.isActive()) break;
-
-        if (msg.type === "assistant" && msg.message?.content) {
-          for (const block of msg.message.content) {
-            if (block.type === "text") {
-              fullResponse += block.text;
-              sendToRenderer({
-                type: "suggestions_progress",
-                content: block.text,
-              });
-            } else if (block.type === "tool_use") {
-              sendToRenderer({
-                type: "suggestions_tool",
-                tool: block.name,
-                input: block.input,
-              });
-            }
-          }
-        }
-      }
-
-      execution.query = null;
-      execution.abortController = null;
-
-      // Parse the suggestions from the response
-      const suggestions = this.parseSuggestions(fullResponse);
-
-      sendToRenderer({
-        type: "suggestions_complete",
-        suggestions: suggestions,
-      });
-
-      return {
-        success: true,
-        suggestions: suggestions,
-      };
-    } catch (error) {
-      if (error instanceof AbortError || error?.name === "AbortError") {
-        console.log("[FeatureSuggestions] Analysis aborted");
-        if (execution) {
-          execution.abortController = null;
-          execution.query = null;
-        }
-        return {
-          success: false,
-          message: "Analysis aborted",
-          suggestions: [],
-        };
-      }
-
-      console.error(
-        "[FeatureSuggestions] Error generating suggestions:",
-        error
-      );
-      if (execution) {
-        execution.abortController = null;
-        execution.query = null;
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * Parse suggestions from the LLM response
-   * Looks for JSON array in the response
-   */
-  parseSuggestions(response) {
-    try {
-      // Try to find JSON array in the response
-      // Look for ```json ... ``` blocks first
-      const jsonBlockMatch = response.match(/```json\s*([\s\S]*?)```/);
-      if (jsonBlockMatch) {
-        const parsed = JSON.parse(jsonBlockMatch[1].trim());
-        if (Array.isArray(parsed)) {
-          return this.validateSuggestions(parsed);
-        }
-      }
-
-      // Try to find a raw JSON array
-      const jsonArrayMatch = response.match(/\[\s*\{[\s\S]*\}\s*\]/);
-      if (jsonArrayMatch) {
-        const parsed = JSON.parse(jsonArrayMatch[0]);
-        if (Array.isArray(parsed)) {
-          return this.validateSuggestions(parsed);
-        }
-      }
-
-      console.warn(
-        "[FeatureSuggestions] Could not parse suggestions from response"
-      );
-      return [];
-    } catch (error) {
-      console.error("[FeatureSuggestions] Error parsing suggestions:", error);
-      return [];
-    }
-  }
-
-  /**
-   * Validate and normalize suggestions
-   */
-  validateSuggestions(suggestions) {
-    return suggestions
-      .filter((s) => s && typeof s === "object")
-      .map((s, index) => ({
-        id: `suggestion-${Date.now()}-${index}`,
-        category: s.category || "Uncategorized",
-        description: s.description || s.title || "No description",
-        steps: Array.isArray(s.steps) ? s.steps : [],
-        priority: typeof s.priority === "number" ? s.priority : index + 1,
-        reasoning: s.reasoning || "",
-      }))
-      .sort((a, b) => a.priority - b.priority);
-  }
-
-  /**
-   * Get the system prompt for feature suggestion analysis
-   * @param {string} suggestionType - Type of suggestions: "features", "refactoring", "security", "performance"
-   */
-  getSystemPrompt(suggestionType = "features") {
-    const basePrompt = `You are an expert software architect. Your job is to analyze a codebase and provide actionable suggestions.
-
-You have access to file reading and search tools. Use them to understand the codebase.
-
-When analyzing, look at:
-- README files and documentation
-- Package.json, cargo.toml, or similar config files for tech stack
-- Source code structure and organization
-- Existing code patterns and implementation styles`;
-
-    switch (suggestionType) {
-      case "refactoring":
-        return `${basePrompt}
-
-Your specific focus is on **refactoring suggestions**. You should:
-1. Identify code smells and areas that need cleanup
-2. Find duplicated code that could be consolidated
-3. Spot overly complex functions or classes that should be broken down
-4. Look for inconsistent naming conventions or coding patterns
-5. Find opportunities to improve code organization and modularity
-6. Identify violations of SOLID principles or common design patterns
-7. Look for dead code or unused dependencies
-
-Prioritize suggestions by:
-- Impact on maintainability
-- Risk level (lower risk refactorings first)
-- Complexity of the refactoring`;
-
-      case "security":
-        return `${basePrompt}
-
-Your specific focus is on **security vulnerabilities and improvements**. You should:
-1. Identify potential security vulnerabilities (OWASP Top 10)
-2. Look for hardcoded secrets, API keys, or credentials
-3. Check for proper input validation and sanitization
-4. Identify SQL injection, XSS, or command injection risks
-5. Review authentication and authorization patterns
-6. Check for secure communication (HTTPS, encryption)
-7. Look for insecure dependencies or outdated packages
-8. Review error handling that might leak sensitive information
-9. Check for proper session management
-10. Identify insecure file handling or path traversal risks
-
-Prioritize by severity:
-- Critical: Exploitable vulnerabilities with high impact
-- High: Security issues that could lead to data exposure
-- Medium: Best practice violations that weaken security
-- Low: Minor improvements to security posture`;
-
-      case "performance":
-        return `${basePrompt}
-
-Your specific focus is on **performance issues and optimizations**. You should:
-1. Identify N+1 query problems or inefficient database access
-2. Look for unnecessary re-renders in React/frontend code
-3. Find opportunities for caching or memoization
-4. Identify large bundle sizes or unoptimized imports
-5. Look for blocking operations that could be async
-6. Find memory leaks or inefficient memory usage
-7. Identify slow algorithms or data structure choices
-8. Look for missing indexes in database schemas
-9. Find opportunities for lazy loading or code splitting
-10. Identify unnecessary network requests or API calls
-
-Prioritize by:
-- Impact on user experience
-- Frequency of the slow path
-- Ease of implementation`;
-
-      default: // "features"
-        return `${basePrompt}
-
-Your specific focus is on **missing features and improvements**. You should:
-1. Identify what the application does and what features it currently has
-2. Look at the .automaker/app_spec.txt file if it exists
-3. Generate a comprehensive list of missing features that would be valuable to users
-4. Consider user experience improvements
-5. Consider developer experience improvements
-6. Look at common patterns in similar applications
-
-Prioritize features by:
-- Impact on users
-- Alignment with project goals
-- Complexity of implementation`;
-    }
-  }
-
-  /**
-   * Build the prompt for analyzing the project
-   * @param {string} suggestionType - Type of suggestions: "features", "refactoring", "security", "performance"
-   */
-  buildAnalysisPrompt(suggestionType = "features") {
-    const commonIntro = `Analyze this project and generate a list of actionable suggestions.
-
-**Your Task:**
-
-1. First, explore the project structure:
-   - Read README.md, package.json, or similar config files
-   - Scan the source code directory structure
-   - Identify the tech stack and frameworks used
-   - Look at existing code and how it's implemented
-
-2. Identify what the application does:
-   - What is the main purpose?
-   - What patterns and conventions are used?
-`;
-
-    const commonOutput = `
-**CRITICAL: Output your suggestions as a JSON array** at the end of your response, formatted like this:
-
-\`\`\`json
-[
-  {
-    "category": "Category Name",
-    "description": "Clear description of the suggestion",
-    "steps": [
-      "Step 1 to implement",
-      "Step 2 to implement",
-      "Step 3 to implement"
-    ],
-    "priority": 1,
-    "reasoning": "Why this is important"
-  }
-]
-\`\`\`
-
-**Important Guidelines:**
-- Generate at least 10-15 suggestions
-- Order them by priority (1 = highest priority)
-- Each suggestion should have clear, actionable steps
-- Be specific about what files might need to be modified
-- Consider the existing tech stack and patterns
-
-Begin by exploring the project structure.`;
-
-    switch (suggestionType) {
-      case "refactoring":
-        return `${commonIntro}
-3. Look for refactoring opportunities:
-   - Find code duplication across the codebase
-   - Identify functions or classes that are too long or complex
-   - Look for inconsistent patterns or naming conventions
-   - Find tightly coupled code that should be decoupled
-   - Identify opportunities to extract reusable utilities
-   - Look for dead code or unused exports
-   - Check for proper separation of concerns
-
-Categories to use: "Code Smell", "Duplication", "Complexity", "Architecture", "Naming", "Dead Code", "Coupling", "Testing"
-${commonOutput}`;
-
-      case "security":
-        return `${commonIntro}
-3. Look for security issues:
-   - Check for hardcoded secrets or API keys
-   - Look for potential injection vulnerabilities (SQL, XSS, command)
-   - Review authentication and authorization code
-   - Check input validation and sanitization
-   - Look for insecure dependencies
-   - Review error handling for information leakage
-   - Check for proper HTTPS/TLS usage
-   - Look for insecure file operations
-
-Categories to use: "Critical", "High", "Medium", "Low" (based on severity)
-${commonOutput}`;
-
-      case "performance":
-        return `${commonIntro}
-3. Look for performance issues:
-   - Find N+1 queries or inefficient database access patterns
-   - Look for unnecessary re-renders in React components
-   - Identify missing memoization opportunities
-   - Check bundle size and import patterns
-   - Look for synchronous operations that could be async
-   - Find potential memory leaks
-   - Identify slow algorithms or data structures
-   - Look for missing caching opportunities
-   - Check for unnecessary network requests
-
-Categories to use: "Database", "Rendering", "Memory", "Bundle Size", "Caching", "Algorithm", "Network"
-${commonOutput}`;
-
-      default: // "features"
-        return `${commonIntro}
-3. Generate feature suggestions:
-   - Think about what's missing compared to similar applications
-   - Consider user experience improvements
-   - Consider developer experience improvements
-   - Think about performance, security, and reliability
-   - Consider testing and documentation improvements
-
-Categories to use: "User Experience", "Performance", "Security", "Testing", "Documentation", "Developer Experience", "Accessibility", etc.
-${commonOutput}`;
-    }
-  }
-
-  /**
-   * Stop the current analysis
-   */
-  stop() {
-    if (this.runningAnalysis && this.runningAnalysis.abortController) {
-      this.runningAnalysis.abortController.abort();
-    }
-    this.runningAnalysis = null;
-  }
-}
-
-module.exports = new FeatureSuggestionsService();

apps/app/electron/services/feature-verifier.js

@@ -1,185 +0,0 @@
-const { query, AbortError } = require("@anthropic-ai/claude-agent-sdk");
-const promptBuilder = require("./prompt-builder");
-const contextManager = require("./context-manager");
-const featureLoader = require("./feature-loader");
-const mcpServerFactory = require("./mcp-server-factory");
-
-/**
- * Feature Verifier - Handles feature verification by running tests
- */
-class FeatureVerifier {
-  /**
-   * Verify feature tests (runs tests and checks if they pass)
-   */
-  async verifyFeatureTests(feature, projectPath, sendToRenderer, execution) {
-    console.log(
-      `[FeatureVerifier] Verifying tests for: ${feature.description}`
-    );
-
-    try {
-      const verifyMsg = `\n✅ Verifying tests for: ${feature.description}\n`;
-      await contextManager.writeToContextFile(
-        projectPath,
-        feature.id,
-        verifyMsg
-      );
-
-      sendToRenderer({
-        type: "auto_mode_phase",
-        featureId: feature.id,
-        phase: "verification",
-        message: `Verifying tests for: ${feature.description}`,
-      });
-
-      const abortController = new AbortController();
-      execution.abortController = abortController;
-
-      // Create custom MCP server with UpdateFeatureStatus tool
-      const featureToolsServer = mcpServerFactory.createFeatureToolsServer(
-        featureLoader.updateFeatureStatus.bind(featureLoader),
-        projectPath
-      );
-
-      const options = {
-        model: "claude-opus-4-5-20251101",
-        systemPrompt: await promptBuilder.getVerificationPrompt(projectPath),
-        maxTurns: 1000,
-        cwd: projectPath,
-        mcpServers: {
-          "automaker-tools": featureToolsServer,
-        },
-        allowedTools: [
-          "Read",
-          "Write",
-          "Edit",
-          "Glob",
-          "Grep",
-          "Bash",
-          "mcp__automaker-tools__UpdateFeatureStatus",
-        ],
-        permissionMode: "acceptEdits",
-        sandbox: {
-          enabled: true,
-          autoAllowBashIfSandboxed: true,
-        },
-        abortController: abortController,
-      };
-
-      const prompt = await promptBuilder.buildVerificationPrompt(
-        feature,
-        projectPath
-      );
-
-      const runningTestsMsg =
-        "Running Playwright tests to verify feature implementation...\n";
-      await contextManager.writeToContextFile(
-        projectPath,
-        feature.id,
-        runningTestsMsg
-      );
-
-      sendToRenderer({
-        type: "auto_mode_progress",
-        featureId: feature.id,
-        content: runningTestsMsg,
-      });
-
-      const currentQuery = query({ prompt, options });
-      execution.query = currentQuery;
-
-      let responseText = "";
-      for await (const msg of currentQuery) {
-        // Check if this specific feature was aborted
-        if (!execution.isActive()) break;
-
-        if (msg.type === "assistant" && msg.message?.content) {
-          for (const block of msg.message.content) {
-            if (block.type === "text") {
-              responseText += block.text;
-
-              await contextManager.writeToContextFile(
-                projectPath,
-                feature.id,
-                block.text
-              );
-
-              sendToRenderer({
-                type: "auto_mode_progress",
-                featureId: feature.id,
-                content: block.text,
-              });
-            } else if (block.type === "tool_use") {
-              const toolMsg = `\n🔧 Tool: ${block.name}\n`;
-              await contextManager.writeToContextFile(
-                projectPath,
-                feature.id,
-                toolMsg
-              );
-
-              sendToRenderer({
-                type: "auto_mode_tool",
-                featureId: feature.id,
-                tool: block.name,
-                input: block.input,
-              });
-            }
-          }
-        }
-      }
-
-      execution.query = null;
-      execution.abortController = null;
-
-      // Re-load features to check if it was marked as verified or waiting_approval (for skipTests)
-      const updatedFeatures = await featureLoader.loadFeatures(projectPath);
-      const updatedFeature = updatedFeatures.find((f) => f.id === feature.id);
-      // For skipTests features, waiting_approval is also considered a success
-      const passes =
-        updatedFeature?.status === "verified" ||
-        (updatedFeature?.skipTests &&
-          updatedFeature?.status === "waiting_approval");
-
-      const finalMsg = passes
-        ? "✓ Verification successful: All tests passed\n"
-        : "✗ Tests failed or not all passing - feature remains in progress\n";
-
-      await contextManager.writeToContextFile(
-        projectPath,
-        feature.id,
-        finalMsg
-      );
-
-      sendToRenderer({
-        type: "auto_mode_progress",
-        featureId: feature.id,
-        content: finalMsg,
-      });
-
-      return {
-        passes,
-        message: responseText.substring(0, 500),
-      };
-    } catch (error) {
-      if (error instanceof AbortError || error?.name === "AbortError") {
-        console.log("[FeatureVerifier] Verification aborted");
-        if (execution) {
-          execution.abortController = null;
-          execution.query = null;
-        }
-        return {
-          passes: false,
-          message: "Verification aborted",
-        };
-      }
-
-      console.error("[FeatureVerifier] Error verifying feature:", error);
-      if (execution) {
-        execution.abortController = null;
-        execution.query = null;
-      }
-      throw error;
-    }
-  }
-}
-
-module.exports = new FeatureVerifier();

apps/app/electron/services/mcp-server-factory.js

@@ -1,98 +0,0 @@
-const { createSdkMcpServer, tool } = require("@anthropic-ai/claude-agent-sdk");
-const { z } = require("zod");
-const featureLoader = require("./feature-loader");
-
-/**
- * MCP Server Factory - Creates custom MCP servers with tools
- */
-class McpServerFactory {
-  /**
-   * Create a custom MCP server with the UpdateFeatureStatus tool
-   * This tool allows Claude Code to safely update feature status without
-   * directly modifying feature files, preventing race conditions
-   * and accidental state corruption.
-   */
-  createFeatureToolsServer(updateFeatureStatusCallback, projectPath) {
-    return createSdkMcpServer({
-      name: "automaker-tools",
-      version: "1.0.0",
-      tools: [
-        tool(
-          "UpdateFeatureStatus",
-          "Create or update a feature. Use this tool to create new features with detailed information or update existing feature status. When creating features, provide comprehensive description, category, and implementation steps.",
-          {
-            featureId: z.string().describe("The ID of the feature (lowercase, hyphens for spaces). Example: 'user-authentication', 'budget-tracking'"),
-            status: z.enum(["backlog", "todo", "in_progress", "verified"]).describe("The status for the feature. Use 'backlog' or 'todo' for new features."),
-            summary: z.string().optional().describe("A brief summary of what was implemented/changed or what the feature does."),
-            description: z.string().optional().describe("A detailed description of the feature. Be comprehensive - explain what the feature does, its purpose, and key functionality."),
-            category: z.string().optional().describe("The category/phase for this feature. Example: 'Phase 1: Foundation', 'Phase 2: Core Logic', 'Phase 3: Polish', 'Authentication', 'UI/UX'"),
-            steps: z.array(z.string()).optional().describe("Array of implementation steps. Each step should be a clear, actionable task. Example: ['Set up database schema', 'Create API endpoints', 'Build UI components', 'Add validation']")
-          },
-          async (args) => {
-            try {
-              console.log(`[McpServerFactory] UpdateFeatureStatus tool called: featureId=${args.featureId}, status=${args.status}, summary=${args.summary || "(none)"}, category=${args.category || "(none)"}, steps=${args.steps?.length || 0}`);
-              console.log(`[Feature Creation] Creating/updating feature "${args.featureId}" with status "${args.status}"`);
-
-              // Load the feature to check skipTests flag
-              const features = await featureLoader.loadFeatures(projectPath);
-              const feature = features.find((f) => f.id === args.featureId);
-
-              if (!feature) {
-                console.log(`[Feature Creation] Feature ${args.featureId} not found - this might be a new feature being created`);
-                // This might be a new feature - try to proceed anyway
-              }
-
-              // If agent tries to mark as verified but feature has skipTests=true, convert to waiting_approval
-              let finalStatus = args.status;
-              // Convert 'todo' to 'backlog' for consistency, but only for new features
-              if (!feature && finalStatus === "todo") {
-                finalStatus = "backlog";
-              }
-              if (feature && args.status === "verified" && feature.skipTests === true) {
-                console.log(`[McpServerFactory] Feature ${args.featureId} has skipTests=true, converting verified -> waiting_approval`);
-                finalStatus = "waiting_approval";
-              }
-
-              // Call the provided callback to update feature status
-              await updateFeatureStatusCallback(
-                args.featureId, 
-                finalStatus, 
-                projectPath, 
-                {
-                  summary: args.summary,
-                  description: args.description,
-                  category: args.category,
-                  steps: args.steps,
-                }
-              );
-
-              const statusMessage = finalStatus !== args.status
-                ? `Successfully created/updated feature ${args.featureId} to status "${finalStatus}" (converted from "${args.status}")${args.summary ? ` - ${args.summary}` : ""}`
-                : `Successfully created/updated feature ${args.featureId} to status "${finalStatus}"${args.summary ? ` - ${args.summary}` : ""}`;
-
-              console.log(`[Feature Creation] ✓ ${statusMessage}`);
-
-              return {
-                content: [{
-                  type: "text",
-                  text: statusMessage
-                }]
-              };
-            } catch (error) {
-              console.error("[McpServerFactory] UpdateFeatureStatus tool error:", error);
-              console.error(`[Feature Creation] ✗ Failed to create/update feature ${args.featureId}: ${error.message}`);
-              return {
-                content: [{
-                  type: "text",
-                  text: `Failed to update feature status: ${error.message}`
-                }]
-              };
-            }
-          }
-        )
-      ]
-    });
-  }
-}
-
-module.exports = new McpServerFactory();

apps/app/electron/services/mcp-server-stdio.js

@@ -1,349 +0,0 @@
-#!/usr/bin/env node
-/**
- * Standalone STDIO MCP Server for Automaker Tools
- * 
- * This script runs as a standalone process and communicates via JSON-RPC 2.0
- * over stdin/stdout. It implements the MCP protocol to expose the UpdateFeatureStatus
- * tool to Codex CLI.
- * 
- * Environment variables:
- * - AUTOMAKER_PROJECT_PATH: Path to the project directory
- * - AUTOMAKER_IPC_CHANNEL: IPC channel name for callback communication (optional, uses default)
- */
-
-const readline = require('readline');
-const path = require('path');
-
-// Redirect all console.log output to stderr to avoid polluting MCP stdout
-const originalConsoleLog = console.log;
-console.log = (...args) => {
-  console.error(...args);
-};
-
-// Set up readline interface for line-by-line JSON-RPC input
-// IMPORTANT: Use a separate output stream for readline to avoid interfering with JSON-RPC stdout
-// We'll write JSON-RPC responses directly to stdout, not through readline
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: null, // Don't use stdout for readline output
-  terminal: false
-});
-
-let initialized = false;
-let projectPath = null;
-let ipcChannel = null;
-
-// Get configuration from environment
-projectPath = process.env.AUTOMAKER_PROJECT_PATH || process.cwd();
-ipcChannel = process.env.AUTOMAKER_IPC_CHANNEL || 'mcp:update-feature-status';
-
-// Load dependencies (these will be available in the Electron app context)
-let featureLoader;
-let electron;
-
-// Try to load Electron IPC if available (when running from Electron app)
-try {
-  // In Electron, we can use IPC directly
-  if (typeof require !== 'undefined') {
-    // Check if we're in Electron context
-    const electronModule = require('electron');
-    if (electronModule && electronModule.ipcMain) {
-      electron = electronModule;
-    }
-  }
-} catch (e) {
-  // Not in Electron context, will use alternative method
-}
-
-// Load feature loader
-// Try multiple paths since this script might be run from different contexts
-try {
-  // First try relative path (when run from electron/services/)
-  featureLoader = require('./feature-loader');
-} catch (e) {
-  try {
-    // Try absolute path resolution
-    const featureLoaderPath = path.resolve(__dirname, 'feature-loader.js');
-    delete require.cache[require.resolve(featureLoaderPath)];
-    featureLoader = require(featureLoaderPath);
-  } catch (e2) {
-    // If still fails, try from parent directory
-    try {
-      featureLoader = require(path.join(__dirname, '..', 'services', 'feature-loader'));
-    } catch (e3) {
-      console.error('[McpServerStdio] Error loading feature-loader:', e3.message);
-      console.error('[McpServerStdio] Tried paths:', [
-        './feature-loader',
-        path.resolve(__dirname, 'feature-loader.js'),
-        path.join(__dirname, '..', 'services', 'feature-loader')
-      ]);
-      process.exit(1);
-    }
-  }
-}
-
-/**
- * Send JSON-RPC response
- * CRITICAL: Must write directly to stdout, not via console.log
- * MCP protocol requires ONLY JSON-RPC messages on stdout
- */
-function sendResponse(id, result, error = null) {
-  const response = {
-    jsonrpc: '2.0',
-    id
-  };
-  
-  if (error) {
-    response.error = error;
-  } else {
-    response.result = result;
-  }
-  
-  // Write directly to stdout with newline (MCP uses line-delimited JSON)
-  process.stdout.write(JSON.stringify(response) + '\n');
-}
-
-/**
- * Send JSON-RPC notification
- * CRITICAL: Must write directly to stdout, not via console.log
- */
-function sendNotification(method, params) {
-  const notification = {
-    jsonrpc: '2.0',
-    method,
-    params
-  };
-  
-  // Write directly to stdout with newline (MCP uses line-delimited JSON)
-  process.stdout.write(JSON.stringify(notification) + '\n');
-}
-
-/**
- * Handle MCP initialize request
- */
-async function handleInitialize(params, id) {
-  initialized = true;
-  
-  sendResponse(id, {
-    protocolVersion: '2024-11-05',
-    capabilities: {
-      tools: {}
-    },
-    serverInfo: {
-      name: 'automaker-tools',
-      version: '1.0.0'
-    }
-  });
-}
-
-/**
- * Handle tools/list request
- */
-async function handleToolsList(params, id) {
-  sendResponse(id, {
-    tools: [
-      {
-        name: 'UpdateFeatureStatus',
-        description: 'Update the status of a feature. Use this tool instead of directly modifying feature files to safely update feature status. IMPORTANT: If the feature has skipTests=true, you should NOT mark it as verified - instead it will automatically go to waiting_approval status for manual review. Always include a summary of what was done.',
-        inputSchema: {
-          type: 'object',
-          properties: {
-            featureId: {
-              type: 'string',
-              description: 'The ID of the feature to update'
-            },
-            status: {
-              type: 'string',
-              enum: ['backlog', 'in_progress', 'verified'],
-              description: 'The new status for the feature. Note: If skipTests=true, verified will be converted to waiting_approval automatically.'
-            },
-            summary: {
-              type: 'string',
-              description: 'A brief summary of what was implemented/changed. This will be displayed on the Kanban card. Example: "Added dark mode toggle. Modified: settings.tsx, theme-provider.tsx"'
-            }
-          },
-          required: ['featureId', 'status']
-        }
-      }
-    ]
-  });
-}
-
-/**
- * Handle tools/call request
- */
-async function handleToolsCall(params, id) {
-  const { name, arguments: args } = params;
-  
-  if (name !== 'UpdateFeatureStatus') {
-    sendResponse(id, null, {
-      code: -32601,
-      message: `Unknown tool: ${name}`
-    });
-    return;
-  }
-  
-  try {
-    const { featureId, status, summary } = args;
-    
-    if (!featureId || !status) {
-      sendResponse(id, null, {
-        code: -32602,
-        message: 'Missing required parameters: featureId and status are required'
-      });
-      return;
-    }
-    
-    // Load the feature to check skipTests flag
-    const features = await featureLoader.loadFeatures(projectPath);
-    const feature = features.find((f) => f.id === featureId);
-    
-    if (!feature) {
-      sendResponse(id, null, {
-        code: -32602,
-        message: `Feature ${featureId} not found`
-      });
-      return;
-    }
-    
-    // If agent tries to mark as verified but feature has skipTests=true, convert to waiting_approval
-    let finalStatus = status;
-    if (status === 'verified' && feature.skipTests === true) {
-      finalStatus = 'waiting_approval';
-    }
-    
-    // Call the update callback via IPC or direct call
-    // Since we're in a separate process, we need to use IPC to communicate back
-    // For now, we'll call the feature loader directly since it has the update method
-    await featureLoader.updateFeatureStatus(featureId, finalStatus, projectPath, { summary });
-    
-    const statusMessage = finalStatus !== status
-      ? `Successfully updated feature ${featureId} to status "${finalStatus}" (converted from "${status}" because skipTests=true)${summary ? ` with summary: "${summary}"` : ''}`
-      : `Successfully updated feature ${featureId} to status "${finalStatus}"${summary ? ` with summary: "${summary}"` : ''}`;
-    
-    sendResponse(id, {
-      content: [
-        {
-          type: 'text',
-          text: statusMessage
-        }
-      ]
-    });
-  } catch (error) {
-    console.error('[McpServerStdio] UpdateFeatureStatus error:', error);
-    sendResponse(id, null, {
-      code: -32603,
-      message: `Failed to update feature status: ${error.message}`
-    });
-  }
-}
-
-/**
- * Handle JSON-RPC request
- */
-async function handleRequest(line) {
-  let request;
-  
-  try {
-    request = JSON.parse(line);
-  } catch (e) {
-    sendResponse(null, null, {
-      code: -32700,
-      message: 'Parse error'
-    });
-    return;
-  }
-  
-  // Validate JSON-RPC 2.0 structure
-  if (request.jsonrpc !== '2.0') {
-    sendResponse(request.id || null, null, {
-      code: -32600,
-      message: 'Invalid Request'
-    });
-    return;
-  }
-  
-  const { method, params, id } = request;
-  
-  // Handle notifications (no id)
-  if (id === undefined) {
-    // Handle notifications if needed
-    return;
-  }
-  
-  // Handle requests
-  try {
-    switch (method) {
-      case 'initialize':
-        await handleInitialize(params, id);
-        break;
-        
-      case 'tools/list':
-        if (!initialized) {
-          sendResponse(id, null, {
-            code: -32002,
-            message: 'Server not initialized'
-          });
-          return;
-        }
-        await handleToolsList(params, id);
-        break;
-        
-      case 'tools/call':
-        if (!initialized) {
-          sendResponse(id, null, {
-            code: -32002,
-            message: 'Server not initialized'
-          });
-          return;
-        }
-        await handleToolsCall(params, id);
-        break;
-        
-      default:
-        sendResponse(id, null, {
-          code: -32601,
-          message: `Method not found: ${method}`
-        });
-    }
-  } catch (error) {
-    console.error('[McpServerStdio] Error handling request:', error);
-    sendResponse(id, null, {
-      code: -32603,
-      message: `Internal error: ${error.message}`
-    });
-  }
-}
-
-// Process stdin line by line
-rl.on('line', async (line) => {
-  if (!line.trim()) {
-    return;
-  }
-  
-  await handleRequest(line);
-});
-
-// Handle errors
-rl.on('error', (error) => {
-  console.error('[McpServerStdio] Readline error:', error);
-  process.exit(1);
-});
-
-// Handle process termination
-process.on('SIGTERM', () => {
-  rl.close();
-  process.exit(0);
-});
-
-process.on('SIGINT', () => {
-  rl.close();
-  process.exit(0);
-});
-
-// Log startup
-console.error('[McpServerStdio] Starting MCP server for automaker-tools');
-console.error(`[McpServerStdio] Project path: ${projectPath}`);
-console.error(`[McpServerStdio] IPC channel: ${ipcChannel}`);
-
-

apps/app/electron/services/model-provider.js

@@ -1,524 +0,0 @@
-/**
- * Model Provider Abstraction Layer
- *
- * This module provides an abstract interface for model providers (Claude, Codex, etc.)
- * allowing the application to use different AI models through a unified API.
- */
-
-/**
- * Base class for model providers
- * Concrete implementations should extend this class
- */
-class ModelProvider {
-  constructor(config = {}) {
-    this.config = config;
-    this.name = 'base';
-  }
-
-  /**
-   * Get provider name
-   * @returns {string} Provider name
-   */
-  getName() {
-    return this.name;
-  }
-
-  /**
-   * Execute a query with the model provider
-   * @param {Object} options Query options
-   * @param {string} options.prompt The prompt to send
-   * @param {string} options.model The model to use
-   * @param {string} options.systemPrompt System prompt
-   * @param {string} options.cwd Working directory
-   * @param {number} options.maxTurns Maximum turns
-   * @param {string[]} options.allowedTools Allowed tools
-   * @param {Object} options.mcpServers MCP servers configuration
-   * @param {AbortController} options.abortController Abort controller
-   * @param {Object} options.thinking Thinking configuration
-   * @returns {AsyncGenerator} Async generator yielding messages
-   */
-  async *executeQuery(options) {
-    throw new Error('executeQuery must be implemented by subclass');
-  }
-
-  /**
-   * Detect if this provider's CLI/SDK is installed
-   * @returns {Promise<Object>} Installation status
-   */
-  async detectInstallation() {
-    throw new Error('detectInstallation must be implemented by subclass');
-  }
-
-  /**
-   * Get list of available models for this provider
-   * @returns {Array<Object>} Array of model definitions
-   */
-  getAvailableModels() {
-    throw new Error('getAvailableModels must be implemented by subclass');
-  }
-
-  /**
-   * Validate provider configuration
-   * @returns {Object} Validation result { valid: boolean, errors: string[] }
-   */
-  validateConfig() {
-    throw new Error('validateConfig must be implemented by subclass');
-  }
-
-  /**
-   * Get the full model string for a model key
-   * @param {string} modelKey Short model key (e.g., 'opus', 'gpt-5.1-codex')
-   * @returns {string} Full model string
-   */
-  getModelString(modelKey) {
-    throw new Error('getModelString must be implemented by subclass');
-  }
-
-  /**
-   * Check if provider supports a specific feature
-   * @param {string} feature Feature name (e.g., 'thinking', 'tools', 'streaming')
-   * @returns {boolean} Whether the feature is supported
-   */
-  supportsFeature(feature) {
-    return false;
-  }
-}
-
-/**
- * Claude Provider - Uses Anthropic Claude Agent SDK
- */
-class ClaudeProvider extends ModelProvider {
-  constructor(config = {}) {
-    super(config);
-    this.name = 'claude';
-    this.sdk = null;
-  }
-
-  /**
-   * Try to load credentials from the app's own credentials.json file.
-   * This is where we store OAuth tokens and API keys that users enter in the setup wizard.
-   * Returns { oauthToken, apiKey } or null values if not found.
-   */
-  loadTokenFromAppCredentials() {
-    try {
-      const fs = require('fs');
-      const path = require('path');
-      const { app } = require('electron');
-      const credentialsPath = path.join(app.getPath('userData'), 'credentials.json');
-
-      if (!fs.existsSync(credentialsPath)) {
-        console.log('[ClaudeProvider] App credentials file does not exist:', credentialsPath);
-        return { oauthToken: null, apiKey: null };
-      }
-
-      const raw = fs.readFileSync(credentialsPath, 'utf-8');
-      const parsed = JSON.parse(raw);
-
-      // Check for OAuth token first (from claude setup-token), then API key
-      const oauthToken = parsed.anthropic_oauth_token || null;
-      const apiKey = parsed.anthropic || parsed.anthropic_api_key || null;
-
-      console.log('[ClaudeProvider] App credentials check - OAuth token:', !!oauthToken, ', API key:', !!apiKey);
-      return { oauthToken, apiKey };
-    } catch (err) {
-      console.warn('[ClaudeProvider] Failed to read app credentials:', err?.message);
-      return { oauthToken: null, apiKey: null };
-    }
-  }
-
-  /**
-   * Try to load a Claude OAuth token from the local CLI config (~/.claude/config.json).
-   * Returns the token string or null if not found.
-   * NOTE: Claude's credentials.json is encrypted, so we only try config.json
-   */
-  loadTokenFromCliConfig() {
-    try {
-      const fs = require('fs');
-      const path = require('path');
-      const configPath = path.join(require('os').homedir(), '.claude', 'config.json');
-      if (!fs.existsSync(configPath)) {
-        return null;
-      }
-      const raw = fs.readFileSync(configPath, 'utf-8');
-      const parsed = JSON.parse(raw);
-      // CLI config stores token as oauth_token (newer) or token (older)
-      return parsed.oauth_token || parsed.token || null;
-    } catch (err) {
-      console.warn('[ClaudeProvider] Failed to read CLI config token:', err?.message);
-      return null;
-    }
-  }
-
-  ensureAuthEnv() {
-    // If API key or token already present in environment, keep as-is.
-    if (process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_CODE_OAUTH_TOKEN) {
-      console.log('[ClaudeProvider] Auth already present in environment');
-      return true;
-    }
-
-    // Priority 1: Try to load from app's own credentials (setup wizard)
-    const appCredentials = this.loadTokenFromAppCredentials();
-    if (appCredentials.oauthToken) {
-      process.env.CLAUDE_CODE_OAUTH_TOKEN = appCredentials.oauthToken;
-      console.log('[ClaudeProvider] Loaded CLAUDE_CODE_OAUTH_TOKEN from app credentials');
-      return true;
-    }
-    if (appCredentials.apiKey) {
-      process.env.ANTHROPIC_API_KEY = appCredentials.apiKey;
-      console.log('[ClaudeProvider] Loaded ANTHROPIC_API_KEY from app credentials');
-      return true;
-    }
-
-    // Priority 2: Try to hydrate from CLI login config (legacy)
-    const token = this.loadTokenFromCliConfig();
-    if (token) {
-      process.env.CLAUDE_CODE_OAUTH_TOKEN = token;
-      console.log('[ClaudeProvider] Loaded CLAUDE_CODE_OAUTH_TOKEN from ~/.claude/config.json');
-      return true;
-    }
-
-    // Check if CLI is installed but not logged in
-    try {
-      const claudeCliDetector = require('./claude-cli-detector');
-      const detection = claudeCliDetector.detectClaudeInstallation();
-      if (detection.installed && detection.method === 'cli') {
-        console.error('[ClaudeProvider] Claude CLI is installed but not authenticated. Use the setup wizard or set ANTHROPIC_API_KEY or CLAUDE_CODE_OAUTH_TOKEN environment variable.');
-      } else {
-        console.error('[ClaudeProvider] No Anthropic auth found. Use the setup wizard or set ANTHROPIC_API_KEY or CLAUDE_CODE_OAUTH_TOKEN.');
-      }
-    } catch (err) {
-      console.error('[ClaudeProvider] No Anthropic auth found. Use the setup wizard or set ANTHROPIC_API_KEY or CLAUDE_CODE_OAUTH_TOKEN.');
-    }
-    return false;
-  }
-
-  /**
-   * Lazily load the Claude SDK
-   */
-  loadSdk() {
-    if (!this.sdk) {
-      this.sdk = require('@anthropic-ai/claude-agent-sdk');
-    }
-    return this.sdk;
-  }
-
-  async *executeQuery(options) {
-    // Ensure we have auth; fall back to app credentials or CLI login token if available.
-    if (!this.ensureAuthEnv()) {
-      // Check if CLI is installed to provide better error message
-      let msg = 'Missing Anthropic auth. Go to Settings > Setup to configure your Claude authentication.';
-      try {
-        const claudeCliDetector = require('./claude-cli-detector');
-        const detection = claudeCliDetector.detectClaudeInstallation();
-        if (detection.installed && detection.method === 'cli') {
-          msg = 'Claude CLI is installed but not authenticated. Go to Settings > Setup to provide your subscription token (from `claude setup-token`) or API key.';
-        } else {
-          msg = 'Missing Anthropic auth. Go to Settings > Setup to configure your Claude authentication, or set ANTHROPIC_API_KEY environment variable.';
-        }
-      } catch (err) {
-        // Fallback to default message
-      }
-      console.error(`[ClaudeProvider] ${msg}`);
-      yield { type: 'error', error: msg };
-      return;
-    }
-
-    const { query } = this.loadSdk();
-
-    const sdkOptions = {
-      model: options.model,
-      systemPrompt: options.systemPrompt,
-      maxTurns: options.maxTurns || 1000,
-      cwd: options.cwd,
-      mcpServers: options.mcpServers,
-      allowedTools: options.allowedTools,
-      permissionMode: options.permissionMode || 'acceptEdits',
-      sandbox: options.sandbox,
-      abortController: options.abortController,
-    };
-
-    // Add thinking configuration if enabled
-    if (options.thinking) {
-      sdkOptions.thinking = options.thinking;
-    }
-
-    const currentQuery = query({ prompt: options.prompt, options: sdkOptions });
-
-    for await (const msg of currentQuery) {
-      yield msg;
-    }
-  }
-
-  async detectInstallation() {
-    const claudeCliDetector = require('./claude-cli-detector');
-    return claudeCliDetector.getFullStatus();
-  }
-
-  getAvailableModels() {
-    return [
-      {
-        id: 'haiku',
-        name: 'Claude Haiku',
-        modelString: 'claude-haiku-4-5',
-        provider: 'claude',
-        description: 'Fast and efficient for simple tasks',
-        tier: 'basic'
-      },
-      {
-        id: 'sonnet',
-        name: 'Claude Sonnet',
-        modelString: 'claude-sonnet-4-20250514',
-        provider: 'claude',
-        description: 'Balanced performance and capabilities',
-        tier: 'standard'
-      },
-      {
-        id: 'opus',
-        name: 'Claude Opus 4.5',
-        modelString: 'claude-opus-4-5-20251101',
-        provider: 'claude',
-        description: 'Most capable model for complex tasks',
-        tier: 'premium'
-      }
-    ];
-  }
-
-  validateConfig() {
-    const errors = [];
-
-    // Ensure auth is available (try to auto-load from app credentials or CLI config)
-    this.ensureAuthEnv();
-
-    if (!process.env.CLAUDE_CODE_OAUTH_TOKEN && !process.env.ANTHROPIC_API_KEY) {
-      errors.push('No Claude authentication found. Go to Settings > Setup to configure your subscription token or API key.');
-    }
-
-    return {
-      valid: errors.length === 0,
-      errors
-    };
-  }
-
-  getModelString(modelKey) {
-    const modelMap = {
-      haiku: 'claude-haiku-4-5',
-      sonnet: 'claude-sonnet-4-20250514',
-      opus: 'claude-opus-4-5-20251101'
-    };
-    return modelMap[modelKey] || modelMap.opus;
-  }
-
-  supportsFeature(feature) {
-    const supportedFeatures = ['thinking', 'tools', 'streaming', 'mcp'];
-    return supportedFeatures.includes(feature);
-  }
-}
-
-/**
- * Codex Provider - Uses OpenAI Codex CLI
- */
-class CodexProvider extends ModelProvider {
-  constructor(config = {}) {
-    super(config);
-    this.name = 'codex';
-  }
-
-  async *executeQuery(options) {
-    const codexExecutor = require('./codex-executor');
-
-    // Validate that we're not receiving a Claude model string
-    if (options.model && options.model.startsWith('claude-')) {
-      const errorMsg = `Codex provider cannot use Claude model '${options.model}'. Codex only supports OpenAI models (gpt-5.1-codex-max, gpt-5.1-codex, gpt-5.1-codex-mini, gpt-5.1).`;
-      console.error(`[CodexProvider] ${errorMsg}`);
-      yield {
-        type: 'error',
-        error: errorMsg
-      };
-      return;
-    }
-
-    const executeOptions = {
-      prompt: options.prompt,
-      model: options.model,
-      cwd: options.cwd,
-      systemPrompt: options.systemPrompt,
-      maxTurns: options.maxTurns || 20,
-      allowedTools: options.allowedTools,
-      mcpServers: options.mcpServers, // Pass MCP servers config to executor
-      env: {
-        ...process.env,
-        OPENAI_API_KEY: process.env.OPENAI_API_KEY
-      }
-    };
-
-    // Execute and yield results
-    const generator = codexExecutor.execute(executeOptions);
-    for await (const msg of generator) {
-      yield msg;
-    }
-  }
-
-  async detectInstallation() {
-    const codexCliDetector = require('./codex-cli-detector');
-    return codexCliDetector.getInstallationInfo();
-  }
-
-  getAvailableModels() {
-    return [
-      {
-        id: 'gpt-5.1-codex-max',
-        name: 'GPT-5.1 Codex Max',
-        modelString: 'gpt-5.1-codex-max',
-        provider: 'codex',
-        description: 'Latest flagship - deep and fast reasoning for coding',
-        tier: 'premium',
-        default: true
-      },
-      {
-        id: 'gpt-5.1-codex',
-        name: 'GPT-5.1 Codex',
-        modelString: 'gpt-5.1-codex',
-        provider: 'codex',
-        description: 'Optimized for code generation',
-        tier: 'standard'
-      },
-      {
-        id: 'gpt-5.1-codex-mini',
-        name: 'GPT-5.1 Codex Mini',
-        modelString: 'gpt-5.1-codex-mini',
-        provider: 'codex',
-        description: 'Faster and cheaper option',
-        tier: 'basic'
-      },
-      {
-        id: 'gpt-5.1',
-        name: 'GPT-5.1',
-        modelString: 'gpt-5.1',
-        provider: 'codex',
-        description: 'Broad world knowledge with strong reasoning',
-        tier: 'standard'
-      }
-    ];
-  }
-
-  validateConfig() {
-    const errors = [];
-    const codexCliDetector = require('./codex-cli-detector');
-    const installation = codexCliDetector.detectCodexInstallation();
-
-    if (!installation.installed && !process.env.OPENAI_API_KEY) {
-      errors.push('Codex CLI not installed and no OPENAI_API_KEY found.');
-    }
-
-    return {
-      valid: errors.length === 0,
-      errors
-    };
-  }
-
-  getModelString(modelKey) {
-    // Codex models use the key directly as the model string
-    const modelMap = {
-      'gpt-5.1-codex-max': 'gpt-5.1-codex-max',
-      'gpt-5.1-codex': 'gpt-5.1-codex',
-      'gpt-5.1-codex-mini': 'gpt-5.1-codex-mini',
-      'gpt-5.1': 'gpt-5.1'
-    };
-    return modelMap[modelKey] || 'gpt-5.1-codex-max';
-  }
-
-  supportsFeature(feature) {
-    const supportedFeatures = ['tools', 'streaming'];
-    return supportedFeatures.includes(feature);
-  }
-}
-
-/**
- * Model Provider Factory
- * Creates the appropriate provider based on model or provider name
- */
-class ModelProviderFactory {
-  static providers = {
-    claude: ClaudeProvider,
-    codex: CodexProvider
-  };
-
-  /**
-   * Get provider for a specific model
-   * @param {string} modelId Model ID (e.g., 'opus', 'gpt-5.1-codex')
-   * @returns {ModelProvider} Provider instance
-   */
-  static getProviderForModel(modelId) {
-    // Check if it's a Claude model
-    const claudeModels = ['haiku', 'sonnet', 'opus'];
-    if (claudeModels.includes(modelId)) {
-      return new ClaudeProvider();
-    }
-
-    // Check if it's a Codex/OpenAI model
-    const codexModels = [
-      'gpt-5.1-codex-max', 'gpt-5.1-codex', 'gpt-5.1-codex-mini', 'gpt-5.1'
-    ];
-    if (codexModels.includes(modelId)) {
-      return new CodexProvider();
-    }
-
-    // Default to Claude
-    return new ClaudeProvider();
-  }
-
-  /**
-   * Get provider by name
-   * @param {string} providerName Provider name ('claude' or 'codex')
-   * @returns {ModelProvider} Provider instance
-   */
-  static getProvider(providerName) {
-    const ProviderClass = this.providers[providerName];
-    if (!ProviderClass) {
-      throw new Error(`Unknown provider: ${providerName}`);
-    }
-    return new ProviderClass();
-  }
-
-  /**
-   * Get all available providers
-   * @returns {string[]} List of provider names
-   */
-  static getAvailableProviders() {
-    return Object.keys(this.providers);
-  }
-
-  /**
-   * Get all available models across all providers
-   * @returns {Array<Object>} All available models
-   */
-  static getAllModels() {
-    const allModels = [];
-    for (const providerName of this.getAvailableProviders()) {
-      const provider = this.getProvider(providerName);
-      const models = provider.getAvailableModels();
-      allModels.push(...models);
-    }
-    return allModels;
-  }
-
-  /**
-   * Check installation status for all providers
-   * @returns {Promise<Object>} Installation status for each provider
-   */
-  static async checkAllProviders() {
-    const status = {};
-    for (const providerName of this.getAvailableProviders()) {
-      const provider = this.getProvider(providerName);
-      status[providerName] = await provider.detectInstallation();
-    }
-    return status;
-  }
-}
-
-module.exports = {
-  ModelProvider,
-  ClaudeProvider,
-  CodexProvider,
-  ModelProviderFactory
-};

apps/app/electron/services/model-registry.js

@@ -1,320 +0,0 @@
-/**
- * Model Registry - Centralized model definitions and metadata
- *
- * This module provides a central registry of all available models
- * across different providers (Claude, Codex/OpenAI).
- */
-
-/**
- * Model Categories
- */
-const MODEL_CATEGORIES = {
-  CLAUDE: 'claude',
-  OPENAI: 'openai',
-  CODEX: 'codex'
-};
-
-/**
- * Model Tiers (capability levels)
- */
-const MODEL_TIERS = {
-  BASIC: 'basic',      // Fast, cheap, simple tasks
-  STANDARD: 'standard', // Balanced performance
-  PREMIUM: 'premium'    // Most capable, complex tasks
-};
-
-const CODEX_MODEL_IDS = [
-  'gpt-5.1-codex-max',
-  'gpt-5.1-codex',
-  'gpt-5.1-codex-mini',
-  'gpt-5.1'
-];
-
-/**
- * All available models with full metadata
- */
-const MODELS = {
-  // Claude Models
-  haiku: {
-    id: 'haiku',
-    name: 'Claude Haiku',
-    modelString: 'claude-haiku-4-5',
-    provider: 'claude',
-    category: MODEL_CATEGORIES.CLAUDE,
-    tier: MODEL_TIERS.BASIC,
-    description: 'Fast and efficient for simple tasks',
-    capabilities: ['code', 'text', 'tools'],
-    maxTokens: 8192,
-    contextWindow: 200000,
-    supportsThinking: true,
-    requiresAuth: 'CLAUDE_CODE_OAUTH_TOKEN'
-  },
-  sonnet: {
-    id: 'sonnet',
-    name: 'Claude Sonnet',
-    modelString: 'claude-sonnet-4-20250514',
-    provider: 'claude',
-    category: MODEL_CATEGORIES.CLAUDE,
-    tier: MODEL_TIERS.STANDARD,
-    description: 'Balanced performance and capabilities',
-    capabilities: ['code', 'text', 'tools', 'analysis'],
-    maxTokens: 8192,
-    contextWindow: 200000,
-    supportsThinking: true,
-    requiresAuth: 'CLAUDE_CODE_OAUTH_TOKEN'
-  },
-  opus: {
-    id: 'opus',
-    name: 'Claude Opus 4.5',
-    modelString: 'claude-opus-4-5-20251101',
-    provider: 'claude',
-    category: MODEL_CATEGORIES.CLAUDE,
-    tier: MODEL_TIERS.PREMIUM,
-    description: 'Most capable model for complex tasks',
-    capabilities: ['code', 'text', 'tools', 'analysis', 'reasoning'],
-    maxTokens: 8192,
-    contextWindow: 200000,
-    supportsThinking: true,
-    requiresAuth: 'CLAUDE_CODE_OAUTH_TOKEN',
-    default: true
-  },
-
-  // OpenAI GPT-5.1 Codex Models
-  'gpt-5.1-codex-max': {
-    id: 'gpt-5.1-codex-max',
-    name: 'GPT-5.1 Codex Max',
-    modelString: 'gpt-5.1-codex-max',
-    provider: 'codex',
-    category: MODEL_CATEGORIES.OPENAI,
-    tier: MODEL_TIERS.PREMIUM,
-    description: 'Latest flagship - deep and fast reasoning for coding',
-    capabilities: ['code', 'text', 'tools', 'reasoning'],
-    maxTokens: 32768,
-    contextWindow: 128000,
-    supportsThinking: false,
-    requiresAuth: 'OPENAI_API_KEY',
-    codexDefault: true
-  },
-  'gpt-5.1-codex': {
-    id: 'gpt-5.1-codex',
-    name: 'GPT-5.1 Codex',
-    modelString: 'gpt-5.1-codex',
-    provider: 'codex',
-    category: MODEL_CATEGORIES.OPENAI,
-    tier: MODEL_TIERS.STANDARD,
-    description: 'Optimized for code generation',
-    capabilities: ['code', 'text', 'tools'],
-    maxTokens: 32768,
-    contextWindow: 128000,
-    supportsThinking: false,
-    requiresAuth: 'OPENAI_API_KEY'
-  },
-  'gpt-5.1-codex-mini': {
-    id: 'gpt-5.1-codex-mini',
-    name: 'GPT-5.1 Codex Mini',
-    modelString: 'gpt-5.1-codex-mini',
-    provider: 'codex',
-    category: MODEL_CATEGORIES.OPENAI,
-    tier: MODEL_TIERS.BASIC,
-    description: 'Faster and cheaper option',
-    capabilities: ['code', 'text'],
-    maxTokens: 16384,
-    contextWindow: 128000,
-    supportsThinking: false,
-    requiresAuth: 'OPENAI_API_KEY'
-  },
-  'gpt-5.1': {
-    id: 'gpt-5.1',
-    name: 'GPT-5.1',
-    modelString: 'gpt-5.1',
-    provider: 'codex',
-    category: MODEL_CATEGORIES.OPENAI,
-    tier: MODEL_TIERS.STANDARD,
-    description: 'Broad world knowledge with strong reasoning',
-    capabilities: ['code', 'text', 'reasoning'],
-    maxTokens: 32768,
-    contextWindow: 128000,
-    supportsThinking: false,
-    requiresAuth: 'OPENAI_API_KEY'
-  }
-};
-
-/**
- * Model Registry class for querying and managing models
- */
-class ModelRegistry {
-  /**
-   * Get all registered models
-   * @returns {Object} All models
-   */
-  static getAllModels() {
-    return MODELS;
-  }
-
-  /**
-   * Get model by ID
-   * @param {string} modelId Model ID
-   * @returns {Object|null} Model definition or null
-   */
-  static getModel(modelId) {
-    return MODELS[modelId] || null;
-  }
-
-  /**
-   * Get models by provider
-   * @param {string} provider Provider name ('claude' or 'codex')
-   * @returns {Object[]} Array of models for the provider
-   */
-  static getModelsByProvider(provider) {
-    return Object.values(MODELS).filter(m => m.provider === provider);
-  }
-
-  /**
-   * Get models by category
-   * @param {string} category Category name
-   * @returns {Object[]} Array of models in the category
-   */
-  static getModelsByCategory(category) {
-    return Object.values(MODELS).filter(m => m.category === category);
-  }
-
-  /**
-   * Get models by tier
-   * @param {string} tier Tier name
-   * @returns {Object[]} Array of models in the tier
-   */
-  static getModelsByTier(tier) {
-    return Object.values(MODELS).filter(m => m.tier === tier);
-  }
-
-  /**
-   * Get default model for a provider
-   * @param {string} provider Provider name
-   * @returns {Object|null} Default model or null
-   */
-  static getDefaultModel(provider = 'claude') {
-    const models = this.getModelsByProvider(provider);
-    if (provider === 'claude') {
-      return models.find(m => m.default) || models[0];
-    }
-    if (provider === 'codex') {
-      return models.find(m => m.codexDefault) || models[0];
-    }
-    return models[0];
-  }
-
-  /**
-   * Get model string (full model name) for a model ID
-   * @param {string} modelId Model ID
-   * @returns {string} Full model string
-   */
-  static getModelString(modelId) {
-    const model = this.getModel(modelId);
-    return model ? model.modelString : modelId;
-  }
-
-  /**
-   * Determine provider for a model ID
-   * @param {string} modelId Model ID
-   * @returns {string} Provider name ('claude' or 'codex')
-   */
-  static getProviderForModel(modelId) {
-    const model = this.getModel(modelId);
-    if (model) {
-      return model.provider;
-    }
-
-    // Fallback detection for models not explicitly registered (keeps legacy Codex IDs working)
-    if (CODEX_MODEL_IDS.includes(modelId)) {
-      return 'codex';
-    }
-
-    return 'claude';
-  }
-
-  /**
-   * Check if a model is a Claude model
-   * @param {string} modelId Model ID
-   * @returns {boolean} Whether it's a Claude model
-   */
-  static isClaudeModel(modelId) {
-    return this.getProviderForModel(modelId) === 'claude';
-  }
-
-  /**
-   * Check if a model is a Codex/OpenAI model
-   * @param {string} modelId Model ID
-   * @returns {boolean} Whether it's a Codex model
-   */
-  static isCodexModel(modelId) {
-    return this.getProviderForModel(modelId) === 'codex';
-  }
-
-  /**
-   * Get models grouped by provider for UI display
-   * @returns {Object} Models grouped by provider
-   */
-  static getModelsGroupedByProvider() {
-    return {
-      claude: this.getModelsByProvider('claude'),
-      codex: this.getModelsByProvider('codex')
-    };
-  }
-
-  /**
-   * Get all model IDs as an array
-   * @returns {string[]} Array of model IDs
-   */
-  static getAllModelIds() {
-    return Object.keys(MODELS);
-  }
-
-  /**
-   * Check if model supports a specific capability
-   * @param {string} modelId Model ID
-   * @param {string} capability Capability name
-   * @returns {boolean} Whether the model supports the capability
-   */
-  static modelSupportsCapability(modelId, capability) {
-    const model = this.getModel(modelId);
-    return model ? model.capabilities.includes(capability) : false;
-  }
-
-  /**
-   * Check if model supports extended thinking
-   * @param {string} modelId Model ID
-   * @returns {boolean} Whether the model supports thinking
-   */
-  static modelSupportsThinking(modelId) {
-    const model = this.getModel(modelId);
-    return model ? model.supportsThinking : false;
-  }
-
-  /**
-   * Get required authentication for a model
-   * @param {string} modelId Model ID
-   * @returns {string|null} Required auth env variable name
-   */
-  static getRequiredAuth(modelId) {
-    const model = this.getModel(modelId);
-    return model ? model.requiresAuth : null;
-  }
-
-  /**
-   * Check if authentication is available for a model
-   * @param {string} modelId Model ID
-   * @returns {boolean} Whether auth is available
-   */
-  static hasAuthForModel(modelId) {
-    const authVar = this.getRequiredAuth(modelId);
-    if (!authVar) return false;
-    return !!process.env[authVar];
-  }
-}
-
-module.exports = {
-  MODEL_CATEGORIES,
-  MODEL_TIERS,
-  MODELS,
-  ModelRegistry
-};

apps/app/electron/services/project-analyzer.js

@@ -1,112 +0,0 @@
-const { query, AbortError } = require("@anthropic-ai/claude-agent-sdk");
-const promptBuilder = require("./prompt-builder");
-
-/**
- * Project Analyzer - Scans codebase and updates app_spec.txt
- */
-class ProjectAnalyzer {
-  /**
-   * Run the project analysis using Claude Agent SDK
-   */
-  async runProjectAnalysis(projectPath, analysisId, sendToRenderer, execution) {
-    console.log(`[ProjectAnalyzer] Running project analysis for: ${projectPath}`);
-
-    try {
-      sendToRenderer({
-        type: "auto_mode_phase",
-        featureId: analysisId,
-        phase: "planning",
-        message: "Scanning project structure...",
-      });
-
-      const abortController = new AbortController();
-      execution.abortController = abortController;
-
-      const options = {
-        model: "claude-sonnet-4-20250514",
-        systemPrompt: promptBuilder.getProjectAnalysisSystemPrompt(),
-        maxTurns: 50,
-        cwd: projectPath,
-        allowedTools: ["Read", "Write", "Edit", "Glob", "Grep", "Bash"],
-        permissionMode: "acceptEdits",
-        sandbox: {
-          enabled: true,
-          autoAllowBashIfSandboxed: true,
-        },
-        abortController: abortController,
-      };
-
-      const prompt = promptBuilder.buildProjectAnalysisPrompt(projectPath);
-
-      sendToRenderer({
-        type: "auto_mode_progress",
-        featureId: analysisId,
-        content: "Starting project analysis...\n",
-      });
-
-      const currentQuery = query({ prompt, options });
-      execution.query = currentQuery;
-
-      let responseText = "";
-      for await (const msg of currentQuery) {
-        if (!execution.isActive()) break;
-
-        if (msg.type === "assistant" && msg.message?.content) {
-          for (const block of msg.message.content) {
-            if (block.type === "text") {
-              responseText += block.text;
-              sendToRenderer({
-                type: "auto_mode_progress",
-                featureId: analysisId,
-                content: block.text,
-              });
-            } else if (block.type === "tool_use") {
-              sendToRenderer({
-                type: "auto_mode_tool",
-                featureId: analysisId,
-                tool: block.name,
-                input: block.input,
-              });
-            }
-          }
-        }
-      }
-
-      execution.query = null;
-      execution.abortController = null;
-
-      sendToRenderer({
-        type: "auto_mode_phase",
-        featureId: analysisId,
-        phase: "verification",
-        message: "Project analysis complete",
-      });
-
-      return {
-        success: true,
-        message: "Project analyzed successfully",
-      };
-    } catch (error) {
-      if (error instanceof AbortError || error?.name === "AbortError") {
-        console.log("[ProjectAnalyzer] Project analysis aborted");
-        if (execution) {
-          execution.abortController = null;
-          execution.query = null;
-        }
-        return {
-          success: false,
-          message: "Analysis aborted",
-        };
-      }
-
-      console.error("[ProjectAnalyzer] Error in project analysis:", error);
-      if (execution) {
-        execution.abortController = null;
-        execution.query = null;
-      }
-      throw error;
-    }
-  }
-}
-
-module.exports = new ProjectAnalyzer();

apps/app/electron/services/prompt-builder.js

@@ -1,787 +0,0 @@
-const contextManager = require("./context-manager");
-
-/**
- * Prompt Builder - Generates prompts for different agent tasks
- */
-class PromptBuilder {
-  /**
-   * Build the prompt for implementing a specific feature
-   */
-  async buildFeaturePrompt(feature, projectPath) {
-    const skipTestsNote = feature.skipTests
-      ? `\n**⚠️ IMPORTANT - Manual Testing Mode:**\nThis feature has skipTests=true, which means:\n- DO NOT commit changes automatically\n- DO NOT mark as verified - it will automatically go to "waiting_approval" status\n- The user will manually review and commit the changes\n- Just implement the feature and mark it as verified (it will be converted to waiting_approval)\n`
-      : "";
-
-    let imagesNote = "";
-    if (feature.imagePaths && feature.imagePaths.length > 0) {
-      const imagesList = feature.imagePaths
-        .map(
-          (img, idx) =>
-            `   ${idx + 1}. ${img.filename} (${img.mimeType})\n      Path: ${
-              img.path
-            }`
-        )
-        .join("\n");
-
-      imagesNote = `\n**📎 Context Images Attached:**\nThe user has attached ${feature.imagePaths.length} image(s) for context. These images are provided both visually (in the initial message) and as files you can read:
-
-${imagesList}
-
-You can use the Read tool to view these images at any time during implementation. Review them carefully before implementing.\n`;
-    }
-
-    // Get context files preview
-    const contextFilesPreview = await contextManager.getContextFilesPreview(
-      projectPath
-    );
-
-    // Get memory content (lessons learned from previous runs)
-    const memoryContent = await contextManager.getMemoryContent(projectPath);
-
-    // Build mode header for this feature
-    const modeHeader = feature.skipTests
-      ? `**🔨 MODE: Manual Review (No Automated Tests)**
-This feature is set for manual review - focus on clean implementation without automated tests.`
-      : `**🧪 MODE: Test-Driven Development (TDD)**
-This feature requires automated Playwright tests to verify the implementation.`;
-
-    return `You are working on a feature implementation task.
-
-${modeHeader}
-${memoryContent}
-**Current Feature to Implement:**
-
-ID: ${feature.id}
-Category: ${feature.category || "Uncategorized"}
-Description: ${feature.description || feature.summary || feature.title || "No description provided"}
-${skipTestsNote}${imagesNote}${contextFilesPreview}
-**Steps to Complete:**
-${(feature.steps || []).map((step, i) => `${i + 1}. ${step}`).join("\n") || "No specific steps provided - implement based on description"}
-
-**Your Task:**
-
-1. Read the project files to understand the current codebase structure
-2. Implement the feature according to the description and steps
-${
-  feature.skipTests
-    ? "3. Test the implementation manually (no automated tests needed for skipTests features)"
-    : "3. Write Playwright tests to verify the feature works correctly\n4. Run the tests and ensure they pass\n5. **DELETE the test file(s) you created** - tests are only for immediate verification"
-}
-${
-  feature.skipTests ? "4" : "6"
-}. **CRITICAL: Use the UpdateFeatureStatus tool to mark this feature as verified**
-${
-  feature.skipTests
-    ? "5. **DO NOT commit changes** - the user will review and commit manually"
-    : "7. Commit your changes with git"
-}
-
-**IMPORTANT - Updating Feature Status:**
-
-When you have completed the feature${
-      feature.skipTests ? "" : " and all tests pass"
-    }, you MUST use the \`mcp__automaker-tools__UpdateFeatureStatus\` tool to update the feature status:
-- Call the tool with: featureId="${feature.id}" and status="verified"
-- **You can also include a summary parameter** to describe what was done: summary="Brief summary of changes"
-- **DO NOT manually edit feature files** - this can cause race conditions
-- The UpdateFeatureStatus tool safely updates the feature status without risk of corrupting other data
-- **If skipTests=true, the tool will automatically convert "verified" to "waiting_approval"** - this is correct behavior
-
-**IMPORTANT - Feature Summary (REQUIRED):**
-
-When calling UpdateFeatureStatus, you MUST include a summary parameter that describes:
-- What files were modified/created
-- What functionality was added or changed
-- Any notable implementation decisions
-
-Example:
-\`\`\`
-UpdateFeatureStatus(featureId="${
-      feature.id
-    }", status="verified", summary="Added dark mode toggle to settings. Modified: settings.tsx, theme-provider.tsx. Created new useTheme hook.")
-\`\`\`
-
-The summary will be displayed on the Kanban card so the user can see what was done without checking the code.
-
-**Important Guidelines:**
-
-- Focus ONLY on implementing this specific feature
-- Write clean, production-quality code
-- Add proper error handling
-${
-  feature.skipTests
-    ? "- Skip automated testing (skipTests=true) - user will manually verify"
-    : "- Write comprehensive Playwright tests\n- Ensure all existing tests still pass\n- Mark the feature as passing only when all tests are green\n- **CRITICAL: Delete test files after verification** - tests accumulate and become brittle"
-}
-- **CRITICAL: Use UpdateFeatureStatus tool instead of editing feature files directly**
-- **CRITICAL: Always include a summary when marking feature as verified**
-${
-  feature.skipTests
-    ? "- **DO NOT commit changes** - user will review and commit manually"
-    : "- Make a git commit when complete"
-}
-
-**Testing Utilities (CRITICAL):**
-
-1. **Create/maintain tests/utils.ts** - Add helper functions for finding elements and common test operations
-2. **Use utilities in tests** - Import and use helper functions instead of repeating selectors
-3. **Add utilities as needed** - When you write a test, if you need a new helper, add it to utils.ts
-4. **Update utilities when functionality changes** - If you modify components, update corresponding utilities
-
-Example utilities to add:
-- getByTestId(page, testId) - Find elements by data-testid
-- getButtonByText(page, text) - Find buttons by text
-- clickElement(page, testId) - Click an element by test ID
-- fillForm(page, formData) - Fill form fields
-- waitForElement(page, testId) - Wait for element to appear
-
-This makes future tests easier to write and maintain!
-
-**Test Deletion Policy:**
-After tests pass, delete them immediately:
-\`\`\`bash
-rm tests/[feature-name].spec.ts
-\`\`\`
-
-Begin by reading the project structure and then implementing the feature.`;
-  }
-
-  /**
-   * Build the prompt for verifying a specific feature
-   */
-  async buildVerificationPrompt(feature, projectPath) {
-    const skipTestsNote = feature.skipTests
-      ? `\n**⚠️ IMPORTANT - Manual Testing Mode:**\nThis feature has skipTests=true, which means:\n- DO NOT commit changes automatically\n- DO NOT mark as verified - it will automatically go to "waiting_approval" status\n- The user will manually review and commit the changes\n- Just implement the feature and mark it as verified (it will be converted to waiting_approval)\n`
-      : "";
-
-    let imagesNote = "";
-    if (feature.imagePaths && feature.imagePaths.length > 0) {
-      const imagesList = feature.imagePaths
-        .map(
-          (img, idx) =>
-            `   ${idx + 1}. ${img.filename} (${img.mimeType})\n      Path: ${
-              img.path
-            }`
-        )
-        .join("\n");
-
-      imagesNote = `\n**📎 Context Images Attached:**\nThe user has attached ${feature.imagePaths.length} image(s) for context. These images are provided both visually (in the initial message) and as files you can read:
-
-${imagesList}
-
-You can use the Read tool to view these images at any time during implementation. Review them carefully before implementing.\n`;
-    }
-
-    // Get context files preview
-    const contextFilesPreview = await contextManager.getContextFilesPreview(
-      projectPath
-    );
-
-    // Get memory content (lessons learned from previous runs)
-    const memoryContent = await contextManager.getMemoryContent(projectPath);
-
-    // Build mode header for this feature
-    const modeHeader = feature.skipTests
-      ? `**🔨 MODE: Manual Review (No Automated Tests)**
-This feature is set for manual review - focus on completing implementation without automated tests.`
-      : `**🧪 MODE: Test-Driven Development (TDD)**
-This feature requires automated Playwright tests to verify the implementation.`;
-
-    return `You are implementing and verifying a feature until it is complete and working correctly.
-
-${modeHeader}
-${memoryContent}
-
-**Feature to Implement/Verify:**
-
-ID: ${feature.id}
-Category: ${feature.category || "Uncategorized"}
-Description: ${feature.description || feature.summary || feature.title || "No description provided"}
-Current Status: ${feature.status}
-${skipTestsNote}${imagesNote}${contextFilesPreview}
-**Steps that should be implemented:**
-${(feature.steps || []).map((step, i) => `${i + 1}. ${step}`).join("\n") || "No specific steps provided - implement based on description"}
-
-**Your Task:**
-
-1. Read the project files to understand the current implementation
-2. If the feature is not fully implemented, continue implementing it
-${
-  feature.skipTests
-    ? "3. Test the implementation manually (no automated tests needed for skipTests features)"
-    : `3. Write or update Playwright tests to verify the feature works correctly
-4. Run the Playwright tests: npx playwright test tests/[feature-name].spec.ts
-5. Check if all tests pass
-6. **If ANY tests fail:**
-   - Analyze the test failures and error messages
-   - Fix the implementation code to make the tests pass
-   - Update test utilities in tests/utils.ts if needed
-   - Re-run the tests to verify the fixes
-   - **REPEAT this process until ALL tests pass**
-7. **If ALL tests pass:**
-   - **DELETE the test file(s) for this feature** - tests are only for immediate verification`
-}
-${
-  feature.skipTests ? "4" : "8"
-}. **CRITICAL: Use the UpdateFeatureStatus tool to mark this feature as verified**
-${
-  feature.skipTests
-    ? "5. **DO NOT commit changes** - the user will review and commit manually"
-    : "9. Explain what was implemented/fixed and that all tests passed\n10. Commit your changes with git"
-}
-
-**IMPORTANT - Updating Feature Status:**
-
-When you have completed the feature${
-      feature.skipTests ? "" : " and all tests pass"
-    }, you MUST use the \`mcp__automaker-tools__UpdateFeatureStatus\` tool to update the feature status:
-- Call the tool with: featureId="${feature.id}" and status="verified"
-- **You can also include a summary parameter** to describe what was done: summary="Brief summary of changes"
-- **DO NOT manually edit feature files** - this can cause race conditions
-- The UpdateFeatureStatus tool safely updates the feature status without risk of corrupting other data
-- **If skipTests=true, the tool will automatically convert "verified" to "waiting_approval"** - this is correct behavior
-
-**IMPORTANT - Feature Summary (REQUIRED):**
-
-When calling UpdateFeatureStatus, you MUST include a summary parameter that describes:
-- What files were modified/created
-- What functionality was added or changed
-- Any notable implementation decisions
-
-Example:
-\`\`\`
-UpdateFeatureStatus(featureId="${
-      feature.id
-    }", status="verified", summary="Added dark mode toggle to settings. Modified: settings.tsx, theme-provider.tsx. Created new useTheme hook.")
-\`\`\`
-
-The summary will be displayed on the Kanban card so the user can see what was done without checking the code.
-
-**Testing Utilities:**
-- Check if tests/utils.ts exists and is being used
-- If utilities are outdated due to functionality changes, update them
-- Add new utilities as needed for this feature's tests
-- Ensure test utilities stay in sync with code changes
-
-**Test Deletion Policy:**
-After tests pass, delete them immediately:
-\`\`\`bash
-rm tests/[feature-name].spec.ts
-\`\`\`
-
-**Important:**
-${
-  feature.skipTests
-    ? "- Skip automated testing (skipTests=true) - user will manually verify\n- **DO NOT commit changes** - user will review and commit manually"
-    : "- **CONTINUE IMPLEMENTING until all tests pass** - don't stop at the first failure\n- Only mark as verified if Playwright tests pass\n- **CRITICAL: Delete test files after they pass** - tests should not accumulate\n- Update test utilities if functionality changed\n- Make a git commit when the feature is complete\n- Be thorough and persistent in fixing issues"
-}
-- **CRITICAL: Use UpdateFeatureStatus tool instead of editing feature files directly**
-- **CRITICAL: Always include a summary when marking feature as verified**
-
-Begin by reading the project structure and understanding what needs to be implemented or fixed.`;
-  }
-
-  /**
-   * Build prompt for resuming feature with previous context
-   */
-  async buildResumePrompt(feature, previousContext, projectPath) {
-    const skipTestsNote = feature.skipTests
-      ? `\n**⚠️ IMPORTANT - Manual Testing Mode:**\nThis feature has skipTests=true, which means:\n- DO NOT commit changes automatically\n- DO NOT mark as verified - it will automatically go to "waiting_approval" status\n- The user will manually review and commit the changes\n- Just implement the feature and mark it as verified (it will be converted to waiting_approval)\n`
-      : "";
-
-    // For resume, check both followUpImages and imagePaths
-    const imagePaths = feature.followUpImages || feature.imagePaths;
-    let imagesNote = "";
-    if (imagePaths && imagePaths.length > 0) {
-      const imagesList = imagePaths
-        .map((img, idx) => {
-          // Handle both FeatureImagePath objects and simple path strings
-          const path = typeof img === "string" ? img : img.path;
-          const filename =
-            typeof img === "string" ? path.split("/").pop() : img.filename;
-          const mimeType = typeof img === "string" ? "image/*" : img.mimeType;
-          return `   ${
-            idx + 1
-          }. ${filename} (${mimeType})\n      Path: ${path}`;
-        })
-        .join("\n");
-
-      imagesNote = `\n**📎 Context Images Attached:**\nThe user has attached ${imagePaths.length} image(s) for context. These images are provided both visually (in the initial message) and as files you can read:
-
-${imagesList}
-
-You can use the Read tool to view these images at any time. Review them carefully.\n`;
-    }
-
-    // Get context files preview
-    const contextFilesPreview = await contextManager.getContextFilesPreview(
-      projectPath
-    );
-
-    // Get memory content (lessons learned from previous runs)
-    const memoryContent = await contextManager.getMemoryContent(projectPath);
-
-    // Build mode header for this feature
-    const modeHeader = feature.skipTests
-      ? `**🔨 MODE: Manual Review (No Automated Tests)**
-This feature is set for manual review - focus on clean implementation without automated tests.`
-      : `**🧪 MODE: Test-Driven Development (TDD)**
-This feature requires automated Playwright tests to verify the implementation.`;
-
-    return `You are resuming work on a feature implementation that was previously started.
-
-${modeHeader}
-${memoryContent}
-**Current Feature:**
-
-ID: ${feature.id}
-Category: ${feature.category || "Uncategorized"}
-Description: ${feature.description || feature.summary || feature.title || "No description provided"}
-${skipTestsNote}${imagesNote}${contextFilesPreview}
-**Steps to Complete:**
-${(feature.steps || []).map((step, i) => `${i + 1}. ${step}`).join("\n") || "No specific steps provided - implement based on description"}
-
-**Previous Work Context:**
-
-${previousContext || "No previous context available - this is a fresh start."}
-
-**Your Task:**
-
-Continue where you left off and complete the feature implementation:
-
-1. Review the previous work context above to understand what has been done
-2. Continue implementing the feature according to the description and steps
-${
-  feature.skipTests
-    ? "3. Test the implementation manually (no automated tests needed for skipTests features)"
-    : "3. Write Playwright tests to verify the feature works correctly (if not already done)\n4. Run the tests and ensure they pass\n5. **DELETE the test file(s) you created** - tests are only for immediate verification"
-}
-${
-  feature.skipTests ? "4" : "6"
-}. **CRITICAL: Use the UpdateFeatureStatus tool to mark this feature as verified**
-${
-  feature.skipTests
-    ? "5. **DO NOT commit changes** - the user will review and commit manually"
-    : "7. Commit your changes with git"
-}
-
-**IMPORTANT - Updating Feature Status:**
-
-When you have completed the feature${
-      feature.skipTests ? "" : " and all tests pass"
-    }, you MUST use the \`mcp__automaker-tools__UpdateFeatureStatus\` tool to update the feature status:
-- Call the tool with: featureId="${feature.id}" and status="verified"
-- **You can also include a summary parameter** to describe what was done: summary="Brief summary of changes"
-- **DO NOT manually edit feature files** - this can cause race conditions
-- The UpdateFeatureStatus tool safely updates the feature status without risk of corrupting other data
-- **If skipTests=true, the tool will automatically convert "verified" to "waiting_approval"** - this is correct behavior
-
-**IMPORTANT - Feature Summary (REQUIRED):**
-
-When calling UpdateFeatureStatus, you MUST include a summary parameter that describes:
-- What files were modified/created
-- What functionality was added or changed
-- Any notable implementation decisions
-
-Example:
-\`\`\`
-UpdateFeatureStatus(featureId="${
-      feature.id
-    }", status="verified", summary="Added dark mode toggle to settings. Modified: settings.tsx, theme-provider.tsx. Created new useTheme hook.")
-\`\`\`
-
-The summary will be displayed on the Kanban card so the user can see what was done without checking the code.
-
-**Important Guidelines:**
-
-- Review what was already done in the previous context
-- Don't redo work that's already complete - continue from where it left off
-- Focus on completing any remaining tasks
-${
-  feature.skipTests
-    ? "- Skip automated testing (skipTests=true) - user will manually verify"
-    : "- Write comprehensive Playwright tests if not already done\n- Ensure all tests pass before marking as verified\n- **CRITICAL: Delete test files after verification**"
-}
-- **CRITICAL: Use UpdateFeatureStatus tool instead of editing feature files directly**
-- **CRITICAL: Always include a summary when marking feature as verified**
-${
-  feature.skipTests
-    ? "- **DO NOT commit changes** - user will review and commit manually"
-    : "- Make a git commit when complete"
-}
-
-Begin by assessing what's been done and what remains to be completed.`;
-  }
-
-  /**
-   * Build the prompt for project analysis
-   */
-  buildProjectAnalysisPrompt(projectPath) {
-    return `You are analyzing a new project that was just opened in Automaker, an autonomous AI development studio.
-
-**Your Task:**
-
-Analyze this project's codebase and update the .automaker/app_spec.txt file with accurate information about:
-
-1. **Project Name** - Detect the name from package.json, README, or directory name
-2. **Overview** - Brief description of what the project does
-3. **Technology Stack** - Languages, frameworks, libraries detected
-4. **Core Capabilities** - Main features and functionality
-5. **Implemented Features** - What features are already built
-6. **Implementation Roadmap** - Break down remaining work into phases with individual features
-
-**Steps to Follow:**
-
-1. First, explore the project structure:
-   - Look at package.json, cargo.toml, go.mod, requirements.txt, etc. for tech stack
-   - Check README.md for project description
-   - List key directories (src, lib, components, etc.)
-
-2. Identify the tech stack:
-   - Frontend framework (React, Vue, Next.js, etc.)
-   - Backend framework (Express, FastAPI, etc.)
-   - Database (if any config files exist)
-   - Testing framework
-   - Build tools
-
-3. Update .automaker/app_spec.txt with your findings in this format:
-   \`\`\`xml
-   <project_specification>
-     <project_name>Detected Name</project_name>
-
-     <overview>
-       Clear description of what this project does based on your analysis.
-     </overview>
-
-     <technology_stack>
-       <frontend>
-         <framework>Framework Name</framework>
-         <!-- Add detected technologies -->
-       </frontend>
-       <backend>
-         <!-- If applicable -->
-       </backend>
-       <database>
-         <!-- If applicable -->
-       </database>
-       <testing>
-         <!-- Testing frameworks detected -->
-       </testing>
-     </technology_stack>
-
-     <core_capabilities>
-       <!-- List main features/capabilities you found -->
-     </core_capabilities>
-
-     <implemented_features>
-       <!-- List specific features that appear to be implemented -->
-     </implemented_features>
-
-     <implementation_roadmap>
-       <phase_1_foundation>
-         <!-- List foundational features to build first -->
-       </phase_1_foundation>
-       <phase_2_core_logic>
-         <!-- List core logic features -->
-       </phase_2_core_logic>
-       <phase_3_polish>
-         <!-- List polish and enhancement features -->
-       </phase_3_polish>
-     </implementation_roadmap>
-   </project_specification>
-   \`\`\`
-
-4. Ensure .automaker/context/ directory exists
-
-5. Ensure .automaker/features/ directory exists
-
-**Important:**
-- Be concise but accurate
-- Only include information you can verify from the codebase
-- If unsure about something, note it as "to be determined"
-- Don't make up features that don't exist
-- Features are stored in .automaker/features/{id}/feature.json - each feature gets its own folder
-
-Begin by exploring the project structure.`;
-  }
-
-  /**
-   * Get the system prompt for coding agent
-   * @param {string} projectPath - Path to the project
-   * @param {boolean} isTDD - Whether this is Test-Driven Development mode (skipTests=false)
-   */
-  async getCodingPrompt(projectPath, isTDD = true) {
-    // Get context files preview
-    const contextFilesPreview = projectPath
-      ? await contextManager.getContextFilesPreview(projectPath)
-      : "";
-
-    // Get memory content (lessons learned from previous runs)
-    const memoryContent = projectPath
-      ? await contextManager.getMemoryContent(projectPath)
-      : "";
-
-    // Build mode-specific instructions
-    const modeHeader = isTDD
-      ? `**🧪 MODE: Test-Driven Development (TDD)**
-You are implementing features using TDD methodology. This means:
-- Write Playwright tests BEFORE or alongside implementation
-- Run tests frequently to verify your work
-- Tests are your validation mechanism
-- Delete tests after they pass (they're for immediate verification only)`
-      : `**🔨 MODE: Manual Review (No Automated Tests)**
-You are implementing features for manual user review. This means:
-- Focus on clean, working implementation
-- NO automated test writing required
-- User will manually verify the implementation
-- DO NOT commit changes - user will review and commit`;
-
-    return `You are an AI coding agent working autonomously to implement features.
-
-${modeHeader}
-${memoryContent}
-
-**Feature Storage:**
-Features are stored in .automaker/features/{id}/feature.json - each feature has its own folder.
-
-**THE ONLY WAY to update features:**
-Use the mcp__automaker-tools__UpdateFeatureStatus tool with featureId, status, and summary parameters.
-Do NOT manually edit feature.json files directly.
-
-${contextFilesPreview}
-
-Your role is to:
-- Implement features exactly as specified
-- Write production-quality code
-- Check if feature.skipTests is true - if so, skip automated testing and don't commit
-- Create comprehensive Playwright tests using testing utilities (only if skipTests is false)
-- Ensure all tests pass before marking features complete (only if skipTests is false)
-- **DELETE test files after successful verification** - tests are only for immediate feature verification (only if skipTests is false)
-- **Use the UpdateFeatureStatus tool to mark features as verified** - NEVER manually edit feature files
-- **Always include a summary parameter when calling UpdateFeatureStatus** - describe what was done
-- Commit working code to git (only if skipTests is false - skipTests features require manual review)
-- Be thorough and detail-oriented
-
-**IMPORTANT - Manual Testing Mode (skipTests=true):**
-If a feature has skipTests=true:
-- DO NOT write automated tests
-- DO NOT commit changes - the user will review and commit manually
-- Still mark the feature as verified using UpdateFeatureStatus - it will automatically convert to "waiting_approval" for manual review
-- The user will manually verify and commit the changes
-
-**IMPORTANT - UpdateFeatureStatus Tool:**
-You have access to the \`mcp__automaker-tools__UpdateFeatureStatus\` tool. When the feature is complete (and all tests pass if skipTests is false), use this tool to update the feature status:
-- Call with featureId, status="verified", and summary="Description of what was done"
-- **DO NOT manually edit feature files** - this can cause race conditions and restore old state
-- The tool safely updates the status without corrupting other feature data
-- **If skipTests=true, the tool will automatically convert "verified" to "waiting_approval"** - this is correct
-
-**IMPORTANT - Feature Summary (REQUIRED):**
-When calling UpdateFeatureStatus, you MUST include a summary parameter that describes:
-- What files were modified/created
-- What functionality was added or changed
-- Any notable implementation decisions
-
-Example: summary="Added dark mode toggle. Modified: settings.tsx, theme-provider.tsx. Created useTheme hook."
-
-The summary will be displayed on the Kanban card so the user can quickly see what was done.
-
-**Testing Utilities (CRITICAL):**
-- **Create and maintain tests/utils.ts** with helper functions for finding elements and common operations
-- **Always use utilities in tests** instead of repeating selectors
-- **Add new utilities as you write tests** - if you need a helper, add it to utils.ts
-- **Update utilities when functionality changes** - keep helpers in sync with code changes
-
-This makes future tests easier to write and more maintainable!
-
-**Test Deletion Policy:**
-Tests should NOT accumulate. After a feature is verified:
-1. Run the tests to ensure they pass
-2. Delete the test file for that feature
-3. Use UpdateFeatureStatus tool to mark the feature as "verified"
-
-This prevents test brittleness as the app changes rapidly.
-
-You have full access to:
-- Read and write files
-- Run bash commands
-- Execute tests
-- Delete files (rm command)
-- Make git commits
-- Search and analyze the codebase
-- **UpdateFeatureStatus tool** (mcp__automaker-tools__UpdateFeatureStatus) - Use this to update feature status
-
-**🧠 Learning from Errors - Memory System:**
-
-If you encounter an error or issue that:
-- Took multiple attempts to debug
-- Was caused by a non-obvious codebase quirk
-- Required understanding something specific about this project
-- Could trip up future agent runs
-
-**ADD IT TO MEMORY** by appending to \`.automaker/memory.md\`:
-
-\`\`\`markdown
-### Issue: [Brief Title]
-**Problem:** [1-2 sentence description of the issue]
-**Fix:** [Concise explanation of the solution]
-\`\`\`
-
-Keep entries concise - focus on the essential information needed to avoid the issue in the future. This helps both you and other agents learn from mistakes.
-
-Focus on one feature at a time and complete it fully before finishing. Always delete tests after they pass and use the UpdateFeatureStatus tool.`;
-  }
-
-  /**
-   * Get the system prompt for verification agent
-   * @param {string} projectPath - Path to the project
-   * @param {boolean} isTDD - Whether this is Test-Driven Development mode (skipTests=false)
-   */
-  async getVerificationPrompt(projectPath, isTDD = true) {
-    // Get context files preview
-    const contextFilesPreview = projectPath
-      ? await contextManager.getContextFilesPreview(projectPath)
-      : "";
-
-    // Get memory content (lessons learned from previous runs)
-    const memoryContent = projectPath
-      ? await contextManager.getMemoryContent(projectPath)
-      : "";
-
-    // Build mode-specific instructions
-    const modeHeader = isTDD
-      ? `**🧪 MODE: Test-Driven Development (TDD)**
-You are verifying/completing features using TDD methodology. This means:
-- Run Playwright tests to verify implementation
-- Fix failing tests by updating code
-- Tests are your validation mechanism
-- Delete tests after they pass (they're for immediate verification only)`
-      : `**🔨 MODE: Manual Review (No Automated Tests)**
-You are completing features for manual user review. This means:
-- Focus on clean, working implementation
-- NO automated test writing required
-- User will manually verify the implementation
-- DO NOT commit changes - user will review and commit`;
-
-    return `You are an AI implementation and verification agent focused on completing features and ensuring they work.
-
-${modeHeader}
-${memoryContent}
-**Feature Storage:**
-Features are stored in .automaker/features/{id}/feature.json - each feature has its own folder.
-
-**THE ONLY WAY to update features:**
-Use the mcp__automaker-tools__UpdateFeatureStatus tool with featureId, status, and summary parameters.
-Do NOT manually edit feature.json files directly.
-
-${contextFilesPreview}
-
-Your role is to:
-- **Continue implementing features until they are complete** - don't stop at the first failure
-- Check if feature.skipTests is true - if so, skip automated testing and don't commit
-- Write or update code to fix failing tests (only if skipTests is false)
-- Run Playwright tests to verify feature implementations (only if skipTests is false)
-- If tests fail, analyze errors and fix the implementation (only if skipTests is false)
-- If other tests fail, verify if those tests are still accurate or should be updated or deleted (only if skipTests is false)
-- Continue rerunning tests and fixing issues until ALL tests pass (only if skipTests is false)
-- **DELETE test files after successful verification** - tests are only for immediate feature verification (only if skipTests is false)
-- **Use the UpdateFeatureStatus tool to mark features as verified** - NEVER manually edit feature files
-- **Always include a summary parameter when calling UpdateFeatureStatus** - describe what was done
-- **Update test utilities (tests/utils.ts) if functionality changed** - keep helpers in sync with code (only if skipTests is false)
-- Commit working code to git (only if skipTests is false - skipTests features require manual review)
-
-**IMPORTANT - Manual Testing Mode (skipTests=true):**
-If a feature has skipTests=true:
-- DO NOT write automated tests
-- DO NOT commit changes - the user will review and commit manually
-- Still mark the feature as verified using UpdateFeatureStatus - it will automatically convert to "waiting_approval" for manual review
-- The user will manually verify and commit the changes
-
-**IMPORTANT - UpdateFeatureStatus Tool:**
-You have access to the \`mcp__automaker-tools__UpdateFeatureStatus\` tool. When the feature is complete (and all tests pass if skipTests is false), use this tool to update the feature status:
-- Call with featureId, status="verified", and summary="Description of what was done"
-- **DO NOT manually edit feature files** - this can cause race conditions and restore old state
-- The tool safely updates the status without corrupting other feature data
-- **If skipTests=true, the tool will automatically convert "verified" to "waiting_approval"** - this is correct
-
-**IMPORTANT - Feature Summary (REQUIRED):**
-When calling UpdateFeatureStatus, you MUST include a summary parameter that describes:
-- What files were modified/created
-- What functionality was added or changed
-- Any notable implementation decisions
-
-Example: summary="Fixed login validation. Modified: auth.ts, login-form.tsx. Added password strength check."
-
-The summary will be displayed on the Kanban card so the user can quickly see what was done.
-
-**Testing Utilities:**
-- Check if tests/utils.ts needs updates based on code changes
-- If a component's selectors or behavior changed, update the corresponding utility functions
-- Add new utilities as needed for the feature's tests
-- Ensure utilities remain accurate and helpful for future tests
-
-**Test Deletion Policy:**
-Tests should NOT accumulate. After a feature is verified:
-1. Delete the test file for that feature
-2. Use UpdateFeatureStatus tool to mark the feature as "verified"
-
-This prevents test brittleness as the app changes rapidly.
-
-You have access to:
-- Read and edit files
-- Write new code or modify existing code
-- Run bash commands (especially Playwright tests)
-- Delete files (rm command)
-- Analyze test output
-- Make git commits
-- **UpdateFeatureStatus tool** (mcp__automaker-tools__UpdateFeatureStatus) - Use this to update feature status
-
-**🧠 Learning from Errors - Memory System:**
-
-If you encounter an error or issue that:
-- Took multiple attempts to debug
-- Was caused by a non-obvious codebase quirk
-- Required understanding something specific about this project
-- Could trip up future agent runs
-
-**ADD IT TO MEMORY** by appending to \`.automaker/memory.md\`:
-
-\`\`\`markdown
-### Issue: [Brief Title]
-**Problem:** [1-2 sentence description of the issue]
-**Fix:** [Concise explanation of the solution]
-\`\`\`
-
-Keep entries concise - focus on the essential information needed to avoid the issue in the future. This helps both you and other agents learn from mistakes.
-
-**CRITICAL:** Be persistent and thorough - keep iterating on the implementation until all tests pass. Don't give up after the first failure. Always delete tests after they pass, use the UpdateFeatureStatus tool with a summary, and commit your work.`;
-  }
-
-  /**
-   * Get system prompt for project analysis agent
-   */
-  getProjectAnalysisSystemPrompt() {
-    return `You are a project analysis agent that examines codebases to understand their structure, tech stack, and implemented features.
-
-Your goal is to:
-- Quickly scan and understand project structure
-- Identify programming languages, frameworks, and libraries
-- Detect existing features and capabilities
-- Update the .automaker/app_spec.txt with accurate information
-- Ensure all required .automaker files and directories exist
-
-Be efficient - don't read every file, focus on:
-- Configuration files (package.json, tsconfig.json, etc.)
-- Main entry points
-- Directory structure
-- README and documentation
-
-**Feature Storage:**
-Features are stored in .automaker/features/{id}/feature.json - each feature has its own folder.
-Use the UpdateFeatureStatus tool to manage features, not direct file edits.
-
-You have access to Read, Write, Edit, Glob, Grep, and Bash tools. Use them to explore the structure and write the necessary files.`;
-  }
-}
-
-module.exports = new PromptBuilder();

apps/app/electron/services/pty-runner.js

@@ -1,84 +0,0 @@
-const os = require("os");
-
-// Prefer prebuilt to avoid native build issues.
-const pty = require("@homebridge/node-pty-prebuilt-multiarch");
-
-/**
- * Minimal PTY helper to run CLI commands with a pseudo-terminal.
- * Useful for CLIs (like Claude) that need raw mode on Windows.
- *
- * @param {string} command Executable path
- * @param {string[]} args Arguments for the executable
- * @param {Object} options Additional spawn options
- * @param {(chunk: string) => void} [options.onData] Data callback
- * @param {string} [options.cwd] Working directory
- * @param {Object} [options.env] Extra env vars
- * @param {number} [options.cols] Terminal columns
- * @param {number} [options.rows] Terminal rows
- * @returns {Promise<{ success: boolean, exitCode: number, signal?: number, output: string, errorOutput: string }>}
- */
-function runPtyCommand(command, args = [], options = {}) {
-  const {
-    onData,
-    cwd = process.cwd(),
-    env = {},
-    cols = 120,
-    rows = 30,
-  } = options;
-
-  const mergedEnv = {
-    ...process.env,
-    TERM: process.env.TERM || "xterm-256color",
-    ...env,
-  };
-
-  return new Promise((resolve, reject) => {
-    let ptyProcess;
-
-    try {
-      ptyProcess = pty.spawn(command, args, {
-        name: os.platform() === "win32" ? "Windows.Terminal" : "xterm-color",
-        cols,
-        rows,
-        cwd,
-        env: mergedEnv,
-        useConpty: true,
-      });
-    } catch (error) {
-      return reject(error);
-    }
-
-    let output = "";
-    let errorOutput = "";
-
-    ptyProcess.onData((data) => {
-      output += data;
-      if (typeof onData === "function") {
-        onData(data);
-      }
-    });
-
-    // node-pty does not emit 'error' in practice, but guard anyway
-    if (ptyProcess.on) {
-      ptyProcess.on("error", (err) => {
-        errorOutput += err?.message || "";
-        reject(err);
-      });
-    }
-
-    ptyProcess.onExit(({ exitCode, signal }) => {
-      resolve({
-        success: exitCode === 0,
-        exitCode,
-        signal,
-        output,
-        errorOutput,
-      });
-    });
-  });
-}
-
-module.exports = {
-  runPtyCommand,
-};
-

apps/app/electron/services/worktree-manager.js

@@ -1,569 +0,0 @@
-const path = require("path");
-const fs = require("fs/promises");
-const { exec, spawn } = require("child_process");
-const { promisify } = require("util");
-
-const execAsync = promisify(exec);
-
-/**
- * Worktree Manager - Handles git worktrees for feature isolation
- *
- * This service creates isolated git worktrees for each feature, allowing:
- * - Features to be worked on in isolation without affecting the main branch
- * - Easy rollback/revert by simply deleting the worktree
- * - Checkpointing - user can see changes in the worktree before merging
- */
-class WorktreeManager {
-  constructor() {
-    // Cache for worktree info
-    this.worktreeCache = new Map();
-  }
-
-  /**
-   * Get the base worktree directory path
-   */
-  getWorktreeBasePath(projectPath) {
-    return path.join(projectPath, ".automaker", "worktrees");
-  }
-
-  /**
-   * Generate a safe branch name from feature description
-   */
-  generateBranchName(feature) {
-    // Create a slug from the description
-    const slug = feature.description
-      .toLowerCase()
-      .replace(/[^a-z0-9\s-]/g, "") // Remove special chars
-      .replace(/\s+/g, "-") // Replace spaces with hyphens
-      .substring(0, 40); // Limit length
-
-    // Add feature ID for uniqueness
-    const shortId = feature.id.replace("feature-", "").substring(0, 12);
-    return `feature/${shortId}-${slug}`;
-  }
-
-  /**
-   * Check if the project is a git repository
-   */
-  async isGitRepo(projectPath) {
-    try {
-      await execAsync("git rev-parse --is-inside-work-tree", { cwd: projectPath });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Get the current branch name
-   */
-  async getCurrentBranch(projectPath) {
-    try {
-      const { stdout } = await execAsync("git rev-parse --abbrev-ref HEAD", { cwd: projectPath });
-      return stdout.trim();
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to get current branch:", error);
-      return null;
-    }
-  }
-
-  /**
-   * Check if a branch exists (local or remote)
-   */
-  async branchExists(projectPath, branchName) {
-    try {
-      await execAsync(`git rev-parse --verify ${branchName}`, { cwd: projectPath });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * List all existing worktrees
-   */
-  async listWorktrees(projectPath) {
-    try {
-      const { stdout } = await execAsync("git worktree list --porcelain", { cwd: projectPath });
-      const worktrees = [];
-      const lines = stdout.split("\n");
-
-      let currentWorktree = null;
-      for (const line of lines) {
-        if (line.startsWith("worktree ")) {
-          if (currentWorktree) {
-            worktrees.push(currentWorktree);
-          }
-          currentWorktree = { path: line.replace("worktree ", "") };
-        } else if (line.startsWith("branch ") && currentWorktree) {
-          currentWorktree.branch = line.replace("branch refs/heads/", "");
-        } else if (line.startsWith("HEAD ") && currentWorktree) {
-          currentWorktree.head = line.replace("HEAD ", "");
-        }
-      }
-      if (currentWorktree) {
-        worktrees.push(currentWorktree);
-      }
-
-      return worktrees;
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to list worktrees:", error);
-      return [];
-    }
-  }
-
-  /**
-   * Create a worktree for a feature
-   * @param {string} projectPath - Path to the main project
-   * @param {object} feature - Feature object with id and description
-   * @returns {object} - { success, worktreePath, branchName, error }
-   */
-  async createWorktree(projectPath, feature) {
-    console.log(`[WorktreeManager] Creating worktree for feature: ${feature.id}`);
-
-    // Check if project is a git repo
-    if (!await this.isGitRepo(projectPath)) {
-      return { success: false, error: "Project is not a git repository" };
-    }
-
-    const branchName = this.generateBranchName(feature);
-    const worktreeBasePath = this.getWorktreeBasePath(projectPath);
-    const worktreePath = path.join(worktreeBasePath, branchName.replace("feature/", ""));
-
-    try {
-      // Ensure worktree directory exists
-      await fs.mkdir(worktreeBasePath, { recursive: true });
-
-      // Check if worktree already exists
-      const worktrees = await this.listWorktrees(projectPath);
-      const existingWorktree = worktrees.find(
-        w => w.path === worktreePath || w.branch === branchName
-      );
-
-      if (existingWorktree) {
-        console.log(`[WorktreeManager] Worktree already exists for feature: ${feature.id}`);
-        return {
-          success: true,
-          worktreePath: existingWorktree.path,
-          branchName: existingWorktree.branch,
-          existed: true,
-        };
-      }
-
-      // Get current branch to base the new branch on
-      const baseBranch = await this.getCurrentBranch(projectPath);
-      if (!baseBranch) {
-        return { success: false, error: "Could not determine current branch" };
-      }
-
-      // Check if branch already exists
-      const branchExists = await this.branchExists(projectPath, branchName);
-
-      if (branchExists) {
-        // Use existing branch
-        console.log(`[WorktreeManager] Using existing branch: ${branchName}`);
-        await execAsync(`git worktree add "${worktreePath}" ${branchName}`, { cwd: projectPath });
-      } else {
-        // Create new worktree with new branch
-        console.log(`[WorktreeManager] Creating new branch: ${branchName} based on ${baseBranch}`);
-        await execAsync(`git worktree add -b ${branchName} "${worktreePath}" ${baseBranch}`, { cwd: projectPath });
-      }
-
-      // Copy .automaker directory to worktree (except worktrees directory itself to avoid recursion)
-      const automakerSrc = path.join(projectPath, ".automaker");
-      const automakerDst = path.join(worktreePath, ".automaker");
-
-      try {
-        await fs.mkdir(automakerDst, { recursive: true });
-
-        // Note: Features are stored in .automaker/features/{id}/feature.json
-        // These are managed by the main project, not copied to worktrees
-
-        // Copy app_spec.txt if it exists
-        const appSpecSrc = path.join(automakerSrc, "app_spec.txt");
-        const appSpecDst = path.join(automakerDst, "app_spec.txt");
-        try {
-          const content = await fs.readFile(appSpecSrc, "utf-8");
-          await fs.writeFile(appSpecDst, content, "utf-8");
-        } catch {
-          // App spec might not exist yet
-        }
-
-        // Copy categories.json if it exists
-        const categoriesSrc = path.join(automakerSrc, "categories.json");
-        const categoriesDst = path.join(automakerDst, "categories.json");
-        try {
-          const content = await fs.readFile(categoriesSrc, "utf-8");
-          await fs.writeFile(categoriesDst, content, "utf-8");
-        } catch {
-          // Categories might not exist yet
-        }
-      } catch (error) {
-        console.warn("[WorktreeManager] Failed to copy .automaker directory:", error);
-      }
-
-      // Store worktree info in cache
-      this.worktreeCache.set(feature.id, {
-        worktreePath,
-        branchName,
-        createdAt: new Date().toISOString(),
-        baseBranch,
-      });
-
-      console.log(`[WorktreeManager] Worktree created at: ${worktreePath}`);
-      return {
-        success: true,
-        worktreePath,
-        branchName,
-        baseBranch,
-        existed: false,
-      };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to create worktree:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Get worktree info for a feature
-   */
-  async getWorktreeInfo(projectPath, featureId) {
-    // Check cache first
-    if (this.worktreeCache.has(featureId)) {
-      return { success: true, ...this.worktreeCache.get(featureId) };
-    }
-
-    // Scan worktrees to find matching one
-    const worktrees = await this.listWorktrees(projectPath);
-    const worktreeBasePath = this.getWorktreeBasePath(projectPath);
-
-    for (const worktree of worktrees) {
-      // Check if this worktree is in our worktree directory
-      if (worktree.path.startsWith(worktreeBasePath)) {
-        // Check if the feature ID is in the branch name
-        const shortId = featureId.replace("feature-", "").substring(0, 12);
-        if (worktree.branch && worktree.branch.includes(shortId)) {
-          const info = {
-            worktreePath: worktree.path,
-            branchName: worktree.branch,
-            head: worktree.head,
-          };
-          this.worktreeCache.set(featureId, info);
-          return { success: true, ...info };
-        }
-      }
-    }
-
-    return { success: false, error: "Worktree not found" };
-  }
-
-  /**
-   * Remove a worktree for a feature
-   * This effectively reverts all changes made by the agent
-   */
-  async removeWorktree(projectPath, featureId, deleteBranch = false) {
-    console.log(`[WorktreeManager] Removing worktree for feature: ${featureId}`);
-
-    const worktreeInfo = await this.getWorktreeInfo(projectPath, featureId);
-    if (!worktreeInfo.success) {
-      console.log(`[WorktreeManager] No worktree found for feature: ${featureId}`);
-      return { success: true, message: "No worktree to remove" };
-    }
-
-    const { worktreePath, branchName } = worktreeInfo;
-
-    try {
-      // Remove the worktree
-      await execAsync(`git worktree remove "${worktreePath}" --force`, { cwd: projectPath });
-      console.log(`[WorktreeManager] Worktree removed: ${worktreePath}`);
-
-      // Optionally delete the branch too
-      if (deleteBranch && branchName) {
-        try {
-          await execAsync(`git branch -D ${branchName}`, { cwd: projectPath });
-          console.log(`[WorktreeManager] Branch deleted: ${branchName}`);
-        } catch (error) {
-          console.warn(`[WorktreeManager] Could not delete branch ${branchName}:`, error.message);
-        }
-      }
-
-      // Remove from cache
-      this.worktreeCache.delete(featureId);
-
-      return { success: true, removedPath: worktreePath, removedBranch: deleteBranch ? branchName : null };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to remove worktree:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Get status of changes in a worktree
-   */
-  async getWorktreeStatus(worktreePath) {
-    try {
-      const { stdout: statusOutput } = await execAsync("git status --porcelain", { cwd: worktreePath });
-      const { stdout: diffStat } = await execAsync("git diff --stat", { cwd: worktreePath });
-      const { stdout: commitLog } = await execAsync("git log --oneline -10", { cwd: worktreePath });
-
-      const files = statusOutput.trim().split("\n").filter(Boolean);
-      const commits = commitLog.trim().split("\n").filter(Boolean);
-
-      return {
-        success: true,
-        modifiedFiles: files.length,
-        files: files.slice(0, 20), // Limit to 20 files
-        diffStat: diffStat.trim(),
-        recentCommits: commits.slice(0, 5), // Last 5 commits
-      };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to get worktree status:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Get detailed file diff content for a worktree
-   * Returns unified diff format for all changes
-   */
-  async getFileDiffs(worktreePath) {
-    try {
-      // Get both staged and unstaged diffs
-      const { stdout: unstagedDiff } = await execAsync("git diff --no-color", {
-        cwd: worktreePath,
-        maxBuffer: 10 * 1024 * 1024 // 10MB buffer for large diffs
-      });
-      const { stdout: stagedDiff } = await execAsync("git diff --cached --no-color", {
-        cwd: worktreePath,
-        maxBuffer: 10 * 1024 * 1024
-      });
-
-      // Get list of files with their status
-      const { stdout: statusOutput } = await execAsync("git status --porcelain", { cwd: worktreePath });
-      const files = statusOutput.trim().split("\n").filter(Boolean);
-
-      // Parse file statuses
-      const fileStatuses = files.map(line => {
-        const status = line.substring(0, 2);
-        const filePath = line.substring(3);
-        return {
-          status: status.trim() || 'M',
-          path: filePath,
-          statusText: this.getStatusText(status)
-        };
-      });
-
-      // Combine diffs
-      const combinedDiff = [stagedDiff, unstagedDiff].filter(Boolean).join("\n");
-
-      return {
-        success: true,
-        diff: combinedDiff,
-        files: fileStatuses,
-        hasChanges: files.length > 0
-      };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to get file diffs:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Get human-readable status text from git status code
-   */
-  getStatusText(status) {
-    const statusMap = {
-      'M': 'Modified',
-      'A': 'Added',
-      'D': 'Deleted',
-      'R': 'Renamed',
-      'C': 'Copied',
-      'U': 'Updated',
-      '?': 'Untracked',
-      '!': 'Ignored'
-    };
-    const firstChar = status.charAt(0);
-    const secondChar = status.charAt(1);
-    return statusMap[firstChar] || statusMap[secondChar] || 'Changed';
-  }
-
-  /**
-   * Get diff for a specific file in a worktree
-   */
-  async getFileDiff(worktreePath, filePath) {
-    try {
-      // Try to get unstaged diff first, then staged if no unstaged changes
-      let diff = '';
-      try {
-        const { stdout } = await execAsync(`git diff --no-color -- "${filePath}"`, {
-          cwd: worktreePath,
-          maxBuffer: 5 * 1024 * 1024
-        });
-        diff = stdout;
-      } catch {
-        // File might be staged
-      }
-
-      if (!diff) {
-        try {
-          const { stdout } = await execAsync(`git diff --cached --no-color -- "${filePath}"`, {
-            cwd: worktreePath,
-            maxBuffer: 5 * 1024 * 1024
-          });
-          diff = stdout;
-        } catch {
-          // File might be untracked, show the content
-        }
-      }
-
-      // If still no diff, might be an untracked file - show the content
-      if (!diff) {
-        try {
-          const fullPath = path.join(worktreePath, filePath);
-          const content = await fs.readFile(fullPath, 'utf-8');
-          diff = `+++ ${filePath} (new file)\n${content.split('\n').map(l => '+' + l).join('\n')}`;
-        } catch {
-          diff = '(Unable to read file content)';
-        }
-      }
-
-      return {
-        success: true,
-        diff,
-        filePath
-      };
-    } catch (error) {
-      console.error(`[WorktreeManager] Failed to get diff for ${filePath}:`, error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Merge worktree changes back to the main branch
-   */
-  async mergeWorktree(projectPath, featureId, options = {}) {
-    console.log(`[WorktreeManager] Merging worktree for feature: ${featureId}`);
-
-    const worktreeInfo = await this.getWorktreeInfo(projectPath, featureId);
-    if (!worktreeInfo.success) {
-      return { success: false, error: "Worktree not found" };
-    }
-
-    const { branchName, worktreePath } = worktreeInfo;
-    const baseBranch = await this.getCurrentBranch(projectPath);
-
-    try {
-      // First commit any uncommitted changes in the worktree
-      const { stdout: status } = await execAsync("git status --porcelain", { cwd: worktreePath });
-      if (status.trim()) {
-        // There are uncommitted changes - commit them
-        await execAsync("git add -A", { cwd: worktreePath });
-        const commitMsg = options.commitMessage || `feat: complete ${featureId}`;
-        await execAsync(`git commit -m "${commitMsg}"`, { cwd: worktreePath });
-      }
-
-      // Merge the feature branch into the current branch in the main repo
-      if (options.squash) {
-        await execAsync(`git merge --squash ${branchName}`, { cwd: projectPath });
-        const squashMsg = options.squashMessage || `feat: ${featureId} - squashed merge`;
-        await execAsync(`git commit -m "${squashMsg}"`, { cwd: projectPath });
-      } else {
-        await execAsync(`git merge ${branchName} --no-ff -m "Merge ${branchName}"`, { cwd: projectPath });
-      }
-
-      console.log(`[WorktreeManager] Successfully merged ${branchName} into ${baseBranch}`);
-
-      // Optionally cleanup worktree after merge
-      if (options.cleanup) {
-        await this.removeWorktree(projectPath, featureId, true);
-      }
-
-      return {
-        success: true,
-        mergedBranch: branchName,
-        intoBranch: baseBranch,
-      };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to merge worktree:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Sync changes from main branch to worktree (rebase or merge)
-   */
-  async syncWorktree(projectPath, featureId, method = "rebase") {
-    console.log(`[WorktreeManager] Syncing worktree for feature: ${featureId}`);
-
-    const worktreeInfo = await this.getWorktreeInfo(projectPath, featureId);
-    if (!worktreeInfo.success) {
-      return { success: false, error: "Worktree not found" };
-    }
-
-    const { worktreePath, baseBranch } = worktreeInfo;
-
-    try {
-      if (method === "rebase") {
-        await execAsync(`git rebase ${baseBranch}`, { cwd: worktreePath });
-      } else {
-        await execAsync(`git merge ${baseBranch}`, { cwd: worktreePath });
-      }
-
-      return { success: true, method };
-    } catch (error) {
-      console.error("[WorktreeManager] Failed to sync worktree:", error);
-      return { success: false, error: error.message };
-    }
-  }
-
-  /**
-   * Get list of all feature worktrees
-   */
-  async getAllFeatureWorktrees(projectPath) {
-    const worktrees = await this.listWorktrees(projectPath);
-    const worktreeBasePath = this.getWorktreeBasePath(projectPath);
-
-    return worktrees.filter(w =>
-      w.path.startsWith(worktreeBasePath) &&
-      w.branch &&
-      w.branch.startsWith("feature/")
-    );
-  }
-
-  /**
-   * Cleanup orphaned worktrees (worktrees without matching features)
-   */
-  async cleanupOrphanedWorktrees(projectPath, activeFeatureIds) {
-    console.log("[WorktreeManager] Cleaning up orphaned worktrees...");
-
-    const worktrees = await this.getAllFeatureWorktrees(projectPath);
-    const cleaned = [];
-
-    for (const worktree of worktrees) {
-      // Extract feature ID from branch name
-      const branchParts = worktree.branch.replace("feature/", "").split("-");
-      const shortId = branchParts[0];
-
-      // Check if any active feature has this short ID
-      const hasMatchingFeature = activeFeatureIds.some(id => {
-        const featureShortId = id.replace("feature-", "").substring(0, 12);
-        return featureShortId === shortId;
-      });
-
-      if (!hasMatchingFeature) {
-        console.log(`[WorktreeManager] Removing orphaned worktree: ${worktree.path}`);
-        try {
-          await execAsync(`git worktree remove "${worktree.path}" --force`, { cwd: projectPath });
-          await execAsync(`git branch -D ${worktree.branch}`, { cwd: projectPath });
-          cleaned.push(worktree.path);
-        } catch (error) {
-          console.warn(`[WorktreeManager] Failed to cleanup worktree ${worktree.path}:`, error.message);
-        }
-      }
-    }
-
-    return { success: true, cleaned };
-  }
-}
-
-module.exports = new WorktreeManager();

apps/app/next.config.ts

@@ -1,6 +1,7 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
+  output: "export",
   env: {
     CLAUDE_CODE_OAUTH_TOKEN: process.env.CLAUDE_CODE_OAUTH_TOKEN || "",
   },

apps/app/package.json

@@ -20,20 +20,26 @@
     "dev:electron": "concurrently \"next dev -p 3007\" \"wait-on http://localhost:3007 && electron .\"",
     "dev:electron:debug": "concurrently \"next dev -p 3007\" \"wait-on http://localhost:3007 && OPEN_DEVTOOLS=true electron .\"",
     "build": "next build",
-    "build:electron": "next build && electron-builder",
+    "build:electron": "node scripts/prepare-server.js && next build && electron-builder",
+    "build:electron:win": "node scripts/prepare-server.js && next build && electron-builder --win",
+    "build:electron:mac": "node scripts/prepare-server.js && next build && electron-builder --mac",
+    "build:electron:linux": "node scripts/prepare-server.js && next build && electron-builder --linux",
+    "postinstall": "electron-builder install-app-deps",
     "start": "next start",
     "lint": "eslint",
+    "pretest": "node scripts/setup-e2e-fixtures.js",
     "test": "playwright test",
     "test:headed": "playwright test --headed",
     "dev:electron:wsl": "concurrently \"next dev -p 3007\" \"wait-on http://localhost:3007 && electron . --no-sandbox --disable-gpu\"",
     "dev:electron:wsl:gpu": "concurrently \"next dev -p 3007\" \"wait-on http://localhost:3007 && MESA_D3D12_DEFAULT_ADAPTER_NAME=NVIDIA electron . --no-sandbox --disable-gpu-sandbox\""
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.1.61",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
+    "@lezer/highlight": "^1.2.3",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
@@ -44,20 +50,36 @@
     "@radix-ui/react-tabs": "^1.1.13",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@tanstack/react-query": "^5.90.12",
+    "@uiw/react-codemirror": "^4.25.4",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-webgl": "^0.18.0",
+    "@xterm/xterm": "^5.5.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "dotenv": "^17.2.3",
     "geist": "^1.5.1",
     "lucide-react": "^0.556.0",
-    "next": "16.0.7",
+    "next": "^16.0.10",
     "react": "19.2.0",
     "react-dom": "19.2.0",
     "react-markdown": "^10.1.0",
+    "react-resizable-panels": "^3.0.6",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.4.0",
     "zustand": "^5.0.9"
   },
+  "optionalDependencies": {
+    "lightningcss-darwin-arm64": "^1.29.2",
+    "lightningcss-darwin-x64": "^1.29.2",
+    "lightningcss-linux-arm-gnueabihf": "^1.29.2",
+    "lightningcss-linux-arm64-gnu": "^1.29.2",
+    "lightningcss-linux-arm64-musl": "^1.29.2",
+    "lightningcss-linux-x64-gnu": "^1.29.2",
+    "lightningcss-linux-x64-musl": "^1.29.2",
+    "lightningcss-win32-arm64-msvc": "^1.29.2",
+    "lightningcss-win32-x64-msvc": "^1.29.2"
+  },
   "devDependencies": {
     "@electron/rebuild": "^4.0.2",
     "@playwright/test": "^1.57.0",
@@ -66,32 +88,44 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "concurrently": "^9.2.1",
-    "electron": "^39.2.6",
+    "electron": "39.2.7",
     "electron-builder": "^26.0.12",
     "eslint": "^9",
     "eslint-config-next": "16.0.7",
     "tailwindcss": "^4",
     "tw-animate-css": "^1.4.0",
-    "typescript": "^5",
+    "typescript": "5.9.3",
     "wait-on": "^9.0.3"
   },
   "build": {
     "appId": "com.automaker.app",
     "productName": "Automaker",
     "artifactName": "${productName}-${version}-${arch}.${ext}",
+    "afterPack": "./scripts/rebuild-server-natives.js",
     "directories": {
       "output": "dist"
     },
     "files": [
       "electron/**/*",
-      ".next/**/*",
+      "out/**/*",
       "public/**/*",
-      "!node_modules/**/*",
-      "node_modules/@anthropic-ai/**/*"
+      "!node_modules/**/*"
     ],
     "extraResources": [
       {
-        "from": ".env",
+        "from": "server-bundle/dist",
+        "to": "server"
+      },
+      {
+        "from": "server-bundle/node_modules",
+        "to": "server/node_modules"
+      },
+      {
+        "from": "server-bundle/package.json",
+        "to": "server/package.json"
+      },
+      {
+        "from": "../../.env",
         "to": ".env",
         "filter": [
           "**/*"
@@ -127,7 +161,7 @@
           ]
         }
       ],
-      "icon": "public/logo_larger.png"
+      "icon": "public/icon.ico"
     },
     "linux": {
       "target": [

apps/app/playwright.config.ts

@@ -30,6 +30,10 @@ export default defineConfig({
           url: `http://localhost:${port}`,
           reuseExistingServer: !process.env.CI,
           timeout: 120000,
+          env: {
+            ...process.env,
+            NEXT_PUBLIC_SKIP_SETUP: "true",
+          },
         },
       }),
 });

apps/app/public/automaker.svg

@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256" role="img" aria-label="Code icon">
+  <defs>
+    <linearGradient id="bg" x1="0" y1="0" x2="256" y2="256" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#6B5BFF"></stop>
+      <stop offset="100%" stop-color="#2EC7FF"></stop>
+    </linearGradient>
+
+    <filter id="iconShadow" x="-20%" y="-20%" width="140%" height="140%">
+      <feDropShadow dx="0" dy="4" stdDeviation="4" flood-color="#000000" flood-opacity="0.25"></feDropShadow>
+    </filter>
+  </defs>
+
+  <!-- Rounded square background -->
+  <rect x="16" y="16" width="224" height="224" rx="56" fill="url(#bg)"></rect>
+
+  <!-- </> icon (slightly reduced overall size) -->
+  <g fill="none" stroke="#FFFFFF" stroke-width="20" stroke-linecap="round" stroke-linejoin="round" filter="url(#iconShadow)">
+    <!-- Left bracket < -->
+    <path d="M92 92 L52 128 L92 164"></path>
+
+    <!-- Slash / -->
+    <path d="M144 72 L116 184"></path>
+
+    <!-- Right bracket > -->
+    <path d="M164 92 L204 128 L164 164"></path>
+  </g>
+</svg>

apps/app/scripts/prepare-server.js

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+
+/**
+ * This script prepares the server for bundling with Electron.
+ * It copies the server dist and installs production dependencies
+ * in a way that works with npm workspaces.
+ */
+
+import { execSync } from 'child_process';
+import { cpSync, existsSync, mkdirSync, rmSync, writeFileSync, readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const APP_DIR = join(__dirname, '..');
+const SERVER_DIR = join(APP_DIR, '..', 'server');
+const BUNDLE_DIR = join(APP_DIR, 'server-bundle');
+
+console.log('🔧 Preparing server for Electron bundling...\n');
+
+// Step 1: Clean up previous bundle
+if (existsSync(BUNDLE_DIR)) {
+  console.log('🗑️  Cleaning previous server-bundle...');
+  rmSync(BUNDLE_DIR, { recursive: true });
+}
+mkdirSync(BUNDLE_DIR, { recursive: true });
+
+// Step 2: Build the server TypeScript
+console.log('📦 Building server TypeScript...');
+execSync('npm run build', { cwd: SERVER_DIR, stdio: 'inherit' });
+
+// Step 3: Copy server dist
+console.log('📋 Copying server dist...');
+cpSync(join(SERVER_DIR, 'dist'), join(BUNDLE_DIR, 'dist'), { recursive: true });
+
+// Step 4: Create a minimal package.json for the server
+console.log('📝 Creating server package.json...');
+const serverPkg = JSON.parse(readFileSync(join(SERVER_DIR, 'package.json'), 'utf-8'));
+
+const bundlePkg = {
+  name: '@automaker/server-bundle',
+  version: serverPkg.version,
+  type: 'module',
+  main: 'dist/index.js',
+  dependencies: serverPkg.dependencies
+};
+
+writeFileSync(
+  join(BUNDLE_DIR, 'package.json'),
+  JSON.stringify(bundlePkg, null, 2)
+);
+
+// Step 5: Install production dependencies
+console.log('📥 Installing server production dependencies...');
+execSync('npm install --omit=dev', {
+  cwd: BUNDLE_DIR,
+  stdio: 'inherit',
+  env: {
+    ...process.env,
+    // Prevent npm from using workspace resolution
+    npm_config_workspace: ''
+  }
+});
+
+// Step 6: 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...');
+try {
+  execSync('npm rebuild', {
+    cwd: BUNDLE_DIR,
+    stdio: 'inherit'
+  });
+  console.log('✅ Native modules rebuilt successfully');
+} catch (error) {
+  console.warn('⚠️  Warning: Failed to rebuild native modules. Terminal functionality may not work.');
+  console.warn('   Error:', error.message);
+}
+
+console.log('\n✅ Server prepared for bundling at:', BUNDLE_DIR);

apps/app/scripts/rebuild-server-natives.js

@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+
+/**
+ * Electron-builder afterPack hook
+ * Rebuilds native modules in the server bundle for the target architecture
+ */
+
+const { exec } = require('child_process');
+const { promisify } = require('util');
+const path = require('path');
+
+const execAsync = promisify(exec);
+
+exports.default = async function(context) {
+  const { appOutDir, electronPlatformName, arch, packager } = context;
+  const electronVersion = packager.config.electronVersion;
+
+  // Convert arch to string if it's a number (electron-builder sometimes passes indices)
+  const archNames = ['ia32', 'x64', 'armv7l', 'arm64', 'universal'];
+  const archStr = typeof arch === 'number' ? archNames[arch] : arch;
+
+  console.log(`\n🔨 Rebuilding server native modules for ${electronPlatformName}-${archStr}...`);
+
+  // Path to server node_modules in the packaged app
+  let serverNodeModulesPath;
+  if (electronPlatformName === 'darwin') {
+    serverNodeModulesPath = path.join(
+      appOutDir,
+      `${packager.appInfo.productName}.app`,
+      'Contents',
+      'Resources',
+      'server',
+      'node_modules'
+    );
+  } else if (electronPlatformName === 'win32') {
+    serverNodeModulesPath = path.join(
+      appOutDir,
+      'resources',
+      'server',
+      'node_modules'
+    );
+  } else {
+    serverNodeModulesPath = path.join(
+      appOutDir,
+      'resources',
+      'server',
+      'node_modules'
+    );
+  }
+
+  try {
+    // Rebuild native modules for the target architecture
+    const rebuildCmd = `npx --yes @electron/rebuild --version=${electronVersion} --arch=${archStr} --force --module-dir="${serverNodeModulesPath}/.."`;
+
+    console.log(`   Command: ${rebuildCmd}`);
+
+    const { stdout, stderr } = await execAsync(rebuildCmd);
+    if (stdout) console.log(stdout);
+    if (stderr) console.error(stderr);
+
+    console.log(`✅ Server native modules rebuilt successfully for ${archStr}\n`);
+  } catch (error) {
+    console.error(`❌ Failed to rebuild server native modules:`, error.message);
+    // Don't fail the build, just warn
+  }
+};

apps/app/scripts/setup-e2e-fixtures.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+/**
+ * Setup script for E2E test fixtures
+ * Creates the necessary test fixture directories and files before running Playwright tests
+ */
+
+import * as fs from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Resolve workspace root (apps/app/scripts -> workspace root)
+const WORKSPACE_ROOT = path.resolve(__dirname, "../../..");
+const FIXTURE_PATH = path.join(WORKSPACE_ROOT, "test/fixtures/projectA");
+const SPEC_FILE_PATH = path.join(FIXTURE_PATH, ".automaker/app_spec.txt");
+
+const SPEC_CONTENT = `<app_spec>
+  <name>Test Project A</name>
+  <description>A test fixture project for Playwright testing</description>
+  <tech_stack>
+    <item>TypeScript</item>
+    <item>React</item>
+  </tech_stack>
+</app_spec>
+`;
+
+function setupFixtures() {
+  console.log("Setting up E2E test fixtures...");
+  console.log(`Workspace root: ${WORKSPACE_ROOT}`);
+  console.log(`Fixture path: ${FIXTURE_PATH}`);
+
+  // Create fixture directory
+  const specDir = path.dirname(SPEC_FILE_PATH);
+  if (!fs.existsSync(specDir)) {
+    fs.mkdirSync(specDir, { recursive: true });
+    console.log(`Created directory: ${specDir}`);
+  }
+
+  // Create app_spec.txt
+  fs.writeFileSync(SPEC_FILE_PATH, SPEC_CONTENT);
+  console.log(`Created fixture file: ${SPEC_FILE_PATH}`);
+
+  console.log("E2E test fixtures setup complete!");
+}
+
+setupFixtures();

apps/app/src/app/api/chat/route.ts

@@ -1,172 +0,0 @@
-import {
-  query,
-  Options,
-  SDKAssistantMessage,
-} from "@anthropic-ai/claude-agent-sdk";
-import { NextRequest, NextResponse } from "next/server";
-import path from "path";
-
-const systemPrompt = `You are an AI assistant helping users build software. You are part of the Automaker application,
-which is designed to help developers plan, design, and implement software projects autonomously.
-
-Your role is to:
-- Help users define their project requirements and specifications
-- Ask clarifying questions to better understand their needs
-- Suggest technical approaches and architectures
-- Guide them through the development process
-- Be conversational and helpful
-- Write, edit, and modify code files as requested
-- Execute commands and tests
-- Search and analyze the codebase
-
-When discussing projects, help users think through:
-- Core functionality and features
-- Technical stack choices
-- Data models and architecture
-- User experience considerations
-- Testing strategies
-
-You have full access to the codebase and can:
-- Read files to understand existing code
-- Write new files
-- Edit existing files
-- Run bash commands
-- Search for code patterns
-- Execute tests and builds`;
-
-export async function POST(request: NextRequest) {
-  try {
-    const { messages, workingDirectory } = await request.json();
-
-    console.log(
-      "[API] CLAUDE_CODE_OAUTH_TOKEN present:",
-      !!process.env.CLAUDE_CODE_OAUTH_TOKEN
-    );
-
-    if (!process.env.CLAUDE_CODE_OAUTH_TOKEN) {
-      return NextResponse.json(
-        { error: "CLAUDE_CODE_OAUTH_TOKEN not configured" },
-        { status: 500 }
-      );
-    }
-
-    // Get the last user message
-    const lastMessage = messages[messages.length - 1];
-
-    // Determine working directory - default to parent of app directory
-    const cwd = workingDirectory || path.resolve(process.cwd(), "..");
-
-    console.log("[API] Working directory:", cwd);
-
-    // Create query with options that enable code modification
-    const options: Options = {
-      // model: "claude-sonnet-4-20250514",
-      model: "claude-opus-4-5-20251101",
-      systemPrompt,
-      maxTurns: 20,
-      cwd,
-      // Enable all core tools for code modification
-      allowedTools: [
-        "Read",
-        "Write",
-        "Edit",
-        "Glob",
-        "Grep",
-        "Bash",
-        "WebSearch",
-        "WebFetch",
-      ],
-      // Auto-accept file edits within the working directory
-      permissionMode: "acceptEdits",
-      // Enable sandbox for safer bash execution
-      sandbox: {
-        enabled: true,
-        autoAllowBashIfSandboxed: true,
-      },
-    };
-
-    // Convert message history to SDK format to preserve conversation context
-    // Include both user and assistant messages for full context
-    const sessionId = `api-session-${Date.now()}`;
-    const conversationMessages = messages.map(
-      (msg: { role: string; content: string }) => {
-        if (msg.role === "user") {
-          return {
-            type: "user" as const,
-            message: {
-              role: "user" as const,
-              content: msg.content,
-            },
-            parent_tool_use_id: null,
-            session_id: sessionId,
-          };
-        } else {
-          // Assistant message
-          return {
-            type: "assistant" as const,
-            message: {
-              role: "assistant" as const,
-              content: [
-                {
-                  type: "text" as const,
-                  text: msg.content,
-                },
-              ],
-            },
-            session_id: sessionId,
-          };
-        }
-      }
-    );
-
-    // Execute query with full conversation context
-    const queryResult = query({
-      prompt:
-        conversationMessages.length > 0
-          ? conversationMessages
-          : lastMessage.content,
-      options,
-    });
-
-    let responseText = "";
-    const toolUses: Array<{ name: string; input: unknown }> = [];
-
-    // Collect the response from the async generator
-    for await (const msg of queryResult) {
-      if (msg.type === "assistant") {
-        const assistantMsg = msg as SDKAssistantMessage;
-        if (assistantMsg.message.content) {
-          for (const block of assistantMsg.message.content) {
-            if (block.type === "text") {
-              responseText += block.text;
-            } else if (block.type === "tool_use") {
-              // Track tool usage for transparency
-              toolUses.push({
-                name: block.name,
-                input: block.input,
-              });
-            }
-          }
-        }
-      } else if (msg.type === "result") {
-        if (msg.subtype === "success") {
-          if (msg.result) {
-            responseText = msg.result;
-          }
-        }
-      }
-    }
-
-    return NextResponse.json({
-      content: responseText || "Sorry, I couldn't generate a response.",
-      toolUses: toolUses.length > 0 ? toolUses : undefined,
-    });
-  } catch (error: unknown) {
-    console.error("Claude API error:", error);
-    const errorMessage =
-      error instanceof Error
-        ? error.message
-        : "Failed to get response from Claude";
-    return NextResponse.json({ error: errorMessage }, { status: 500 });
-  }
-}

apps/app/src/app/globals.css

@@ -12,6 +12,7 @@
 @custom-variant catppuccin (&:is(.catppuccin *));
 @custom-variant onedark (&:is(.onedark *));
 @custom-variant synthwave (&:is(.synthwave *));
+@custom-variant red (&:is(.red *));
 
 @theme inline {
   --color-background: var(--background);
@@ -78,6 +79,19 @@
   --color-running-indicator: var(--running-indicator);
   --color-running-indicator-text: var(--running-indicator-text);
 
+  /* Status colors */
+  --color-status-success: var(--status-success);
+  --color-status-success-bg: var(--status-success-bg);
+  --color-status-warning: var(--status-warning);
+  --color-status-warning-bg: var(--status-warning-bg);
+  --color-status-error: var(--status-error);
+  --color-status-error-bg: var(--status-error-bg);
+  --color-status-info: var(--status-info);
+  --color-status-info-bg: var(--status-info-bg);
+  --color-status-backlog: var(--status-backlog);
+  --color-status-in-progress: var(--status-in-progress);
+  --color-status-waiting: var(--status-waiting);
+
   /* Border radius */
   --radius-sm: calc(var(--radius) - 4px);
   --radius-md: calc(var(--radius) - 2px);
@@ -141,6 +155,125 @@
   /* Running indicator - Purple */
   --running-indicator: oklch(0.55 0.25 265);
   --running-indicator-text: oklch(0.6 0.22 265);
+
+  /* Status colors - Light mode */
+  --status-success: oklch(0.55 0.2 140);
+  --status-success-bg: oklch(0.55 0.2 140 / 0.15);
+  --status-warning: oklch(0.7 0.15 70);
+  --status-warning-bg: oklch(0.7 0.15 70 / 0.15);
+  --status-error: oklch(0.55 0.22 25);
+  --status-error-bg: oklch(0.55 0.22 25 / 0.15);
+  --status-info: oklch(0.55 0.2 230);
+  --status-info-bg: oklch(0.55 0.2 230 / 0.15);
+  --status-backlog: oklch(0.5 0 0);
+  --status-in-progress: oklch(0.7 0.15 70);
+  --status-waiting: oklch(0.65 0.18 50);
+
+  /* Shadow tokens */
+  --shadow-xs: 0 1px 2px rgba(0, 0, 0, 0.05);
+  --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06);
+  --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+  --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+  --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+
+  /* Transition tokens */
+  --transition-fast: 150ms ease;
+  --transition-normal: 200ms ease;
+  --transition-slow: 300ms ease-out;
+}
+
+/* Apply dark mode immediately based on system preference (before JS runs) */
+@media (prefers-color-scheme: dark) {
+  :root {
+    /* Deep dark backgrounds - zinc-950 family */
+    --background: oklch(0.04 0 0); /* zinc-950 */
+    --background-50: oklch(0.04 0 0 / 0.5); /* zinc-950/50 */
+    --background-80: oklch(0.04 0 0 / 0.8); /* zinc-950/80 */
+
+    /* Text colors following hierarchy */
+    --foreground: oklch(1 0 0); /* text-white */
+    --foreground-secondary: oklch(0.588 0 0); /* text-zinc-400 */
+    --foreground-muted: oklch(0.525 0 0); /* text-zinc-500 */
+
+    /* Card and popover backgrounds */
+    --card: oklch(0.14 0 0);
+    --card-foreground: oklch(1 0 0);
+    --popover: oklch(0.10 0 0);
+    --popover-foreground: oklch(1 0 0);
+
+    /* Brand colors - purple/violet theme */
+    --primary: oklch(0.55 0.25 265);
+    --primary-foreground: oklch(1 0 0);
+    --brand-400: oklch(0.6 0.22 265);
+    --brand-500: oklch(0.55 0.25 265);
+    --brand-600: oklch(0.5 0.28 270);
+
+    /* Glass morphism borders and accents */
+    --secondary: oklch(1 0 0 / 0.05);
+    --secondary-foreground: oklch(1 0 0);
+    --muted: oklch(0.176 0 0);
+    --muted-foreground: oklch(0.588 0 0);
+    --accent: oklch(1 0 0 / 0.1);
+    --accent-foreground: oklch(1 0 0);
+
+    /* Borders with transparency for glass effect */
+    --border: oklch(0.176 0 0);
+    --border-glass: oklch(1 0 0 / 0.1);
+    --destructive: oklch(0.6 0.25 25);
+    --input: oklch(0.04 0 0 / 0.8);
+    --ring: oklch(0.55 0.25 265);
+
+    /* Chart colors with brand theme */
+    --chart-1: oklch(0.55 0.25 265);
+    --chart-2: oklch(0.65 0.2 160);
+    --chart-3: oklch(0.75 0.2 70);
+    --chart-4: oklch(0.6 0.25 300);
+    --chart-5: oklch(0.6 0.25 20);
+
+    /* Sidebar with glass morphism */
+    --sidebar: oklch(0.04 0 0 / 0.5);
+    --sidebar-foreground: oklch(1 0 0);
+    --sidebar-primary: oklch(0.55 0.25 265);
+    --sidebar-primary-foreground: oklch(1 0 0);
+    --sidebar-accent: oklch(1 0 0 / 0.05);
+    --sidebar-accent-foreground: oklch(1 0 0);
+    --sidebar-border: oklch(1 0 0 / 0.1);
+    --sidebar-ring: oklch(0.55 0.25 265);
+
+    /* Action button colors */
+    --action-view: oklch(0.6 0.25 265);
+    --action-view-hover: oklch(0.55 0.27 270);
+    --action-followup: oklch(0.6 0.2 230);
+    --action-followup-hover: oklch(0.55 0.22 230);
+    --action-commit: oklch(0.55 0.2 140);
+    --action-commit-hover: oklch(0.5 0.22 140);
+    --action-verify: oklch(0.55 0.2 140);
+    --action-verify-hover: oklch(0.5 0.22 140);
+
+    /* Running indicator - Purple */
+    --running-indicator: oklch(0.6 0.25 265);
+    --running-indicator-text: oklch(0.65 0.22 265);
+
+    /* Status colors - Dark mode */
+    --status-success: oklch(0.65 0.2 140);
+    --status-success-bg: oklch(0.65 0.2 140 / 0.2);
+    --status-warning: oklch(0.75 0.15 70);
+    --status-warning-bg: oklch(0.75 0.15 70 / 0.2);
+    --status-error: oklch(0.65 0.22 25);
+    --status-error-bg: oklch(0.65 0.22 25 / 0.2);
+    --status-info: oklch(0.65 0.2 230);
+    --status-info-bg: oklch(0.65 0.2 230 / 0.2);
+    --status-backlog: oklch(0.6 0 0);
+    --status-in-progress: oklch(0.75 0.15 70);
+    --status-waiting: oklch(0.7 0.18 50);
+
+    /* Shadow tokens - darker for dark mode */
+    --shadow-xs: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.4), 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.4), 0 2px 4px -1px rgba(0, 0, 0, 0.3);
+    --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.4), 0 4px 6px -2px rgba(0, 0, 0, 0.2);
+    --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.5), 0 10px 10px -5px rgba(0, 0, 0, 0.3);
+  }
 }
 
 .light {
@@ -211,10 +344,10 @@
   --foreground-secondary: oklch(0.588 0 0); /* text-zinc-400 */
   --foreground-muted: oklch(0.525 0 0); /* text-zinc-500 */
 
-  /* Glass morphism effects */
-  --card: oklch(0.04 0 0 / 0.5); /* zinc-950/50 with transparency */
+  /* Card and popover backgrounds */
+  --card: oklch(0.14 0 0); /* slightly lighter than background for contrast */
   --card-foreground: oklch(1 0 0);
-  --popover: oklch(0.04 0 0 / 0.8); /* zinc-950/80 for popover */
+  --popover: oklch(0.10 0 0); /* slightly lighter than background */
   --popover-foreground: oklch(1 0 0);
 
   /* Brand colors - purple/violet theme */
@@ -269,6 +402,26 @@
   /* Running indicator - Purple */
   --running-indicator: oklch(0.6 0.25 265);
   --running-indicator-text: oklch(0.65 0.22 265);
+
+  /* Status colors - Dark mode */
+  --status-success: oklch(0.65 0.2 140);
+  --status-success-bg: oklch(0.65 0.2 140 / 0.2);
+  --status-warning: oklch(0.75 0.15 70);
+  --status-warning-bg: oklch(0.75 0.15 70 / 0.2);
+  --status-error: oklch(0.65 0.22 25);
+  --status-error-bg: oklch(0.65 0.22 25 / 0.2);
+  --status-info: oklch(0.65 0.2 230);
+  --status-info-bg: oklch(0.65 0.2 230 / 0.2);
+  --status-backlog: oklch(0.6 0 0);
+  --status-in-progress: oklch(0.75 0.15 70);
+  --status-waiting: oklch(0.7 0.18 50);
+
+  /* Shadow tokens - darker for dark mode */
+  --shadow-xs: 0 1px 2px rgba(0, 0, 0, 0.3);
+  --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.4), 0 1px 2px rgba(0, 0, 0, 0.3);
+  --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.4), 0 2px 4px -1px rgba(0, 0, 0, 0.3);
+  --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.4), 0 4px 6px -2px rgba(0, 0, 0, 0.2);
+  --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.5), 0 10px 10px -5px rgba(0, 0, 0, 0.3);
 }
 
 .retro {
@@ -998,6 +1151,75 @@
   --running-indicator-text: oklch(0.75 0.26 350);
 }
 
+/* Red Theme - Bold crimson/red aesthetic */
+.red {
+  --background: oklch(0.12 0.03 15); /* Deep dark red-tinted black */
+  --background-50: oklch(0.12 0.03 15 / 0.5);
+  --background-80: oklch(0.12 0.03 15 / 0.8);
+
+  --foreground: oklch(0.95 0.01 15); /* Off-white with warm tint */
+  --foreground-secondary: oklch(0.7 0.02 15);
+  --foreground-muted: oklch(0.5 0.03 15);
+
+  --card: oklch(0.18 0.04 15); /* Slightly lighter dark red */
+  --card-foreground: oklch(0.95 0.01 15);
+  --popover: oklch(0.15 0.035 15);
+  --popover-foreground: oklch(0.95 0.01 15);
+
+  --primary: oklch(0.55 0.25 25); /* Vibrant crimson red */
+  --primary-foreground: oklch(0.98 0 0);
+
+  --brand-400: oklch(0.6 0.23 25);
+  --brand-500: oklch(0.55 0.25 25); /* Crimson */
+  --brand-600: oklch(0.5 0.27 25);
+
+  --secondary: oklch(0.22 0.05 15);
+  --secondary-foreground: oklch(0.95 0.01 15);
+
+  --muted: oklch(0.22 0.05 15);
+  --muted-foreground: oklch(0.5 0.03 15);
+
+  --accent: oklch(0.28 0.06 15);
+  --accent-foreground: oklch(0.95 0.01 15);
+
+  --destructive: oklch(0.6 0.28 30); /* Bright orange-red for destructive */
+
+  --border: oklch(0.35 0.08 15);
+  --border-glass: oklch(0.55 0.25 25 / 0.3);
+
+  --input: oklch(0.18 0.04 15);
+  --ring: oklch(0.55 0.25 25);
+
+  --chart-1: oklch(0.55 0.25 25); /* Crimson */
+  --chart-2: oklch(0.7 0.2 50); /* Orange */
+  --chart-3: oklch(0.8 0.18 80); /* Gold */
+  --chart-4: oklch(0.6 0.22 0); /* Pure red */
+  --chart-5: oklch(0.65 0.2 350); /* Pink-red */
+
+  --sidebar: oklch(0.1 0.025 15);
+  --sidebar-foreground: oklch(0.95 0.01 15);
+  --sidebar-primary: oklch(0.55 0.25 25);
+  --sidebar-primary-foreground: oklch(0.98 0 0);
+  --sidebar-accent: oklch(0.22 0.05 15);
+  --sidebar-accent-foreground: oklch(0.95 0.01 15);
+  --sidebar-border: oklch(0.35 0.08 15);
+  --sidebar-ring: oklch(0.55 0.25 25);
+
+  /* Action button colors - Red theme */
+  --action-view: oklch(0.55 0.25 25); /* Crimson */
+  --action-view-hover: oklch(0.5 0.27 25);
+  --action-followup: oklch(0.7 0.2 50); /* Orange */
+  --action-followup-hover: oklch(0.65 0.22 50);
+  --action-commit: oklch(0.6 0.2 140); /* Green for positive actions */
+  --action-commit-hover: oklch(0.55 0.22 140);
+  --action-verify: oklch(0.6 0.2 140); /* Green */
+  --action-verify-hover: oklch(0.55 0.22 140);
+
+  /* Running indicator - Crimson */
+  --running-indicator: oklch(0.55 0.25 25);
+  --running-indicator-text: oklch(0.6 0.23 25);
+}
+
 @layer base {
   * {
     @apply border-border outline-ring/50;
@@ -1033,12 +1255,12 @@
 }
 
 /* Custom scrollbar for dark themes */
-:is(.dark, .retro, .dracula, .nord, .monokai, .tokyonight, .solarized, .gruvbox, .catppuccin, .onedark, .synthwave) ::-webkit-scrollbar {
+:is(.dark, .retro, .dracula, .nord, .monokai, .tokyonight, .solarized, .gruvbox, .catppuccin, .onedark, .synthwave, .red) ::-webkit-scrollbar {
   width: 8px;
   height: 8px;
 }
 
-:is(.dark, .retro, .dracula, .nord, .monokai, .tokyonight, .solarized, .gruvbox, .catppuccin, .onedark, .synthwave) ::-webkit-scrollbar-track {
+:is(.dark, .retro, .dracula, .nord, .monokai, .tokyonight, .solarized, .gruvbox, .catppuccin, .onedark, .synthwave, .red) ::-webkit-scrollbar-track {
   background: var(--muted);
 }
 
@@ -1060,6 +1282,20 @@
     background: var(--background);
 }
 
+/* Red theme scrollbar */
+.red ::-webkit-scrollbar-thumb {
+  background: oklch(0.35 0.15 25);
+  border-radius: 4px;
+}
+
+.red ::-webkit-scrollbar-thumb:hover {
+  background: oklch(0.45 0.18 25);
+}
+
+.red ::-webkit-scrollbar-track {
+  background: oklch(0.15 0.05 25);
+}
+
 /* Always visible scrollbar for file diffs and code blocks */
 .scrollbar-visible {
   overflow-y: auto !important;
@@ -1253,6 +1489,39 @@
   .text-running-indicator {
     color: var(--running-indicator-text);
   }
+
+  /* Animated border for in-progress cards */
+  @keyframes border-rotate {
+    0% {
+      background-position: 0% 50%;
+    }
+    50% {
+      background-position: 100% 50%;
+    }
+    100% {
+      background-position: 0% 50%;
+    }
+  }
+
+  .animated-border-wrapper {
+    position: relative;
+    border-radius: 0.75rem;
+    padding: 2px;
+    background: linear-gradient(
+      90deg,
+      var(--running-indicator),
+      color-mix(in oklch, var(--running-indicator), transparent 50%),
+      var(--running-indicator),
+      color-mix(in oklch, var(--running-indicator), transparent 50%),
+      var(--running-indicator)
+    );
+    background-size: 200% 100%;
+    animation: border-rotate 3s ease infinite;
+  }
+
+  .animated-border-wrapper > * {
+    border-radius: calc(0.75rem - 2px);
+  }
 }
 
 /* Retro Overrides for Utilities */

apps/app/src/app/page.tsx

@@ -7,21 +7,36 @@ import { BoardView } from "@/components/views/board-view";
 import { SpecView } from "@/components/views/spec-view";
 import { AgentView } from "@/components/views/agent-view";
 import { SettingsView } from "@/components/views/settings-view";
-import { AgentToolsView } from "@/components/views/agent-tools-view";
 import { InterviewView } from "@/components/views/interview-view";
 import { ContextView } from "@/components/views/context-view";
 import { ProfilesView } from "@/components/views/profiles-view";
 import { SetupView } from "@/components/views/setup-view";
 import { RunningAgentsView } from "@/components/views/running-agents-view";
+import { TerminalView } from "@/components/views/terminal-view";
+import { WikiView } from "@/components/views/wiki-view";
 import { useAppStore } from "@/store/app-store";
 import { useSetupStore } from "@/store/setup-store";
 import { getElectronAPI, isElectron } from "@/lib/electron";
+import {
+  FileBrowserProvider,
+  useFileBrowser,
+  setGlobalFileBrowser,
+} from "@/contexts/file-browser-context";
 
-export default function Home() {
-  const { currentView, setCurrentView, setIpcConnected, theme, currentProject } = useAppStore();
+function HomeContent() {
+  const {
+    currentView,
+    setCurrentView,
+    setIpcConnected,
+    theme,
+    currentProject,
+    previewTheme,
+    getEffectiveTheme,
+  } = useAppStore();
   const { isFirstRun, setupComplete } = useSetupStore();
   const [isMounted, setIsMounted] = useState(false);
   const [streamerPanelOpen, setStreamerPanelOpen] = useState(false);
+  const { openFileBrowser } = useFileBrowser();
 
   // Hidden streamer panel - opens with "\" key
   const handleStreamerPanelShortcut = useCallback((event: KeyboardEvent) => {
@@ -29,7 +44,11 @@ export default function Home() {
     const activeElement = document.activeElement;
     if (activeElement) {
       const tagName = activeElement.tagName.toLowerCase();
-      if (tagName === "input" || tagName === "textarea" || tagName === "select") {
+      if (
+        tagName === "input" ||
+        tagName === "textarea" ||
+        tagName === "select"
+      ) {
         return;
       }
       if (activeElement.getAttribute("contenteditable") === "true") {
@@ -61,15 +80,20 @@ export default function Home() {
     };
   }, [handleStreamerPanelShortcut]);
 
-  // Compute the effective theme: project theme takes priority over global theme
-  // This is reactive because it depends on currentProject and theme from the store
-  const effectiveTheme = currentProject?.theme || theme;
+  // Compute the effective theme: previewTheme takes priority, then project theme, then global theme
+  // This is reactive because it depends on previewTheme, currentProject, and theme from the store
+  const effectiveTheme = getEffectiveTheme();
 
   // Prevent hydration issues
   useEffect(() => {
     setIsMounted(true);
   }, []);
 
+  // Initialize global file browser for HttpApiClient
+  useEffect(() => {
+    setGlobalFileBrowser(openFileBrowser);
+  }, [openFileBrowser]);
+
   // Check if this is first run and redirect to setup if needed
   useEffect(() => {
     console.log("[Setup Flow] Checking setup state:", {
@@ -81,7 +105,9 @@ export default function Home() {
     });
 
     if (isMounted && isFirstRun && !setupComplete) {
-      console.log("[Setup Flow] Redirecting to setup wizard (first run, not complete)");
+      console.log(
+        "[Setup Flow] Redirecting to setup wizard (first run, not complete)"
+      );
       setCurrentView("setup");
     } else if (isMounted && setupComplete) {
       console.log("[Setup Flow] Setup already complete, showing normal view");
@@ -94,7 +120,7 @@ export default function Home() {
       try {
         const api = getElectronAPI();
         const result = await api.ping();
-        setIpcConnected(result === "pong" || result === "pong (mock)");
+        setIpcConnected(result === "pong");
       } catch (error) {
         console.error("IPC connection failed:", error);
         setIpcConnected(false);
@@ -104,7 +130,7 @@ export default function Home() {
     testConnection();
   }, [setIpcConnected]);
 
-  // Apply theme class to document (uses effective theme - project-specific or global)
+  // Apply theme class to document (uses effective theme - preview, project-specific, or global)
   useEffect(() => {
     const root = document.documentElement;
     root.classList.remove(
@@ -119,7 +145,8 @@ export default function Home() {
       "gruvbox",
       "catppuccin",
       "onedark",
-      "synthwave"
+      "synthwave",
+      "red"
     );
 
     if (effectiveTheme === "dark") {
@@ -144,6 +171,8 @@ export default function Home() {
       root.classList.add("onedark");
     } else if (effectiveTheme === "synthwave") {
       root.classList.add("synthwave");
+    } else if (effectiveTheme === "red") {
+      root.classList.add("red");
     } else if (effectiveTheme === "light") {
       root.classList.add("light");
     } else if (effectiveTheme === "system") {
@@ -155,7 +184,7 @@ export default function Home() {
         root.classList.add("light");
       }
     }
-  }, [effectiveTheme]);
+  }, [effectiveTheme, previewTheme, currentProject, theme]);
 
   const renderView = () => {
     switch (currentView) {
@@ -171,8 +200,6 @@ export default function Home() {
         return <AgentView />;
       case "settings":
         return <SettingsView />;
-      case "tools":
-        return <AgentToolsView />;
       case "interview":
         return <InterviewView />;
       case "context":
@@ -181,6 +208,10 @@ export default function Home() {
         return <ProfilesView />;
       case "running-agents":
         return <RunningAgentsView />;
+      case "terminal":
+        return <TerminalView />;
+      case "wiki":
+        return <WikiView />;
       default:
         return <WelcomeView />;
     }
@@ -191,12 +222,6 @@ export default function Home() {
     return (
       <main className="h-screen overflow-hidden" data-testid="app-container">
         <SetupView />
-        {/* Environment indicator */}
-        {isMounted && !isElectron() && (
-          <div className="fixed bottom-4 right-4 px-3 py-1.5 bg-yellow-500/10 text-yellow-500 text-xs rounded-full border border-yellow-500/20 pointer-events-none">
-            Web Mode (Mock IPC)
-          </div>
-        )}
       </main>
     );
   }
@@ -204,23 +229,27 @@ export default function Home() {
   return (
     <main className="flex h-screen overflow-hidden" data-testid="app-container">
       <Sidebar />
-      <div className="flex-1 flex flex-col overflow-hidden transition-all duration-300" style={{ marginRight: streamerPanelOpen ? '250px' : '0' }}>
+      <div
+        className="flex-1 flex flex-col overflow-hidden transition-all duration-300"
+        style={{ marginRight: streamerPanelOpen ? "250px" : "0" }}
+      >
         {renderView()}
       </div>
 
-      {/* Environment indicator - only show after mount to prevent hydration issues */}
-      {isMounted && !isElectron() && (
-        <div className="fixed bottom-4 right-4 px-3 py-1.5 bg-yellow-500/10 text-yellow-500 text-xs rounded-full border border-yellow-500/20 pointer-events-none">
-          Web Mode (Mock IPC)
-        </div>
-      )}
-
       {/* Hidden streamer panel - opens with "\" key, pushes content */}
       <div
         className={`fixed top-0 right-0 h-full w-[250px] bg-background border-l border-border transition-transform duration-300 ${
-          streamerPanelOpen ? 'translate-x-0' : 'translate-x-full'
+          streamerPanelOpen ? "translate-x-0" : "translate-x-full"
         }`}
       />
     </main>
   );
 }
+
+export default function Home() {
+  return (
+    <FileBrowserProvider>
+      <HomeContent />
+    </FileBrowserProvider>
+  );
+}

apps/app/src/components/delete-session-dialog.tsx

@@ -0,0 +1,52 @@
+import { MessageSquare } from "lucide-react";
+import { DeleteConfirmDialog } from "@/components/ui/delete-confirm-dialog";
+import type { SessionListItem } from "@/types/electron";
+
+interface DeleteSessionDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  session: SessionListItem | null;
+  onConfirm: (sessionId: string) => void;
+}
+
+export function DeleteSessionDialog({
+  open,
+  onOpenChange,
+  session,
+  onConfirm,
+}: DeleteSessionDialogProps) {
+  const handleConfirm = () => {
+    if (session) {
+      onConfirm(session.id);
+    }
+  };
+
+  return (
+    <DeleteConfirmDialog
+      open={open}
+      onOpenChange={onOpenChange}
+      onConfirm={handleConfirm}
+      title="Delete Session"
+      description="Are you sure you want to delete this session? This action cannot be undone."
+      confirmText="Delete Session"
+      testId="delete-session-dialog"
+      confirmTestId="confirm-delete-session"
+    >
+      {session && (
+        <div className="flex items-center gap-3 p-4 rounded-lg bg-sidebar-accent/10 border border-sidebar-border">
+          <div className="w-10 h-10 rounded-lg bg-sidebar-accent/20 border border-sidebar-border flex items-center justify-center shrink-0">
+            <MessageSquare className="w-5 h-5 text-brand-500" />
+          </div>
+          <div className="min-w-0">
+            <p className="font-medium text-foreground truncate">
+              {session.name}
+            </p>
+            <p className="text-xs text-muted-foreground">
+              {session.messageCount} messages
+            </p>
+          </div>
+        </div>
+      )}
+    </DeleteConfirmDialog>
+  );
+}

apps/app/src/components/dialogs/board-background-modal.tsx

@@ -0,0 +1,520 @@
+"use client";
+
+import { useState, useRef, useCallback, useEffect } from "react";
+import { ImageIcon, Upload, Loader2, Trash2 } from "lucide-react";
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@/components/ui/sheet";
+import { Button } from "@/components/ui/button";
+import { Slider } from "@/components/ui/slider";
+import { Label } from "@/components/ui/label";
+import { Checkbox } from "@/components/ui/checkbox";
+import { cn } from "@/lib/utils";
+import { useAppStore, defaultBackgroundSettings } from "@/store/app-store";
+import { getHttpApiClient } from "@/lib/http-api-client";
+import { toast } from "sonner";
+
+const ACCEPTED_IMAGE_TYPES = [
+  "image/jpeg",
+  "image/jpg",
+  "image/png",
+  "image/gif",
+  "image/webp",
+];
+const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB
+
+interface BoardBackgroundModalProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function BoardBackgroundModal({
+  open,
+  onOpenChange,
+}: BoardBackgroundModalProps) {
+  const {
+    currentProject,
+    boardBackgroundByProject,
+    setBoardBackground,
+    setCardOpacity,
+    setColumnOpacity,
+    setColumnBorderEnabled,
+    setCardGlassmorphism,
+    setCardBorderEnabled,
+    setCardBorderOpacity,
+    setHideScrollbar,
+    clearBoardBackground,
+  } = useAppStore();
+  const [isDragOver, setIsDragOver] = useState(false);
+  const [isProcessing, setIsProcessing] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+
+  // Get current background settings (live from store)
+  const backgroundSettings =
+    (currentProject && boardBackgroundByProject[currentProject.path]) ||
+    defaultBackgroundSettings;
+
+  const cardOpacity = backgroundSettings.cardOpacity;
+  const columnOpacity = backgroundSettings.columnOpacity;
+  const columnBorderEnabled = backgroundSettings.columnBorderEnabled;
+  const cardGlassmorphism = backgroundSettings.cardGlassmorphism;
+  const cardBorderEnabled = backgroundSettings.cardBorderEnabled;
+  const cardBorderOpacity = backgroundSettings.cardBorderOpacity;
+  const hideScrollbar = backgroundSettings.hideScrollbar;
+  const imageVersion = backgroundSettings.imageVersion;
+
+  // Update preview image when background settings change
+  useEffect(() => {
+    if (currentProject && backgroundSettings.imagePath) {
+      const serverUrl =
+        process.env.NEXT_PUBLIC_SERVER_URL || "http://localhost:3008";
+      // Add cache-busting query parameter to force browser to reload image
+      const cacheBuster = imageVersion
+        ? `&v=${imageVersion}`
+        : `&v=${Date.now()}`;
+      const imagePath = `${serverUrl}/api/fs/image?path=${encodeURIComponent(
+        backgroundSettings.imagePath
+      )}&projectPath=${encodeURIComponent(currentProject.path)}${cacheBuster}`;
+      setPreviewImage(imagePath);
+    } else {
+      setPreviewImage(null);
+    }
+  }, [currentProject, backgroundSettings.imagePath, imageVersion]);
+
+  const fileToBase64 = (file: File): Promise<string> => {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onload = () => {
+        if (typeof reader.result === "string") {
+          resolve(reader.result);
+        } else {
+          reject(new Error("Failed to read file as base64"));
+        }
+      };
+      reader.onerror = () => reject(new Error("Failed to read file"));
+      reader.readAsDataURL(file);
+    });
+  };
+
+  const processFile = useCallback(
+    async (file: File) => {
+      if (!currentProject) {
+        toast.error("No project selected");
+        return;
+      }
+
+      // Validate file type
+      if (!ACCEPTED_IMAGE_TYPES.includes(file.type)) {
+        toast.error(
+          "Unsupported file type. Please use JPG, PNG, GIF, or WebP."
+        );
+        return;
+      }
+
+      // Validate file size
+      if (file.size > DEFAULT_MAX_FILE_SIZE) {
+        const maxSizeMB = DEFAULT_MAX_FILE_SIZE / (1024 * 1024);
+        toast.error(`File too large. Maximum size is ${maxSizeMB}MB.`);
+        return;
+      }
+
+      setIsProcessing(true);
+      try {
+        const base64 = await fileToBase64(file);
+
+        // Set preview immediately
+        setPreviewImage(base64);
+
+        // Save to server
+        const httpClient = getHttpApiClient();
+        const result = await httpClient.saveBoardBackground(
+          base64,
+          file.name,
+          file.type,
+          currentProject.path
+        );
+
+        if (result.success && result.path) {
+          // Update store with the relative path (live update)
+          setBoardBackground(currentProject.path, result.path);
+          toast.success("Background image saved");
+        } else {
+          toast.error(result.error || "Failed to save background image");
+          setPreviewImage(null);
+        }
+      } catch (error) {
+        console.error("Failed to process image:", error);
+        toast.error("Failed to process image");
+        setPreviewImage(null);
+      } finally {
+        setIsProcessing(false);
+      }
+    },
+    [currentProject, setBoardBackground]
+  );
+
+  const handleDrop = useCallback(
+    (e: React.DragEvent) => {
+      e.preventDefault();
+      e.stopPropagation();
+      setIsDragOver(false);
+
+      const files = e.dataTransfer.files;
+      if (files.length > 0) {
+        processFile(files[0]);
+      }
+    },
+    [processFile]
+  );
+
+  const handleDragOver = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsDragOver(true);
+  }, []);
+
+  const handleDragLeave = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsDragOver(false);
+  }, []);
+
+  const handleFileSelect = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const files = e.target.files;
+      if (files && files.length > 0) {
+        processFile(files[0]);
+      }
+      // Reset the input so the same file can be selected again
+      if (fileInputRef.current) {
+        fileInputRef.current.value = "";
+      }
+    },
+    [processFile]
+  );
+
+  const handleBrowseClick = useCallback(() => {
+    if (fileInputRef.current) {
+      fileInputRef.current.click();
+    }
+  }, []);
+
+  const handleClear = useCallback(async () => {
+    if (!currentProject) return;
+
+    try {
+      setIsProcessing(true);
+      const httpClient = getHttpApiClient();
+      const result = await httpClient.deleteBoardBackground(
+        currentProject.path
+      );
+
+      if (result.success) {
+        clearBoardBackground(currentProject.path);
+        setPreviewImage(null);
+        toast.success("Background image cleared");
+      } else {
+        toast.error(result.error || "Failed to clear background image");
+      }
+    } catch (error) {
+      console.error("Failed to clear background:", error);
+      toast.error("Failed to clear background");
+    } finally {
+      setIsProcessing(false);
+    }
+  }, [currentProject, clearBoardBackground]);
+
+  // Live update opacity when sliders change
+  const handleCardOpacityChange = useCallback(
+    (value: number[]) => {
+      if (!currentProject) return;
+      setCardOpacity(currentProject.path, value[0]);
+    },
+    [currentProject, setCardOpacity]
+  );
+
+  const handleColumnOpacityChange = useCallback(
+    (value: number[]) => {
+      if (!currentProject) return;
+      setColumnOpacity(currentProject.path, value[0]);
+    },
+    [currentProject, setColumnOpacity]
+  );
+
+  const handleColumnBorderToggle = useCallback(
+    (checked: boolean) => {
+      if (!currentProject) return;
+      setColumnBorderEnabled(currentProject.path, checked);
+    },
+    [currentProject, setColumnBorderEnabled]
+  );
+
+  const handleCardGlassmorphismToggle = useCallback(
+    (checked: boolean) => {
+      if (!currentProject) return;
+      setCardGlassmorphism(currentProject.path, checked);
+    },
+    [currentProject, setCardGlassmorphism]
+  );
+
+  const handleCardBorderToggle = useCallback(
+    (checked: boolean) => {
+      if (!currentProject) return;
+      setCardBorderEnabled(currentProject.path, checked);
+    },
+    [currentProject, setCardBorderEnabled]
+  );
+
+  const handleCardBorderOpacityChange = useCallback(
+    (value: number[]) => {
+      if (!currentProject) return;
+      setCardBorderOpacity(currentProject.path, value[0]);
+    },
+    [currentProject, setCardBorderOpacity]
+  );
+
+  const handleHideScrollbarToggle = useCallback(
+    (checked: boolean) => {
+      if (!currentProject) return;
+      setHideScrollbar(currentProject.path, checked);
+    },
+    [currentProject, setHideScrollbar]
+  );
+
+  if (!currentProject) {
+    return null;
+  }
+
+  return (
+    <Sheet open={open} onOpenChange={onOpenChange}>
+      <SheetContent side="right" className="w-full sm:max-w-md overflow-y-auto">
+        <SheetHeader className="px-6 pt-6">
+          <SheetTitle className="flex items-center gap-2">
+            <ImageIcon className="w-5 h-5 text-brand-500" />
+            Board Background Settings
+          </SheetTitle>
+          <SheetDescription className="text-muted-foreground">
+            Set a custom background image for your kanban board and adjust
+            card/column opacity
+          </SheetDescription>
+        </SheetHeader>
+
+        <div className="space-y-6 px-6 pb-6">
+          {/* Image Upload Section */}
+          <div className="space-y-3">
+            <Label>Background Image</Label>
+
+            {/* Hidden file input */}
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept={ACCEPTED_IMAGE_TYPES.join(",")}
+              onChange={handleFileSelect}
+              className="hidden"
+              disabled={isProcessing}
+            />
+
+            {/* Drop zone */}
+            <div
+              onDrop={handleDrop}
+              onDragOver={handleDragOver}
+              onDragLeave={handleDragLeave}
+              className={cn(
+                "relative rounded-lg border-2 border-dashed transition-all duration-200",
+                {
+                  "border-brand-500/60 bg-brand-500/5 dark:bg-brand-500/10":
+                    isDragOver && !isProcessing,
+                  "border-muted-foreground/25": !isDragOver && !isProcessing,
+                  "border-muted-foreground/10 opacity-50 cursor-not-allowed":
+                    isProcessing,
+                  "hover:border-brand-500/40 hover:bg-brand-500/5 dark:hover:bg-brand-500/5":
+                    !isProcessing && !isDragOver,
+                }
+              )}
+            >
+              {previewImage ? (
+                <div className="relative p-4">
+                  <div className="relative w-full h-48 rounded-md overflow-hidden border border-border bg-muted">
+                    <img
+                      src={previewImage}
+                      alt="Background preview"
+                      className="w-full h-full object-cover"
+                    />
+                    {isProcessing && (
+                      <div className="absolute inset-0 flex items-center justify-center bg-background/80">
+                        <Loader2 className="w-6 h-6 animate-spin text-brand-500" />
+                      </div>
+                    )}
+                  </div>
+                  <div className="flex gap-2 mt-3">
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      onClick={handleBrowseClick}
+                      disabled={isProcessing}
+                      className="flex-1"
+                    >
+                      <Upload className="w-4 h-4 mr-2" />
+                      Change Image
+                    </Button>
+                    <Button
+                      variant="destructive"
+                      size="sm"
+                      onClick={handleClear}
+                      disabled={isProcessing}
+                    >
+                      <Trash2 className="w-4 h-4 mr-2" />
+                      Clear
+                    </Button>
+                  </div>
+                </div>
+              ) : (
+                <div
+                  onClick={handleBrowseClick}
+                  className="flex flex-col items-center justify-center p-8 text-center cursor-pointer"
+                >
+                  <div
+                    className={cn(
+                      "rounded-full p-3 mb-3",
+                      isDragOver && !isProcessing
+                        ? "bg-brand-500/10 dark:bg-brand-500/20"
+                        : "bg-muted"
+                    )}
+                  >
+                    {isProcessing ? (
+                      <Upload className="h-6 w-6 animate-spin text-muted-foreground" />
+                    ) : (
+                      <ImageIcon className="h-6 w-6 text-muted-foreground" />
+                    )}
+                  </div>
+                  <p className="text-sm text-muted-foreground">
+                    {isDragOver && !isProcessing
+                      ? "Drop image here"
+                      : "Click to upload or drag and drop"}
+                  </p>
+                  <p className="text-xs text-muted-foreground mt-1">
+                    JPG, PNG, GIF, or WebP (max{" "}
+                    {Math.round(DEFAULT_MAX_FILE_SIZE / (1024 * 1024))}MB)
+                  </p>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {/* Opacity Controls */}
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <div className="flex items-center justify-between">
+                <Label>Card Opacity</Label>
+                <span className="text-sm text-muted-foreground">
+                  {cardOpacity}%
+                </span>
+              </div>
+              <Slider
+                value={[cardOpacity]}
+                onValueChange={handleCardOpacityChange}
+                min={0}
+                max={100}
+                step={1}
+                className="w-full"
+              />
+            </div>
+
+            <div className="space-y-2">
+              <div className="flex items-center justify-between">
+                <Label>Column Opacity</Label>
+                <span className="text-sm text-muted-foreground">
+                  {columnOpacity}%
+                </span>
+              </div>
+              <Slider
+                value={[columnOpacity]}
+                onValueChange={handleColumnOpacityChange}
+                min={0}
+                max={100}
+                step={1}
+                className="w-full"
+              />
+            </div>
+
+            {/* Column Border Toggle */}
+            <div className="flex items-center gap-2">
+              <Checkbox
+                id="column-border-toggle"
+                checked={columnBorderEnabled}
+                onCheckedChange={handleColumnBorderToggle}
+              />
+              <Label htmlFor="column-border-toggle" className="cursor-pointer">
+                Show Column Borders
+              </Label>
+            </div>
+
+            {/* Card Glassmorphism Toggle */}
+            <div className="flex items-center gap-2">
+              <Checkbox
+                id="card-glassmorphism-toggle"
+                checked={cardGlassmorphism}
+                onCheckedChange={handleCardGlassmorphismToggle}
+              />
+              <Label
+                htmlFor="card-glassmorphism-toggle"
+                className="cursor-pointer"
+              >
+                Card Glassmorphism (blur effect)
+              </Label>
+            </div>
+
+            {/* Card Border Toggle */}
+            <div className="flex items-center gap-2">
+              <Checkbox
+                id="card-border-toggle"
+                checked={cardBorderEnabled}
+                onCheckedChange={handleCardBorderToggle}
+              />
+              <Label htmlFor="card-border-toggle" className="cursor-pointer">
+                Show Card Borders
+              </Label>
+            </div>
+
+            {/* Card Border Opacity - only show when border is enabled */}
+            {cardBorderEnabled && (
+              <div className="space-y-2">
+                <div className="flex items-center justify-between">
+                  <Label>Card Border Opacity</Label>
+                  <span className="text-sm text-muted-foreground">
+                    {cardBorderOpacity}%
+                  </span>
+                </div>
+                <Slider
+                  value={[cardBorderOpacity]}
+                  onValueChange={handleCardBorderOpacityChange}
+                  min={0}
+                  max={100}
+                  step={1}
+                  className="w-full"
+                />
+              </div>
+            )}
+
+            {/* Hide Scrollbar Toggle */}
+            <div className="flex items-center gap-2">
+              <Checkbox
+                id="hide-scrollbar-toggle"
+                checked={hideScrollbar}
+                onCheckedChange={handleHideScrollbarToggle}
+              />
+              <Label htmlFor="hide-scrollbar-toggle" className="cursor-pointer">
+                Hide Board Scrollbar
+              </Label>
+            </div>
+          </div>
+        </div>
+      </SheetContent>
+    </Sheet>
+  );
+}

apps/app/src/components/dialogs/file-browser-dialog.tsx

@@ -0,0 +1,316 @@
+"use client";
+
+import { useState, useEffect, useRef } from "react";
+import {
+  FolderOpen,
+  Folder,
+  ChevronRight,
+  Home,
+  ArrowLeft,
+  HardDrive,
+  CornerDownLeft,
+} from "lucide-react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+
+interface DirectoryEntry {
+  name: string;
+  path: string;
+}
+
+interface BrowseResult {
+  success: boolean;
+  currentPath: string;
+  parentPath: string | null;
+  directories: DirectoryEntry[];
+  drives?: string[];
+  error?: string;
+  warning?: string;
+}
+
+interface FileBrowserDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSelect: (path: string) => void;
+  title?: string;
+  description?: string;
+  initialPath?: string;
+}
+
+export function FileBrowserDialog({
+  open,
+  onOpenChange,
+  onSelect,
+  title = "Select Project Directory",
+  description = "Navigate to your project folder or paste a path directly",
+  initialPath,
+}: FileBrowserDialogProps) {
+  const [currentPath, setCurrentPath] = useState<string>("");
+  const [pathInput, setPathInput] = useState<string>("");
+  const [parentPath, setParentPath] = useState<string | null>(null);
+  const [directories, setDirectories] = useState<DirectoryEntry[]>([]);
+  const [drives, setDrives] = useState<string[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState("");
+  const [warning, setWarning] = useState("");
+  const pathInputRef = useRef<HTMLInputElement>(null);
+
+  const browseDirectory = async (dirPath?: string) => {
+    setLoading(true);
+    setError("");
+    setWarning("");
+
+    try {
+      // Get server URL from environment or default
+      const serverUrl =
+        process.env.NEXT_PUBLIC_SERVER_URL || "http://localhost:3008";
+
+      const response = await fetch(`${serverUrl}/api/fs/browse`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ dirPath }),
+      });
+
+      const result: BrowseResult = await response.json();
+
+      if (result.success) {
+        setCurrentPath(result.currentPath);
+        setPathInput(result.currentPath);
+        setParentPath(result.parentPath);
+        setDirectories(result.directories);
+        setDrives(result.drives || []);
+        setWarning(result.warning || "");
+      } else {
+        setError(result.error || "Failed to browse directory");
+      }
+    } catch (err) {
+      setError(
+        err instanceof Error ? err.message : "Failed to load directories"
+      );
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // Reset current path when dialog closes
+  useEffect(() => {
+    if (!open) {
+      setCurrentPath("");
+      setPathInput("");
+      setParentPath(null);
+      setDirectories([]);
+      setError("");
+      setWarning("");
+    }
+  }, [open]);
+
+  // Load initial path or home directory when dialog opens
+  useEffect(() => {
+    if (open && !currentPath) {
+      browseDirectory(initialPath);
+    }
+  }, [open, initialPath]);
+
+  const handleSelectDirectory = (dir: DirectoryEntry) => {
+    browseDirectory(dir.path);
+  };
+
+  const handleGoToParent = () => {
+    if (parentPath) {
+      browseDirectory(parentPath);
+    }
+  };
+
+  const handleGoHome = () => {
+    browseDirectory();
+  };
+
+  const handleSelectDrive = (drivePath: string) => {
+    browseDirectory(drivePath);
+  };
+
+  const handleGoToPath = () => {
+    const trimmedPath = pathInput.trim();
+    if (trimmedPath) {
+      browseDirectory(trimmedPath);
+    }
+  };
+
+  const handlePathInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      handleGoToPath();
+    }
+  };
+
+  const handleSelect = () => {
+    if (currentPath) {
+      onSelect(currentPath);
+      onOpenChange(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="bg-popover border-border max-w-2xl max-h-[80vh] overflow-hidden flex flex-col">
+        <DialogHeader className="pb-2">
+          <DialogTitle className="flex items-center gap-2">
+            <FolderOpen className="w-5 h-5 text-brand-500" />
+            {title}
+          </DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            {description}
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="flex flex-col gap-3 min-h-[400px] flex-1 overflow-hidden py-2">
+          {/* Direct path input */}
+          <div className="flex items-center gap-2">
+            <Input
+              ref={pathInputRef}
+              type="text"
+              placeholder="Paste or type a full path (e.g., /home/user/projects/myapp)"
+              value={pathInput}
+              onChange={(e) => setPathInput(e.target.value)}
+              onKeyDown={handlePathInputKeyDown}
+              className="flex-1 font-mono text-sm"
+              data-testid="path-input"
+              disabled={loading}
+            />
+            <Button
+              variant="secondary"
+              size="sm"
+              onClick={handleGoToPath}
+              disabled={loading || !pathInput.trim()}
+              data-testid="go-to-path-button"
+            >
+              <CornerDownLeft className="w-4 h-4 mr-1" />
+              Go
+            </Button>
+          </div>
+
+          {/* Drives selector (Windows only) */}
+          {drives.length > 0 && (
+            <div className="flex flex-wrap gap-2 p-3 rounded-lg bg-sidebar-accent/10 border border-sidebar-border">
+              <div className="flex items-center gap-1 text-xs text-muted-foreground mr-2">
+                <HardDrive className="w-3 h-3" />
+                <span>Drives:</span>
+              </div>
+              {drives.map((drive) => (
+                <Button
+                  key={drive}
+                  variant={
+                    currentPath.startsWith(drive) ? "default" : "outline"
+                  }
+                  size="sm"
+                  onClick={() => handleSelectDrive(drive)}
+                  className="h-7 px-3 text-xs"
+                  disabled={loading}
+                >
+                  {drive.replace("\\", "")}
+                </Button>
+              ))}
+            </div>
+          )}
+
+          {/* Current path breadcrumb */}
+          <div className="flex items-center gap-2 p-3 rounded-lg bg-sidebar-accent/10 border border-sidebar-border">
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={handleGoHome}
+              className="h-7 px-2"
+              disabled={loading}
+            >
+              <Home className="w-4 h-4" />
+            </Button>
+            {parentPath && (
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={handleGoToParent}
+                className="h-7 px-2"
+                disabled={loading}
+              >
+                <ArrowLeft className="w-4 h-4" />
+              </Button>
+            )}
+            <div className="flex-1 font-mono text-sm truncate text-muted-foreground">
+              {currentPath || "Loading..."}
+            </div>
+          </div>
+
+          {/* Directory list */}
+          <div className="flex-1 overflow-y-auto border border-sidebar-border rounded-lg">
+            {loading && (
+              <div className="flex items-center justify-center h-full p-8">
+                <div className="text-sm text-muted-foreground">
+                  Loading directories...
+                </div>
+              </div>
+            )}
+
+            {error && (
+              <div className="flex items-center justify-center h-full p-8">
+                <div className="text-sm text-destructive">{error}</div>
+              </div>
+            )}
+
+            {warning && (
+              <div className="p-3 bg-yellow-500/10 border border-yellow-500/30 rounded-lg mb-2">
+                <div className="text-sm text-yellow-500">{warning}</div>
+              </div>
+            )}
+
+            {!loading && !error && !warning && directories.length === 0 && (
+              <div className="flex items-center justify-center h-full p-8">
+                <div className="text-sm text-muted-foreground">
+                  No subdirectories found
+                </div>
+              </div>
+            )}
+
+            {!loading && !error && directories.length > 0 && (
+              <div className="divide-y divide-sidebar-border">
+                {directories.map((dir) => (
+                  <button
+                    key={dir.path}
+                    onClick={() => handleSelectDirectory(dir)}
+                    className="w-full flex items-center gap-3 p-3 hover:bg-sidebar-accent/10 transition-colors text-left group"
+                  >
+                    <Folder className="w-5 h-5 text-brand-500 shrink-0" />
+                    <span className="flex-1 truncate text-sm">{dir.name}</span>
+                    <ChevronRight className="w-4 h-4 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity shrink-0" />
+                  </button>
+                ))}
+              </div>
+            )}
+          </div>
+
+          <div className="text-xs text-muted-foreground">
+            Paste a full path above, or click on folders to navigate. Press
+            Enter or click Go to jump to a path.
+          </div>
+        </div>
+
+        <DialogFooter className="border-t border-border pt-4 gap-2">
+          <Button variant="ghost" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+          <Button onClick={handleSelect} disabled={!currentPath || loading}>
+            <FolderOpen className="w-4 h-4 mr-2" />
+            Select Current Folder
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/app/src/components/layout/project-setup-dialog.tsx

@@ -0,0 +1,167 @@
+"use client";
+
+import { Sparkles, Clock } from "lucide-react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { cn } from "@/lib/utils";
+
+// Feature count options
+export type FeatureCount = 20 | 50 | 100;
+const FEATURE_COUNT_OPTIONS: {
+  value: FeatureCount;
+  label: string;
+  warning?: string;
+}[] = [
+  { value: 20, label: "20" },
+  { value: 50, label: "50", warning: "May take up to 5 minutes" },
+  { value: 100, label: "100", warning: "May take up to 5 minutes" },
+];
+
+interface ProjectSetupDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  projectOverview: string;
+  onProjectOverviewChange: (value: string) => void;
+  generateFeatures: boolean;
+  onGenerateFeaturesChange: (value: boolean) => void;
+  featureCount: FeatureCount;
+  onFeatureCountChange: (value: FeatureCount) => void;
+  onCreateSpec: () => void;
+  onSkip: () => void;
+  isCreatingSpec: boolean;
+}
+
+export function ProjectSetupDialog({
+  open,
+  onOpenChange,
+  projectOverview,
+  onProjectOverviewChange,
+  generateFeatures,
+  onGenerateFeaturesChange,
+  featureCount,
+  onFeatureCountChange,
+  onCreateSpec,
+  onSkip,
+  isCreatingSpec,
+}: ProjectSetupDialogProps) {
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={(open) => {
+        onOpenChange(open);
+        if (!open && !isCreatingSpec) {
+          onSkip();
+        }
+      }}
+    >
+      <DialogContent className="max-w-2xl">
+        <DialogHeader>
+          <DialogTitle>Set Up Your Project</DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            We didn&apos;t find an app_spec.txt file. Let us help you generate
+            your app_spec.txt to help describe your project for our system.
+            We&apos;ll analyze your project&apos;s tech stack and create a
+            comprehensive specification.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 py-4">
+          <div className="space-y-2">
+            <label className="text-sm font-medium">Project Overview</label>
+            <p className="text-xs text-muted-foreground">
+              Describe what your project does and what features you want to
+              build. Be as detailed as you want - this will help us create a
+              better specification.
+            </p>
+            <textarea
+              className="w-full h-48 p-3 rounded-md border border-border bg-background font-mono text-sm resize-none focus:outline-none focus:ring-2 focus:ring-ring"
+              value={projectOverview}
+              onChange={(e) => onProjectOverviewChange(e.target.value)}
+              placeholder="e.g., A project management tool that allows teams to track tasks, manage sprints, and visualize progress through kanban boards. It should support user authentication, real-time updates, and file attachments..."
+              autoFocus
+            />
+          </div>
+
+          <div className="flex items-start space-x-3 pt-2">
+            <Checkbox
+              id="sidebar-generate-features"
+              checked={generateFeatures}
+              onCheckedChange={(checked) =>
+                onGenerateFeaturesChange(checked === true)
+              }
+            />
+            <div className="space-y-1">
+              <label
+                htmlFor="sidebar-generate-features"
+                className="text-sm font-medium cursor-pointer"
+              >
+                Generate feature list
+              </label>
+              <p className="text-xs text-muted-foreground">
+                Automatically create features in the features folder from the
+                implementation roadmap after the spec is generated.
+              </p>
+            </div>
+          </div>
+
+          {/* Feature Count Selection - only shown when generateFeatures is enabled */}
+          {generateFeatures && (
+            <div className="space-y-2 pt-2 pl-7">
+              <label className="text-sm font-medium">Number of Features</label>
+              <div className="flex gap-2">
+                {FEATURE_COUNT_OPTIONS.map((option) => (
+                  <Button
+                    key={option.value}
+                    type="button"
+                    variant={
+                      featureCount === option.value ? "default" : "outline"
+                    }
+                    size="sm"
+                    onClick={() => onFeatureCountChange(option.value)}
+                    className={cn(
+                      "flex-1 transition-all",
+                      featureCount === option.value
+                        ? "bg-primary hover:bg-primary/90 text-primary-foreground"
+                        : "bg-muted/30 hover:bg-muted/50 border-border"
+                    )}
+                    data-testid={`feature-count-${option.value}`}
+                  >
+                    {option.label}
+                  </Button>
+                ))}
+              </div>
+              {FEATURE_COUNT_OPTIONS.find((o) => o.value === featureCount)
+                ?.warning && (
+                <p className="text-xs text-amber-500 flex items-center gap-1">
+                  <Clock className="w-3 h-3" />
+                  {
+                    FEATURE_COUNT_OPTIONS.find((o) => o.value === featureCount)
+                      ?.warning
+                  }
+                </p>
+              )}
+            </div>
+          )}
+        </div>
+
+        <DialogFooter>
+          <Button variant="ghost" onClick={onSkip}>
+            Skip for now
+          </Button>
+          <Button onClick={onCreateSpec} disabled={!projectOverview.trim()}>
+            <Sparkles className="w-4 h-4 mr-2" />
+            Generate Spec
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/app/src/components/new-project-modal.tsx

@@ -0,0 +1,515 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { HotkeyButton } from "@/components/ui/hotkey-button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Badge } from "@/components/ui/badge";
+import {
+  FolderPlus,
+  FolderOpen,
+  Rocket,
+  ExternalLink,
+  Check,
+  Loader2,
+  Link,
+  Folder,
+} from "lucide-react";
+import { starterTemplates, type StarterTemplate } from "@/lib/templates";
+import { getElectronAPI } from "@/lib/electron";
+import { getHttpApiClient } from "@/lib/http-api-client";
+import { cn } from "@/lib/utils";
+import { useFileBrowser } from "@/contexts/file-browser-context";
+
+const LAST_PROJECT_DIR_KEY = "automaker:lastProjectDir";
+
+interface ValidationErrors {
+  projectName?: boolean;
+  workspaceDir?: boolean;
+  templateSelection?: boolean;
+  customUrl?: boolean;
+}
+
+interface NewProjectModalProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onCreateBlankProject: (
+    projectName: string,
+    parentDir: string
+  ) => Promise<void>;
+  onCreateFromTemplate: (
+    template: StarterTemplate,
+    projectName: string,
+    parentDir: string
+  ) => Promise<void>;
+  onCreateFromCustomUrl: (
+    repoUrl: string,
+    projectName: string,
+    parentDir: string
+  ) => Promise<void>;
+  isCreating: boolean;
+}
+
+export function NewProjectModal({
+  open,
+  onOpenChange,
+  onCreateBlankProject,
+  onCreateFromTemplate,
+  onCreateFromCustomUrl,
+  isCreating,
+}: NewProjectModalProps) {
+  const [activeTab, setActiveTab] = useState<"blank" | "template">("blank");
+  const [projectName, setProjectName] = useState("");
+  const [workspaceDir, setWorkspaceDir] = useState<string>("");
+  const [isLoadingWorkspace, setIsLoadingWorkspace] = useState(false);
+  const [selectedTemplate, setSelectedTemplate] =
+    useState<StarterTemplate | null>(null);
+  const [useCustomUrl, setUseCustomUrl] = useState(false);
+  const [customUrl, setCustomUrl] = useState("");
+  const [errors, setErrors] = useState<ValidationErrors>({});
+  const { openFileBrowser } = useFileBrowser();
+
+  // Fetch workspace directory when modal opens
+  useEffect(() => {
+    if (open) {
+      // First, check localStorage for last used directory
+      const lastUsedDir = localStorage.getItem(LAST_PROJECT_DIR_KEY);
+      if (lastUsedDir) {
+        setWorkspaceDir(lastUsedDir);
+        return;
+      }
+
+      // Fall back to server config if no saved directory
+      setIsLoadingWorkspace(true);
+      const httpClient = getHttpApiClient();
+      httpClient.workspace
+        .getConfig()
+        .then((result) => {
+          if (result.success && result.workspaceDir) {
+            setWorkspaceDir(result.workspaceDir);
+          }
+        })
+        .catch((error) => {
+          console.error("Failed to get workspace config:", error);
+        })
+        .finally(() => {
+          setIsLoadingWorkspace(false);
+        });
+    }
+  }, [open]);
+
+  // Reset form when modal closes
+  useEffect(() => {
+    if (!open) {
+      setProjectName("");
+      setSelectedTemplate(null);
+      setUseCustomUrl(false);
+      setCustomUrl("");
+      setActiveTab("blank");
+      setErrors({});
+    }
+  }, [open]);
+
+  // Clear specific errors when user fixes them
+  useEffect(() => {
+    if (projectName && errors.projectName) {
+      setErrors((prev) => ({ ...prev, projectName: false }));
+    }
+  }, [projectName, errors.projectName]);
+
+  useEffect(() => {
+    if (
+      (selectedTemplate || (useCustomUrl && customUrl)) &&
+      errors.templateSelection
+    ) {
+      setErrors((prev) => ({ ...prev, templateSelection: false }));
+    }
+  }, [selectedTemplate, useCustomUrl, customUrl, errors.templateSelection]);
+
+  useEffect(() => {
+    if (customUrl && errors.customUrl) {
+      setErrors((prev) => ({ ...prev, customUrl: false }));
+    }
+  }, [customUrl, errors.customUrl]);
+
+  const validateAndCreate = async () => {
+    const newErrors: ValidationErrors = {};
+
+    // Check project name
+    if (!projectName.trim()) {
+      newErrors.projectName = true;
+    }
+
+    // Check workspace dir
+    if (!workspaceDir) {
+      newErrors.workspaceDir = true;
+    }
+
+    // Check template selection (only for template tab)
+    if (activeTab === "template") {
+      if (useCustomUrl) {
+        if (!customUrl.trim()) {
+          newErrors.customUrl = true;
+        }
+      } else if (!selectedTemplate) {
+        newErrors.templateSelection = true;
+      }
+    }
+
+    // If there are errors, show them and don't proceed
+    if (Object.values(newErrors).some(Boolean)) {
+      setErrors(newErrors);
+      return;
+    }
+
+    // Clear errors and proceed
+    setErrors({});
+
+    if (activeTab === "blank") {
+      await onCreateBlankProject(projectName, workspaceDir);
+    } else if (useCustomUrl && customUrl) {
+      await onCreateFromCustomUrl(customUrl, projectName, workspaceDir);
+    } else if (selectedTemplate) {
+      await onCreateFromTemplate(selectedTemplate, projectName, workspaceDir);
+    }
+  };
+
+  const handleOpenRepo = (url: string) => {
+    const api = getElectronAPI();
+    api.openExternalLink(url);
+  };
+
+  const handleSelectTemplate = (template: StarterTemplate) => {
+    setSelectedTemplate(template);
+    setUseCustomUrl(false);
+    setCustomUrl("");
+  };
+
+  const handleToggleCustomUrl = () => {
+    setUseCustomUrl(!useCustomUrl);
+    if (!useCustomUrl) {
+      setSelectedTemplate(null);
+    }
+  };
+
+  const handleBrowseDirectory = async () => {
+    const selectedPath = await openFileBrowser({
+      title: "Select Base Project Directory",
+      description:
+        "Choose the parent directory where your project will be created",
+      initialPath: workspaceDir || undefined,
+    });
+    if (selectedPath) {
+      setWorkspaceDir(selectedPath);
+      // Save to localStorage for next time
+      localStorage.setItem(LAST_PROJECT_DIR_KEY, selectedPath);
+      // Clear any workspace error when a valid directory is selected
+      if (errors.workspaceDir) {
+        setErrors((prev) => ({ ...prev, workspaceDir: false }));
+      }
+    }
+  };
+
+  // Use platform-specific path separator
+  const pathSep =
+    typeof window !== "undefined" && (window as any).electronAPI
+      ? navigator.platform.indexOf("Win") !== -1
+        ? "\\"
+        : "/"
+      : "/";
+  const projectPath =
+    workspaceDir && projectName
+      ? `${workspaceDir}${pathSep}${projectName}`
+      : "";
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        className="bg-card border-border max-w-2xl max-h-[85vh] overflow-hidden flex flex-col"
+        data-testid="new-project-modal"
+      >
+        <DialogHeader className="pb-2">
+          <DialogTitle className="text-foreground">
+            Create New Project
+          </DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            Start with a blank project or choose from a starter template.
+          </DialogDescription>
+        </DialogHeader>
+
+        {/* Project Name Input - Always visible at top */}
+        <div className="space-y-3 pb-4 border-b border-border">
+          <div className="space-y-2">
+            <Label
+              htmlFor="project-name"
+              className={cn(
+                "text-foreground",
+                errors.projectName && "text-red-500"
+              )}
+            >
+              Project Name{" "}
+              {errors.projectName && <span className="text-red-500">*</span>}
+            </Label>
+            <Input
+              id="project-name"
+              placeholder="my-awesome-project"
+              value={projectName}
+              onChange={(e) => setProjectName(e.target.value)}
+              className={cn(
+                "bg-input text-foreground placeholder:text-muted-foreground",
+                errors.projectName
+                  ? "border-red-500 focus:border-red-500 focus:ring-red-500/20"
+                  : "border-border"
+              )}
+              data-testid="project-name-input"
+              autoFocus
+            />
+            {errors.projectName && (
+              <p className="text-xs text-red-500">Project name is required</p>
+            )}
+          </div>
+
+          {/* Workspace Directory Display */}
+          <div
+            className={cn(
+              "flex items-center gap-2 text-sm",
+              errors.workspaceDir ? "text-red-500" : "text-muted-foreground"
+            )}
+          >
+            <Folder className="w-4 h-4 shrink-0" />
+            <span className="flex-1 min-w-0">
+              {isLoadingWorkspace ? (
+                "Loading workspace..."
+              ) : workspaceDir ? (
+                <>
+                  Will be created at:{" "}
+                  <code className="text-xs bg-muted px-1.5 py-0.5 rounded truncate">
+                    {projectPath || workspaceDir}
+                  </code>
+                </>
+              ) : (
+                <span className="text-red-500">No workspace configured</span>
+              )}
+            </span>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleBrowseDirectory}
+              disabled={isLoadingWorkspace}
+              className="shrink-0 h-7 px-2 text-xs"
+              data-testid="browse-directory-button"
+            >
+              <FolderOpen className="w-3.5 h-3.5 mr-1" />
+              Browse
+            </Button>
+          </div>
+        </div>
+
+        <Tabs
+          value={activeTab}
+          onValueChange={(v) => setActiveTab(v as "blank" | "template")}
+          className="flex-1 flex flex-col overflow-hidden"
+        >
+          <TabsList className="w-full justify-start">
+            <TabsTrigger value="blank" className="gap-2">
+              <FolderPlus className="w-4 h-4" />
+              Blank Project
+            </TabsTrigger>
+            <TabsTrigger value="template" className="gap-2">
+              <Rocket className="w-4 h-4" />
+              Starter Kit
+            </TabsTrigger>
+          </TabsList>
+
+          <div className="flex-1 overflow-y-auto py-4">
+            <TabsContent value="blank" className="mt-0">
+              <div className="p-4 rounded-lg bg-muted/50 border border-border">
+                <p className="text-sm text-muted-foreground">
+                  Create an empty project with the standard .automaker directory
+                  structure. Perfect for starting from scratch or importing an
+                  existing codebase.
+                </p>
+              </div>
+            </TabsContent>
+
+            <TabsContent value="template" className="mt-0">
+              <div className="space-y-4">
+                {/* Error message for template selection */}
+                {errors.templateSelection && (
+                  <p className="text-sm text-red-500">
+                    Please select a template or enter a custom GitHub URL
+                  </p>
+                )}
+
+                {/* Preset Templates */}
+                <div
+                  className={cn(
+                    "space-y-3 rounded-lg p-1 -m-1",
+                    errors.templateSelection && "ring-2 ring-red-500/50"
+                  )}
+                >
+                  {starterTemplates.map((template) => (
+                    <div
+                      key={template.id}
+                      className={cn(
+                        "p-4 rounded-lg border cursor-pointer transition-all",
+                        selectedTemplate?.id === template.id && !useCustomUrl
+                          ? "border-brand-500 bg-brand-500/10"
+                          : "border-border bg-muted/30 hover:border-border-glass hover:bg-muted/50"
+                      )}
+                      onClick={() => handleSelectTemplate(template)}
+                      data-testid={`template-${template.id}`}
+                    >
+                      <div className="flex items-start justify-between gap-4">
+                        <div className="flex-1 min-w-0">
+                          <div className="flex items-center gap-2 mb-1">
+                            <h4 className="font-medium text-foreground">
+                              {template.name}
+                            </h4>
+                            {selectedTemplate?.id === template.id &&
+                              !useCustomUrl && (
+                                <Check className="w-4 h-4 text-brand-500" />
+                              )}
+                          </div>
+                          <p className="text-sm text-muted-foreground mb-3">
+                            {template.description}
+                          </p>
+
+                          {/* Tech Stack */}
+                          <div className="flex flex-wrap gap-1.5 mb-3">
+                            {template.techStack.slice(0, 6).map((tech) => (
+                              <Badge
+                                key={tech}
+                                variant="secondary"
+                                className="text-xs"
+                              >
+                                {tech}
+                              </Badge>
+                            ))}
+                            {template.techStack.length > 6 && (
+                              <Badge variant="secondary" className="text-xs">
+                                +{template.techStack.length - 6} more
+                              </Badge>
+                            )}
+                          </div>
+
+                          {/* Key Features */}
+                          <div className="text-xs text-muted-foreground">
+                            <span className="font-medium">Features: </span>
+                            {template.features.slice(0, 3).join(" · ")}
+                            {template.features.length > 3 &&
+                              ` · +${template.features.length - 3} more`}
+                          </div>
+                        </div>
+
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          className="shrink-0"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleOpenRepo(template.repoUrl);
+                          }}
+                        >
+                          <ExternalLink className="w-4 h-4 mr-1" />
+                          View
+                        </Button>
+                      </div>
+                    </div>
+                  ))}
+
+                  {/* Custom URL Option */}
+                  <div
+                    className={cn(
+                      "p-4 rounded-lg border cursor-pointer transition-all",
+                      useCustomUrl
+                        ? "border-brand-500 bg-brand-500/10"
+                        : "border-border bg-muted/30 hover:border-border-glass hover:bg-muted/50"
+                    )}
+                    onClick={handleToggleCustomUrl}
+                  >
+                    <div className="flex items-center gap-2 mb-2">
+                      <Link className="w-4 h-4 text-muted-foreground" />
+                      <h4 className="font-medium text-foreground">
+                        Custom GitHub URL
+                      </h4>
+                      {useCustomUrl && (
+                        <Check className="w-4 h-4 text-brand-500" />
+                      )}
+                    </div>
+                    <p className="text-sm text-muted-foreground mb-3">
+                      Clone any public GitHub repository as a starting point.
+                    </p>
+
+                    {useCustomUrl && (
+                      <div
+                        onClick={(e) => e.stopPropagation()}
+                        className="space-y-1"
+                      >
+                        <Input
+                          placeholder="https://github.com/username/repository"
+                          value={customUrl}
+                          onChange={(e) => setCustomUrl(e.target.value)}
+                          className={cn(
+                            "bg-input text-foreground placeholder:text-muted-foreground",
+                            errors.customUrl
+                              ? "border-red-500 focus:border-red-500 focus:ring-red-500/20"
+                              : "border-border"
+                          )}
+                          data-testid="custom-url-input"
+                        />
+                        {errors.customUrl && (
+                          <p className="text-xs text-red-500">
+                            GitHub URL is required
+                          </p>
+                        )}
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </TabsContent>
+          </div>
+        </Tabs>
+
+        <DialogFooter className="border-t border-border pt-4">
+          <Button
+            variant="ghost"
+            onClick={() => onOpenChange(false)}
+            className="text-muted-foreground hover:text-foreground hover:bg-accent"
+          >
+            Cancel
+          </Button>
+          <HotkeyButton
+            onClick={validateAndCreate}
+            disabled={isCreating}
+            className="bg-gradient-to-r from-brand-500 to-brand-600 hover:from-brand-600 hover:to-brand-600 text-white border-0"
+            hotkey={{ key: "Enter", cmdCtrl: true }}
+            hotkeyActive={open}
+            data-testid="confirm-create-project"
+          >
+            {isCreating ? (
+              <>
+                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                {activeTab === "template" ? "Cloning..." : "Creating..."}
+              </>
+            ) : (
+              <>Create Project</>
+            )}
+          </HotkeyButton>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/app/src/components/session-manager.tsx

@@ -4,14 +4,13 @@ import { useState, useEffect } from "react";
 import {
   Card,
   CardContent,
-  CardDescription,
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { HotkeyButton } from "@/components/ui/hotkey-button";
 import { Input } from "@/components/ui/input";
-import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
   Plus,
   MessageSquare,
@@ -26,7 +25,8 @@ import {
 import { cn } from "@/lib/utils";
 import type { SessionListItem } from "@/types/electron";
 import { useKeyboardShortcutsConfig } from "@/hooks/use-keyboard-shortcuts";
-import { useAppStore } from "@/store/app-store";
+import { getElectronAPI } from "@/lib/electron";
+import { DeleteSessionDialog } from "@/components/delete-session-dialog";
 
 // Random session name generator
 const adjectives = [
@@ -114,17 +114,20 @@ export function SessionManager({
   const [runningSessions, setRunningSessions] = useState<Set<string>>(
     new Set()
   );
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
+  const [sessionToDelete, setSessionToDelete] = useState<SessionListItem | null>(null);
 
   // Check running state for all sessions
   const checkRunningSessions = async (sessionList: SessionListItem[]) => {
-    if (!window.electronAPI?.agent) return;
+    const api = getElectronAPI();
+    if (!api?.agent) return;
 
     const runningIds = new Set<string>();
 
     // Check each session's running state
     for (const session of sessionList) {
       try {
-        const result = await window.electronAPI.agent.getHistory(session.id);
+        const result = await api.agent.getHistory(session.id);
         if (result.success && result.isRunning) {
           runningIds.add(session.id);
         }
@@ -142,10 +145,11 @@ export function SessionManager({
 
   // Load sessions
   const loadSessions = async () => {
-    if (!window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!api?.sessions) return;
 
     // Always load all sessions and filter client-side
-    const result = await window.electronAPI.sessions.list(true);
+    const result = await api.sessions.list(true);
     if (result.success && result.sessions) {
       setSessions(result.sessions);
       // Check running state for all sessions
@@ -173,39 +177,41 @@ export function SessionManager({
 
   // Create new session with random name
   const handleCreateSession = async () => {
-    if (!window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!api?.sessions) return;
 
     const sessionName = newSessionName.trim() || generateRandomSessionName();
 
-    const result = await window.electronAPI.sessions.create(
+    const result = await api.sessions.create(
       sessionName,
       projectPath,
       projectPath
     );
 
-    if (result.success && result.sessionId) {
+    if (result.success && result.session?.id) {
       setNewSessionName("");
       setIsCreating(false);
       await loadSessions();
-      onSelectSession(result.sessionId);
+      onSelectSession(result.session.id);
     }
   };
 
   // Create new session directly with a random name (one-click)
   const handleQuickCreateSession = async () => {
-    if (!window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!api?.sessions) return;
 
     const sessionName = generateRandomSessionName();
 
-    const result = await window.electronAPI.sessions.create(
+    const result = await api.sessions.create(
       sessionName,
       projectPath,
       projectPath
     );
 
-    if (result.success && result.sessionId) {
+    if (result.success && result.session?.id) {
       await loadSessions();
-      onSelectSession(result.sessionId);
+      onSelectSession(result.session.id);
     }
   };
 
@@ -223,9 +229,10 @@ export function SessionManager({
 
   // Rename session
   const handleRenameSession = async (sessionId: string) => {
-    if (!editingName.trim() || !window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!editingName.trim() || !api?.sessions) return;
 
-    const result = await window.electronAPI.sessions.update(
+    const result = await api.sessions.update(
       sessionId,
       editingName,
       undefined
@@ -240,34 +247,60 @@ export function SessionManager({
 
   // Archive session
   const handleArchiveSession = async (sessionId: string) => {
-    if (!window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!api?.sessions) {
+      console.error("[SessionManager] Sessions API not available");
+      return;
+    }
 
-    const result = await window.electronAPI.sessions.archive(sessionId);
-    if (result.success) {
-      // If the archived session was currently selected, deselect it
-      if (currentSessionId === sessionId) {
-        onSelectSession(null);
+    try {
+      const result = await api.sessions.archive(sessionId);
+      if (result.success) {
+        // If the archived session was currently selected, deselect it
+        if (currentSessionId === sessionId) {
+          onSelectSession(null);
+        }
+        await loadSessions();
+      } else {
+        console.error("[SessionManager] Archive failed:", result.error);
       }
-      await loadSessions();
+    } catch (error) {
+      console.error("[SessionManager] Archive error:", error);
     }
   };
 
   // Unarchive session
   const handleUnarchiveSession = async (sessionId: string) => {
-    if (!window.electronAPI?.sessions) return;
+    const api = getElectronAPI();
+    if (!api?.sessions) {
+      console.error("[SessionManager] Sessions API not available");
+      return;
+    }
 
-    const result = await window.electronAPI.sessions.unarchive(sessionId);
-    if (result.success) {
-      await loadSessions();
+    try {
+      const result = await api.sessions.unarchive(sessionId);
+      if (result.success) {
+        await loadSessions();
+      } else {
+        console.error("[SessionManager] Unarchive failed:", result.error);
+      }
+    } catch (error) {
+      console.error("[SessionManager] Unarchive error:", error);
     }
   };
 
-  // Delete session
-  const handleDeleteSession = async (sessionId: string) => {
-    if (!window.electronAPI?.sessions) return;
-    if (!confirm("Are you sure you want to delete this session?")) return;
+  // Open delete session dialog
+  const handleDeleteSession = (session: SessionListItem) => {
+    setSessionToDelete(session);
+    setIsDeleteDialogOpen(true);
+  };
 
-    const result = await window.electronAPI.sessions.delete(sessionId);
+  // Confirm delete session
+  const confirmDeleteSession = async (sessionId: string) => {
+    const api = getElectronAPI();
+    if (!api?.sessions) return;
+
+    const result = await api.sessions.delete(sessionId);
     if (result.success) {
       await loadSessions();
       if (currentSessionId === sessionId) {
@@ -278,6 +311,7 @@ export function SessionManager({
         }
       }
     }
+    setSessionToDelete(null);
   };
 
   const activeSessions = sessions.filter((s) => !s.isArchived);
@@ -286,24 +320,28 @@ export function SessionManager({
     activeTab === "active" ? activeSessions : archivedSessions;
 
   return (
-    <Card className="h-full flex flex-col">
+    <Card className="h-full flex flex-col rounded-none">
       <CardHeader className="pb-3">
         <div className="flex items-center justify-between mb-4">
           <CardTitle>Agent Sessions</CardTitle>
-          {activeTab === "active" && (
-            <HotkeyButton
-              variant="default"
-              size="sm"
-              onClick={handleQuickCreateSession}
-              hotkey={shortcuts.newSession}
-              hotkeyActive={false}
-              data-testid="new-session-button"
-              title={`New Session (${shortcuts.newSession})`}
-            >
-              <Plus className="w-4 h-4 mr-1" />
-              New
-            </HotkeyButton>
-          )}
+          <HotkeyButton
+            variant="default"
+            size="sm"
+            onClick={() => {
+              // Switch to active tab if on archived tab
+              if (activeTab === "archived") {
+                setActiveTab("active");
+              }
+              handleQuickCreateSession();
+            }}
+            hotkey={shortcuts.newSession}
+            hotkeyActive={false}
+            data-testid="new-session-button"
+            title={`New Session (${shortcuts.newSession})`}
+          >
+            <Plus className="w-4 h-4 mr-1" />
+            New
+          </HotkeyButton>
         </div>
 
         <Tabs
@@ -500,8 +538,9 @@ export function SessionManager({
                   <Button
                     size="sm"
                     variant="ghost"
-                    onClick={() => handleDeleteSession(session.id)}
+                    onClick={() => handleDeleteSession(session)}
                     className="h-7 w-7 p-0 text-destructive"
+                    data-testid={`delete-session-${session.id}`}
                   >
                     <Trash2 className="w-3 h-3" />
                   </Button>
@@ -527,6 +566,14 @@ export function SessionManager({
           </div>
         )}
       </CardContent>
+
+      {/* Delete Session Confirmation Dialog */}
+      <DeleteSessionDialog
+        open={isDeleteDialogOpen}
+        onOpenChange={setIsDeleteDialogOpen}
+        session={sessionToDelete}
+        onConfirm={confirmDeleteSession}
+      />
     </Card>
   );
 }

apps/app/src/components/ui/badge.tsx

@@ -4,21 +4,42 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@/lib/utils";
 
 const badgeVariants = cva(
-  "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+  "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-medium transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 shadow-sm",
   {
     variants: {
       variant: {
         default:
-          "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
+          "border-transparent bg-primary text-primary-foreground hover:bg-primary/90",
         secondary:
           "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
         destructive:
-          "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
-        outline: "text-foreground",
+          "border-transparent bg-destructive text-white hover:bg-destructive/90",
+        outline:
+          "text-foreground border-border bg-background/50 backdrop-blur-sm",
+        // Semantic status variants using CSS variables
+        success:
+          "border-transparent bg-[var(--status-success-bg)] text-[var(--status-success)] border border-[var(--status-success)]/30",
+        warning:
+          "border-transparent bg-[var(--status-warning-bg)] text-[var(--status-warning)] border border-[var(--status-warning)]/30",
+        error:
+          "border-transparent bg-[var(--status-error-bg)] text-[var(--status-error)] border border-[var(--status-error)]/30",
+        info:
+          "border-transparent bg-[var(--status-info-bg)] text-[var(--status-info)] border border-[var(--status-info)]/30",
+        // Muted variants for subtle indication
+        muted:
+          "border-border/50 bg-muted/50 text-muted-foreground",
+        brand:
+          "border-transparent bg-brand-500/15 text-brand-500 border border-brand-500/30",
+      },
+      size: {
+        default: "px-2.5 py-0.5 text-xs",
+        sm: "px-2 py-0.5 text-[10px]",
+        lg: "px-3 py-1 text-sm",
       },
     },
     defaultVariants: {
       variant: "default",
+      size: "default",
     },
   }
 );
@@ -27,9 +48,9 @@ export interface BadgeProps
   extends React.HTMLAttributes<HTMLDivElement>,
     VariantProps<typeof badgeVariants> {}
 
-function Badge({ className, variant, ...props }: BadgeProps) {
+function Badge({ className, variant, size, ...props }: BadgeProps) {
   return (
-    <div className={cn(badgeVariants({ variant }), className)} {...props} />
+    <div className={cn(badgeVariants({ variant, size }), className)} {...props} />
   );
 }
 

apps/app/src/components/ui/button.tsx

@@ -1,24 +1,26 @@
 import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Loader2 } from "lucide-react";
 
 import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all cursor-pointer disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all duration-200 cursor-pointer disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive active:scale-[0.98]",
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        default:
+          "bg-primary text-primary-foreground shadow-sm hover:bg-primary/90 hover:shadow-md hover:shadow-primary/25",
         destructive:
-          "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+          "bg-destructive text-white shadow-sm hover:bg-destructive/90 hover:shadow-md hover:shadow-destructive/25 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:
           "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
         secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+          "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
           "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
-        link: "text-primary underline-offset-4 hover:underline",
+        link: "text-primary underline-offset-4 hover:underline active:scale-100",
         "animated-outline":
           "relative overflow-hidden rounded-xl hover:bg-transparent shadow-none",
       },
@@ -38,17 +40,32 @@ const buttonVariants = cva(
   }
 );
 
+// Loading spinner component
+function ButtonSpinner({ className }: { className?: string }) {
+  return (
+    <Loader2
+      className={cn("size-4 animate-spin", className)}
+      aria-hidden="true"
+    />
+  );
+}
+
 function Button({
   className,
   variant,
   size,
   asChild = false,
+  loading = false,
+  disabled,
   children,
   ...props
 }: React.ComponentProps<"button"> &
   VariantProps<typeof buttonVariants> & {
     asChild?: boolean;
+    loading?: boolean;
   }) {
+  const isDisabled = disabled || loading;
+
   // Special handling for animated-outline variant
   if (variant === "animated-outline" && !asChild) {
     return (
@@ -59,20 +76,22 @@ function Button({
           className
         )}
         data-slot="button"
+        disabled={isDisabled}
         {...props}
       >
-        {/* Animated rotating gradient border */}
-        <span className="absolute inset-[-1000%] animate-[spin_2s_linear_infinite] animated-outline-gradient" />
+        {/* Animated rotating gradient border - smoother animation */}
+        <span className="absolute inset-[-1000%] animate-[spin_3s_linear_infinite] animated-outline-gradient opacity-75 transition-opacity duration-300 group-hover:opacity-100" />
 
         {/* Inner content container */}
         <span
           className={cn(
-            "animated-outline-inner inline-flex h-full w-full cursor-pointer items-center justify-center gap-2 rounded-[10px] px-4 py-1 text-sm font-medium backdrop-blur-3xl transition-all",
+            "animated-outline-inner inline-flex h-full w-full cursor-pointer items-center justify-center gap-2 rounded-[10px] px-4 py-1 text-sm font-medium backdrop-blur-3xl transition-all duration-200",
             size === "sm" && "px-3 text-xs gap-1.5",
             size === "lg" && "px-8",
             size === "icon" && "p-0 gap-0"
           )}
         >
+          {loading && <ButtonSpinner />}
           {children}
         </span>
       </button>
@@ -85,8 +104,10 @@ function Button({
     <Comp
       data-slot="button"
       className={cn(buttonVariants({ variant, size, className }))}
+      disabled={isDisabled}
       {...props}
     >
+      {loading && <ButtonSpinner />}
       {children}
     </Comp>
   );

apps/app/src/components/ui/card.tsx

@@ -2,12 +2,20 @@ import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
-function Card({ className, ...props }: React.ComponentProps<"div">) {
+interface CardProps extends React.ComponentProps<"div"> {
+  gradient?: boolean;
+}
+
+function Card({ className, gradient = false, ...props }: CardProps) {
   return (
     <div
       data-slot="card"
       className={cn(
-        "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border border-white/10 backdrop-blur-sm py-6 shadow-sm",
+        "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border border-white/10 backdrop-blur-md py-6",
+        // Premium layered shadow
+        "shadow-[0_1px_2px_rgba(0,0,0,0.05),0_4px_6px_rgba(0,0,0,0.05),0_10px_20px_rgba(0,0,0,0.04)]",
+        // Gradient border option
+        gradient && "relative before:absolute before:inset-0 before:rounded-xl before:p-[1px] before:bg-gradient-to-br before:from-white/20 before:to-transparent before:pointer-events-none before:-z-10",
         className
       )}
       {...props}
@@ -20,7 +28,7 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
     <div
       data-slot="card-header"
       className={cn(
-        "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-2 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
+        "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
         className
       )}
       {...props}
@@ -32,7 +40,7 @@ function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
       data-slot="card-title"
-      className={cn("leading-none font-semibold", className)}
+      className={cn("leading-none font-semibold tracking-tight", className)}
       {...props}
     />
   );
@@ -42,7 +50,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
       data-slot="card-description"
-      className={cn("text-muted-foreground text-sm", className)}
+      className={cn("text-muted-foreground text-sm leading-relaxed", className)}
       {...props}
     />
   );
@@ -75,7 +83,7 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
       data-slot="card-footer"
-      className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
+      className={cn("flex items-center gap-3 px-6 [.border-t]:pt-6", className)}
       {...props}
     />
   );

apps/app/src/components/ui/course-promo-badge.tsx

@@ -0,0 +1,88 @@
+"use client";
+
+import * as React from "react";
+import { Sparkles, X } from "lucide-react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+
+interface CoursePromoBadgeProps {
+  sidebarOpen?: boolean;
+}
+
+export function CoursePromoBadge({ sidebarOpen = true }: CoursePromoBadgeProps) {
+  const [dismissed, setDismissed] = React.useState(false);
+
+  if (dismissed) {
+    return null;
+  }
+
+  // Collapsed state - show only icon with tooltip
+  if (!sidebarOpen) {
+    return (
+      <div className="p-2 pb-0 flex justify-center">
+        <TooltipProvider delayDuration={300}>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <a
+                href="https://agenticjumpstart.com"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="group cursor-pointer flex items-center justify-center w-10 h-10 bg-primary/10 text-primary rounded-lg hover:bg-primary/20 transition-all border border-primary/30"
+                data-testid="course-promo-badge-collapsed"
+              >
+                <Sparkles className="size-4 shrink-0" />
+              </a>
+            </TooltipTrigger>
+            <TooltipContent side="right" className="flex items-center gap-2">
+              <span>Become a 10x Dev</span>
+              <span
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  setDismissed(true);
+                }}
+                className="p-0.5 rounded-full hover:bg-primary/30 transition-colors cursor-pointer"
+                aria-label="Dismiss"
+              >
+                <X className="size-3" />
+              </span>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </div>
+    );
+  }
+
+  // Expanded state - show full badge
+  return (
+    <div className="p-2 pb-0">
+      <a
+        href="https://agenticjumpstart.com"
+        target="_blank"
+        rel="noopener noreferrer"
+        className="group cursor-pointer flex items-center justify-between w-full px-2 lg:px-3 py-2.5 bg-primary/10 text-primary rounded-lg font-medium text-sm hover:bg-primary/20 transition-all border border-primary/30"
+        data-testid="course-promo-badge"
+      >
+        <div className="flex items-center gap-2">
+          <Sparkles className="size-4 shrink-0" />
+          <span className="hidden lg:block">Become a 10x Dev</span>
+        </div>
+        <span
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            setDismissed(true);
+          }}
+          className="hidden lg:block p-1 rounded-full hover:bg-primary/30 transition-colors cursor-pointer"
+          aria-label="Dismiss"
+        >
+          <X className="size-3.5" />
+        </span>
+      </a>
+    </div>
+  );
+}

apps/app/src/components/ui/delete-confirm-dialog.tsx

@@ -0,0 +1,88 @@
+import { Trash2 } from "lucide-react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { HotkeyButton } from "@/components/ui/hotkey-button";
+import type { ReactNode } from "react";
+
+interface DeleteConfirmDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onConfirm: () => void;
+  title: string;
+  description: string;
+  /** Optional content to show between description and buttons (e.g., item preview card) */
+  children?: ReactNode;
+  /** Text for the confirm button. Defaults to "Delete" */
+  confirmText?: string;
+  /** Test ID for the dialog */
+  testId?: string;
+  /** Test ID for the confirm button */
+  confirmTestId?: string;
+}
+
+export function DeleteConfirmDialog({
+  open,
+  onOpenChange,
+  onConfirm,
+  title,
+  description,
+  children,
+  confirmText = "Delete",
+  testId = "delete-confirm-dialog",
+  confirmTestId = "confirm-delete-button",
+}: DeleteConfirmDialogProps) {
+  const handleConfirm = () => {
+    onConfirm();
+    onOpenChange(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        className="bg-popover border-border max-w-md"
+        data-testid={testId}
+      >
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <Trash2 className="w-5 h-5 text-destructive" />
+            {title}
+          </DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            {description}
+          </DialogDescription>
+        </DialogHeader>
+
+        {children}
+
+        <DialogFooter className="gap-2 sm:gap-2 pt-4">
+          <Button
+            variant="ghost"
+            onClick={() => onOpenChange(false)}
+            className="px-4"
+            data-testid="cancel-delete-button"
+          >
+            Cancel
+          </Button>
+          <HotkeyButton
+            variant="destructive"
+            onClick={handleConfirm}
+            data-testid={confirmTestId}
+            hotkey={{ key: "Enter", cmdCtrl: true }}
+            hotkeyActive={open}
+            className="px-4"
+          >
+            <Trash2 className="w-4 h-4 mr-2" />
+            {confirmText}
+          </HotkeyButton>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/app/src/components/ui/description-image-dropzone.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useState, useRef, useCallback, useEffect } from "react";
+import React, { useState, useRef, useCallback } from "react";
 import { cn } from "@/lib/utils";
 import { ImageIcon, X, Loader2 } from "lucide-react";
 import { Textarea } from "@/components/ui/textarea";
@@ -83,6 +83,13 @@ export function DescriptionImageDropZone({
   const fileInputRef = useRef<HTMLInputElement>(null);
   const currentProject = useAppStore((state) => state.currentProject);
 
+  // Construct server URL for loading saved images
+  const getImageServerUrl = useCallback((imagePath: string): string => {
+    const serverUrl = process.env.NEXT_PUBLIC_SERVER_URL || "http://localhost:3008";
+    const projectPath = currentProject?.path || "";
+    return `${serverUrl}/api/fs/image?path=${encodeURIComponent(imagePath)}&projectPath=${encodeURIComponent(projectPath)}`;
+  }, [currentProject?.path]);
+
   const fileToBase64 = (file: File): Promise<string> => {
     return new Promise((resolve, reject) => {
       const reader = new FileReader();
@@ -98,7 +105,7 @@ export function DescriptionImageDropZone({
     });
   };
 
-  const saveImageToTemp = async (
+  const saveImageToTemp = useCallback(async (
     base64Data: string,
     filename: string,
     mimeType: string
@@ -107,8 +114,8 @@ export function DescriptionImageDropZone({
       const api = getElectronAPI();
       // Check if saveImageToTemp method exists
       if (!api.saveImageToTemp) {
-        // Fallback for mock API - return a mock path in .automaker/images
-        console.log("[DescriptionImageDropZone] Using mock path for image");
+        // Fallback path when saveImageToTemp is not available
+        console.log("[DescriptionImageDropZone] Using fallback path for image");
         return `.automaker/images/${Date.now()}_${filename}`;
       }
 
@@ -124,7 +131,7 @@ export function DescriptionImageDropZone({
       console.error("[DescriptionImageDropZone] Error saving image:", error);
       return null;
     }
-  };
+  }, [currentProject?.path]);
 
   const processFiles = useCallback(
     async (files: FileList) => {
@@ -193,7 +200,7 @@ export function DescriptionImageDropZone({
 
       setIsProcessing(false);
     },
-    [disabled, isProcessing, images, maxFiles, maxFileSize, onImagesChange, previewImages]
+    [disabled, isProcessing, images, maxFiles, maxFileSize, onImagesChange, previewImages, saveImageToTemp]
   );
 
   const handleDrop = useCallback(
@@ -374,7 +381,15 @@ export function DescriptionImageDropZone({
                       className="max-w-full max-h-full object-contain"
                     />
                   ) : (
-                    <ImageIcon className="w-6 h-6 text-muted-foreground" />
+                    <img
+                      src={getImageServerUrl(image.path)}
+                      alt={image.filename}
+                      className="max-w-full max-h-full object-contain"
+                      onError={(e) => {
+                        // If image fails to load, hide it
+                        (e.target as HTMLImageElement).style.display = 'none';
+                      }}
+                    />
                   )}
                 </div>
                 {/* Remove button */}

apps/app/src/components/ui/dialog.tsx

@@ -38,7 +38,10 @@ function DialogOverlay({
     <DialogPrimitive.Overlay
       data-slot="dialog-overlay"
       className={cn(
-        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+        "fixed inset-0 z-50 bg-black/60 backdrop-blur-sm",
+        "data-[state=open]:animate-in data-[state=closed]:animate-out",
+        "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+        "duration-200",
         className
       )}
       {...props}
@@ -66,7 +69,17 @@ function DialogContent({
       <DialogPrimitive.Content
         data-slot="dialog-content"
         className={cn(
-          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 flex flex-col w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] rounded-lg border shadow-lg duration-200 max-h-[calc(100vh-4rem)]",
+          "fixed top-[50%] left-[50%] z-50 translate-x-[-50%] translate-y-[-50%]",
+          "flex flex-col w-full max-w-[calc(100%-2rem)] max-h-[calc(100vh-4rem)]",
+          "bg-card border border-border rounded-xl shadow-2xl",
+          // Premium shadow
+          "shadow-[0_25px_50px_-12px_rgba(0,0,0,0.25)]",
+          // Animations - smoother with scale
+          "data-[state=open]:animate-in data-[state=closed]:animate-out",
+          "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+          "data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
+          "data-[state=closed]:slide-out-to-top-[2%] data-[state=open]:slide-in-from-top-[2%]",
+          "duration-200",
           compact
             ? "max-w-4xl p-4"
             : !hasCustomMaxWidth
@@ -81,8 +94,13 @@ function DialogContent({
           <DialogPrimitive.Close
             data-slot="dialog-close"
             className={cn(
-              "ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute rounded-xs opacity-70 transition-opacity cursor-pointer hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-              compact ? "top-2 right-3" : "top-3 right-5"
+              "absolute rounded-lg opacity-60 transition-all duration-200 cursor-pointer",
+              "hover:opacity-100 hover:bg-muted",
+              "focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:outline-none",
+              "disabled:pointer-events-none disabled:cursor-not-allowed",
+              "[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg]:size-4",
+              "p-1.5",
+              compact ? "top-2 right-3" : "top-4 right-4"
             )}
           >
             <XIcon />
@@ -109,7 +127,7 @@ function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
     <div
       data-slot="dialog-footer"
       className={cn(
-        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end mt-6",
         className
       )}
       {...props}
@@ -124,7 +142,7 @@ function DialogTitle({
   return (
     <DialogPrimitive.Title
       data-slot="dialog-title"
-      className={cn("text-lg leading-none font-semibold", className)}
+      className={cn("text-lg leading-none font-semibold tracking-tight", className)}
       {...props}
     />
   );
@@ -137,7 +155,7 @@ function DialogDescription({
   return (
     <DialogPrimitive.Description
       data-slot="dialog-description"
-      className={cn("text-muted-foreground text-sm", className)}
+      className={cn("text-muted-foreground text-sm leading-relaxed", className)}
       {...props}
     />
   );

apps/app/src/components/ui/dropdown-menu.tsx

@@ -43,14 +43,16 @@ const DropdownMenuSubContent = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
 >(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.SubContent
-    ref={ref}
-    className={cn(
-      "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-      className
-    )}
-    {...props}
-  />
+  <DropdownMenuPrimitive.Portal>
+    <DropdownMenuPrimitive.SubContent
+      ref={ref}
+      className={cn(
+        "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        className
+      )}
+      {...props}
+    />
+  </DropdownMenuPrimitive.Portal>
 ))
 DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName
 

apps/app/src/components/ui/input.tsx

@@ -2,20 +2,64 @@ import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
-  return (
+interface InputProps extends React.ComponentProps<"input"> {
+  startAddon?: React.ReactNode;
+  endAddon?: React.ReactNode;
+}
+
+function Input({ className, type, startAddon, endAddon, ...props }: InputProps) {
+  const hasAddons = startAddon || endAddon;
+
+  const inputElement = (
     <input
       type={type}
       data-slot="input"
       className={cn(
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground bg-input border-input h-9 w-full min-w-0 rounded-md border px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "file:text-foreground placeholder:text-muted-foreground/60 selection:bg-primary selection:text-primary-foreground bg-input border-border h-9 w-full min-w-0 rounded-md border px-3 py-1 text-base shadow-xs outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        // Inner shadow for depth
+        "shadow-[inset_0_1px_2px_rgba(0,0,0,0.05)]",
+        // Animated focus ring
+        "transition-[color,box-shadow,border-color] duration-200 ease-out",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
         "aria-invalid:ring-destructive/20 aria-invalid:border-destructive",
+        // Adjust padding for addons
+        startAddon && "pl-0",
+        endAddon && "pr-0",
+        hasAddons && "border-0 shadow-none focus-visible:ring-0",
         className
       )}
       {...props}
     />
-  )
+  );
+
+  if (!hasAddons) {
+    return inputElement;
+  }
+
+  return (
+    <div
+      className={cn(
+        "flex items-center h-9 w-full rounded-md border border-border bg-input shadow-xs",
+        "shadow-[inset_0_1px_2px_rgba(0,0,0,0.05)]",
+        "transition-[box-shadow,border-color] duration-200 ease-out",
+        "focus-within:border-ring focus-within:ring-ring/50 focus-within:ring-[3px]",
+        "has-[input:disabled]:opacity-50 has-[input:disabled]:cursor-not-allowed",
+        "has-[input[aria-invalid]]:ring-destructive/20 has-[input[aria-invalid]]:border-destructive"
+      )}
+    >
+      {startAddon && (
+        <span className="flex items-center justify-center px-3 text-muted-foreground text-sm">
+          {startAddon}
+        </span>
+      )}
+      {inputElement}
+      {endAddon && (
+        <span className="flex items-center justify-center px-3 text-muted-foreground text-sm">
+          {endAddon}
+        </span>
+      )}
+    </div>
+  );
 }
 
 export { Input }

apps/app/src/components/ui/keyboard-map.tsx

@@ -88,9 +88,9 @@ const SHORTCUT_LABELS: Record<keyof KeyboardShortcuts, string> = {
   agent: "Agent Runner",
   spec: "Spec Editor",
   context: "Context",
-  tools: "Agent Tools",
   settings: "Settings",
   profiles: "AI Profiles",
+  terminal: "Terminal",
   toggleSidebar: "Toggle Sidebar",
   addFeature: "Add Feature",
   addContextFile: "Add Context File",
@@ -101,6 +101,9 @@ const SHORTCUT_LABELS: Record<keyof KeyboardShortcuts, string> = {
   cyclePrevProject: "Prev Project",
   cycleNextProject: "Next Project",
   addProfile: "Add Profile",
+  splitTerminalRight: "Split Right",
+  splitTerminalDown: "Split Down",
+  closeTerminal: "Close Terminal",
 };
 
 // Categorize shortcuts for color coding
@@ -109,9 +112,9 @@ const SHORTCUT_CATEGORIES: Record<keyof KeyboardShortcuts, "navigation" | "ui" |
   agent: "navigation",
   spec: "navigation",
   context: "navigation",
-  tools: "navigation",
   settings: "navigation",
   profiles: "navigation",
+  terminal: "navigation",
   toggleSidebar: "ui",
   addFeature: "action",
   addContextFile: "action",
@@ -122,6 +125,9 @@ const SHORTCUT_CATEGORIES: Record<keyof KeyboardShortcuts, "navigation" | "ui" |
   cyclePrevProject: "action",
   cycleNextProject: "action",
   addProfile: "action",
+  splitTerminalRight: "action",
+  splitTerminalDown: "action",
+  closeTerminal: "action",
 };
 
 // Category colors
@@ -155,11 +161,18 @@ interface KeyboardMapProps {
 export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMapProps) {
   const { keyboardShortcuts } = useAppStore();
 
+  // Merge with defaults to ensure new shortcuts are always shown
+  const mergedShortcuts = React.useMemo(() => ({
+    ...DEFAULT_KEYBOARD_SHORTCUTS,
+    ...keyboardShortcuts,
+  }), [keyboardShortcuts]);
+
   // Create a reverse map: base key -> list of shortcut names (including info about modifiers)
   const keyToShortcuts = React.useMemo(() => {
     const map: Record<string, Array<{ name: keyof KeyboardShortcuts; hasModifiers: boolean }>> = {};
-    (Object.entries(keyboardShortcuts) as [keyof KeyboardShortcuts, string][]).forEach(
+    (Object.entries(mergedShortcuts) as [keyof KeyboardShortcuts, string][]).forEach(
       ([shortcutName, shortcutStr]) => {
+        if (!shortcutStr) return; // Skip undefined shortcuts
         const parsed = parseShortcut(shortcutStr);
         const normalizedKey = parsed.key.toUpperCase();
         const hasModifiers = !!(parsed.shift || parsed.cmdCtrl || parsed.alt);
@@ -170,7 +183,7 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
       }
     );
     return map;
-  }, [keyboardShortcuts]);
+  }, [mergedShortcuts]);
 
   const renderKey = (keyDef: { key: string; label: string; width: number }) => {
     const normalizedKey = keyDef.key.toUpperCase();
@@ -179,7 +192,7 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
     const isBound = shortcuts.length > 0;
     const isSelected = selectedKey?.toUpperCase() === normalizedKey;
     const isModified = shortcuts.some(
-      (s) => keyboardShortcuts[s] !== DEFAULT_KEYBOARD_SHORTCUTS[s]
+      (s) => mergedShortcuts[s] !== DEFAULT_KEYBOARD_SHORTCUTS[s]
     );
 
     // Get category for coloring (use first shortcut's category if multiple)
@@ -225,7 +238,7 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
         >
           {isBound && shortcuts.length > 0
             ? (shortcuts.length === 1
-                ? SHORTCUT_LABELS[shortcuts[0]].split(" ")[0]
+                ? (SHORTCUT_LABELS[shortcuts[0]]?.split(" ")[0] ?? shortcuts[0])
                 : `${shortcuts.length}x`)
             : "\u00A0" // Non-breaking space to maintain height
           }
@@ -244,21 +257,23 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
           <TooltipContent side="top" className="max-w-xs">
             <div className="space-y-1">
               {shortcuts.map((shortcut) => {
-                const shortcutStr = keyboardShortcuts[shortcut];
+                const shortcutStr = mergedShortcuts[shortcut];
                 const displayShortcut = formatShortcut(shortcutStr, true);
                 return (
                   <div key={shortcut} className="flex items-center gap-2">
                     <span
                       className={cn(
                         "w-2 h-2 rounded-full",
-                        CATEGORY_COLORS[SHORTCUT_CATEGORIES[shortcut]].bg.replace("/20", "")
+                        SHORTCUT_CATEGORIES[shortcut] && CATEGORY_COLORS[SHORTCUT_CATEGORIES[shortcut]]
+                          ? CATEGORY_COLORS[SHORTCUT_CATEGORIES[shortcut]].bg.replace("/20", "")
+                          : "bg-muted-foreground"
                       )}
                     />
-                    <span className="text-sm">{SHORTCUT_LABELS[shortcut]}</span>
+                    <span className="text-sm">{SHORTCUT_LABELS[shortcut] ?? shortcut}</span>
                     <kbd className="text-xs font-mono bg-sidebar-accent/30 px-1 rounded">
                       {displayShortcut}
                     </kbd>
-                    {keyboardShortcuts[shortcut] !== DEFAULT_KEYBOARD_SHORTCUTS[shortcut] && (
+                    {mergedShortcuts[shortcut] !== DEFAULT_KEYBOARD_SHORTCUTS[shortcut] && (
                       <span className="text-xs text-yellow-400">(custom)</span>
                     )}
                   </div>
@@ -345,6 +360,12 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
   const [modifiers, setModifiers] = React.useState({ shift: false, cmdCtrl: false, alt: false });
   const [shortcutError, setShortcutError] = React.useState<string | null>(null);
 
+  // Merge with defaults to ensure new shortcuts are always shown
+  const mergedShortcuts = React.useMemo(() => ({
+    ...DEFAULT_KEYBOARD_SHORTCUTS,
+    ...keyboardShortcuts,
+  }), [keyboardShortcuts]);
+
   const groupedShortcuts = React.useMemo(() => {
     const groups: Record<string, Array<{ key: keyof KeyboardShortcuts; label: string; value: string }>> = {
       navigation: [],
@@ -356,14 +377,14 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
       ([shortcut, category]) => {
         groups[category].push({
           key: shortcut,
-          label: SHORTCUT_LABELS[shortcut],
-          value: keyboardShortcuts[shortcut],
+          label: SHORTCUT_LABELS[shortcut] ?? shortcut,
+          value: mergedShortcuts[shortcut],
         });
       }
     );
 
     return groups;
-  }, [keyboardShortcuts]);
+  }, [mergedShortcuts]);
 
   // Build the full shortcut string from key + modifiers
   const buildShortcutString = React.useCallback((key: string, mods: typeof modifiers) => {
@@ -377,14 +398,14 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
 
   // Check for conflicts with other shortcuts
   const checkConflict = React.useCallback((shortcutStr: string, currentKey: keyof KeyboardShortcuts) => {
-    const conflict = Object.entries(keyboardShortcuts).find(
-      ([k, v]) => k !== currentKey && v.toUpperCase() === shortcutStr.toUpperCase()
+    const conflict = Object.entries(mergedShortcuts).find(
+      ([k, v]) => k !== currentKey && v?.toUpperCase() === shortcutStr.toUpperCase()
     );
-    return conflict ? SHORTCUT_LABELS[conflict[0] as keyof KeyboardShortcuts] : null;
-  }, [keyboardShortcuts]);
+    return conflict ? (SHORTCUT_LABELS[conflict[0] as keyof KeyboardShortcuts] ?? conflict[0]) : null;
+  }, [mergedShortcuts]);
 
   const handleStartEdit = (key: keyof KeyboardShortcuts) => {
-    const currentValue = keyboardShortcuts[key];
+    const currentValue = mergedShortcuts[key];
     const parsed = parseShortcut(currentValue);
     setEditingShortcut(key);
     setKeyValue(parsed.key);
@@ -487,7 +508,7 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
             </h4>
             <div className="grid grid-cols-2 gap-2">
               {shortcuts.map(({ key, label, value }) => {
-                const isModified = keyboardShortcuts[key] !== DEFAULT_KEYBOARD_SHORTCUTS[key];
+                const isModified = mergedShortcuts[key] !== DEFAULT_KEYBOARD_SHORTCUTS[key];
                 const isEditing = editingShortcut === key;
 
                 return (

apps/app/src/components/ui/textarea.tsx

@@ -7,7 +7,11 @@ function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
     <textarea
       data-slot="textarea"
       className={cn(
-        "placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input min-h-[80px] w-full min-w-0 rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm resize-none",
+        "placeholder:text-muted-foreground/60 selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-border min-h-[80px] w-full min-w-0 rounded-md border bg-transparent px-3 py-2 text-base outline-none disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm resize-none",
+        // Inner shadow for depth
+        "shadow-[inset_0_1px_2px_rgba(0,0,0,0.05)]",
+        // Animated focus ring
+        "transition-[color,box-shadow,border-color] duration-200 ease-out",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
         "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
         className

apps/app/src/components/ui/tooltip.tsx

@@ -14,13 +14,23 @@ const TooltipTrigger = TooltipPrimitive.Trigger
 const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className, sideOffset = 4, ...props }, ref) => (
+>(({ className, sideOffset = 6, ...props }, ref) => (
   <TooltipPrimitive.Portal>
     <TooltipPrimitive.Content
       ref={ref}
       sideOffset={sideOffset}
       className={cn(
-        "z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        "z-50 overflow-hidden rounded-lg border border-border bg-popover px-3 py-1.5 text-xs font-medium text-popover-foreground",
+        // Premium shadow
+        "shadow-lg shadow-black/10",
+        // Faster, snappier animations
+        "animate-in fade-in-0 zoom-in-95 duration-150",
+        "data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=closed]:duration-100",
+        // Slide from edge
+        "data-[side=bottom]:slide-in-from-top-1",
+        "data-[side=left]:slide-in-from-right-1",
+        "data-[side=right]:slide-in-from-left-1",
+        "data-[side=top]:slide-in-from-bottom-1",
         className
       )}
       {...props}

apps/app/src/components/ui/xml-syntax-editor.tsx

@@ -1,6 +1,11 @@
 "use client";
 
-import { useRef, useCallback, useMemo } from "react";
+import CodeMirror from "@uiw/react-codemirror";
+import { xml } from "@codemirror/lang-xml";
+import { EditorView } from "@codemirror/view";
+import { Extension } from "@codemirror/state";
+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
+import { tags as t } from "@lezer/highlight";
 import { cn } from "@/lib/utils";
 
 interface XmlSyntaxEditorProps {
@@ -11,199 +16,78 @@ interface XmlSyntaxEditorProps {
   "data-testid"?: string;
 }
 
-// Tokenize XML content into parts for highlighting
-interface Token {
-  type:
-    | "tag-bracket"
-    | "tag-name"
-    | "attribute-name"
-    | "attribute-equals"
-    | "attribute-value"
-    | "text"
-    | "comment"
-    | "cdata"
-    | "doctype";
-  value: string;
-}
+// Syntax highlighting that uses CSS variables from the app's theme system
+// This automatically adapts to any theme (dark, light, dracula, nord, etc.)
+const syntaxColors = HighlightStyle.define([
+  // XML tags - use primary color
+  { tag: t.tagName, color: "var(--primary)" },
+  { tag: t.angleBracket, color: "var(--muted-foreground)" },
 
-function tokenizeXml(text: string): Token[] {
-  const tokens: Token[] = [];
-  let i = 0;
+  // Attributes
+  { tag: t.attributeName, color: "var(--chart-2, oklch(0.6 0.118 184.704))" },
+  { tag: t.attributeValue, color: "var(--chart-1, oklch(0.646 0.222 41.116))" },
 
-  while (i < text.length) {
-    // Comment: <!-- ... -->
-    if (text.slice(i, i + 4) === "<!--") {
-      const end = text.indexOf("-->", i + 4);
-      if (end !== -1) {
-        tokens.push({ type: "comment", value: text.slice(i, end + 3) });
-        i = end + 3;
-        continue;
-      }
-    }
+  // Strings and content
+  { tag: t.string, color: "var(--chart-1, oklch(0.646 0.222 41.116))" },
+  { tag: t.content, color: "var(--foreground)" },
 
-    // CDATA: <![CDATA[ ... ]]>
-    if (text.slice(i, i + 9) === "<![CDATA[") {
-      const end = text.indexOf("]]>", i + 9);
-      if (end !== -1) {
-        tokens.push({ type: "cdata", value: text.slice(i, end + 3) });
-        i = end + 3;
-        continue;
-      }
-    }
+  // Comments
+  { tag: t.comment, color: "var(--muted-foreground)", fontStyle: "italic" },
 
-    // DOCTYPE: <!DOCTYPE ... >
-    if (text.slice(i, i + 9).toUpperCase() === "<!DOCTYPE") {
-      const end = text.indexOf(">", i + 9);
-      if (end !== -1) {
-        tokens.push({ type: "doctype", value: text.slice(i, end + 1) });
-        i = end + 1;
-        continue;
-      }
-    }
+  // Special
+  { tag: t.processingInstruction, color: "var(--muted-foreground)" },
+  { tag: t.documentMeta, color: "var(--muted-foreground)" },
+]);
 
-    // Tag: < ... >
-    if (text[i] === "<") {
-      // Find the end of the tag
-      let tagEnd = i + 1;
-      let inString: string | null = null;
+// Editor theme using CSS variables
+const editorTheme = EditorView.theme({
+  "&": {
+    height: "100%",
+    fontSize: "0.875rem",
+    fontFamily: "ui-monospace, monospace",
+    backgroundColor: "transparent",
+    color: "var(--foreground)",
+  },
+  ".cm-scroller": {
+    overflow: "auto",
+    fontFamily: "ui-monospace, monospace",
+  },
+  ".cm-content": {
+    padding: "1rem",
+    minHeight: "100%",
+    caretColor: "var(--primary)",
+  },
+  ".cm-cursor, .cm-dropCursor": {
+    borderLeftColor: "var(--primary)",
+  },
+  "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
+    {
+      backgroundColor: "oklch(0.55 0.25 265 / 0.3)",
+    },
+  ".cm-activeLine": {
+    backgroundColor: "transparent",
+  },
+  ".cm-line": {
+    padding: "0",
+  },
+  "&.cm-focused": {
+    outline: "none",
+  },
+  ".cm-gutters": {
+    display: "none",
+  },
+  ".cm-placeholder": {
+    color: "var(--muted-foreground)",
+    fontStyle: "italic",
+  },
+});
 
-      while (tagEnd < text.length) {
-        const char = text[tagEnd];
-
-        if (inString) {
-          if (char === inString && text[tagEnd - 1] !== "\\") {
-            inString = null;
-          }
-        } else {
-          if (char === '"' || char === "'") {
-            inString = char;
-          } else if (char === ">") {
-            tagEnd++;
-            break;
-          }
-        }
-        tagEnd++;
-      }
-
-      const tagContent = text.slice(i, tagEnd);
-      const tagTokens = tokenizeTag(tagContent);
-      tokens.push(...tagTokens);
-      i = tagEnd;
-      continue;
-    }
-
-    // Text content between tags
-    const nextTag = text.indexOf("<", i);
-    if (nextTag === -1) {
-      tokens.push({ type: "text", value: text.slice(i) });
-      break;
-    } else if (nextTag > i) {
-      tokens.push({ type: "text", value: text.slice(i, nextTag) });
-      i = nextTag;
-    }
-  }
-
-  return tokens;
-}
-
-function tokenizeTag(tag: string): Token[] {
-  const tokens: Token[] = [];
-  let i = 0;
-
-  // Opening bracket (< or </ or <?)
-  if (tag.startsWith("</")) {
-    tokens.push({ type: "tag-bracket", value: "</" });
-    i = 2;
-  } else if (tag.startsWith("<?")) {
-    tokens.push({ type: "tag-bracket", value: "<?" });
-    i = 2;
-  } else {
-    tokens.push({ type: "tag-bracket", value: "<" });
-    i = 1;
-  }
-
-  // Skip whitespace
-  while (i < tag.length && /\s/.test(tag[i])) {
-    tokens.push({ type: "text", value: tag[i] });
-    i++;
-  }
-
-  // Tag name
-  let tagName = "";
-  while (i < tag.length && /[a-zA-Z0-9_:-]/.test(tag[i])) {
-    tagName += tag[i];
-    i++;
-  }
-  if (tagName) {
-    tokens.push({ type: "tag-name", value: tagName });
-  }
-
-  // Attributes and closing
-  while (i < tag.length) {
-    // Skip whitespace
-    if (/\s/.test(tag[i])) {
-      let ws = "";
-      while (i < tag.length && /\s/.test(tag[i])) {
-        ws += tag[i];
-        i++;
-      }
-      tokens.push({ type: "text", value: ws });
-      continue;
-    }
-
-    // Closing bracket
-    if (tag[i] === ">" || tag.slice(i, i + 2) === "/>" || tag.slice(i, i + 2) === "?>") {
-      tokens.push({ type: "tag-bracket", value: tag.slice(i) });
-      break;
-    }
-
-    // Attribute name
-    let attrName = "";
-    while (i < tag.length && /[a-zA-Z0-9_:-]/.test(tag[i])) {
-      attrName += tag[i];
-      i++;
-    }
-    if (attrName) {
-      tokens.push({ type: "attribute-name", value: attrName });
-    }
-
-    // Skip whitespace around =
-    while (i < tag.length && /\s/.test(tag[i])) {
-      tokens.push({ type: "text", value: tag[i] });
-      i++;
-    }
-
-    // Equals sign
-    if (tag[i] === "=") {
-      tokens.push({ type: "attribute-equals", value: "=" });
-      i++;
-    }
-
-    // Skip whitespace after =
-    while (i < tag.length && /\s/.test(tag[i])) {
-      tokens.push({ type: "text", value: tag[i] });
-      i++;
-    }
-
-    // Attribute value
-    if (tag[i] === '"' || tag[i] === "'") {
-      const quote = tag[i];
-      let value = quote;
-      i++;
-      while (i < tag.length && tag[i] !== quote) {
-        value += tag[i];
-        i++;
-      }
-      if (i < tag.length) {
-        value += tag[i];
-        i++;
-      }
-      tokens.push({ type: "attribute-value", value });
-    }
-  }
-
-  return tokens;
-}
+// Combine all extensions
+const extensions: Extension[] = [
+  xml(),
+  syntaxHighlighting(syntaxColors),
+  editorTheme,
+];
 
 export function XmlSyntaxEditor({
   value,
@@ -212,78 +96,24 @@ export function XmlSyntaxEditor({
   className,
   "data-testid": testId,
 }: XmlSyntaxEditorProps) {
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
-  const highlightRef = useRef<HTMLDivElement>(null);
-
-  // Sync scroll between textarea and highlight layer
-  const handleScroll = useCallback(() => {
-    if (textareaRef.current && highlightRef.current) {
-      highlightRef.current.scrollTop = textareaRef.current.scrollTop;
-      highlightRef.current.scrollLeft = textareaRef.current.scrollLeft;
-    }
-  }, []);
-
-  // Handle tab key for indentation
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      if (e.key === "Tab") {
-        e.preventDefault();
-        const textarea = e.currentTarget;
-        const start = textarea.selectionStart;
-        const end = textarea.selectionEnd;
-        const newValue =
-          value.substring(0, start) + "  " + value.substring(end);
-        onChange(newValue);
-        // Reset cursor position after state update
-        requestAnimationFrame(() => {
-          textarea.selectionStart = textarea.selectionEnd = start + 2;
-        });
-      }
-    },
-    [value, onChange]
-  );
-
-  // Memoize the highlighted content
-  const highlightedContent = useMemo(() => {
-    const tokens = tokenizeXml(value);
-
-    return tokens.map((token, index) => {
-      const className = `xml-${token.type}`;
-      // React handles escaping automatically, just render the raw value
-      return (
-        <span key={index} className={className}>
-          {token.value}
-        </span>
-      );
-    });
-  }, [value]);
-
   return (
-    <div className={cn("relative w-full h-full xml-editor", className)}>
-      {/* Syntax highlighted layer (read-only, behind textarea) */}
-      <div
-        ref={highlightRef}
-        className="absolute inset-0 overflow-auto pointer-events-none font-mono text-sm p-4 whitespace-pre-wrap break-words"
-        aria-hidden="true"
-      >
-        {value ? (
-          <code className="xml-highlight">{highlightedContent}</code>
-        ) : (
-          <span className="text-muted-foreground opacity-50">{placeholder}</span>
-        )}
-      </div>
-
-      {/* Actual textarea (transparent text, handles input) */}
-      <textarea
-        ref={textareaRef}
+    <div className={cn("w-full h-full", className)} data-testid={testId}>
+      <CodeMirror
         value={value}
-        onChange={(e) => onChange(e.target.value)}
-        onScroll={handleScroll}
-        onKeyDown={handleKeyDown}
-        placeholder=""
-        spellCheck={false}
-        className="absolute inset-0 w-full h-full font-mono text-sm p-4 bg-transparent resize-none focus:outline-none text-transparent caret-foreground selection:bg-primary/30"
-        data-testid={testId}
+        onChange={onChange}
+        extensions={extensions}
+        theme="none"
+        placeholder={placeholder}
+        className="h-full [&_.cm-editor]:h-full"
+        basicSetup={{
+          lineNumbers: false,
+          foldGutter: false,
+          highlightActiveLine: false,
+          highlightSelectionMatches: true,
+          autocompletion: true,
+          bracketMatching: true,
+          indentOnInput: true,
+        }}
       />
     </div>
   );

apps/app/src/components/views/agent-tools-view.tsx

@@ -149,12 +149,12 @@ export function AgentToolsView() {
     setTerminalResult(null);
 
     try {
-      // Simulate agent requesting terminal command execution
-      console.log(`[Agent Tool] Requesting to run command: ${terminalCommand}`);
+      // Terminal command simulation for demonstration purposes
+      console.log(`[Agent Tool] Simulating command: ${terminalCommand}`);
 
-      // In mock mode, simulate terminal output
-      // In real Electron mode, this would use child_process
-      const mockOutputs: Record<string, string> = {
+      // Simulated outputs for common commands (preview mode)
+      // In production, the agent executes commands via Claude SDK
+      const simulatedOutputs: Record<string, string> = {
         ls: "app_spec.txt\nfeatures\nnode_modules\npackage.json\nsrc\ntests\ntsconfig.json",
         pwd: currentProject?.path || "/Users/demo/project",
         "echo hello": "hello",
@@ -168,8 +168,8 @@ export function AgentToolsView() {
       await new Promise((resolve) => setTimeout(resolve, 500));
 
       const output =
-        mockOutputs[terminalCommand.toLowerCase()] ||
-        `Command executed: ${terminalCommand}\n(Mock output - real execution requires Electron mode)`;
+        simulatedOutputs[terminalCommand.toLowerCase()] ||
+        `[Preview] ${terminalCommand}\n(Terminal commands are executed by the agent during feature implementation)`;
 
       setTerminalResult({
         success: true,

apps/app/src/components/views/agent-view.tsx

@@ -2,7 +2,6 @@
 
 import { useState, useCallback, useRef, useEffect, useMemo } from "react";
 import { useAppStore } from "@/store/app-store";
-import { Card, CardContent } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { ImageDropZone } from "@/components/ui/image-drop-zone";
@@ -222,11 +221,6 @@ export function AgentView() {
       e.stopPropagation();
       if (isProcessing || !isConnected) return;
 
-      console.log(
-        "[agent-view] Drag enter types:",
-        Array.from(e.dataTransfer.types)
-      );
-
       // Check if dragged items contain files
       if (e.dataTransfer.types.includes("Files")) {
         setIsDragOver(true);
@@ -262,39 +256,21 @@ export function AgentView() {
 
       if (isProcessing || !isConnected) return;
 
-      console.log("[agent-view] Drop event:", {
-        filesCount: e.dataTransfer.files.length,
-        itemsCount: e.dataTransfer.items.length,
-        types: Array.from(e.dataTransfer.types),
-      });
-
       // Check if we have files
       const files = e.dataTransfer.files;
       if (files && files.length > 0) {
-        console.log("[agent-view] Processing files from dataTransfer.files");
         processDroppedFiles(files);
         return;
       }
 
       // Handle file paths (from screenshots or other sources)
-      // This is common on macOS when dragging screenshots
       const items = e.dataTransfer.items;
       if (items && items.length > 0) {
-        console.log("[agent-view] Processing items");
         for (let i = 0; i < items.length; i++) {
           const item = items[i];
-          console.log(`[agent-view] Item ${i}:`, {
-            kind: item.kind,
-            type: item.type,
-          });
           if (item.kind === "file") {
             const file = item.getAsFile();
             if (file) {
-              console.log("[agent-view] Got file from item:", {
-                name: file.name,
-                type: file.type,
-                size: file.size,
-              });
               const dataTransfer = new DataTransfer();
               dataTransfer.items.add(file);
               processDroppedFiles(dataTransfer.files);
@@ -315,10 +291,6 @@ export function AgentView() {
 
         for (let i = 0; i < items.length; i++) {
           const item = items[i];
-          console.log("[agent-view] Paste item:", {
-            kind: item.kind,
-            type: item.type,
-          });
 
           if (item.kind === "file") {
             const file = item.getAsFile();
@@ -330,10 +302,6 @@ export function AgentView() {
         }
 
         if (files.length > 0) {
-          console.log(
-            "[agent-view] Processing pasted image files:",
-            files.length
-          );
           const dataTransfer = new DataTransfer();
           files.forEach((file) => dataTransfer.items.add(file));
           await processDroppedFiles(dataTransfer.files);
@@ -442,13 +410,15 @@ export function AgentView() {
   if (!currentProject) {
     return (
       <div
-        className="flex-1 flex items-center justify-center"
+        className="flex-1 flex items-center justify-center bg-background"
         data-testid="agent-view-no-project"
       >
-        <div className="text-center">
-          <Sparkles className="w-12 h-12 text-muted-foreground mx-auto mb-4" />
-          <h2 className="text-xl font-semibold mb-2">No Project Selected</h2>
-          <p className="text-muted-foreground">
+        <div className="text-center max-w-md">
+          <div className="w-16 h-16 rounded-2xl bg-primary/10 flex items-center justify-center mx-auto mb-6">
+            <Sparkles className="w-8 h-8 text-primary" />
+          </div>
+          <h2 className="text-xl font-semibold mb-3 text-foreground">No Project Selected</h2>
+          <p className="text-muted-foreground leading-relaxed">
             Open or create a project to start working with the AI agent.
           </p>
         </div>
@@ -472,12 +442,12 @@ export function AgentView() {
 
   return (
     <div
-      className="flex-1 flex overflow-hidden content-bg"
+      className="flex-1 flex overflow-hidden bg-background"
       data-testid="agent-view"
     >
       {/* Session Manager Sidebar */}
       {showSessionManager && currentProject && (
-        <div className="w-80 border-r flex-shrink-0">
+        <div className="w-80 border-r border-border flex-shrink-0 bg-card/50">
           <SessionManager
             currentSessionId={currentSessionId}
             onSelectSession={handleSelectSession}
@@ -491,13 +461,13 @@ export function AgentView() {
       {/* Chat Area */}
       <div className="flex-1 flex flex-col overflow-hidden">
         {/* Header */}
-        <div className="flex items-center justify-between p-4 border-b border-border bg-glass backdrop-blur-md">
-          <div className="flex items-center gap-3">
+        <div className="flex items-center justify-between px-6 py-4 border-b border-border bg-card/50 backdrop-blur-sm">
+          <div className="flex items-center gap-4">
             <Button
               variant="ghost"
               size="sm"
               onClick={() => setShowSessionManager(!showSessionManager)}
-              className="h-8 w-8 p-0"
+              className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
             >
               {showSessionManager ? (
                 <PanelLeftClose className="w-4 h-4" />
@@ -505,26 +475,28 @@ export function AgentView() {
                 <PanelLeft className="w-4 h-4" />
               )}
             </Button>
-            <Bot className="w-5 h-5 text-primary" />
+            <div className="w-9 h-9 rounded-xl bg-primary/10 flex items-center justify-center">
+              <Bot className="w-5 h-5 text-primary" />
+            </div>
             <div>
-              <h1 className="text-xl font-bold">AI Agent</h1>
+              <h1 className="text-lg font-semibold text-foreground">AI Agent</h1>
               <p className="text-sm text-muted-foreground">
                 {currentProject.name}
-                {currentSessionId && !isConnected && " · Connecting..."}
+                {currentSessionId && !isConnected && " - Connecting..."}
               </p>
             </div>
           </div>
 
           {/* Status indicators & actions */}
-          <div className="flex items-center gap-2">
+          <div className="flex items-center gap-3">
             {currentTool && (
-              <div className="flex items-center gap-1 text-xs text-muted-foreground bg-muted px-2 py-1 rounded">
-                <Wrench className="w-3 h-3" />
-                <span>{currentTool}</span>
+              <div className="flex items-center gap-2 text-xs text-muted-foreground bg-muted/50 px-3 py-1.5 rounded-full border border-border">
+                <Wrench className="w-3 h-3 text-primary" />
+                <span className="font-medium">{currentTool}</span>
               </div>
             )}
             {agentError && (
-              <span className="text-xs text-destructive">{agentError}</span>
+              <span className="text-xs text-destructive font-medium">{agentError}</span>
             )}
             {currentSessionId && messages.length > 0 && (
               <Button
@@ -532,8 +504,9 @@ export function AgentView() {
                 size="sm"
                 onClick={handleClearChat}
                 disabled={isProcessing}
+                className="text-muted-foreground hover:text-foreground"
               >
-                <Trash2 className="w-4 h-4 mr-1" />
+                <Trash2 className="w-4 h-4 mr-2" />
                 Clear
               </Button>
             )}
@@ -543,22 +516,25 @@ export function AgentView() {
         {/* Messages */}
         {!currentSessionId ? (
           <div
-            className="flex-1 flex items-center justify-center"
+            className="flex-1 flex items-center justify-center bg-background"
             data-testid="no-session-placeholder"
           >
-            <div className="text-center">
-              <Bot className="w-12 h-12 text-muted-foreground mx-auto mb-4 opacity-50" />
-              <h2 className="text-lg font-semibold mb-2">
+            <div className="text-center max-w-md">
+              <div className="w-16 h-16 rounded-2xl bg-muted/50 flex items-center justify-center mx-auto mb-6">
+                <Bot className="w-8 h-8 text-muted-foreground" />
+              </div>
+              <h2 className="text-lg font-semibold mb-3 text-foreground">
                 No Session Selected
               </h2>
-              <p className="text-sm text-muted-foreground mb-4">
-                Create or select a session to start chatting
+              <p className="text-sm text-muted-foreground mb-6 leading-relaxed">
+                Create or select a session to start chatting with the AI agent
               </p>
               <Button
                 onClick={() => setShowSessionManager(true)}
                 variant="outline"
+                className="gap-2"
               >
-                <PanelLeft className="w-4 h-4 mr-2" />
+                <PanelLeft className="w-4 h-4" />
                 {showSessionManager ? "View" : "Show"} Sessions
               </Button>
             </div>
@@ -566,7 +542,7 @@ export function AgentView() {
         ) : (
           <div
             ref={messagesContainerRef}
-            className="flex-1 overflow-y-auto p-4 space-y-4"
+            className="flex-1 overflow-y-auto px-6 py-6 space-y-6 scroll-smooth"
             data-testid="message-list"
             onScroll={handleScroll}
           >
@@ -574,95 +550,156 @@ export function AgentView() {
               <div
                 key={message.id}
                 className={cn(
-                  "flex gap-3",
-                  message.role === "user" && "flex-row-reverse"
+                  "flex gap-4 max-w-4xl",
+                  message.role === "user" ? "flex-row-reverse ml-auto" : ""
                 )}
               >
+                {/* Avatar */}
                 <div
                   className={cn(
-                    "w-8 h-8 rounded-full flex items-center justify-center shrink-0",
-                    message.role === "assistant" ? "bg-primary/10" : "bg-muted"
+                    "w-9 h-9 rounded-xl flex items-center justify-center shrink-0 shadow-sm",
+                    message.role === "assistant"
+                      ? "bg-primary/10 ring-1 ring-primary/20"
+                      : "bg-muted ring-1 ring-border"
                   )}
                 >
                   {message.role === "assistant" ? (
                     <Bot className="w-4 h-4 text-primary" />
                   ) : (
-                    <User className="w-4 h-4" />
+                    <User className="w-4 h-4 text-muted-foreground" />
                   )}
                 </div>
-                <Card
+
+                {/* Message Bubble */}
+                <div
                   className={cn(
-                    "max-w-[80%] py-0",
+                    "flex-1 max-w-[85%] rounded-2xl px-4 py-3 shadow-sm",
                     message.role === "user"
-                      ? "bg-transparent border border-primary text-foreground"
-                      : "border-l-4 border-primary bg-card"
+                      ? "bg-primary text-primary-foreground"
+                      : "bg-card border border-border"
                   )}
                 >
-                  <CardContent className="px-3 py-2">
-                    {message.role === "assistant" ? (
-                      <Markdown className="text-sm text-primary prose-headings:text-primary prose-strong:text-primary prose-code:text-primary">
-                        {message.content}
-                      </Markdown>
-                    ) : (
-                      <p className="text-sm whitespace-pre-wrap">
-                        {message.content}
-                      </p>
-                    )}
-                    <p
-                      className={cn(
-                        "text-xs mt-1",
-                        message.role === "user"
-                          ? "text-muted-foreground"
-                          : "text-primary/70"
-                      )}
-                    >
-                      {new Date(message.timestamp).toLocaleTimeString()}
+                  {message.role === "assistant" ? (
+                    <Markdown className="text-sm text-foreground prose-p:leading-relaxed prose-headings:text-foreground prose-strong:text-foreground prose-code:text-primary prose-code:bg-muted prose-code:px-1.5 prose-code:py-0.5 prose-code:rounded">
+                      {message.content}
+                    </Markdown>
+                  ) : (
+                    <p className="text-sm whitespace-pre-wrap leading-relaxed">
+                      {message.content}
                     </p>
-                  </CardContent>
-                </Card>
+                  )}
+                  <p
+                    className={cn(
+                      "text-[11px] mt-2 font-medium",
+                      message.role === "user"
+                        ? "text-primary-foreground/70"
+                        : "text-muted-foreground"
+                    )}
+                  >
+                    {new Date(message.timestamp).toLocaleTimeString([], {
+                      hour: "2-digit",
+                      minute: "2-digit",
+                    })}
+                  </p>
+                </div>
               </div>
             ))}
 
+            {/* Thinking Indicator */}
             {isProcessing && (
-              <div className="flex gap-3">
-                <div className="w-8 h-8 rounded-full bg-primary/10 flex items-center justify-center">
+              <div className="flex gap-4 max-w-4xl">
+                <div className="w-9 h-9 rounded-xl bg-primary/10 ring-1 ring-primary/20 flex items-center justify-center shrink-0 shadow-sm">
                   <Bot className="w-4 h-4 text-primary" />
                 </div>
-                <Card className="border-l-4 border-primary bg-card py-0">
-                  <CardContent className="p-3">
-                    <div className="flex items-center gap-2">
-                      <Loader2 className="w-4 h-4 animate-spin text-primary" />
-                      <span className="text-sm text-primary">
-                        Thinking...
-                      </span>
+                <div className="bg-card border border-border rounded-2xl px-4 py-3 shadow-sm">
+                  <div className="flex items-center gap-3">
+                    <div className="flex items-center gap-1">
+                      <span className="w-2 h-2 rounded-full bg-primary animate-pulse" style={{ animationDelay: "0ms" }} />
+                      <span className="w-2 h-2 rounded-full bg-primary animate-pulse" style={{ animationDelay: "150ms" }} />
+                      <span className="w-2 h-2 rounded-full bg-primary animate-pulse" style={{ animationDelay: "300ms" }} />
                     </div>
-                  </CardContent>
-                </Card>
+                    <span className="text-sm text-muted-foreground">
+                      Thinking...
+                    </span>
+                  </div>
+                </div>
               </div>
             )}
           </div>
         )}
 
-        {/* Input */}
+        {/* Input Area */}
         {currentSessionId && (
-          <div className="border-t border-border p-4 space-y-3 bg-background">
+          <div className="border-t border-border p-4 bg-card/50 backdrop-blur-sm">
             {/* Image Drop Zone (when visible) */}
             {showImageDropZone && (
               <ImageDropZone
                 onImagesSelected={handleImagesSelected}
                 images={selectedImages}
                 maxFiles={5}
-                className="mb-3"
+                className="mb-4"
                 disabled={isProcessing || !isConnected}
               />
             )}
 
-            {/* Text Input and Controls - with drag and drop support */}
+            {/* Selected Images Preview */}
+            {selectedImages.length > 0 && (
+              <div className="mb-4 space-y-2">
+                <div className="flex items-center justify-between">
+                  <p className="text-xs font-medium text-foreground">
+                    {selectedImages.length} image
+                    {selectedImages.length > 1 ? "s" : ""} attached
+                  </p>
+                  <button
+                    onClick={() => setSelectedImages([])}
+                    className="text-xs text-muted-foreground hover:text-foreground transition-colors"
+                    disabled={isProcessing}
+                  >
+                    Clear all
+                  </button>
+                </div>
+                <div className="flex flex-wrap gap-2">
+                  {selectedImages.map((image) => (
+                    <div
+                      key={image.id}
+                      className="group relative rounded-lg border border-border bg-muted/30 p-2 flex items-center gap-2 hover:border-primary/30 transition-colors"
+                    >
+                      {/* Image thumbnail */}
+                      <div className="w-8 h-8 rounded-md overflow-hidden bg-muted flex-shrink-0">
+                        <img
+                          src={image.data}
+                          alt={image.filename}
+                          className="w-full h-full object-cover"
+                        />
+                      </div>
+                      {/* Image info */}
+                      <div className="min-w-0 flex-1">
+                        <p className="text-xs font-medium text-foreground truncate max-w-24">
+                          {image.filename}
+                        </p>
+                        <p className="text-[10px] text-muted-foreground">
+                          {formatFileSize(image.size)}
+                        </p>
+                      </div>
+                      {/* Remove button */}
+                      <button
+                        onClick={() => removeImage(image.id)}
+                        className="opacity-0 group-hover:opacity-100 transition-opacity p-1 rounded-full hover:bg-destructive/10 text-muted-foreground hover:text-destructive"
+                        disabled={isProcessing}
+                      >
+                        <X className="h-3 w-3" />
+                      </button>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )}
+
+            {/* Text Input and Controls */}
             <div
               className={cn(
-                "flex gap-2 transition-all duration-200 rounded-lg",
-                isDragOver &&
-                  "bg-primary/10 ring-2 ring-primary ring-offset-2 ring-offset-background"
+                "flex gap-2 transition-all duration-200 rounded-xl p-1",
+                isDragOver && "bg-primary/5 ring-2 ring-primary/30"
               )}
               onDragEnter={handleDragEnter}
               onDragLeave={handleDragLeave}
@@ -684,21 +721,19 @@ export function AgentView() {
                   disabled={isProcessing || !isConnected}
                   data-testid="agent-input"
                   className={cn(
-                    "bg-input border-border",
-                    selectedImages.length > 0 &&
-                      "border-primary/50 bg-primary/5",
-                    isDragOver &&
-                      "border-primary bg-primary/10"
+                    "h-11 bg-background border-border rounded-xl pl-4 pr-20 text-sm transition-all",
+                    "focus:ring-2 focus:ring-primary/20 focus:border-primary/50",
+                    selectedImages.length > 0 && "border-primary/30",
+                    isDragOver && "border-primary bg-primary/5"
                   )}
                 />
                 {selectedImages.length > 0 && !isDragOver && (
-                  <div className="absolute right-2 top-1/2 transform -translate-y-1/2 text-xs text-primary-foreground bg-primary px-2 py-1 rounded">
-                    {selectedImages.length} image
-                    {selectedImages.length > 1 ? "s" : ""}
+                  <div className="absolute right-3 top-1/2 -translate-y-1/2 text-xs bg-primary text-primary-foreground px-2 py-0.5 rounded-full font-medium">
+                    {selectedImages.length} image{selectedImages.length > 1 ? "s" : ""}
                   </div>
                 )}
                 {isDragOver && (
-                  <div className="absolute right-2 top-1/2 transform -translate-y-1/2 text-xs text-primary-foreground bg-primary px-2 py-1 rounded flex items-center gap-1">
+                  <div className="absolute right-3 top-1/2 -translate-y-1/2 flex items-center gap-1.5 text-xs text-primary font-medium">
                     <Paperclip className="w-3 h-3" />
                     Drop here
                   </div>
@@ -708,13 +743,13 @@ export function AgentView() {
               {/* Image Attachment Button */}
               <Button
                 variant="outline"
-                size="default"
+                size="icon"
                 onClick={toggleImageDropZone}
                 disabled={isProcessing || !isConnected}
                 className={cn(
-                  showImageDropZone &&
-                    "bg-primary/20 text-primary border-primary",
-                  selectedImages.length > 0 && "border-primary"
+                  "h-11 w-11 rounded-xl border-border",
+                  showImageDropZone && "bg-primary/10 text-primary border-primary/30",
+                  selectedImages.length > 0 && "border-primary/30 text-primary"
                 )}
                 title="Attach images"
               >
@@ -729,64 +764,17 @@ export function AgentView() {
                   isProcessing ||
                   !isConnected
                 }
+                className="h-11 px-4 rounded-xl"
                 data-testid="send-message"
               >
                 <Send className="w-4 h-4" />
               </Button>
             </div>
 
-            {/* Selected Images Preview */}
-            {selectedImages.length > 0 && (
-              <div className="space-y-2">
-                <div className="flex items-center justify-between">
-                  <p className="text-xs font-medium text-foreground">
-                    {selectedImages.length} image
-                    {selectedImages.length > 1 ? "s" : ""} attached
-                  </p>
-                  <button
-                    onClick={() => setSelectedImages([])}
-                    className="text-xs text-muted-foreground hover:text-foreground"
-                    disabled={isProcessing}
-                  >
-                    Clear all
-                  </button>
-                </div>
-                <div className="flex flex-wrap gap-2">
-                  {selectedImages.map((image) => (
-                    <div
-                      key={image.id}
-                      className="relative group rounded-md border border-muted bg-muted/50 p-2 flex items-center space-x-2"
-                    >
-                      {/* Image thumbnail */}
-                      <div className="w-8 h-8 rounded overflow-hidden bg-muted flex-shrink-0">
-                        <img
-                          src={image.data}
-                          alt={image.filename}
-                          className="w-full h-full object-cover"
-                        />
-                      </div>
-                      {/* Image info */}
-                      <div className="min-w-0 flex-1">
-                        <p className="text-xs font-medium text-foreground truncate">
-                          {image.filename}
-                        </p>
-                        <p className="text-xs text-muted-foreground">
-                          {formatFileSize(image.size)}
-                        </p>
-                      </div>
-                      {/* Remove button */}
-                      <button
-                        onClick={() => removeImage(image.id)}
-                        className="opacity-0 group-hover:opacity-100 transition-opacity p-1 rounded-full hover:bg-destructive hover:text-destructive-foreground text-muted-foreground"
-                        disabled={isProcessing}
-                      >
-                        <X className="h-3 w-3" />
-                      </button>
-                    </div>
-                  ))}
-                </div>
-              </div>
-            )}
+            {/* Keyboard hint */}
+            <p className="text-[11px] text-muted-foreground mt-2 text-center">
+              Press <kbd className="px-1.5 py-0.5 bg-muted rounded text-[10px] font-medium">Enter</kbd> to send
+            </p>
           </div>
         )}
       </div>

apps/app/src/components/views/analysis-view.tsx

@@ -345,6 +345,7 @@ export function AnalysisView() {
       const techStack = detectTechStack();
 
       // Generate the spec content
+      // Note: Must follow XML format as defined in apps/server/src/lib/app-spec-format.ts
       const specContent = `<project_specification>
   <project_name>${projectName}</project_name>
 
@@ -399,7 +400,7 @@ ${Object.entries(projectAnalysis.filesByExtension)
 `;
 
       // Write the spec file
-      const specPath = `${currentProject.path}/app_spec.txt`;
+      const specPath = `${currentProject.path}/.automaker/app_spec.txt`;
       const writeResult = await api.writeFile(specPath, specContent);
 
       if (writeResult.success) {

apps/app/src/components/views/context-view.tsx

@@ -17,6 +17,8 @@ import {
   File,
   X,
   BookOpen,
+  EditIcon,
+  Eye,
 } from "lucide-react";
 import {
   useKeyboardShortcuts,
@@ -34,6 +36,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { cn } from "@/lib/utils";
+import { Markdown } from "../ui/markdown";
 
 interface ContextFile {
   name: string;
@@ -60,6 +63,7 @@ export function ContextView() {
   );
   const [newFileContent, setNewFileContent] = useState("");
   const [isDropHovering, setIsDropHovering] = useState(false);
+  const [isPreviewMode, setIsPreviewMode] = useState(false);
 
   // Keyboard shortcuts for this view
   const contextShortcuts: KeyboardShortcut[] = useMemo(
@@ -80,6 +84,11 @@ export function ContextView() {
     return `${currentProject.path}/.automaker/context`;
   }, [currentProject]);
 
+  const isMarkdownFile = (filename: string): boolean => {
+    const ext = filename.toLowerCase().substring(filename.lastIndexOf("."));
+    return ext === ".md" || ext === ".markdown";
+  };
+
   // Determine if a file is an image based on extension
   const isImageFile = (filename: string): boolean => {
     const imageExtensions = [
@@ -151,6 +160,7 @@ export function ContextView() {
       // Could add a confirmation dialog here
     }
     loadFileContent(file);
+    setIsPreviewMode(isMarkdownFile(file.name));
   };
 
   // Save current file
@@ -383,6 +393,7 @@ export function ContextView() {
         className="flex-1 flex overflow-hidden"
         onDrop={handleDrop}
         onDragOver={handleDragOver}
+        data-testid="context-drop-zone"
       >
         {/* Left Panel - File List */}
         <div className="w-64 border-r border-border flex flex-col overflow-hidden">
@@ -448,6 +459,27 @@ export function ContextView() {
                   </span>
                 </div>
                 <div className="flex gap-2">
+                  {selectedFile.type === "text" &&
+                    isMarkdownFile(selectedFile.name) && (
+                      <Button
+                        variant={"outline"}
+                        size="sm"
+                        onClick={() => setIsPreviewMode(!isPreviewMode)}
+                        data-testid="toggle-preview-mode"
+                      >
+                        {isPreviewMode ? (
+                          <>
+                            <EditIcon className="w-4 h-4 mr-2" />
+                            Edit
+                          </>
+                        ) : (
+                          <>
+                            <Eye className="w-4 h-4 mr-2" />
+                            Preview
+                          </>
+                        )}
+                      </Button>
+                    )}
                   {selectedFile.type === "text" && (
                     <Button
                       size="sm"
@@ -484,6 +516,10 @@ export function ContextView() {
                       className="max-w-full max-h-full object-contain"
                     />
                   </div>
+                ) : isPreviewMode ? (
+                  <Card className="h-full overflow-auto p-4" data-testid="markdown-preview">
+                    <Markdown>{editedContent}</Markdown>
+                  </Card>
                 ) : (
                   <Card className="h-full overflow-hidden">
                     <textarea

apps/app/src/components/views/interview-view.tsx

@@ -18,6 +18,8 @@ import {
 import { cn } from "@/lib/utils";
 import { getElectronAPI } from "@/lib/electron";
 import { Markdown } from "@/components/ui/markdown";
+import { useFileBrowser } from "@/contexts/file-browser-context";
+import { toast } from "sonner";
 
 interface InterviewMessage {
   id: string;
@@ -65,6 +67,7 @@ const INTERVIEW_QUESTIONS = [
 export function InterviewView() {
   const { setCurrentView, addProject, setCurrentProject, setAppSpec } =
     useAppStore();
+  const { openFileBrowser } = useFileBrowser();
   const [input, setInput] = useState("");
   const [messages, setMessages] = useState<InterviewMessage[]>([]);
   const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
@@ -245,6 +248,7 @@ export function InterviewView() {
       .toLowerCase()
       .replace(/[^a-z0-9-]/g, "");
 
+    // Note: Must follow XML format as defined in apps/server/src/lib/app-spec-format.ts
     return `<project_specification>
   <project_name>${projectName || "my-project"}</project_name>
 
@@ -286,11 +290,14 @@ export function InterviewView() {
   };
 
   const handleSelectDirectory = async () => {
-    const api = getElectronAPI();
-    const result = await api.openDirectory();
+    const selectedPath = await openFileBrowser({
+      title: "Select Base Directory",
+      description:
+        "Choose the parent directory where your new project will be created",
+    });
 
-    if (!result.canceled && result.filePaths[0]) {
-      setProjectPath(result.filePaths[0]);
+    if (selectedPath) {
+      setProjectPath(selectedPath);
     }
   };
 
@@ -301,10 +308,24 @@ export function InterviewView() {
 
     try {
       const api = getElectronAPI();
-      const fullProjectPath = `${projectPath}/${projectName}`;
+      // Use platform-specific path separator
+      const pathSep =
+        typeof window !== "undefined" && (window as any).electronAPI
+          ? navigator.platform.indexOf("Win") !== -1
+            ? "\\"
+            : "/"
+          : "/";
+      const fullProjectPath = `${projectPath}${pathSep}${projectName}`;
 
       // Create project directory
-      await api.mkdir(fullProjectPath);
+      const mkdirResult = await api.mkdir(fullProjectPath);
+      if (!mkdirResult.success) {
+        toast.error("Failed to create project directory", {
+          description: mkdirResult.error || "Unknown error occurred",
+        });
+        setIsGenerating(false);
+        return;
+      }
 
       // Write app_spec.txt with generated content
       await api.writeFile(

apps/app/src/components/views/kanban-column.tsx

@@ -8,19 +8,25 @@ import type { ReactNode } from "react";
 interface KanbanColumnProps {
   id: string;
   title: string;
-  color: string;
+  colorClass: string;
   count: number;
   children: ReactNode;
   headerAction?: ReactNode;
+  opacity?: number;
+  showBorder?: boolean;
+  hideScrollbar?: boolean;
 }
 
 export const KanbanColumn = memo(function KanbanColumn({
   id,
   title,
-  color,
+  colorClass,
   count,
   children,
   headerAction,
+  opacity = 100,
+  showBorder = true,
+  hideScrollbar = false,
 }: KanbanColumnProps) {
   const { setNodeRef, isOver } = useDroppable({ id });
 
@@ -28,25 +34,53 @@ export const KanbanColumn = memo(function KanbanColumn({
     <div
       ref={setNodeRef}
       className={cn(
-        "flex flex-col h-full rounded-lg bg-card backdrop-blur-sm border border-border transition-colors w-72",
-        isOver && "bg-accent"
+        "relative flex flex-col h-full rounded-xl transition-all duration-200 w-72",
+        showBorder && "border border-border/60",
+        isOver && "ring-2 ring-primary/30 ring-offset-1 ring-offset-background"
       )}
       data-testid={`kanban-column-${id}`}
     >
+      {/* Background layer with opacity */}
+      <div
+        className={cn(
+          "absolute inset-0 rounded-xl backdrop-blur-sm transition-colors duration-200",
+          isOver ? "bg-accent/80" : "bg-card/80"
+        )}
+        style={{ opacity: opacity / 100 }}
+      />
+
       {/* Column Header */}
-      <div className="flex items-center gap-2 p-3 border-b border-border">
-        <div className={cn("w-3 h-3 rounded-full", color)} />
-        <h3 className="font-medium text-sm flex-1">{title}</h3>
+      <div
+        className={cn(
+          "relative z-10 flex items-center gap-3 px-3 py-2.5",
+          showBorder && "border-b border-border/40"
+        )}
+      >
+        <div className={cn("w-2.5 h-2.5 rounded-full shrink-0", colorClass)} />
+        <h3 className="font-semibold text-sm text-foreground/90 flex-1 tracking-tight">{title}</h3>
         {headerAction}
-        <span className="text-xs text-muted-foreground bg-background px-2 py-0.5 rounded-full">
+        <span className="text-xs font-medium text-muted-foreground/80 bg-muted/50 px-2 py-0.5 rounded-md tabular-nums">
           {count}
         </span>
       </div>
 
       {/* Column Content */}
-      <div className="flex-1 overflow-y-auto p-2 space-y-2">
+      <div
+        className={cn(
+          "relative z-10 flex-1 overflow-y-auto p-2 space-y-2.5",
+          hideScrollbar &&
+            "[&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]",
+          // Smooth scrolling
+          "scroll-smooth"
+        )}
+      >
         {children}
       </div>
+
+      {/* Drop zone indicator when dragging over */}
+      {isOver && (
+        <div className="absolute inset-0 rounded-xl bg-primary/5 pointer-events-none z-5 border-2 border-dashed border-primary/20" />
+      )}
     </div>
   );
 });

apps/app/src/components/views/profiles-view.tsx

@@ -1,19 +1,10 @@
 "use client";
 
-import { useState, useMemo, useCallback, useEffect } from "react";
+import { useState, useMemo, useCallback } from "react";
 import {
   useAppStore,
   AIProfile,
-  AgentModel,
-  ThinkingLevel,
-  ModelProvider,
 } from "@/store/app-store";
-import { Button } from "@/components/ui/button";
-import { HotkeyButton } from "@/components/ui/hotkey-button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { cn, modelSupportsThinking } from "@/lib/utils";
 import {
   useKeyboardShortcuts,
   useKeyboardShortcutsConfig,
@@ -23,26 +14,12 @@ import {
   Dialog,
   DialogContent,
   DialogDescription,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import {
-  UserCircle,
-  Plus,
-  Pencil,
-  Trash2,
-  Brain,
-  Zap,
-  Scale,
-  Cpu,
-  Rocket,
-  Sparkles,
-  GripVertical,
-  Lock,
-  Check,
-} from "lucide-react";
+import { Sparkles } from "lucide-react";
 import { toast } from "sonner";
+import { DeleteConfirmDialog } from "@/components/ui/delete-confirm-dialog";
 import {
   DndContext,
   DragEndEvent,
@@ -53,406 +30,13 @@ import {
 } from "@dnd-kit/core";
 import {
   SortableContext,
-  useSortable,
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import { CSS } from "@dnd-kit/utilities";
-
-// Icon mapping for profiles
-const PROFILE_ICONS: Record<
-  string,
-  React.ComponentType<{ className?: string }>
-> = {
-  Brain,
-  Zap,
-  Scale,
-  Cpu,
-  Rocket,
-  Sparkles,
-};
-
-// Available icons for selection
-const ICON_OPTIONS = [
-  { name: "Brain", icon: Brain },
-  { name: "Zap", icon: Zap },
-  { name: "Scale", icon: Scale },
-  { name: "Cpu", icon: Cpu },
-  { name: "Rocket", icon: Rocket },
-  { name: "Sparkles", icon: Sparkles },
-];
-
-// Model options for the form
-const CLAUDE_MODELS: { id: AgentModel; label: string }[] = [
-  { id: "haiku", label: "Claude Haiku" },
-  { id: "sonnet", label: "Claude Sonnet" },
-  { id: "opus", label: "Claude Opus" },
-];
-
-const CODEX_MODELS: { id: AgentModel; label: string }[] = [
-  { id: "gpt-5.1-codex-max", label: "GPT-5.1 Codex Max" },
-  { id: "gpt-5.1-codex", label: "GPT-5.1 Codex" },
-  { id: "gpt-5.1-codex-mini", label: "GPT-5.1 Codex Mini" },
-  { id: "gpt-5.1", label: "GPT-5.1" },
-];
-
-const THINKING_LEVELS: { id: ThinkingLevel; label: string }[] = [
-  { id: "none", label: "None" },
-  { id: "low", label: "Low" },
-  { id: "medium", label: "Medium" },
-  { id: "high", label: "High" },
-  { id: "ultrathink", label: "Ultrathink" },
-];
-
-// Helper to determine provider from model
-function getProviderFromModel(model: AgentModel): ModelProvider {
-  if (model.startsWith("gpt")) {
-    return "codex";
-  }
-  return "claude";
-}
-
-// Sortable Profile Card Component
-function SortableProfileCard({
-  profile,
-  onEdit,
-  onDelete,
-}: {
-  profile: AIProfile;
-  onEdit: () => void;
-  onDelete: () => void;
-}) {
-  const {
-    attributes,
-    listeners,
-    setNodeRef,
-    transform,
-    transition,
-    isDragging,
-  } = useSortable({ id: profile.id });
-
-  const style = {
-    transform: CSS.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-  };
-
-  const IconComponent = profile.icon ? PROFILE_ICONS[profile.icon] : Brain;
-  const isCodex = profile.provider === "codex";
-
-  return (
-    <div
-      ref={setNodeRef}
-      style={style}
-      className={cn(
-        "group relative flex items-start gap-4 p-4 rounded-xl border bg-card transition-all",
-        isDragging && "shadow-lg",
-        profile.isBuiltIn
-          ? "border-border/50"
-          : "border-border hover:border-primary/50 hover:shadow-sm"
-      )}
-      data-testid={`profile-card-${profile.id}`}
-    >
-      {/* Drag Handle */}
-      <button
-        {...attributes}
-        {...listeners}
-        className="p-1 rounded hover:bg-accent cursor-grab active:cursor-grabbing flex-shrink-0 mt-1"
-        data-testid={`profile-drag-handle-${profile.id}`}
-        onClick={(e) => e.stopPropagation()}
-      >
-        <GripVertical className="h-4 w-4 text-muted-foreground" />
-      </button>
-
-      {/* Icon */}
-      <div
-        className={cn(
-          "flex-shrink-0 w-10 h-10 rounded-lg flex items-center justify-center",
-          isCodex ? "bg-emerald-500/10" : "bg-primary/10"
-        )}
-      >
-        {IconComponent && (
-          <IconComponent
-            className={cn(
-              "w-5 h-5",
-              isCodex ? "text-emerald-500" : "text-primary"
-            )}
-          />
-        )}
-      </div>
-
-      {/* Content */}
-      <div className="flex-1 min-w-0">
-        <div className="flex items-center gap-2">
-          <h3 className="font-semibold text-foreground">{profile.name}</h3>
-          {profile.isBuiltIn && (
-            <span className="flex items-center gap-1 text-[10px] px-1.5 py-0.5 rounded-full bg-muted text-muted-foreground">
-              <Lock className="w-2.5 h-2.5" />
-              Built-in
-            </span>
-          )}
-        </div>
-        <p className="text-sm text-muted-foreground mt-0.5 line-clamp-2">
-          {profile.description}
-        </p>
-        <div className="flex items-center gap-2 mt-2 flex-wrap">
-          <span
-            className={cn(
-              "text-xs px-2 py-0.5 rounded-full border",
-              isCodex
-                ? "border-emerald-500/30 text-emerald-600 dark:text-emerald-400 bg-emerald-500/10"
-                : "border-primary/30 text-primary bg-primary/10"
-            )}
-          >
-            {profile.model}
-          </span>
-          {profile.thinkingLevel !== "none" && (
-            <span className="text-xs px-2 py-0.5 rounded-full border border-amber-500/30 text-amber-600 dark:text-amber-400 bg-amber-500/10">
-              {profile.thinkingLevel}
-            </span>
-          )}
-        </div>
-      </div>
-
-      {/* Actions */}
-      {!profile.isBuiltIn && (
-        <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={onEdit}
-            className="h-8 w-8 p-0"
-            data-testid={`edit-profile-${profile.id}`}
-          >
-            <Pencil className="w-4 h-4" />
-          </Button>
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={onDelete}
-            className="h-8 w-8 p-0 text-destructive hover:text-destructive"
-            data-testid={`delete-profile-${profile.id}`}
-          >
-            <Trash2 className="w-4 h-4" />
-          </Button>
-        </div>
-      )}
-    </div>
-  );
-}
-
-// Profile Form Component
-function ProfileForm({
-  profile,
-  onSave,
-  onCancel,
-  isEditing,
-  hotkeyActive,
-}: {
-  profile: Partial<AIProfile>;
-  onSave: (profile: Omit<AIProfile, "id">) => void;
-  onCancel: () => void;
-  isEditing: boolean;
-  hotkeyActive: boolean;
-}) {
-  const [formData, setFormData] = useState({
-    name: profile.name || "",
-    description: profile.description || "",
-    model: profile.model || ("opus" as AgentModel),
-    thinkingLevel: profile.thinkingLevel || ("none" as ThinkingLevel),
-    icon: profile.icon || "Brain",
-  });
-
-  const provider = getProviderFromModel(formData.model);
-  const supportsThinking = modelSupportsThinking(formData.model);
-
-  const handleModelChange = (model: AgentModel) => {
-    const newProvider = getProviderFromModel(model);
-    setFormData({
-      ...formData,
-      model,
-      // Reset thinking level when switching to Codex (doesn't support thinking)
-      thinkingLevel: newProvider === "codex" ? "none" : formData.thinkingLevel,
-    });
-  };
-
-  const handleSubmit = () => {
-    if (!formData.name.trim()) {
-      toast.error("Please enter a profile name");
-      return;
-    }
-
-    onSave({
-      name: formData.name.trim(),
-      description: formData.description.trim(),
-      model: formData.model,
-      thinkingLevel: supportsThinking ? formData.thinkingLevel : "none",
-      provider,
-      isBuiltIn: false,
-      icon: formData.icon,
-    });
-  };
-
-  return (
-    <div className="space-y-4">
-      {/* Name */}
-      <div className="space-y-2">
-        <Label htmlFor="profile-name">Profile Name</Label>
-        <Input
-          id="profile-name"
-          value={formData.name}
-          onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-          placeholder="e.g., Heavy Task, Quick Fix"
-          data-testid="profile-name-input"
-        />
-      </div>
-
-      {/* Description */}
-      <div className="space-y-2">
-        <Label htmlFor="profile-description">Description</Label>
-        <Textarea
-          id="profile-description"
-          value={formData.description}
-          onChange={(e) =>
-            setFormData({ ...formData, description: e.target.value })
-          }
-          placeholder="Describe when to use this profile..."
-          rows={2}
-          data-testid="profile-description-input"
-        />
-      </div>
-
-      {/* Icon Selection */}
-      <div className="space-y-2">
-        <Label>Icon</Label>
-        <div className="flex gap-2 flex-wrap">
-          {ICON_OPTIONS.map(({ name, icon: Icon }) => (
-            <button
-              key={name}
-              type="button"
-              onClick={() => setFormData({ ...formData, icon: name })}
-              className={cn(
-                "w-10 h-10 rounded-lg flex items-center justify-center border transition-colors",
-                formData.icon === name
-                  ? "bg-primary text-primary-foreground border-primary"
-                  : "bg-background hover:bg-accent border-input"
-              )}
-              data-testid={`icon-select-${name}`}
-            >
-              <Icon className="w-5 h-5" />
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Model Selection - Claude */}
-      <div className="space-y-2">
-        <Label className="flex items-center gap-2">
-          <Brain className="w-4 h-4 text-primary" />
-          Claude Models
-        </Label>
-        <div className="flex gap-2 flex-wrap">
-          {CLAUDE_MODELS.map(({ id, label }) => (
-            <button
-              key={id}
-              type="button"
-              onClick={() => handleModelChange(id)}
-              className={cn(
-                "flex-1 min-w-[100px] px-3 py-2 rounded-md border text-sm font-medium transition-colors",
-                formData.model === id
-                  ? "bg-primary text-primary-foreground border-primary"
-                  : "bg-background hover:bg-accent border-input"
-              )}
-              data-testid={`model-select-${id}`}
-            >
-              {label.replace("Claude ", "")}
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Model Selection - Codex */}
-      <div className="space-y-2">
-        <Label className="flex items-center gap-2">
-          <Zap className="w-4 h-4 text-emerald-500" />
-          Codex Models
-        </Label>
-        <div className="flex gap-2 flex-wrap">
-          {CODEX_MODELS.map(({ id, label }) => (
-            <button
-              key={id}
-              type="button"
-              onClick={() => handleModelChange(id)}
-              className={cn(
-                "flex-1 min-w-[100px] px-3 py-2 rounded-md border text-sm font-medium transition-colors",
-                formData.model === id
-                  ? "bg-emerald-600 text-white border-emerald-500"
-                  : "bg-background hover:bg-accent border-input"
-              )}
-              data-testid={`model-select-${id}`}
-            >
-              {label.replace("GPT-5.1 ", "").replace("Codex ", "")}
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Thinking Level - Only for Claude models */}
-      {supportsThinking && (
-        <div className="space-y-2">
-          <Label className="flex items-center gap-2">
-            <Brain className="w-4 h-4 text-amber-500" />
-            Thinking Level
-          </Label>
-          <div className="flex gap-2 flex-wrap">
-            {THINKING_LEVELS.map(({ id, label }) => (
-              <button
-                key={id}
-                type="button"
-                onClick={() => {
-                  setFormData({ ...formData, thinkingLevel: id });
-                  if (id === "ultrathink") {
-                    toast.warning("Ultrathink uses extensive reasoning", {
-                      description:
-                        "Best for complex architecture, migrations, or deep debugging (~$0.48/task).",
-                      duration: 4000,
-                    });
-                  }
-                }}
-                className={cn(
-                  "flex-1 min-w-[70px] px-3 py-2 rounded-md border text-sm font-medium transition-colors",
-                  formData.thinkingLevel === id
-                    ? "bg-amber-500 text-white border-amber-400"
-                    : "bg-background hover:bg-accent border-input"
-                )}
-                data-testid={`thinking-select-${id}`}
-              >
-                {label}
-              </button>
-            ))}
-          </div>
-          <p className="text-xs text-muted-foreground">
-            Higher levels give more time to reason through complex problems.
-          </p>
-        </div>
-      )}
-
-      {/* Actions */}
-      <DialogFooter className="pt-4">
-        <Button variant="ghost" onClick={onCancel}>
-          Cancel
-        </Button>
-        <HotkeyButton
-          onClick={handleSubmit}
-          hotkey={{ key: "Enter", cmdCtrl: true }}
-          hotkeyActive={hotkeyActive}
-          data-testid="save-profile-button"
-        >
-          {isEditing ? "Save Changes" : "Create Profile"}
-        </HotkeyButton>
-      </DialogFooter>
-    </div>
-  );
-}
+import {
+  SortableProfileCard,
+  ProfileForm,
+  ProfilesHeader,
+} from "./profiles-view/components";
 
 export function ProfilesView() {
   const {
@@ -461,11 +45,13 @@ export function ProfilesView() {
     updateAIProfile,
     removeAIProfile,
     reorderAIProfiles,
+    resetAIProfiles,
   } = useAppStore();
   const shortcuts = useKeyboardShortcutsConfig();
 
   const [showAddDialog, setShowAddDialog] = useState(false);
   const [editingProfile, setEditingProfile] = useState<AIProfile | null>(null);
+  const [profileToDelete, setProfileToDelete] = useState<AIProfile | null>(null);
 
   // Sensors for drag-and-drop
   const sensors = useSensors(
@@ -520,12 +106,20 @@ export function ProfilesView() {
     }
   };
 
-  const handleDeleteProfile = (profile: AIProfile) => {
-    if (profile.isBuiltIn) return;
+  const confirmDeleteProfile = () => {
+    if (!profileToDelete) return;
 
-    removeAIProfile(profile.id);
+    removeAIProfile(profileToDelete.id);
     toast.success("Profile deleted", {
-      description: `Deleted "${profile.name}" profile`,
+      description: `Deleted "${profileToDelete.name}" profile`,
+    });
+    setProfileToDelete(null);
+  };
+
+  const handleResetProfiles = () => {
+    resetAIProfiles();
+    toast.success("Profiles refreshed", {
+      description: "Default profiles have been updated to the latest version",
     });
   };
 
@@ -552,34 +146,11 @@ export function ProfilesView() {
       data-testid="profiles-view"
     >
       {/* Header Section */}
-      <div className="shrink-0 border-b border-border bg-glass backdrop-blur-md">
-        <div className="px-8 py-6">
-          <div className="flex items-center justify-between">
-            <div className="flex items-center gap-3">
-              <div className="w-10 h-10 rounded-xl bg-linear-to-br from-brand-500 to-brand-600 shadow-lg shadow-brand-500/20 flex items-center justify-center">
-                <UserCircle className="w-5 h-5 text-primary-foreground" />
-              </div>
-              <div>
-                <h1 className="text-2xl font-bold text-foreground">
-                  AI Profiles
-                </h1>
-                <p className="text-sm text-muted-foreground">
-                  Create and manage model configuration presets
-                </p>
-              </div>
-            </div>
-            <HotkeyButton
-              onClick={() => setShowAddDialog(true)}
-              hotkey={shortcuts.addProfile}
-              hotkeyActive={false}
-              data-testid="add-profile-button"
-            >
-              <Plus className="w-4 h-4 mr-2" />
-              New Profile
-            </HotkeyButton>
-          </div>
-        </div>
-      </div>
+      <ProfilesHeader
+        onResetProfiles={handleResetProfiles}
+        onAddProfile={() => setShowAddDialog(true)}
+        addProfileHotkey={shortcuts.addProfile}
+      />
 
       {/* Content */}
       <div className="flex-1 overflow-y-auto p-8">
@@ -595,19 +166,14 @@ export function ProfilesView() {
               </span>
             </div>
             {customProfiles.length === 0 ? (
-              <div className="rounded-xl border border-dashed border-border p-8 text-center">
-                <Sparkles className="w-10 h-10 text-muted-foreground mx-auto mb-3 opacity-50" />
-                <p className="text-muted-foreground">
+              <div
+                className="group rounded-xl border border-dashed border-border p-8 text-center transition-all duration-300 hover:border-primary hover:bg-primary/5 cursor-pointer"
+                onClick={() => setShowAddDialog(true)}
+              >
+                <Sparkles className="w-10 h-10 text-muted-foreground mx-auto mb-3 opacity-50 transition-all duration-300 group-hover:text-primary group-hover:opacity-100 group-hover:scale-110 group-hover:rotate-12" />
+                <p className="text-muted-foreground transition-colors duration-300 group-hover:text-foreground">
                   No custom profiles yet. Create one to get started!
                 </p>
-                <Button
-                  variant="outline"
-                  className="mt-4"
-                  onClick={() => setShowAddDialog(true)}
-                >
-                  <Plus className="w-4 h-4 mr-2" />
-                  Create Profile
-                </Button>
               </div>
             ) : (
               <DndContext
@@ -625,7 +191,7 @@ export function ProfilesView() {
                         key={profile.id}
                         profile={profile}
                         onEdit={() => setEditingProfile(profile)}
-                        onDelete={() => handleDeleteProfile(profile)}
+                        onDelete={() => setProfileToDelete(profile)}
                       />
                     ))}
                   </div>
@@ -675,8 +241,8 @@ export function ProfilesView() {
 
       {/* Add Profile Dialog */}
       <Dialog open={showAddDialog} onOpenChange={setShowAddDialog}>
-        <DialogContent data-testid="add-profile-dialog">
-          <DialogHeader>
+        <DialogContent data-testid="add-profile-dialog" className="flex flex-col max-h-[calc(100vh-4rem)]">
+          <DialogHeader className="shrink-0">
             <DialogTitle>Create New Profile</DialogTitle>
             <DialogDescription>
               Define a reusable model configuration preset.
@@ -697,8 +263,8 @@ export function ProfilesView() {
         open={!!editingProfile}
         onOpenChange={() => setEditingProfile(null)}
       >
-        <DialogContent data-testid="edit-profile-dialog">
-          <DialogHeader>
+        <DialogContent data-testid="edit-profile-dialog" className="flex flex-col max-h-[calc(100vh-4rem)]">
+          <DialogHeader className="shrink-0">
             <DialogTitle>Edit Profile</DialogTitle>
             <DialogDescription>Modify your profile settings.</DialogDescription>
           </DialogHeader>
@@ -713,6 +279,22 @@ export function ProfilesView() {
           )}
         </DialogContent>
       </Dialog>
+
+      {/* Delete Confirmation Dialog */}
+      <DeleteConfirmDialog
+        open={!!profileToDelete}
+        onOpenChange={(open) => !open && setProfileToDelete(null)}
+        onConfirm={confirmDeleteProfile}
+        title="Delete Profile"
+        description={
+          profileToDelete
+            ? `Are you sure you want to delete "${profileToDelete.name}"? This action cannot be undone.`
+            : ""
+        }
+        confirmText="Delete Profile"
+        testId="delete-profile-confirm-dialog"
+        confirmTestId="confirm-delete-profile-button"
+      />
     </div>
   );
 }

apps/app/src/components/views/profiles-view/components/index.ts

@@ -0,0 +1,3 @@
+export { SortableProfileCard } from "./sortable-profile-card";
+export { ProfileForm } from "./profile-form";
+export { ProfilesHeader } from "./profiles-header";

apps/app/src/components/views/profiles-view/components/profile-form.tsx

@@ -0,0 +1,204 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { HotkeyButton } from "@/components/ui/hotkey-button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import { cn, modelSupportsThinking } from "@/lib/utils";
+import { DialogFooter } from "@/components/ui/dialog";
+import { Brain } from "lucide-react";
+import { toast } from "sonner";
+import type { AIProfile, AgentModel, ThinkingLevel } from "@/store/app-store";
+import { CLAUDE_MODELS, THINKING_LEVELS, ICON_OPTIONS } from "../constants";
+import { getProviderFromModel } from "../utils";
+
+interface ProfileFormProps {
+  profile: Partial<AIProfile>;
+  onSave: (profile: Omit<AIProfile, "id">) => void;
+  onCancel: () => void;
+  isEditing: boolean;
+  hotkeyActive: boolean;
+}
+
+export function ProfileForm({
+  profile,
+  onSave,
+  onCancel,
+  isEditing,
+  hotkeyActive,
+}: ProfileFormProps) {
+  const [formData, setFormData] = useState({
+    name: profile.name || "",
+    description: profile.description || "",
+    model: profile.model || ("opus" as AgentModel),
+    thinkingLevel: profile.thinkingLevel || ("none" as ThinkingLevel),
+    icon: profile.icon || "Brain",
+  });
+
+  const provider = getProviderFromModel(formData.model);
+  const supportsThinking = modelSupportsThinking(formData.model);
+
+  const handleModelChange = (model: AgentModel) => {
+    setFormData({
+      ...formData,
+      model,
+    });
+  };
+
+  const handleSubmit = () => {
+    if (!formData.name.trim()) {
+      toast.error("Please enter a profile name");
+      return;
+    }
+
+    onSave({
+      name: formData.name.trim(),
+      description: formData.description.trim(),
+      model: formData.model,
+      thinkingLevel: supportsThinking ? formData.thinkingLevel : "none",
+      provider,
+      isBuiltIn: false,
+      icon: formData.icon,
+    });
+  };
+
+  return (
+    <>
+      <div className="overflow-y-auto flex-1 min-h-0 space-y-4 pr-3 -mr-3 pl-1">
+        {/* Name */}
+        <div className="mt-2 space-y-2">
+          <Label htmlFor="profile-name">Profile Name</Label>
+          <Input
+            id="profile-name"
+            value={formData.name}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            placeholder="e.g., Heavy Task, Quick Fix"
+            data-testid="profile-name-input"
+          />
+        </div>
+
+        {/* Description */}
+        <div className="space-y-2">
+          <Label htmlFor="profile-description">Description</Label>
+          <Textarea
+            id="profile-description"
+            value={formData.description}
+            onChange={(e) =>
+              setFormData({ ...formData, description: e.target.value })
+            }
+            placeholder="Describe when to use this profile..."
+            rows={2}
+            data-testid="profile-description-input"
+          />
+        </div>
+
+        {/* Icon Selection */}
+        <div className="space-y-2">
+          <Label>Icon</Label>
+          <div className="flex gap-2 flex-wrap">
+            {ICON_OPTIONS.map(({ name, icon: Icon }) => (
+              <button
+                key={name}
+                type="button"
+                onClick={() => setFormData({ ...formData, icon: name })}
+                className={cn(
+                  "w-10 h-10 rounded-lg flex items-center justify-center border transition-colors",
+                  formData.icon === name
+                    ? "bg-primary text-primary-foreground border-primary"
+                    : "bg-background hover:bg-accent border-border"
+                )}
+                data-testid={`icon-select-${name}`}
+              >
+                <Icon className="w-5 h-5" />
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* Model Selection */}
+        <div className="space-y-2">
+          <Label className="flex items-center gap-2">
+            <Brain className="w-4 h-4 text-primary" />
+            Model
+          </Label>
+          <div className="flex gap-2 flex-wrap">
+            {CLAUDE_MODELS.map(({ id, label }) => (
+              <button
+                key={id}
+                type="button"
+                onClick={() => handleModelChange(id)}
+                className={cn(
+                  "flex-1 min-w-[100px] px-3 py-2 rounded-md border text-sm font-medium transition-colors",
+                  formData.model === id
+                    ? "bg-primary text-primary-foreground border-primary"
+                    : "bg-background hover:bg-accent border-border"
+                )}
+                data-testid={`model-select-${id}`}
+              >
+                {label.replace("Claude ", "")}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* Thinking Level */}
+        {supportsThinking && (
+          <div className="space-y-2">
+            <Label className="flex items-center gap-2">
+              <Brain className="w-4 h-4 text-amber-500" />
+              Thinking Level
+            </Label>
+            <div className="flex gap-2 flex-wrap">
+              {THINKING_LEVELS.map(({ id, label }) => (
+                <button
+                  key={id}
+                  type="button"
+                  onClick={() => {
+                    setFormData({ ...formData, thinkingLevel: id });
+                    if (id === "ultrathink") {
+                      toast.warning("Ultrathink uses extensive reasoning", {
+                        description:
+                          "Best for complex architecture, migrations, or deep debugging (~$0.48/task).",
+                        duration: 4000,
+                      });
+                    }
+                  }}
+                  className={cn(
+                    "flex-1 min-w-[70px] px-3 py-2 rounded-md border text-sm font-medium transition-colors",
+                    formData.thinkingLevel === id
+                      ? "bg-amber-500 text-white border-amber-400"
+                      : "bg-background hover:bg-accent border-border"
+                  )}
+                  data-testid={`thinking-select-${id}`}
+                >
+                  {label}
+                </button>
+              ))}
+            </div>
+            <p className="text-xs text-muted-foreground">
+              Higher levels give more time to reason through complex problems.
+            </p>
+          </div>
+        )}
+      </div>
+
+      {/* Actions */}
+      <DialogFooter className="pt-4 border-t border-border mt-4 shrink-0">
+        <Button variant="ghost" onClick={onCancel}>
+          Cancel
+        </Button>
+        <HotkeyButton
+          onClick={handleSubmit}
+          hotkey={{ key: "Enter", cmdCtrl: true }}
+          hotkeyActive={hotkeyActive}
+          data-testid="save-profile-button"
+        >
+          {isEditing ? "Save Changes" : "Create Profile"}
+        </HotkeyButton>
+      </DialogFooter>
+    </>
+  );
+}
+

apps/app/src/components/views/profiles-view/components/profiles-header.tsx

@@ -0,0 +1,58 @@
+import { Button } from "@/components/ui/button";
+import { HotkeyButton } from "@/components/ui/hotkey-button";
+import { UserCircle, Plus, RefreshCw } from "lucide-react";
+
+interface ProfilesHeaderProps {
+  onResetProfiles: () => void;
+  onAddProfile: () => void;
+  addProfileHotkey: string;
+}
+
+export function ProfilesHeader({
+  onResetProfiles,
+  onAddProfile,
+  addProfileHotkey,
+}: ProfilesHeaderProps) {
+  return (
+    <div className="shrink-0 border-b border-border bg-glass backdrop-blur-md">
+      <div className="px-8 py-6">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 rounded-xl bg-linear-to-br from-brand-500 to-brand-600 shadow-lg shadow-brand-500/20 flex items-center justify-center">
+              <UserCircle className="w-5 h-5 text-primary-foreground" />
+            </div>
+            <div>
+              <h1 className="text-2xl font-bold text-foreground">
+                AI Profiles
+              </h1>
+              <p className="text-sm text-muted-foreground">
+                Create and manage model configuration presets
+              </p>
+            </div>
+          </div>
+          <div className="flex items-center gap-2">
+            <Button
+              variant="outline"
+              onClick={onResetProfiles}
+              data-testid="refresh-profiles-button"
+              className="gap-2"
+            >
+              <RefreshCw className="w-4 h-4" />
+              Refresh Defaults
+            </Button>
+            <HotkeyButton
+              onClick={onAddProfile}
+              hotkey={addProfileHotkey}
+              hotkeyActive={false}
+              data-testid="add-profile-button"
+            >
+              <Plus className="w-4 h-4 mr-2" />
+              New Profile
+            </HotkeyButton>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+

apps/app/src/components/views/profiles-view/components/sortable-profile-card.tsx

@@ -0,0 +1,127 @@
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+import { GripVertical, Lock, Pencil, Trash2, Brain } from "lucide-react";
+import { useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import type { AIProfile } from "@/store/app-store";
+import { PROFILE_ICONS } from "../constants";
+
+interface SortableProfileCardProps {
+  profile: AIProfile;
+  onEdit: () => void;
+  onDelete: () => void;
+}
+
+export function SortableProfileCard({
+  profile,
+  onEdit,
+  onDelete,
+}: SortableProfileCardProps) {
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging,
+  } = useSortable({ id: profile.id });
+
+  const style = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+  };
+
+  const IconComponent = profile.icon ? PROFILE_ICONS[profile.icon] : Brain;
+
+  return (
+    <div
+      ref={setNodeRef}
+      style={style}
+      className={cn(
+        "group relative flex items-start gap-4 p-4 rounded-xl border bg-card transition-all",
+        isDragging && "shadow-lg",
+        profile.isBuiltIn
+          ? "border-border/50"
+          : "border-border hover:border-primary/50 hover:shadow-sm"
+      )}
+      data-testid={`profile-card-${profile.id}`}
+    >
+      {/* Drag Handle */}
+      <button
+        {...attributes}
+        {...listeners}
+        className="p-1 rounded hover:bg-accent cursor-grab active:cursor-grabbing flex-shrink-0 mt-1"
+        data-testid={`profile-drag-handle-${profile.id}`}
+        onClick={(e) => e.stopPropagation()}
+        aria-label={`Reorder ${profile.name} profile`}
+      >
+        <GripVertical className="h-4 w-4 text-muted-foreground" />
+      </button>
+
+      {/* Icon */}
+      <div
+        className="flex-shrink-0 w-10 h-10 rounded-lg flex items-center justify-center bg-primary/10"
+      >
+        {IconComponent && (
+          <IconComponent className="w-5 h-5 text-primary" />
+        )}
+      </div>
+
+      {/* Content */}
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center gap-2">
+          <h3 className="font-semibold text-foreground">{profile.name}</h3>
+          {profile.isBuiltIn && (
+            <span className="flex items-center gap-1 text-[10px] px-1.5 py-0.5 rounded-full bg-muted text-muted-foreground">
+              <Lock className="w-2.5 h-2.5" />
+              Built-in
+            </span>
+          )}
+        </div>
+        <p className="text-sm text-muted-foreground mt-0.5 line-clamp-2">
+          {profile.description}
+        </p>
+        <div className="flex items-center gap-2 mt-2 flex-wrap">
+          <span
+            className="text-xs px-2 py-0.5 rounded-full border border-primary/30 text-primary bg-primary/10"
+          >
+            {profile.model}
+          </span>
+          {profile.thinkingLevel !== "none" && (
+            <span className="text-xs px-2 py-0.5 rounded-full border border-amber-500/30 text-amber-600 dark:text-amber-400 bg-amber-500/10">
+              {profile.thinkingLevel}
+            </span>
+          )}
+        </div>
+      </div>
+
+      {/* Actions */}
+      {!profile.isBuiltIn && (
+        <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={onEdit}
+            className="h-8 w-8 p-0"
+            data-testid={`edit-profile-${profile.id}`}
+            aria-label={`Edit ${profile.name} profile`}
+          >
+            <Pencil className="w-4 h-4" />
+          </Button>
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={onDelete}
+            className="h-8 w-8 p-0 text-destructive hover:text-destructive"
+            data-testid={`delete-profile-${profile.id}`}
+            aria-label={`Delete ${profile.name} profile`}
+          >
+            <Trash2 className="w-4 h-4" />
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
+

apps/app/src/components/views/profiles-view/constants.ts

@@ -0,0 +1,48 @@
+import {
+  Brain,
+  Zap,
+  Scale,
+  Cpu,
+  Rocket,
+  Sparkles,
+} from "lucide-react";
+import type { AgentModel, ThinkingLevel } from "@/store/app-store";
+
+// Icon mapping for profiles
+export const PROFILE_ICONS: Record<
+  string,
+  React.ComponentType<{ className?: string }>
+> = {
+  Brain,
+  Zap,
+  Scale,
+  Cpu,
+  Rocket,
+  Sparkles,
+};
+
+// Available icons for selection
+export const ICON_OPTIONS = [
+  { name: "Brain", icon: Brain },
+  { name: "Zap", icon: Zap },
+  { name: "Scale", icon: Scale },
+  { name: "Cpu", icon: Cpu },
+  { name: "Rocket", icon: Rocket },
+  { name: "Sparkles", icon: Sparkles },
+];
+
+// Model options for the form
+export const CLAUDE_MODELS: { id: AgentModel; label: string }[] = [
+  { id: "haiku", label: "Claude Haiku" },
+  { id: "sonnet", label: "Claude Sonnet" },
+  { id: "opus", label: "Claude Opus" },
+];
+
+export const THINKING_LEVELS: { id: ThinkingLevel; label: string }[] = [
+  { id: "none", label: "None" },
+  { id: "low", label: "Low" },
+  { id: "medium", label: "Medium" },
+  { id: "high", label: "High" },
+  { id: "ultrathink", label: "Ultrathink" },
+];
+

apps/app/src/components/views/profiles-view/utils.ts

@@ -0,0 +1,7 @@
+import type { AgentModel, ModelProvider } from "@/store/app-store";
+
+// Helper to determine provider from model
+export function getProviderFromModel(model: AgentModel): ModelProvider {
+  return "claude";
+}
+

apps/app/src/components/views/settings-view.tsx

@@ -7,7 +7,6 @@ import {
   Key,
   Palette,
   Terminal,
-  Atom,
   FlaskConical,
   Trash2,
   Settings2,
@@ -24,7 +23,6 @@ import { DeleteProjectDialog } from "./settings-view/components/delete-project-d
 import { SettingsNavigation } from "./settings-view/components/settings-navigation";
 import { ApiKeysSection } from "./settings-view/api-keys/api-keys-section";
 import { ClaudeCliStatus } from "./settings-view/cli-status/claude-cli-status";
-import { CodexCliStatus } from "./settings-view/cli-status/codex-cli-status";
 import { AppearanceSection } from "./settings-view/appearance/appearance-section";
 import { KeyboardShortcutsSection } from "./settings-view/keyboard-shortcuts/keyboard-shortcuts-section";
 import { FeatureDefaultsSection } from "./settings-view/feature-defaults/feature-defaults-section";
@@ -39,7 +37,6 @@ import type { Project as ElectronProject } from "@/lib/electron";
 const NAV_ITEMS = [
   { id: "api-keys", label: "API Keys", icon: Key },
   { id: "claude", label: "Claude", icon: Terminal },
-  { id: "codex", label: "Codex", icon: Atom },
   { id: "appearance", label: "Appearance", icon: Palette },
   { id: "audio", label: "Audio", icon: Volume2 },
   { id: "keyboard", label: "Keyboard Shortcuts", icon: Settings2 },
@@ -82,23 +79,22 @@ export function SettingsView() {
   // Compute the effective theme for the current project
   const effectiveTheme = (settingsProject?.theme || theme) as Theme;
 
-  // Handler to set theme - saves to project if one is selected, otherwise to global
+  // Handler to set theme - always updates global theme (user's preference),
+  // and also sets per-project theme if a project is selected
   const handleSetTheme = (newTheme: typeof theme) => {
+    // Always update global theme so user's preference persists across all projects
+    setTheme(newTheme);
+    // Also set per-project theme if a project is selected
     if (currentProject) {
       setProjectTheme(currentProject.id, newTheme);
-    } else {
-      setTheme(newTheme);
     }
   };
 
   // Use CLI status hook
   const {
     claudeCliStatus,
-    codexCliStatus,
     isCheckingClaudeCli,
-    isCheckingCodexCli,
     handleRefreshClaudeCli,
-    handleRefreshCodexCli,
   } = useCliStatus();
 
   // Use scroll tracking hook
@@ -145,15 +141,6 @@ export function SettingsView() {
               />
             )}
 
-            {/* Codex CLI Status Section */}
-            {codexCliStatus && (
-              <CodexCliStatus
-                status={codexCliStatus}
-                isChecking={isCheckingCodexCli}
-                onRefresh={handleRefreshCodexCli}
-              />
-            )}
-
             {/* Appearance Section */}
             <AppearanceSection
               effectiveTheme={effectiveTheme}
@@ -170,47 +157,47 @@ export function SettingsView() {
             {/* Audio Section */}
             <div
               id="audio"
-              className="rounded-xl border border-border bg-card backdrop-blur-md overflow-hidden scroll-mt-6"
+              className="rounded-2xl border border-border/50 bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl shadow-sm shadow-black/5 overflow-hidden scroll-mt-6"
             >
-              <div className="p-6 border-b border-border">
-                <div className="flex items-center gap-2 mb-2">
-                  <Volume2 className="w-5 h-5 text-brand-500" />
-                  <h2 className="text-lg font-semibold text-foreground">
+              <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
+                <div className="flex items-center gap-3 mb-2">
+                  <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
+                    <Volume2 className="w-5 h-5 text-brand-500" />
+                  </div>
+                  <h2 className="text-lg font-semibold text-foreground tracking-tight">
                     Audio
                   </h2>
                 </div>
-                <p className="text-sm text-muted-foreground">
+                <p className="text-sm text-muted-foreground/80 ml-12">
                   Configure audio and notification settings.
                 </p>
               </div>
               <div className="p-6 space-y-4">
                 {/* Mute Done Sound Setting */}
-                <div className="space-y-3">
-                  <div className="flex items-start space-x-3">
-                    <Checkbox
-                      id="mute-done-sound"
-                      checked={muteDoneSound}
-                      onCheckedChange={(checked) =>
-                        setMuteDoneSound(checked === true)
-                      }
-                      className="mt-0.5"
-                      data-testid="mute-done-sound-checkbox"
-                    />
-                    <div className="space-y-1">
-                      <Label
-                        htmlFor="mute-done-sound"
-                        className="text-foreground cursor-pointer font-medium flex items-center gap-2"
-                      >
-                        <VolumeX className="w-4 h-4 text-brand-500" />
-                        Mute notification sound when agents complete
-                      </Label>
-                      <p className="text-xs text-muted-foreground">
-                        When enabled, disables the &quot;ding&quot; sound that
-                        plays when an agent completes a feature. The feature
-                        will still move to the completed column, but without
-                        audio notification.
-                      </p>
-                    </div>
+                <div className="group flex items-start space-x-3 p-3 rounded-xl hover:bg-accent/30 transition-colors duration-200 -mx-3">
+                  <Checkbox
+                    id="mute-done-sound"
+                    checked={muteDoneSound}
+                    onCheckedChange={(checked) =>
+                      setMuteDoneSound(checked === true)
+                    }
+                    className="mt-1"
+                    data-testid="mute-done-sound-checkbox"
+                  />
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="mute-done-sound"
+                      className="text-foreground cursor-pointer font-medium flex items-center gap-2"
+                    >
+                      <VolumeX className="w-4 h-4 text-brand-500" />
+                      Mute notification sound when agents complete
+                    </Label>
+                    <p className="text-xs text-muted-foreground/80 leading-relaxed">
+                      When enabled, disables the &quot;ding&quot; sound that
+                      plays when an agent completes a feature. The feature
+                      will still move to the completed column, but without
+                      audio notification.
+                    </p>
                   </div>
                 </div>
               </div>

apps/app/src/components/views/settings-view/api-keys/api-keys-section.tsx

@@ -7,10 +7,11 @@ import { buildProviderConfigs } from "@/config/api-providers";
 import { AuthenticationStatusDisplay } from "./authentication-status-display";
 import { SecurityNotice } from "./security-notice";
 import { useApiKeyManagement } from "./hooks/use-api-key-management";
+import { cn } from "@/lib/utils";
 
 export function ApiKeysSection() {
   const { apiKeys } = useAppStore();
-  const { claudeAuthStatus, codexAuthStatus } = useSetupStore();
+  const { claudeAuthStatus } = useSetupStore();
 
   const { providerConfigParams, apiKeyStatus, handleSave, saved } =
     useApiKeyManagement();
@@ -20,16 +21,22 @@ export function ApiKeysSection() {
   return (
     <div
       id="api-keys"
-      className="rounded-xl border border-border bg-card backdrop-blur-md overflow-hidden scroll-mt-6"
+      className={cn(
+        "rounded-2xl overflow-hidden scroll-mt-6",
+        "border border-border/50",
+        "bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl",
+        "shadow-sm shadow-black/5"
+      )}
     >
-      <div className="p-6 border-b border-border">
-        <div className="flex items-center gap-2 mb-2">
-          <Key className="w-5 h-5 text-brand-500" />
-          <h2 className="text-lg font-semibold text-foreground">API Keys</h2>
+      <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
+        <div className="flex items-center gap-3 mb-2">
+          <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
+            <Key className="w-5 h-5 text-brand-500" />
+          </div>
+          <h2 className="text-lg font-semibold text-foreground tracking-tight">API Keys</h2>
         </div>
-        <p className="text-sm text-muted-foreground">
-          Configure your AI provider API keys. Keys are stored locally in your
-          browser.
+        <p className="text-sm text-muted-foreground/80 ml-12">
+          Configure your AI provider API keys. Keys are stored locally in your browser.
         </p>
       </div>
       <div className="p-6 space-y-6">
@@ -41,7 +48,6 @@ export function ApiKeysSection() {
         {/* Authentication Status Display */}
         <AuthenticationStatusDisplay
           claudeAuthStatus={claudeAuthStatus}
-          codexAuthStatus={codexAuthStatus}
           apiKeyStatus={apiKeyStatus}
           apiKeys={apiKeys}
         />
@@ -54,7 +60,15 @@ export function ApiKeysSection() {
           <Button
             onClick={handleSave}
             data-testid="save-settings"
-            className="min-w-[120px] bg-linear-to-r from-brand-500 to-brand-600 hover:from-brand-600 hover:to-brand-600 text-primary-foreground border-0"
+            className={cn(
+              "min-w-[140px] h-10",
+              "bg-gradient-to-r from-brand-500 to-brand-600",
+              "hover:from-brand-600 hover:to-brand-600",
+              "text-white font-medium border-0",
+              "shadow-md shadow-brand-500/20 hover:shadow-lg hover:shadow-brand-500/25",
+              "transition-all duration-200 ease-out",
+              "hover:scale-[1.02] active:scale-[0.98]"
+            )}
           >
             {saved ? (
               <>

apps/app/src/components/views/settings-view/api-keys/authentication-status-display.tsx

@@ -4,29 +4,24 @@ import {
   AlertCircle,
   Info,
   Terminal,
-  Atom,
   Sparkles,
 } from "lucide-react";
-import type { ClaudeAuthStatus, CodexAuthStatus } from "@/store/setup-store";
+import type { ClaudeAuthStatus } from "@/store/setup-store";
 
 interface AuthenticationStatusDisplayProps {
   claudeAuthStatus: ClaudeAuthStatus | null;
-  codexAuthStatus: CodexAuthStatus | null;
   apiKeyStatus: {
     hasAnthropicKey: boolean;
-    hasOpenAIKey: boolean;
     hasGoogleKey: boolean;
   } | null;
   apiKeys: {
     anthropic: string;
     google: string;
-    openai: string;
   };
 }
 
 export function AuthenticationStatusDisplay({
   claudeAuthStatus,
-  codexAuthStatus,
   apiKeyStatus,
   apiKeys,
 }: AuthenticationStatusDisplayProps) {
@@ -61,12 +56,16 @@ export function AuthenticationStatusDisplay({
                     {claudeAuthStatus.method === "oauth_token_env"
                       ? "Using CLAUDE_CODE_OAUTH_TOKEN"
                       : claudeAuthStatus.method === "oauth_token"
-                      ? "Using stored OAuth token"
+                      ? "Using stored OAuth token (subscription)"
                       : claudeAuthStatus.method === "api_key_env"
                       ? "Using ANTHROPIC_API_KEY"
                       : claudeAuthStatus.method === "api_key"
                       ? "Using stored API key"
-                      : "Unknown method"}
+                      : claudeAuthStatus.method === "credentials_file"
+                      ? "Using credentials file"
+                      : claudeAuthStatus.method === "cli_authenticated"
+                      ? "Using Claude CLI authentication"
+                      : `Using ${claudeAuthStatus.method || "detected"} authentication`}
                   </span>
                 </div>
               </>
@@ -89,54 +88,6 @@ export function AuthenticationStatusDisplay({
           </div>
         </div>
 
-        {/* Codex/OpenAI Authentication Status */}
-        <div className="p-3 rounded-lg bg-card border border-border">
-          <div className="flex items-center gap-2 mb-1.5">
-            <Atom className="w-4 h-4 text-green-500" />
-            <span className="text-sm font-medium text-foreground">
-              Codex (OpenAI)
-            </span>
-          </div>
-          <div className="space-y-1.5 text-xs min-h-12">
-            {codexAuthStatus?.authenticated ? (
-              <>
-                <div className="flex items-center gap-2">
-                  <CheckCircle2 className="w-3 h-3 text-green-500 shrink-0" />
-                  <span className="text-green-400 font-medium">Authenticated</span>
-                </div>
-                <div className="flex items-center gap-2 text-muted-foreground">
-                  <Info className="w-3 h-3 shrink-0" />
-                  <span>
-                    {codexAuthStatus.method === "cli_verified" ||
-                    codexAuthStatus.method === "cli_tokens"
-                      ? "Using CLI login (OpenAI account)"
-                      : codexAuthStatus.method === "api_key"
-                      ? "Using stored API key"
-                      : codexAuthStatus.method === "env"
-                      ? "Using OPENAI_API_KEY"
-                      : "Unknown method"}
-                  </span>
-                </div>
-              </>
-            ) : apiKeyStatus?.hasOpenAIKey ? (
-              <div className="flex items-center gap-2 text-blue-400">
-                <Info className="w-3 h-3 shrink-0" />
-                <span>Using environment variable (OPENAI_API_KEY)</span>
-              </div>
-            ) : apiKeys.openai ? (
-              <div className="flex items-center gap-2 text-blue-400">
-                <Info className="w-3 h-3 shrink-0" />
-                <span>Using manual API key from settings</span>
-              </div>
-            ) : (
-              <div className="flex items-center gap-1.5 text-yellow-500 py-0.5">
-                <AlertCircle className="w-3 h-3 shrink-0" />
-                <span className="text-xs">Not configured</span>
-              </div>
-            )}
-          </div>
-        </div>
-
         {/* Google/Gemini Authentication Status */}
         <div className="p-3 rounded-lg bg-card border border-border">
           <div className="flex items-center gap-2 mb-1.5">

apps/app/src/components/views/settings-view/api-keys/hooks/use-api-key-management.ts

@@ -10,7 +10,6 @@ interface TestResult {
 
 interface ApiKeyStatus {
   hasAnthropicKey: boolean;
-  hasOpenAIKey: boolean;
   hasGoogleKey: boolean;
 }
 
@@ -24,12 +23,10 @@ export function useApiKeyManagement() {
   // API key values
   const [anthropicKey, setAnthropicKey] = useState(apiKeys.anthropic);
   const [googleKey, setGoogleKey] = useState(apiKeys.google);
-  const [openaiKey, setOpenaiKey] = useState(apiKeys.openai);
 
   // Visibility toggles
   const [showAnthropicKey, setShowAnthropicKey] = useState(false);
   const [showGoogleKey, setShowGoogleKey] = useState(false);
-  const [showOpenaiKey, setShowOpenaiKey] = useState(false);
 
   // Test connection states
   const [testingConnection, setTestingConnection] = useState(false);
@@ -38,10 +35,6 @@ export function useApiKeyManagement() {
   const [geminiTestResult, setGeminiTestResult] = useState<TestResult | null>(
     null
   );
-  const [testingOpenaiConnection, setTestingOpenaiConnection] = useState(false);
-  const [openaiTestResult, setOpenaiTestResult] = useState<TestResult | null>(
-    null
-  );
 
   // API key status from environment
   const [apiKeyStatus, setApiKeyStatus] = useState<ApiKeyStatus | null>(null);
@@ -53,7 +46,6 @@ export function useApiKeyManagement() {
   useEffect(() => {
     setAnthropicKey(apiKeys.anthropic);
     setGoogleKey(apiKeys.google);
-    setOpenaiKey(apiKeys.openai);
   }, [apiKeys]);
 
   // Check API key status from environment on mount
@@ -66,7 +58,6 @@ export function useApiKeyManagement() {
           if (status.success) {
             setApiKeyStatus({
               hasAnthropicKey: status.hasAnthropicKey,
-              hasOpenAIKey: status.hasOpenAIKey,
               hasGoogleKey: status.hasGoogleKey,
             });
           }
@@ -152,68 +143,11 @@ export function useApiKeyManagement() {
     }
   };
 
-  // Test OpenAI connection
-  const handleTestOpenaiConnection = async () => {
-    setTestingOpenaiConnection(true);
-    setOpenaiTestResult(null);
-
-    try {
-      const api = getElectronAPI();
-      if (api?.testOpenAIConnection) {
-        const result = await api.testOpenAIConnection(openaiKey);
-        if (result.success) {
-          setOpenaiTestResult({
-            success: true,
-            message:
-              result.message || "Connection successful! OpenAI API responded.",
-          });
-        } else {
-          setOpenaiTestResult({
-            success: false,
-            message: result.error || "Failed to connect to OpenAI API.",
-          });
-        }
-      } else {
-        // Fallback to web API test
-        const response = await fetch("/api/openai/test", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({ apiKey: openaiKey }),
-        });
-
-        const data = await response.json();
-
-        if (response.ok && data.success) {
-          setOpenaiTestResult({
-            success: true,
-            message:
-              data.message || "Connection successful! OpenAI API responded.",
-          });
-        } else {
-          setOpenaiTestResult({
-            success: false,
-            message: data.error || "Failed to connect to OpenAI API.",
-          });
-        }
-      }
-    } catch {
-      setOpenaiTestResult({
-        success: false,
-        message: "Network error. Please check your connection.",
-      });
-    } finally {
-      setTestingOpenaiConnection(false);
-    }
-  };
-
   // Save API keys
   const handleSave = () => {
     setApiKeys({
       anthropic: anthropicKey,
       google: googleKey,
-      openai: openaiKey,
     });
     setSaved(true);
     setTimeout(() => setSaved(false), 2000);
@@ -240,15 +174,6 @@ export function useApiKeyManagement() {
       onTest: handleTestGeminiConnection,
       result: geminiTestResult,
     },
-    openai: {
-      value: openaiKey,
-      setValue: setOpenaiKey,
-      show: showOpenaiKey,
-      setShow: setShowOpenaiKey,
-      testing: testingOpenaiConnection,
-      onTest: handleTestOpenaiConnection,
-      result: openaiTestResult,
-    },
   };
 
   return {

apps/app/src/components/views/settings-view/appearance/appearance-section.tsx

@@ -2,6 +2,7 @@ import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import { Palette } from "lucide-react";
 import { themeOptions } from "@/config/theme-options";
+import { cn } from "@/lib/utils";
 import type { Theme, Project } from "../shared/types";
 
 interface AppearanceSectionProps {
@@ -18,39 +19,65 @@ export function AppearanceSection({
   return (
     <div
       id="appearance"
-      className="rounded-xl border border-border bg-card backdrop-blur-md overflow-hidden scroll-mt-6"
+      className={cn(
+        "rounded-2xl overflow-hidden scroll-mt-6",
+        "border border-border/50",
+        "bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl",
+        "shadow-sm shadow-black/5"
+      )}
     >
-      <div className="p-6 border-b border-border">
-        <div className="flex items-center gap-2 mb-2">
-          <Palette className="w-5 h-5 text-brand-500" />
-          <h2 className="text-lg font-semibold text-foreground">Appearance</h2>
+      <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
+        <div className="flex items-center gap-3 mb-2">
+          <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
+            <Palette className="w-5 h-5 text-brand-500" />
+          </div>
+          <h2 className="text-lg font-semibold text-foreground tracking-tight">Appearance</h2>
         </div>
-        <p className="text-sm text-muted-foreground">
+        <p className="text-sm text-muted-foreground/80 ml-12">
           Customize the look and feel of your application.
         </p>
       </div>
       <div className="p-6 space-y-4">
-        <div className="space-y-3">
-          <Label className="text-foreground">
+        <div className="space-y-4">
+          <Label className="text-foreground font-medium">
             Theme{" "}
-            {currentProject ? `(for ${currentProject.name})` : "(Global)"}
+            <span className="text-muted-foreground font-normal">
+              {currentProject ? `(for ${currentProject.name})` : "(Global)"}
+            </span>
           </Label>
           <div className="grid grid-cols-2 md:grid-cols-4 gap-3">
             {themeOptions.map(({ value, label, Icon, testId }) => {
               const isActive = effectiveTheme === value;
               return (
-                <Button
+                <button
                   key={value}
-                  variant={isActive ? "secondary" : "outline"}
                   onClick={() => onThemeChange(value)}
-                  className={`flex items-center justify-center gap-2 px-3 py-3 h-auto ${
-                    isActive ? "border-brand-500 ring-1 ring-brand-500/50" : ""
-                  }`}
+                  className={cn(
+                    "group flex items-center justify-center gap-2.5 px-4 py-3.5 rounded-xl",
+                    "text-sm font-medium transition-all duration-200 ease-out",
+                    isActive
+                      ? [
+                          "bg-gradient-to-br from-brand-500/15 to-brand-600/10",
+                          "border-2 border-brand-500/40",
+                          "text-foreground",
+                          "shadow-md shadow-brand-500/10",
+                        ]
+                      : [
+                          "bg-accent/30 hover:bg-accent/50",
+                          "border border-border/50 hover:border-border",
+                          "text-muted-foreground hover:text-foreground",
+                          "hover:shadow-sm",
+                        ],
+                    "hover:scale-[1.02] active:scale-[0.98]"
+                  )}
                   data-testid={testId}
                 >
-                  <Icon className="w-4 h-4" />
-                  <span className="font-medium text-sm">{label}</span>
-                </Button>
+                  <Icon className={cn(
+                    "w-4 h-4 transition-all duration-200",
+                    isActive ? "text-brand-500" : "group-hover:text-brand-400"
+                  )} />
+                  <span>{label}</span>
+                </button>
               );
             })}
           </div>

apps/app/src/components/views/settings-view/cli-status/claude-cli-status.tsx

@@ -5,6 +5,7 @@ import {
   AlertCircle,
   RefreshCw,
 } from "lucide-react";
+import { cn } from "@/lib/utils";
 import type { CliStatus } from "../shared/types";
 
 interface CliStatusProps {
@@ -23,13 +24,20 @@ export function ClaudeCliStatus({
   return (
     <div
       id="claude"
-      className="rounded-xl border border-border bg-card backdrop-blur-md overflow-hidden scroll-mt-6"
+      className={cn(
+        "rounded-2xl overflow-hidden scroll-mt-6",
+        "border border-border/50",
+        "bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl",
+        "shadow-sm shadow-black/5"
+      )}
     >
-      <div className="p-6 border-b border-border">
+      <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
         <div className="flex items-center justify-between mb-2">
-          <div className="flex items-center gap-2">
-            <Terminal className="w-5 h-5 text-brand-500" />
-            <h2 className="text-lg font-semibold text-foreground">
+          <div className="flex items-center gap-3">
+            <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
+              <Terminal className="w-5 h-5 text-brand-500" />
+            </div>
+            <h2 className="text-lg font-semibold text-foreground tracking-tight">
               Claude Code CLI
             </h2>
           </div>
@@ -40,13 +48,18 @@ export function ClaudeCliStatus({
             disabled={isChecking}
             data-testid="refresh-claude-cli"
             title="Refresh Claude CLI detection"
+            className={cn(
+              "h-9 w-9 rounded-lg",
+              "hover:bg-accent/50 hover:scale-105",
+              "transition-all duration-200"
+            )}
           >
             <RefreshCw
-              className={`w-4 h-4 ${isChecking ? "animate-spin" : ""}`}
+              className={cn("w-4 h-4", isChecking && "animate-spin")}
             />
           </Button>
         </div>
-        <p className="text-sm text-muted-foreground">
+        <p className="text-sm text-muted-foreground/80 ml-12">
           Claude Code CLI provides better performance for long-running tasks,
           especially with ultrathink.
         </p>
@@ -54,13 +67,15 @@ export function ClaudeCliStatus({
       <div className="p-6 space-y-4">
         {status.success && status.status === "installed" ? (
           <div className="space-y-3">
-            <div className="flex items-center gap-2 p-3 rounded-lg bg-green-500/10 border border-green-500/20">
-              <CheckCircle2 className="w-5 h-5 text-green-500 shrink-0" />
-              <div className="flex-1">
-                <p className="text-sm font-medium text-green-400">
+            <div className="flex items-center gap-3 p-4 rounded-xl bg-emerald-500/10 border border-emerald-500/20">
+              <div className="w-10 h-10 rounded-xl bg-emerald-500/15 flex items-center justify-center border border-emerald-500/20 shrink-0">
+                <CheckCircle2 className="w-5 h-5 text-emerald-500" />
+              </div>
+              <div className="flex-1 min-w-0">
+                <p className="text-sm font-medium text-emerald-400">
                   Claude Code CLI Installed
                 </p>
-                <div className="text-xs text-green-400/80 mt-1 space-y-1">
+                <div className="text-xs text-emerald-400/70 mt-1.5 space-y-0.5">
                   {status.method && (
                     <p>
                       Method: <span className="font-mono">{status.method}</span>
@@ -68,71 +83,65 @@ export function ClaudeCliStatus({
                   )}
                   {status.version && (
                     <p>
-                      Version:{" "}
-                      <span className="font-mono">{status.version}</span>
+                      Version: <span className="font-mono">{status.version}</span>
                     </p>
                   )}
                   {status.path && (
                     <p className="truncate" title={status.path}>
-                      Path:{" "}
-                      <span className="font-mono text-[10px]">
-                        {status.path}
-                      </span>
+                      Path: <span className="font-mono text-[10px]">{status.path}</span>
                     </p>
                   )}
                 </div>
               </div>
             </div>
             {status.recommendation && (
-              <p className="text-xs text-muted-foreground">
+              <p className="text-xs text-muted-foreground/70 ml-1">
                 {status.recommendation}
               </p>
             )}
           </div>
         ) : (
-          <div className="space-y-3">
-            <div className="flex items-start gap-3 p-3 rounded-lg bg-yellow-500/10 border border-yellow-500/20">
-              <AlertCircle className="w-5 h-5 text-yellow-500 mt-0.5 shrink-0" />
+          <div className="space-y-4">
+            <div className="flex items-start gap-3 p-4 rounded-xl bg-amber-500/10 border border-amber-500/20">
+              <div className="w-10 h-10 rounded-xl bg-amber-500/15 flex items-center justify-center border border-amber-500/20 shrink-0 mt-0.5">
+                <AlertCircle className="w-5 h-5 text-amber-500" />
+              </div>
               <div className="flex-1">
-                <p className="text-sm font-medium text-yellow-400">
+                <p className="text-sm font-medium text-amber-400">
                   Claude Code CLI Not Detected
                 </p>
-                <p className="text-xs text-yellow-400/80 mt-1">
+                <p className="text-xs text-amber-400/70 mt-1">
                   {status.recommendation ||
                     "Consider installing Claude Code CLI for optimal performance with ultrathink."}
                 </p>
               </div>
             </div>
             {status.installCommands && (
-              <div className="space-y-2">
-                <p className="text-xs font-medium text-foreground-secondary">
+              <div className="space-y-3">
+                <p className="text-xs font-medium text-foreground/80">
                   Installation Commands:
                 </p>
-                <div className="space-y-1">
+                <div className="space-y-2">
                   {status.installCommands.npm && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">npm:</p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
+                    <div className="p-3 rounded-xl bg-accent/30 border border-border/50">
+                      <p className="text-[10px] text-muted-foreground mb-1.5 font-medium uppercase tracking-wider">npm</p>
+                      <code className="text-xs text-foreground/80 font-mono break-all">
                         {status.installCommands.npm}
                       </code>
                     </div>
                   )}
                   {status.installCommands.macos && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">
-                        macOS/Linux:
-                      </p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
+                    <div className="p-3 rounded-xl bg-accent/30 border border-border/50">
+                      <p className="text-[10px] text-muted-foreground mb-1.5 font-medium uppercase tracking-wider">macOS/Linux</p>
+                      <code className="text-xs text-foreground/80 font-mono break-all">
                         {status.installCommands.macos}
                       </code>
                     </div>
                   )}
                   {status.installCommands.windows && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">
-                        Windows (PowerShell):
-                      </p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
+                    <div className="p-3 rounded-xl bg-accent/30 border border-border/50">
+                      <p className="text-[10px] text-muted-foreground mb-1.5 font-medium uppercase tracking-wider">Windows (PowerShell)</p>
+                      <code className="text-xs text-foreground/80 font-mono break-all">
                         {status.installCommands.windows}
                       </code>
                     </div>

apps/app/src/components/views/settings-view/cli-status/codex-cli-status.tsx

@@ -1,169 +0,0 @@
-import { Button } from "@/components/ui/button";
-import {
-  Terminal,
-  CheckCircle2,
-  AlertCircle,
-  RefreshCw,
-} from "lucide-react";
-import type { CliStatus } from "../shared/types";
-
-interface CliStatusProps {
-  status: CliStatus | null;
-  isChecking: boolean;
-  onRefresh: () => void;
-}
-
-export function CodexCliStatus({
-  status,
-  isChecking,
-  onRefresh,
-}: CliStatusProps) {
-  if (!status) return null;
-
-  return (
-    <div
-      id="codex"
-      className="rounded-xl border border-border bg-card backdrop-blur-md overflow-hidden scroll-mt-6"
-    >
-      <div className="p-6 border-b border-border">
-        <div className="flex items-center justify-between mb-2">
-          <div className="flex items-center gap-2">
-            <Terminal className="w-5 h-5 text-green-500" />
-            <h2 className="text-lg font-semibold text-foreground">
-              OpenAI Codex CLI
-            </h2>
-          </div>
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={onRefresh}
-            disabled={isChecking}
-            data-testid="refresh-codex-cli"
-            title="Refresh Codex CLI detection"
-          >
-            <RefreshCw
-              className={`w-4 h-4 ${isChecking ? "animate-spin" : ""}`}
-            />
-          </Button>
-        </div>
-        <p className="text-sm text-muted-foreground">
-          Codex CLI enables GPT-5.1 Codex models for autonomous coding tasks.
-        </p>
-      </div>
-      <div className="p-6 space-y-4">
-        {status.success && status.status === "installed" ? (
-          <div className="space-y-3">
-            <div className="flex items-center gap-2 p-3 rounded-lg bg-green-500/10 border border-green-500/20">
-              <CheckCircle2 className="w-5 h-5 text-green-500 shrink-0" />
-              <div className="flex-1">
-                <p className="text-sm font-medium text-green-400">
-                  Codex CLI Installed
-                </p>
-                <div className="text-xs text-green-400/80 mt-1 space-y-1">
-                  {status.method && (
-                    <p>
-                      Method: <span className="font-mono">{status.method}</span>
-                    </p>
-                  )}
-                  {status.version && (
-                    <p>
-                      Version:{" "}
-                      <span className="font-mono">{status.version}</span>
-                    </p>
-                  )}
-                  {status.path && (
-                    <p className="truncate" title={status.path}>
-                      Path:{" "}
-                      <span className="font-mono text-[10px]">
-                        {status.path}
-                      </span>
-                    </p>
-                  )}
-                </div>
-              </div>
-            </div>
-            {status.recommendation && (
-              <p className="text-xs text-muted-foreground">
-                {status.recommendation}
-              </p>
-            )}
-          </div>
-        ) : status.status === "api_key_only" ? (
-          <div className="space-y-3">
-            <div className="flex items-start gap-3 p-3 rounded-lg bg-blue-500/10 border border-blue-500/20">
-              <AlertCircle className="w-5 h-5 text-blue-500 mt-0.5 shrink-0" />
-              <div className="flex-1">
-                <p className="text-sm font-medium text-blue-400">
-                  API Key Detected - CLI Not Installed
-                </p>
-                <p className="text-xs text-blue-400/80 mt-1">
-                  {status.recommendation ||
-                    "OPENAI_API_KEY found but Codex CLI not installed. Install the CLI for full agentic capabilities."}
-                </p>
-              </div>
-            </div>
-            {status.installCommands && (
-              <div className="space-y-2">
-                <p className="text-xs font-medium text-foreground-secondary">
-                  Installation Commands:
-                </p>
-                <div className="space-y-1">
-                  {status.installCommands.npm && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">npm:</p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
-                        {status.installCommands.npm}
-                      </code>
-                    </div>
-                  )}
-                </div>
-              </div>
-            )}
-          </div>
-        ) : (
-          <div className="space-y-3">
-            <div className="flex items-start gap-3 p-3 rounded-lg bg-yellow-500/10 border border-yellow-500/20">
-              <AlertCircle className="w-5 h-5 text-yellow-500 mt-0.5 shrink-0" />
-              <div className="flex-1">
-                <p className="text-sm font-medium text-yellow-400">
-                  Codex CLI Not Detected
-                </p>
-                <p className="text-xs text-yellow-400/80 mt-1">
-                  {status.recommendation ||
-                    "Install OpenAI Codex CLI to use GPT-5.1 Codex models for autonomous coding."}
-                </p>
-              </div>
-            </div>
-            {status.installCommands && (
-              <div className="space-y-2">
-                <p className="text-xs font-medium text-foreground-secondary">
-                  Installation Commands:
-                </p>
-                <div className="space-y-1">
-                  {status.installCommands.npm && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">npm:</p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
-                        {status.installCommands.npm}
-                      </code>
-                    </div>
-                  )}
-                  {status.installCommands.macos && (
-                    <div className="p-2 rounded bg-background border border-border-glass">
-                      <p className="text-xs text-muted-foreground mb-1">
-                        macOS (Homebrew):
-                      </p>
-                      <code className="text-xs text-foreground-secondary font-mono break-all">
-                        {status.installCommands.macos}
-                      </code>
-                    </div>
-                  )}
-                </div>
-              </div>
-            )}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}