Add websitebuilder app

2026-01-26 12:50:12 +07:00
parent 93cfc18d1f
commit 4d1bb6892b
227 changed files with 35610 additions and 75 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,119 @@
+name: CI
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+
+jobs:
+  build:
+    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'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build Next.js
+        run: npm run build
+        env:
+          DATABASE_URL: postgresql://test:test@localhost:5432/test
+          REDIS_URL: redis://localhost:6379
+
+  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'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run unit tests with coverage
+        run: npm run test:coverage
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          file: ./coverage/coverage-final.json
+          flags: unittests
+          name: codecov-umbrella
+
+      - name: Check coverage thresholds
+        run: |
+          # Check if coverage meets thresholds
+          COVERAGE=$(cat coverage/coverage-summary.json | jq '.total.lines.pct')
+          echo "Coverage: $COVERAGE%"
+
+          if (( $(echo "$COVERAGE < 80" | bc -l) )); then
+            echo "Coverage below 80% threshold"
+            exit 1
+          fi
+
+  e2e:
+    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'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install Playwright browsers
+        run: npx playwright install --with-deps
+
+      - name: Run E2E tests
+        run: npm run test:e2e
+
+      - name: Upload Playwright report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30
+
+  lint:
+    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'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run ESLint
+        run: npm run lint
+
+      - name: Run TypeScript check
+        run: npx tsc --noEmit
--- a/.nycrc
+++ b/.nycrc
@@ -0,0 +1,33 @@
+{
+  "all": true,
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules/",
+    "tests/",
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/types/**",
+    "**/dist/**",
+    "**/.next/**",
+    "**/coverage/**",
+    "src/app/**",
+    "src/components/ui/**"
+  ],
+  "reporter": [
+    "text",
+    "json",
+    "html",
+    "lcov"
+  ],
+  "report-dir": "./coverage",
+  "check-coverage": true,
+  "lines": 80,
+  "functions": 80,
+  "branches": 80,
+  "statements": 80
+}
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,10 @@
+{
+  "semi": true,
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "arrowParens": "always",
+  "endOfLine": "lf"
+}
--- a/.tmp/sessions/phase1-foundation/context.md
+++ b/.tmp/sessions/phase1-foundation/context.md
@@ -0,0 +1,273 @@
+# Phase 1: Foundation - Context Bundle
+
+## Task Description
+
+Implement Phase 1 Foundation for MoreMinimore SAAS platform. This phase establishes the core infrastructure including project setup, database configuration, authentication system, user management, and CI/CD pipeline.
+
+## Scope Boundaries
+
+### In Scope
+
+- Next.js 15 project initialization with TypeScript
+- PostgreSQL database setup with Drizzle ORM
+- Complete database schema (20+ tables from SPECIFICATION.md)
+- Redis caching setup
+- JWT-based authentication system
+- User management APIs and UI
+- CI/CD pipeline with GitHub Actions
+- Automated testing setup (Vitest, Playwright)
+
+### Out of Scope
+
+- Organization management (Phase 2)
+- Project management (Phase 2)
+- AI integration (Phase 2)
+- Easypanel integration (Phase 4)
+- Gitea integration (Phase 5)
+- Billing system (Phase 6)
+
+## Technical Requirements
+
+### Technology Stack
+
+- **Frontend**: Next.js 15 (App Router), React 19, Tailwind CSS 4, shadcn/ui
+- **Backend**: Next.js API Routes, Node.js 20+
+- **Database**: PostgreSQL 16+, Drizzle ORM
+- **Cache**: Redis 7+
+- **State**: Zustand (global), React Query (server state)
+- **Testing**: Vitest (unit), Playwright (E2E)
+- **CI/CD**: GitHub Actions
+
+### Database Schema
+
+All tables from SPECIFICATION.md lines 141-397:
+
+- users, organizations, organization_members
+- projects, project_versions
+- chats, messages, prompts
+- ai_providers, ai_models, user_api_keys
+- design_systems, deployment_logs
+- invoices, subscription_events
+- audit_logs, sessions
+- email_verification_tokens, password_reset_tokens
+
+### Authentication Requirements
+
+- JWT access tokens (15 min expiration)
+- JWT refresh tokens (7 days expiration)
+- HTTP-only cookies for token storage
+- Email verification required
+- Password reset flow
+- Role-based authorization (admin, co_admin, owner, user)
+
+## Constraints
+
+### Code Quality Standards
+
+- Pure functions (no side effects)
+- Immutability (create new data, don't modify)
+- Small functions (< 50 lines)
+- Explicit dependencies (dependency injection)
+- Modular design (< 100 lines per component)
+
+### Testing Requirements
+
+- AAA pattern (Arrange → Act → Assert)
+- Critical code: 100% coverage
+- High priority: 90%+ coverage
+- Medium priority: 80%+ coverage
+
+### Security Requirements
+
+- Never expose sensitive data in logs
+- Use environment variables for secrets
+- Validate all input data
+- Use parameterized queries
+- Implement rate limiting
+- CSRF protection
+
+## Expected Deliverables
+
+### 1. Project Structure
+
+```
+src/
+├── app/                    # Next.js App Router
+│   ├── api/               # API routes
+│   ├── auth/              # Auth pages
+│   ├── dashboard/         # Dashboard pages
+│   └── layout.tsx
+├── components/            # React components
+│   ├── ui/               # shadcn/ui components
+│   ├── auth/             # Auth components
+│   └── dashboard/        # Dashboard components
+├── lib/                  # Utilities
+│   ├── db/              # Database utilities
+│   ├── auth/            # Auth utilities
+│   └── utils.ts
+├── services/            # Business logic
+│   ├── auth.service.ts
+│   ├── user.service.ts
+│   └── email.service.ts
+├── types/               # TypeScript types
+│   └── index.ts
+└── middleware.ts        # Next.js middleware
+```
+
+### 2. Database
+
+- PostgreSQL database `moreminimore`
+- Drizzle ORM configured
+- All tables created with proper indexes
+- Initial migration generated and applied
+- Redis connection configured
+
+### 3. Authentication
+
+- Password hashing utility (bcrypt)
+- JWT generation/verification utilities
+- Auth APIs: register, login, refresh, logout, verify-email, forgot-password, reset-password
+- Auth middleware: requireAuth, requireRole, requireOrgMembership
+- Session management in database
+
+### 4. User Management
+
+- User profile APIs (GET/PATCH /api/users/me)
+- Admin user management APIs (GET/PATCH/DELETE /api/users)
+- User profile page
+- Settings page
+- Admin user management page
+
+### 5. CI/CD
+
+- GitHub Actions workflow file
+- Automated testing on push/PR
+- Test coverage reporting
+- Build validation
+
+## Acceptance Criteria
+
+### Project Setup
+
+- [ ] Next.js 15 project created with TypeScript
+- [ ] Tailwind CSS 4 configured
+- [ ] shadcn/ui components installed
+- [ ] ESLint and Prettier configured
+- [ ] Path aliases configured (@/components, @/lib, etc.)
+- [ ] Environment variables template created
+
+### Database
+
+- [ ] PostgreSQL database created
+- [ ] Drizzle ORM configured
+- [ ] All 20+ tables defined in schema
+- [ ] Indexes created for performance
+- [ ] Initial migration generated
+- [ ] Migration applied successfully
+- [ ] Redis connection tested
+
+### Authentication
+
+- [ ] Password hashing/verification working
+- [ ] JWT tokens generated with correct expiration
+- [ ] Register API creates user and sends verification email
+- [ ] Login API generates tokens and sets cookies
+- [ ] Refresh API rotates tokens correctly
+- [ ] Logout API clears cookies and invalidates session
+- [ ] Email verification API works
+- [ ] Password reset flow works end-to-end
+- [ ] Auth middleware protects routes correctly
+- [ ] Role-based authorization works
+
+### User Management
+
+- [ ] User profile API returns correct data
+- [ ] User profile update works
+- [ ] Password change works
+- [ ] Admin can list all users
+- [ ] Admin can update user details
+- [ ] Admin can ban/unban users
+- [ ] User profile page displays correctly
+- [ ] Settings page works
+- [ ] Admin user management page works
+
+### CI/CD
+
+- [ ] GitHub Actions workflow runs on push
+- [ ] Tests execute automatically
+- [ ] Coverage report generated
+- [ ] Build validation passes
+- [ ] PR checks work
+
+## Context Files
+
+### Code Quality Standards
+
+- Location: /Users/kunthawatgreethong/.config/opencode/context/core/standards/code-quality.md
+- Key principles: Modular, Functional, Maintainable
+- Critical patterns: Pure functions, immutability, composition, dependency injection
+- Anti-patterns: Mutation, side effects, deep nesting, god modules
+
+### Documentation Standards
+
+- Location: /Users/kunthawatgreethong/.config/opencode/context/core/standards/documentation.md
+- Golden Rule: If users ask the same question twice, document it
+- Document WHY decisions were made, not just WHAT code does
+
+### Testing Standards
+
+- Location: /Users/kunthawatgreethong/.config/opencode/context/core/standards/test-coverage.md
+- Golden Rule: If you can't test it easily, refactor it
+- AAA pattern: Arrange → Act → Assert
+- Coverage goals: Critical 100%, High 90%+, Medium 80%+
+
+### Essential Patterns
+
+- Location: /Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md
+- Core patterns: Error handling, validation, security, logging, pure functions
+- ALWAYS: Handle errors gracefully, validate input, use env vars for secrets
+- NEVER: Expose sensitive info, hardcode credentials, skip validation
+
+### Specification
+
+- Location: /Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md
+- Complete technical specification with database schema, API design, authentication flow
+
+### Task Breakdown
+
+- Location: /Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/TASKS.md
+- Detailed task breakdown for all phases
+
+## Risks & Considerations
+
+### Technical Risks
+
+- PostgreSQL setup complexity on local development
+- Redis configuration and connection pooling
+- JWT token security and rotation
+- Email service integration (Resend/SendGrid)
+- Database migration conflicts
+
+### Mitigation Strategies
+
+- Use Docker for local PostgreSQL/Redis if needed
+- Implement comprehensive error handling
+- Add extensive logging for debugging
+- Create rollback procedures for migrations
+- Test authentication flow thoroughly
+
+## Next Steps
+
+After Phase 1 completion:
+
+1. Validate all acceptance criteria
+2. Run full test suite
+3. Document any deviations
+4. Prepare for Phase 2: Core Features
+
+---
+
+**Session ID**: ses_phase1_foundation
+**Created**: January 19, 2026
+**Priority**: High
+**Estimated Duration**: 4 weeks
--- a/.tmp/tasks/phase1-foundation/subtask_01.json
+++ b/.tmp/tasks/phase1-foundation/subtask_01.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase1-foundation-01",
+  "seq": "01",
+  "title": "Initialize Next.js 15 project with TypeScript",
+  "status": "completed",
+  "depends_on": [],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Next.js 15 project created using npx create-next-app@latest",
+    "TypeScript strict mode enabled in tsconfig.json",
+    "ESLint configured with recommended rules",
+    "Prettier configured with .prettierrc",
+    "Tailwind CSS 4 configured in tailwind.config.ts",
+    "Project builds successfully with npm run build"
+  ],
+  "deliverables": [
+    "package.json",
+    "tsconfig.json",
+    ".eslintrc.json",
+    ".prettierrc",
+    "tailwind.config.ts",
+    "postcss.config.mjs",
+    "next.config.mjs"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_02.json
+++ b/.tmp/tasks/phase1-foundation/subtask_02.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase1-foundation-02",
+  "seq": "02",
+  "title": "Set up project structure and path aliases",
+  "status": "completed",
+  "depends_on": ["01"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "src/ directory created with app, components, lib, services, types folders",
+    "Environment variables template (.env.example) created",
+    "Path aliases configured in tsconfig.json (@/components, @/lib, @/services, @/types)",
+    "Absolute imports work correctly",
+    "Folder structure matches context.md specification"
+  ],
+  "deliverables": [
+    "src/app/",
+    "src/components/",
+    "src/lib/",
+    "src/services/",
+    "src/types/",
+    ".env.example",
+    "tsconfig.json (updated)"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_03.json
+++ b/.tmp/tasks/phase1-foundation/subtask_03.json
@@ -0,0 +1,23 @@
+{
+  "id": "phase1-foundation-03",
+  "title": "Install core dependencies",
+  "seq": "03",
+  "status": "completed",
+  "depends_on": ["02"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Drizzle ORM and Drizzle Kit installed",
+    "Zustand installed for global state",
+    "@tanstack/react-query installed for server state",
+    "shadcn/ui components initialized",
+    "bcrypt installed for password hashing",
+    "jsonwebtoken installed for JWT tokens",
+    "ioredis installed for Redis client",
+    "zod installed for validation",
+    "All packages added to package.json"
+  ],
+  "deliverables": ["package.json (updated)", "components.json (shadcn/ui config)"]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_04.json
+++ b/.tmp/tasks/phase1-foundation/subtask_04.json
@@ -0,0 +1,23 @@
+{
+  "id": "phase1-foundation-04",
+  "seq": "04",
+  "title": "Set up PostgreSQL database",
+  "status": "completed",
+  "depends_on": ["03"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "PostgreSQL 16+ installed locally or Docker container running",
+    "Database 'moreminimore' created",
+    "Database user with proper permissions configured",
+    "Connection string added to .env.example",
+    "Database connection tested successfully"
+  ],
+  "deliverables": [
+    ".env.example (with DATABASE_URL)",
+    "docker-compose.yml (if using Docker)",
+    "README.md with database setup instructions"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_05.json
+++ b/.tmp/tasks/phase1-foundation/subtask_05.json
@@ -0,0 +1,24 @@
+{
+  "id": "phase1-foundation-05",
+  "seq": "05",
+  "title": "Configure Drizzle ORM",
+  "status": "completed",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "drizzle.config.ts created with database connection",
+    "src/lib/db/index.ts created with database client",
+    "Migration folder configured",
+    "Drizzle Kit CLI configured in package.json",
+    "Database connection tested"
+  ],
+  "deliverables": [
+    "drizzle.config.ts",
+    "src/lib/db/index.ts",
+    "drizzle/",
+    "package.json (with drizzle-kit scripts)"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_06.json
+++ b/.tmp/tasks/phase1-foundation/subtask_06.json
@@ -0,0 +1,20 @@
+{
+  "id": "phase1-foundation-06",
+  "seq": "06",
+  "title": "Create database schema with all tables",
+  "status": "completed",
+  "depends_on": ["05"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "All 20+ tables defined in src/lib/db/schema.ts",
+    "Tables: users, organizations, organization_members, projects, project_versions, chats, messages, prompts, ai_providers, ai_models, user_api_keys, design_systems, deployment_logs, invoices, subscription_events, audit_logs, sessions, email_verification_tokens, password_reset_tokens",
+    "Foreign key relationships defined correctly",
+    "Indexes created for performance (email, slug, organization_id, etc.)",
+    "Schema matches SPECIFICATION.md lines 141-397"
+  ],
+  "deliverables": ["src/lib/db/schema.ts"]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_07.json
+++ b/.tmp/tasks/phase1-foundation/subtask_07.json
@@ -0,0 +1,19 @@
+{
+  "id": "phase1-foundation-07",
+  "seq": "07",
+  "title": "Generate and apply initial database migration",
+  "status": "completed",
+  "depends_on": ["06"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Initial migration generated using drizzle-kit generate",
+    "Migration SQL file created in drizzle/ folder",
+    "Migration applied successfully to database",
+    "All tables exist in PostgreSQL",
+    "Indexes verified in database"
+  ],
+  "deliverables": ["drizzle/0000_initial.sql", "drizzle/migration_meta.json"]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_08.json
+++ b/.tmp/tasks/phase1-foundation/subtask_08.json
@@ -0,0 +1,23 @@
+{
+  "id": "phase1-foundation-08",
+  "seq": "08",
+  "title": "Set up Redis caching",
+  "status": "completed",
+  "depends_on": ["04"],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Redis 7+ installed locally or Docker container running",
+    "Redis client configured in src/lib/redis/index.ts",
+    "Connection string added to .env.example",
+    "Redis connection tested successfully",
+    "Basic get/set operations work"
+  ],
+  "deliverables": [
+    "src/lib/redis/index.ts",
+    ".env.example (with REDIS_URL)",
+    "docker-compose.yml (updated if using Docker)"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_09.json
+++ b/.tmp/tasks/phase1-foundation/subtask_09.json
@@ -0,0 +1,20 @@
+{
+  "id": "phase1-foundation-09",
+  "seq": "09",
+  "title": "Implement password hashing utility",
+  "status": "completed",
+  "depends_on": ["03"],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "hashPassword function created using bcrypt with salt rounds 12",
+    "verifyPassword function created",
+    "Functions are pure and testable",
+    "Unit tests written with Vitest",
+    "Tests pass with 100% coverage"
+  ],
+  "deliverables": ["src/lib/auth/password.ts", "src/lib/auth/__tests__/password.test.ts"]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_10.json
+++ b/.tmp/tasks/phase1-foundation/subtask_10.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase1-foundation-10",
+  "seq": "10",
+  "title": "Implement JWT token utilities",
+  "status": "completed",
+  "depends_on": ["03"],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "generateAccessToken function created (15 min expiration)",
+    "generateRefreshToken function created (7 days expiration)",
+    "verifyAccessToken function created",
+    "verifyRefreshToken function created",
+    "JWT_SECRET added to .env.example",
+    "Functions are pure and testable",
+    "Unit tests written with Vitest",
+    "Tests pass with 100% coverage"
+  ],
+  "deliverables": [
+    "src/lib/auth/jwt.ts",
+    "src/lib/auth/__tests__/jwt.test.ts",
+    ".env.example (with JWT_SECRET)"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_11.json
+++ b/.tmp/tasks/phase1-foundation/subtask_11.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase1-foundation-11",
+  "seq": "11",
+  "title": "Create user registration API",
+  "status": "completed",
+  "depends_on": ["07", "09", "10"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/register endpoint created",
+    "Validates email format and password strength",
+    "Hashes password before storing",
+    "Creates user record in database",
+    "Generates email verification token",
+    "Returns user data without sensitive fields",
+    "Error handling for duplicate emails",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/register/route.ts",
+    "src/services/auth.service.ts",
+    "src/app/api/auth/register/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_12.json
+++ b/.tmp/tasks/phase1-foundation/subtask_12.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase1-foundation-12",
+  "seq": "12",
+  "title": "Create user login API",
+  "status": "completed",
+  "depends_on": ["11"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/login endpoint created",
+    "Verifies email and password",
+    "Generates access and refresh tokens",
+    "Sets HTTP-only cookies for tokens",
+    "Creates session record in database",
+    "Updates user last_login_at",
+    "Returns user data",
+    "Error handling for invalid credentials",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/login/route.ts",
+    "src/services/auth.service.ts (updated)",
+    "src/app/api/auth/login/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_13.json
+++ b/.tmp/tasks/phase1-foundation/subtask_13.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase1-foundation-13",
+  "seq": "13",
+  "title": "Create token refresh API",
+  "status": "completed",
+  "depends_on": ["12"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/refresh endpoint created",
+    "Verifies refresh token from cookie",
+    "Generates new access token",
+    "Rotates refresh token",
+    "Updates session in database",
+    "Sets new HTTP-only cookies",
+    "Error handling for expired/invalid tokens",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/refresh/route.ts",
+    "src/services/auth.service.ts (updated)",
+    "src/app/api/auth/refresh/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_14.json
+++ b/.tmp/tasks/phase1-foundation/subtask_14.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase1-foundation-14",
+  "seq": "14",
+  "title": "Create logout API",
+  "status": "completed",
+  "depends_on": ["13"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/logout endpoint created",
+    "Clears HTTP-only cookies",
+    "Invalidates session in database",
+    "Returns success response",
+    "Error handling for missing session",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/logout/route.ts",
+    "src/services/auth.service.ts (updated)",
+    "src/app/api/auth/logout/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_15.json
+++ b/.tmp/tasks/phase1-foundation/subtask_15.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase1-foundation-15",
+  "seq": "15",
+  "title": "Create email verification API",
+  "status": "completed",
+  "depends_on": ["11"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/verify-email endpoint created",
+    "Verifies token from request",
+    "Updates user email_verified to true",
+    "Deletes verification token",
+    "Returns success response",
+    "Error handling for expired/invalid tokens",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/verify-email/route.ts",
+    "src/services/auth.service.ts (updated)",
+    "src/app/api/auth/verify-email/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_16.json
+++ b/.tmp/tasks/phase1-foundation/subtask_16.json
@@ -0,0 +1,33 @@
+{
+  "id": "phase1-foundation-16",
+  "seq": "16",
+  "title": "Create password reset APIs",
+  "status": "completed",
+  "depends_on": ["11"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/auth/forgot-password endpoint created",
+    "Generates reset token",
+    "Stores token in database",
+    "Returns success response (email not exposed)",
+    "POST /api/auth/reset-password endpoint created",
+    "Verifies reset token",
+    "Hashes new password",
+    "Updates user password",
+    "Deletes reset token",
+    "Error handling for expired/invalid tokens",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/auth/forgot-password/route.ts",
+    "src/app/api/auth/reset-password/route.ts",
+    "src/services/auth.service.ts (updated)",
+    "src/app/api/auth/forgot-password/__tests__/route.test.ts",
+    "src/app/api/auth/reset-password/__tests__/route.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_17.json
+++ b/.tmp/tasks/phase1-foundation/subtask_17.json
@@ -0,0 +1,32 @@
+{
+  "id": "phase1-foundation-17",
+  "seq": "17",
+  "title": "Create authentication middleware",
+  "status": "completed",
+  "depends_on": ["10", "12"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "requireAuth middleware created",
+    "Verifies access token from cookie",
+    "Attaches user to request",
+    "Returns 401 for unauthenticated requests",
+    "requireRole middleware created",
+    "Checks user role (admin, co_admin, owner, user)",
+    "Returns 403 for unauthorized roles",
+    "requireOrgMembership middleware created",
+    "Verifies user is member of organization",
+    "Returns 403 for non-members",
+    "Error handling for invalid tokens",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/middleware.ts",
+    "src/lib/auth/middleware.ts",
+    "src/lib/auth/__tests__/middleware.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_18.json
+++ b/.tmp/tasks/phase1-foundation/subtask_18.json
@@ -0,0 +1,35 @@
+{
+  "id": "phase1-foundation-18",
+  "seq": "18",
+  "title": "Create user profile and admin APIs",
+  "status": "completed",
+  "depends_on": ["17"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "acceptance_criteria": [
+    "GET /api/users/me endpoint created (returns current user)",
+    "PATCH /api/users/me endpoint created (update profile, change password)",
+    "GET /api/users endpoint created (admin only, list all users)",
+    "GET /api/users/:id endpoint created (admin only)",
+    "PATCH /api/users/:id endpoint created (admin only, update user)",
+    "DELETE /api/users/:id endpoint created (admin only, ban/unban)",
+    "All endpoints protected with requireAuth middleware",
+    "Admin endpoints protected with requireRole middleware",
+    "Input validation with zod",
+    "Error handling for unauthorized access",
+    "Unit tests written with Vitest",
+    "Tests pass with 90%+ coverage"
+  ],
+  "deliverables": [
+    "src/app/api/users/me/route.ts",
+    "src/app/api/users/route.ts",
+    "src/app/api/users/[id]/route.ts",
+    "src/services/user.service.ts",
+    "src/app/api/users/__tests__/me.test.ts",
+    "src/app/api/users/__tests__/users.test.ts",
+    "src/app/api/users/__tests__/user-id.test.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_19.json
+++ b/.tmp/tasks/phase1-foundation/subtask_19.json
@@ -0,0 +1,41 @@
+{
+  "id": "phase1-foundation-19",
+  "seq": "19",
+  "title": "Create user management UI",
+  "status": "completed",
+  "depends_on": ["18"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/code-quality.md"
+  ],
+  "acceptance_criteria": [
+    "User profile page created at /dashboard/profile",
+    "Displays user information (name, email, avatar)",
+    "Allows editing profile information",
+    "Allows changing password",
+    "Settings page created at /dashboard/settings",
+    "Displays account settings",
+    "Admin user management page created at /admin/users",
+    "Lists all users with search and filtering",
+    "Allows viewing user details",
+    "Allows updating user details",
+    "Allows banning/unbanning users",
+    "All pages use shadcn/ui components",
+    "Components are modular (< 100 lines)",
+    "E2E tests written with Playwright",
+    "Tests pass"
+  ],
+  "deliverables": [
+    "src/app/dashboard/profile/page.tsx",
+    "src/app/dashboard/settings/page.tsx",
+    "src/app/admin/users/page.tsx",
+    "src/components/auth/ProfileForm.tsx",
+    "src/components/auth/PasswordChangeForm.tsx",
+    "src/components/admin/UserList.tsx",
+    "src/components/admin/UserDetails.tsx",
+    "tests/e2e/profile.spec.ts",
+    "tests/e2e/settings.spec.ts",
+    "tests/e2e/admin-users.spec.ts"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/subtask_20.json
+++ b/.tmp/tasks/phase1-foundation/subtask_20.json
@@ -0,0 +1,30 @@
+{
+  "id": "phase1-foundation-20",
+  "seq": "20",
+  "title": "Set up CI/CD pipeline with automated testing",
+  "status": "completed",
+  "depends_on": ["19"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/test-coverage.md"
+  ],
+  "acceptance_criteria": [
+    "GitHub Actions workflow file created at .github/workflows/ci.yml",
+    "Workflow runs on push and pull requests",
+    "Build step validates Next.js build",
+    "Test step runs Vitest unit tests",
+    "Coverage report generated and uploaded",
+    "E2E test step runs Playwright tests",
+    "Coverage thresholds enforced (critical 100%, high 90%, medium 80%)",
+    "Build fails if tests fail or coverage below threshold",
+    "Workflow tested and passes on push"
+  ],
+  "deliverables": [
+    ".github/workflows/ci.yml",
+    "vitest.config.ts",
+    "playwright.config.ts",
+    ".nycrc (coverage config)",
+    "README.md (updated with CI/CD info)"
+  ]
+}
--- a/.tmp/tasks/phase1-foundation/task.json
+++ b/.tmp/tasks/phase1-foundation/task.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase1-foundation",
+  "name": "Phase 1: Foundation",
+  "status": "active",
+  "objective": "Establish core infrastructure: project setup, database, authentication, user management, and CI/CD pipeline",
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/TASKS.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/code-quality.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/test-coverage.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "exit_criteria": [
+    "Next.js 15 project created with TypeScript and configured",
+    "PostgreSQL database with Drizzle ORM and all 20+ tables",
+    "Redis caching configured and tested",
+    "Complete JWT-based authentication system with email verification",
+    "User management APIs and UI (profile, settings, admin)",
+    "CI/CD pipeline with automated testing (Vitest, Playwright)",
+    "All acceptance criteria from context.md met"
+  ],
+  "subtask_count": 20,
+  "completed_count": 20,
+  "created_at": "2026-01-19T00:00:00Z"
+}
--- a/.tmp/tasks/phase2-core-features/subtask_01.json
+++ b/.tmp/tasks/phase2-core-features/subtask_01.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase2-core-features-01",
+  "seq": "01",
+  "title": "Create organization CRUD APIs",
+  "status": "completed",
+  "depends_on": [],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/organizations creates organization with valid data",
+    "GET /api/organizations returns user's organizations",
+    "GET /api/organizations/:id returns single organization",
+    "PATCH /api/organizations/:id updates organization fields",
+    "DELETE /api/organizations/:id soft deletes organization",
+    "All endpoints validate user permissions",
+    "APIs return proper error responses"
+  ],
+  "deliverables": [
+    "src/app/api/organizations/route.ts",
+    "src/app/api/organizations/[id]/route.ts",
+    "src/services/organization.service.ts",
+    "src/lib/db/schema.ts (organizations table)",
+    "src/middleware.ts (updated for org permissions)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_02.json
+++ b/.tmp/tasks/phase2-core-features/subtask_02.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-02",
+  "seq": "02",
+  "title": "Create organization member management APIs",
+  "status": "completed",
+  "depends_on": ["01"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/organizations/:id/members invites new member",
+    "GET /api/organizations/:id/members returns all members",
+    "PATCH /api/organizations/:id/members/:memberId updates member role",
+    "DELETE /api/organizations/:id/members/:memberId removes member",
+    "Only owners/admins can manage members",
+    "Members can view their own organization",
+    "Role-based permissions enforced"
+  ],
+  "deliverables": [
+    "src/app/api/organizations/[id]/members/route.ts",
+    "src/app/api/organizations/[id]/members/[memberId]/route.ts",
+    "src/services/organization-member.service.ts",
+    "src/lib/db/schema.ts (organization_members table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_03.json
+++ b/.tmp/tasks/phase2-core-features/subtask_03.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-03",
+  "seq": "03",
+  "title": "Create organization management UI",
+  "status": "completed",
+  "depends_on": ["01", "02"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Organization creation form validates input",
+    "Organization dashboard displays org details",
+    "Member management page lists all members",
+    "Member role update works correctly",
+    "Member removal requires confirmation",
+    "Organization settings page updates org info",
+    "UI handles loading and error states"
+  ],
+  "deliverables": [
+    "src/app/dashboard/organizations/new/page.tsx",
+    "src/app/dashboard/organizations/[id]/page.tsx",
+    "src/app/dashboard/organizations/[id]/members/page.tsx",
+    "src/app/dashboard/organizations/[id]/settings/page.tsx",
+    "src/components/organizations/OrganizationForm.tsx",
+    "src/components/organizations/MemberList.tsx",
+    "src/components/organizations/MemberActions.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_04.json
+++ b/.tmp/tasks/phase2-core-features/subtask_04.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-04",
+  "seq": "04",
+  "title": "Create project CRUD APIs",
+  "status": "completed",
+  "depends_on": ["01"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/projects creates project in organization",
+    "GET /api/projects returns user's accessible projects",
+    "GET /api/projects/:id returns single project",
+    "PATCH /api/projects/:id updates project fields",
+    "DELETE /api/projects/:id soft deletes project",
+    "Projects scoped to organization",
+    "Slug uniqueness enforced per organization"
+  ],
+  "deliverables": [
+    "src/app/api/projects/route.ts",
+    "src/app/api/projects/[id]/route.ts",
+    "src/services/project.service.ts",
+    "src/lib/db/schema.ts (projects table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_05.json
+++ b/.tmp/tasks/phase2-core-features/subtask_05.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-05",
+  "seq": "05",
+  "title": "Create project management UI",
+  "status": "completed",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Project creation form validates input",
+    "Project list page displays all projects",
+    "Project dashboard shows project details",
+    "Project settings page updates project info",
+    "Project deletion requires confirmation",
+    "UI filters projects by organization",
+    "Loading and error states handled"
+  ],
+  "deliverables": [
+    "src/app/dashboard/projects/new/page.tsx",
+    "src/app/dashboard/projects/page.tsx",
+    "src/app/dashboard/projects/[id]/page.tsx",
+    "src/app/dashboard/projects/[id]/settings/page.tsx",
+    "src/components/projects/ProjectForm.tsx",
+    "src/components/projects/ProjectList.tsx",
+    "src/components/projects/ProjectCard.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_06.json
+++ b/.tmp/tasks/phase2-core-features/subtask_06.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-06",
+  "seq": "06",
+  "title": "Implement project templates system",
+  "status": "completed",
+  "depends_on": ["04"],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Template system defined with default templates",
+    "Template selection UI displays available templates",
+    "Template preview shows template structure",
+    "Template customization allows modifying defaults",
+    "Project creation uses selected template",
+    "Templates include starter files and configuration"
+  ],
+  "deliverables": [
+    "src/lib/templates/index.ts",
+    "src/lib/templates/default-templates.ts",
+    "src/components/projects/TemplateSelector.tsx",
+    "src/components/projects/TemplatePreview.tsx",
+    "src/services/template.service.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_07.json
+++ b/.tmp/tasks/phase2-core-features/subtask_07.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-07",
+  "seq": "07",
+  "title": "Create chat CRUD APIs",
+  "status": "completed",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/projects/:id/chats creates new chat",
+    "GET /api/projects/:id/chats returns project chats",
+    "GET /api/chats/:id returns single chat",
+    "DELETE /api/chats/:id deletes chat",
+    "Chats scoped to project",
+    "Chat title auto-generated from first message"
+  ],
+  "deliverables": [
+    "src/app/api/projects/[id]/chats/route.ts",
+    "src/app/api/chats/[id]/route.ts",
+    "src/services/chat.service.ts",
+    "src/lib/db/schema.ts (chats table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_08.json
+++ b/.tmp/tasks/phase2-core-features/subtask_08.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-08",
+  "seq": "08",
+  "title": "Create message APIs with streaming",
+  "status": "pending",
+  "depends_on": ["07"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/chats/:id/messages creates user message",
+    "GET /api/chats/:id/messages returns chat messages",
+    "Message streaming endpoint returns chunks",
+    "Messages stored with metadata (tokens, tool calls)",
+    "Message order preserved by timestamp",
+    "Streaming handles connection errors"
+  ],
+  "deliverables": [
+    "src/app/api/chats/[id]/messages/route.ts",
+    "src/app/api/chats/[id]/messages/stream/route.ts",
+    "src/services/message.service.ts",
+    "src/lib/db/schema.ts (messages table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_09.json
+++ b/.tmp/tasks/phase2-core-features/subtask_09.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-09",
+  "seq": "09",
+  "title": "Create chat UI components",
+  "status": "pending",
+  "depends_on": ["07", "08"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Chat interface displays message list",
+    "Message input supports multiline text",
+    "User and assistant messages styled differently",
+    "Chat history sidebar shows all chats",
+    "New chat button creates fresh conversation",
+    "Chat deletion requires confirmation",
+    "Auto-scroll to latest message"
+  ],
+  "deliverables": [
+    "src/app/dashboard/projects/[id]/chat/page.tsx",
+    "src/components/chat/ChatInterface.tsx",
+    "src/components/chat/MessageList.tsx",
+    "src/components/chat/MessageItem.tsx",
+    "src/components/chat/MessageInput.tsx",
+    "src/components/chat/ChatSidebar.tsx",
+    "src/components/chat/ChatHistory.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_10.json
+++ b/.tmp/tasks/phase2-core-features/subtask_10.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-10",
+  "seq": "10",
+  "title": "Implement real-time chat updates",
+  "status": "pending",
+  "depends_on": ["08", "09"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Real-time message streaming works",
+    "Typing indicators display for AI responses",
+    "Connection status shown (connected/disconnected)",
+    "Reconnection logic handles disconnects",
+    "Message updates reflect in real-time",
+    "Streaming errors handled gracefully"
+  ],
+  "deliverables": [
+    "src/lib/websocket/chat-socket.ts",
+    "src/components/chat/StreamingMessage.tsx",
+    "src/components/chat/TypingIndicator.tsx",
+    "src/components/chat/ConnectionStatus.tsx",
+    "src/hooks/useChatStream.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_11.json
+++ b/.tmp/tasks/phase2-core-features/subtask_11.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-11",
+  "seq": "11",
+  "title": "Create AI provider configuration",
+  "status": "pending",
+  "depends_on": [],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "AI provider interfaces defined",
+    "OpenAI provider configured",
+    "Anthropic provider configured",
+    "Google provider configured",
+    "Custom provider support added",
+    "Provider selection works correctly",
+    "API key management per provider"
+  ],
+  "deliverables": [
+    "src/lib/ai/providers/index.ts",
+    "src/lib/ai/providers/openai.ts",
+    "src/lib/ai/providers/anthropic.ts",
+    "src/lib/ai/providers/google.ts",
+    "src/lib/ai/providers/types.ts",
+    "src/lib/db/schema.ts (ai_providers, ai_models tables)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_12.json
+++ b/.tmp/tasks/phase2-core-features/subtask_12.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-12",
+  "seq": "12",
+  "title": "Create AI service with streaming",
+  "status": "pending",
+  "depends_on": ["11"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "AI client factory creates provider clients",
+    "Message streaming implemented",
+    "Tool calls handled correctly",
+    "Context window managed properly",
+    "Token counting works",
+    "Streaming errors handled",
+    "Rate limiting applied"
+  ],
+  "deliverables": [
+    "src/services/ai.service.ts",
+    "src/lib/ai/client-factory.ts",
+    "src/lib/ai/stream-handler.ts",
+    "src/lib/ai/token-counter.ts",
+    "src/lib/ai/context-manager.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_13.json
+++ b/.tmp/tasks/phase2-core-features/subtask_13.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-13",
+  "seq": "13",
+  "title": "Create AI model management APIs and UI",
+  "status": "pending",
+  "depends_on": ["11"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "GET /api/ai/models returns available models",
+    "GET /api/ai/providers returns configured providers",
+    "User API key management works",
+    "Model selection UI displays options",
+    "API key input validates format",
+    "Keys encrypted in database",
+    "Active provider shown in UI"
+  ],
+  "deliverables": [
+    "src/app/api/ai/models/route.ts",
+    "src/app/api/ai/providers/route.ts",
+    "src/app/api/ai/keys/route.ts",
+    "src/components/ai/ModelSelector.tsx",
+    "src/components/ai/ApiKeyManager.tsx",
+    "src/services/ai-key.service.ts",
+    "src/lib/db/schema.ts (user_api_keys table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_14.json
+++ b/.tmp/tasks/phase2-core-features/subtask_14.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-14",
+  "seq": "14",
+  "title": "Implement AI code generation",
+  "status": "pending",
+  "depends_on": ["12", "13"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Code generation prompts defined",
+    "Generated code parsed correctly",
+    "File operations handled (create/update)",
+    "Code validation runs before applying",
+    "Syntax errors caught and reported",
+    "Code formatting applied",
+    "Generation history tracked"
+  ],
+  "deliverables": [
+    "src/lib/ai/prompts/code-generation.ts",
+    "src/lib/ai/code-parser.ts",
+    "src/lib/ai/code-validator.ts",
+    "src/services/code-generation.service.ts",
+    "src/components/ai/CodeGenerationPanel.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_15.json
+++ b/.tmp/tasks/phase2-core-features/subtask_15.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-15",
+  "seq": "15",
+  "title": "Integrate Monaco Editor",
+  "status": "pending",
+  "depends_on": [],
+  "parallel": true,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "@monaco-editor/react installed",
+    "Monaco Editor configured",
+    "Syntax highlighting works for multiple languages",
+    "Auto-completion enabled",
+    "Theme customization works",
+    "Editor resizes correctly",
+    "Keyboard shortcuts functional"
+  ],
+  "deliverables": [
+    "src/components/editor/MonacoEditor.tsx",
+    "src/lib/monaco/config.ts",
+    "src/lib/monaco/themes.ts",
+    "src/lib/monaco/languages.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_16.json
+++ b/.tmp/tasks/phase2-core-features/subtask_16.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-16",
+  "seq": "16",
+  "title": "Create file management APIs",
+  "status": "pending",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "GET /api/projects/:id/files returns file tree",
+    "GET /api/projects/:id/files/* returns file content",
+    "PUT /api/projects/:id/files/* creates/updates file",
+    "DELETE /api/projects/:id/files/* deletes file",
+    "File paths validated",
+    "File size limits enforced",
+    "Binary files handled correctly"
+  ],
+  "deliverables": [
+    "src/app/api/projects/[id]/files/route.ts",
+    "src/app/api/projects/[id]/files/[...path]/route.ts",
+    "src/services/file.service.ts",
+    "src/lib/storage/file-storage.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_17.json
+++ b/.tmp/tasks/phase2-core-features/subtask_17.json
@@ -0,0 +1,29 @@
+{
+  "id": "phase2-core-features-17",
+  "seq": "17",
+  "title": "Create file management UI",
+  "status": "pending",
+  "depends_on": ["15", "16"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "File tree displays project structure",
+    "File editor opens selected file",
+    "File creation dialog works",
+    "File deletion requires confirmation",
+    "File search filters results",
+    "File tabs allow switching between files",
+    "Unsaved changes indicator shown"
+  ],
+  "deliverables": [
+    "src/app/dashboard/projects/[id]/editor/page.tsx",
+    "src/components/editor/FileTree.tsx",
+    "src/components/editor/FileEditor.tsx",
+    "src/components/editor/FileTabs.tsx",
+    "src/components/editor/CreateFileDialog.tsx",
+    "src/components/editor/FileSearch.tsx",
+    "src/hooks/useFileOperations.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_18.json
+++ b/.tmp/tasks/phase2-core-features/subtask_18.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features-18",
+  "seq": "18",
+  "title": "Implement file operations",
+  "status": "pending",
+  "depends_on": ["16", "17"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Create file operation works",
+    "Update file operation saves changes",
+    "Delete file operation removes file",
+    "Rename file operation updates path",
+    "Move file operation changes location",
+    "Operations validate permissions",
+    "Error messages displayed clearly"
+  ],
+  "deliverables": [
+    "src/services/file-operations.service.ts",
+    "src/components/editor/RenameFileDialog.tsx",
+    "src/components/editor/MoveFileDialog.tsx",
+    "src/hooks/useFileOperations.ts (updated)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_19.json
+++ b/.tmp/tasks/phase2-core-features/subtask_19.json
@@ -0,0 +1,24 @@
+{
+  "id": "phase2-core-features-19",
+  "seq": "19",
+  "title": "Create preview API",
+  "status": "pending",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "GET /api/projects/:id/preview returns preview URL",
+    "Preview URL generated correctly",
+    "Preview updates trigger refresh",
+    "Preview authentication handled",
+    "Preview timeout configured",
+    "Error responses returned properly"
+  ],
+  "deliverables": [
+    "src/app/api/projects/[id]/preview/route.ts",
+    "src/services/preview.service.ts",
+    "src/lib/preview/url-generator.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_20.json
+++ b/.tmp/tasks/phase2-core-features/subtask_20.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-20",
+  "seq": "20",
+  "title": "Create preview UI components",
+  "status": "pending",
+  "depends_on": ["19"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Preview iframe displays project",
+    "Responsive device toggle works (desktop/tablet/mobile)",
+    "Refresh button reloads preview",
+    "Open in new tab button works",
+    "Loading state shown during load",
+    "Error state displayed on failure",
+    "Preview URL displayed"
+  ],
+  "deliverables": [
+    "src/app/dashboard/projects/[id]/preview/page.tsx",
+    "src/components/preview/PreviewFrame.tsx",
+    "src/components/preview/DeviceToggle.tsx",
+    "src/components/preview/PreviewControls.tsx",
+    "src/components/preview/PreviewUrl.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_21.json
+++ b/.tmp/tasks/phase2-core-features/subtask_21.json
@@ -0,0 +1,27 @@
+{
+  "id": "phase2-core-features-21",
+  "seq": "21",
+  "title": "Implement live preview with auto-refresh",
+  "status": "pending",
+  "depends_on": ["18", "20"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Auto-refresh triggers on file save",
+    "Hot module replacement works",
+    "Debounce prevents excessive refreshes",
+    "Manual refresh available",
+    "Refresh status indicator shown",
+    "Build errors displayed in preview",
+    "Connection errors handled gracefully"
+  ],
+  "deliverables": [
+    "src/lib/preview/hot-reload.ts",
+    "src/lib/preview/debounce.ts",
+    "src/components/preview/LivePreview.tsx",
+    "src/components/preview/RefreshIndicator.tsx",
+    "src/hooks/useLivePreview.ts"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_22.json
+++ b/.tmp/tasks/phase2-core-features/subtask_22.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase2-core-features-22",
+  "seq": "22",
+  "title": "Create version control APIs",
+  "status": "pending",
+  "depends_on": ["04"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md"
+  ],
+  "acceptance_criteria": [
+    "POST /api/projects/:id/versions creates version",
+    "GET /api/projects/:id/versions returns version history",
+    "GET /api/versions/:id returns version details",
+    "POST /api/versions/:id/rollback restores version",
+    "Version numbers auto-incremented",
+    "Current version flag managed",
+    "Rollback creates new version"
+  ],
+  "deliverables": [
+    "src/app/api/projects/[id]/versions/route.ts",
+    "src/app/api/versions/[id]/route.ts",
+    "src/app/api/versions/[id]/rollback/route.ts",
+    "src/services/version.service.ts",
+    "src/lib/db/schema.ts (project_versions table)"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/subtask_23.json
+++ b/.tmp/tasks/phase2-core-features/subtask_23.json
@@ -0,0 +1,28 @@
+{
+  "id": "phase2-core-features-23",
+  "seq": "23",
+  "title": "Create version control UI",
+  "status": "pending",
+  "depends_on": ["22"],
+  "parallel": false,
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md"
+  ],
+  "acceptance_criteria": [
+    "Version history list displays all versions",
+    "Version comparison shows differences",
+    "Rollback confirmation dialog works",
+    "Version tags displayed",
+    "Current version highlighted",
+    "Version details shown on click",
+    "Rollback creates new version entry"
+  ],
+  "deliverables": [
+    "src/app/dashboard/projects/[id]/versions/page.tsx",
+    "src/components/versions/VersionList.tsx",
+    "src/components/versions/VersionComparison.tsx",
+    "src/components/versions/RollbackDialog.tsx",
+    "src/components/versions/VersionDetails.tsx",
+    "src/components/versions/VersionTag.tsx"
+  ]
+}
--- a/.tmp/tasks/phase2-core-features/task.json
+++ b/.tmp/tasks/phase2-core-features/task.json
@@ -0,0 +1,26 @@
+{
+  "id": "phase2-core-features",
+  "name": "Phase 2: Core Features",
+  "status": "active",
+  "objective": "Implement core features including organization management, project management, chat interface, AI integration, code editor, preview system, and version control",
+  "context_files": [
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/.tmp/sessions/phase1-foundation/context.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/SPECIFICATION.md",
+    "/Users/kunthawatgreethong/Gitea/moreminimore-vibe/Websitebuilder/TASKS.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/code-quality.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/standards/test-coverage.md",
+    "/Users/kunthawatgreethong/.config/opencode/context/core/essential-patterns.md"
+  ],
+  "exit_criteria": [
+    "Organization CRUD APIs and UI fully functional",
+    "Project CRUD APIs and UI with template system",
+    "Chat interface with real-time message streaming",
+    "AI integration with multiple providers and code generation",
+    "Monaco editor integrated with file management",
+    "Live preview system with auto-refresh",
+    "Version control with rollback functionality"
+  ],
+  "subtask_count": 23,
+  "completed_count": 0,
+  "created_at": "2026-01-22T00:00:00Z"
+}
--- a/DATABASE_SETUP.md
+++ b/DATABASE_SETUP.md
@@ -0,0 +1,146 @@
+# Database Setup
+
+## Quick Start with Docker
+
+The easiest way to set up the development database is using Docker Compose.
+
+### Prerequisites
+
+- Docker installed on your machine
+- Docker Compose installed
+
+### Start the Database Services
+
+```bash
+docker-compose up -d
+```
+
+This will start:
+
+- PostgreSQL 16 on port 5432
+- Redis 7 on port 6379
+
+### Stop the Database Services
+
+```bash
+docker-compose down
+```
+
+### View Logs
+
+```bash
+docker-compose logs -f
+```
+
+### Reset the Database
+
+```bash
+docker-compose down -v
+docker-compose up -d
+```
+
+## Manual PostgreSQL Setup
+
+If you prefer to install PostgreSQL locally:
+
+### Install PostgreSQL
+
+**macOS (Homebrew):**
+
+```bash
+brew install postgresql@16
+brew services start postgresql@16
+```
+
+**Ubuntu/Debian:**
+
+```bash
+sudo apt-get update
+sudo apt-get install postgresql-16
+```
+
+**Windows:**
+Download and install from [PostgreSQL Official Site](https://www.postgresql.org/download/windows/)
+
+### Create Database
+
+```bash
+# Connect to PostgreSQL
+psql -U postgres
+
+# Create database and user
+CREATE DATABASE moreminimore;
+CREATE USER moreminimore WITH PASSWORD 'moreminimore_password';
+GRANT ALL PRIVILEGES ON DATABASE moreminimore TO moreminimore;
+\q
+```
+
+### Update .env.local
+
+Create a `.env.local` file in the project root:
+
+```env
+DATABASE_URL=postgresql://moreminimore:moreminimore_password@localhost:5432/moreminimore
+REDIS_URL=redis://localhost:6379
+```
+
+## Verify Connection
+
+Run the following command to verify the database connection:
+
+```bash
+psql postgresql://moreminimore:moreminimore_password@localhost:5432/moreminimore -c "SELECT version();"
+```
+
+You should see the PostgreSQL version information.
+
+## Database Migrations
+
+After setting up the database, run migrations:
+
+```bash
+npm run db:generate
+npm run db:migrate
+```
+
+## Troubleshooting
+
+### Port Already in Use
+
+If port 5432 is already in use, you can change the port in `docker-compose.yml`:
+
+```yaml
+ports:
+  - '5433:5432' # Use 5433 instead
+```
+
+Then update your `.env.local`:
+
+```env
+DATABASE_URL=postgresql://moreminimore:moreminimore_password@localhost:5433/moreminimore
+```
+
+### Connection Refused
+
+Make sure the PostgreSQL service is running:
+
+```bash
+docker-compose ps
+```
+
+If it's not running, start it:
+
+```bash
+docker-compose up -d
+```
+
+### Reset Database
+
+To completely reset the database:
+
+```bash
+docker-compose down -v
+docker-compose up -d
+```
+
+This will delete all data and recreate the database from scratch.
--- a/EASYPANEL_UPDATE.md
+++ b/EASYPANEL_UPDATE.md
@@ -0,0 +1,295 @@
+# Easypanel API Integration - Update Summary
+
+## ✅ Update Complete
+
+The Easypanel API integration details have been successfully added to the SPECIFICATION.md file.
+
+---
+
+## 📝 What Was Added
+
+### Comprehensive Easypanel API Documentation
+
+The Easypanel Integration section (starting at line 1065) now includes:
+
+#### 1. **Overview**
+
+- Base URL: `https://panel.moreminimore.com/api`
+- API Documentation link
+- Purpose and scope
+
+#### 2. **Authentication**
+
+- Login endpoint: `POST /api/trpc/auth.login`
+- Request/response examples
+- Environment variables configuration
+- TypeScript implementation
+
+#### 3. **Service Naming Convention**
+
+- Format: `{username}-{project_id}`
+- Examples for apps and databases
+- Duplicate handling with running numbers
+- TypeScript implementation
+
+#### 4. **Database Creation**
+
+- Create database endpoint: `POST /api/trpc/services.mariadb.createService`
+- Complete request body with all parameters
+- Response format
+- Database connection string construction
+- TypeScript implementation
+
+#### 5. **Application Deployment**
+
+- Create application endpoint: `POST /api/trpc/services.app.createService`
+- Complete request body with domains, mounts, environment variables
+- Response format
+- TypeScript implementation
+
+#### 6. **Update/Redeploy Application**
+
+- Update deploy endpoint: `POST /api/trpc/services.app.updateDeploy`
+- Request body format
+- TypeScript implementation
+
+#### 7. **Deployment Status**
+
+- Inspect service endpoint: `GET /api/trpc/services.app.inspectService`
+- Query parameters
+- TypeScript implementation
+
+#### 8. **List Services**
+
+- List projects and services endpoint: `GET /api/trpc/projects.listProjectsAndServices`
+- TypeScript implementation
+
+#### 9. **Delete Service**
+
+- Destroy service endpoint: `POST /api/trpc/services.app.destroyService`
+- Request body format
+- TypeScript implementation
+
+#### 10. **Stop/Start Service**
+
+- Stop service endpoint: `POST /api/trpc/services.app.stopService`
+- Start service endpoint: `POST /api/trpc/services.app.startService`
+- Request body format
+- TypeScript implementation
+
+#### 11. **Domain Management**
+
+- Update domain endpoint: `POST /api/trpc/domains.updateDomain`
+- Complete workflow (get domain ID, then update)
+- Request body format
+- TypeScript implementation
+
+#### 12. **Dockerfile Generation**
+
+- Next.js Dockerfile template
+- React Dockerfile template
+- TypeScript implementation
+
+#### 13. **Complete Easypanel Service**
+
+- Full TypeScript service class with all methods
+- Type definitions for all interfaces
+- Authentication handling
+- Error handling
+
+#### 14. **Error Handling**
+
+- User-friendly error messages
+- Internal logging for debugging
+- Implementation example
+
+#### 15. **Environment Variables**
+
+- Required environment variables
+- Example values
+
+#### 16. **API Reference**
+
+- Complete list of all endpoints
+- Links to API documentation
+
+---
+
+## 📊 Statistics
+
+- **Original file size**: 2,401 lines
+- **New file size**: 3,415 lines
+- **Lines added**: 1,014 lines
+- **Sections added**: 16 major sections
+- **Code examples**: 20+ TypeScript implementations
+- **API endpoints documented**: 11 endpoints
+
+---
+
+## 🔑 Key Features Documented
+
+### Authentication
+
+- Email/password login
+- Bearer token management
+- Automatic token refresh
+
+### Service Management
+
+- Create databases (MariaDB)
+- Create applications
+- Update/redeploy applications
+- Delete services
+- Stop/start services
+- List all services
+
+### Domain Management
+
+- Default domain: `{username}-{serviceName}.moreminimore.com`
+- Custom domain support
+- SSL certificates (Let's Encrypt)
+- Domain update workflow
+
+### Database Connection
+
+- Connection string format: `mariadb://{username}:{password}@{projectName}_{serviceName}:3306/{databaseName}`
+- Auto-generated passwords
+- Secure credential management
+
+### Deployment
+
+- Docker-based deployment
+- Auto-generated Dockerfiles
+- Environment variable management
+- Volume mounts for persistent storage
+- Zero-downtime deployments
+
+---
+
+## 🎯 Ready for Phase 4 Implementation
+
+All Easypanel API details are now documented and ready for Phase 4 implementation (Weeks 11-13).
+
+### What You Have Now
+
+✅ Complete API endpoint documentation
+✅ Request/response examples
+✅ TypeScript implementation code
+✅ Error handling strategies
+✅ Environment variable configuration
+✅ Service naming conventions
+✅ Domain management workflow
+✅ Dockerfile generation templates
+
+### What You Need to Do in Phase 4
+
+1. Create `src/lib/services/easypanel.service.ts`
+2. Implement all methods from the documentation
+3. Add environment variables to `.env.local`
+4. Test authentication
+5. Test database creation
+6. Test application deployment
+7. Test domain management
+8. Test update/redeploy functionality
+
+---
+
+## 📦 Environment Variables
+
+Add these to your `.env.local` file:
+
+```env
+# Easypanel
+EASYPANEL_EMAIL=kunthawat@moreminimore.com
+EASYPANEL_PASSWORD=Coolm@n1234mo
+EASYPANEL_API_URL=https://panel.moreminimore.com/api
+```
+
+---
+
+## 🔗 Quick Reference
+
+### API Endpoints
+
+| Endpoint                                     | Method | Purpose                     |
+| -------------------------------------------- | ------ | --------------------------- |
+| `/api/trpc/auth.login`                       | POST   | Get authentication token    |
+| `/api/trpc/services.mariadb.createService`   | POST   | Create database             |
+| `/api/trpc/services.app.createService`       | POST   | Create application          |
+| `/api/trpc/services.app.updateDeploy`        | POST   | Update/redeploy application |
+| `/api/trpc/services.app.inspectService`      | GET    | Get service details         |
+| `/api/trpc/projects.listProjectsAndServices` | GET    | List all services           |
+| `/api/trpc/services.app.destroyService`      | POST   | Delete service              |
+| `/api/trpc/services.app.stopService`         | POST   | Stop service                |
+| `/api/trpc/services.app.startService`        | POST   | Start service               |
+| `/api/trpc/domains.updateDomain`             | POST   | Update domain               |
+
+### Service Naming
+
+- **App**: `{username}-{project_id}`
+- **Database**: `{username}-{project_id}-db`
+- **Duplicate**: Append running number (e.g., `kunthawat-More-2`)
+
+### Default Domain
+
+- **Format**: `{username}-{serviceName}.moreminimore.com`
+- **Example**: `kunthawat-kunthawat-More.moreminimore.com`
+
+### Database Connection String
+
+- **Format**: `mariadb://{username}:{password}@{projectName}_{serviceName}:3306/{databaseName}`
+- **Example**: `mariadb://wp_user:5edwdr930g4jtpawzzpy@database_kunthawat-More-db:3306/kunthawat-More-db`
+
+---
+
+## ✅ Checklist
+
+Before starting Phase 4 implementation:
+
+- [x] Easypanel API details documented
+- [x] All endpoints documented
+- [x] Request/response examples provided
+- [x] TypeScript implementation code provided
+- [x] Error handling documented
+- [x] Environment variables documented
+- [x] Service naming conventions documented
+- [x] Domain management workflow documented
+- [x] Dockerfile generation templates provided
+
+---
+
+## 🚀 Next Steps
+
+1. **Review the updated SPECIFICATION.md**
+
+   - Read the Easypanel Integration section (line 1065 onwards)
+   - Understand all endpoints and workflows
+   - Review the TypeScript implementation code
+
+2. **Set up environment variables**
+
+   - Add Easypanel credentials to `.env.local`
+   - Test authentication
+
+3. **Start Phase 4 implementation**
+   - Follow the task breakdown in `TASKS.md`
+   - Implement the Easypanel service
+   - Test each endpoint
+   - Integrate with deployment workflow
+
+---
+
+## 📞 Questions?
+
+If you have any questions about the Easypanel API integration:
+
+1. Check the SPECIFICATION.md file (line 1065 onwards)
+2. Review the API documentation: https://panel.moreminimore.com/api#/
+3. Refer to the TypeScript implementation examples
+4. Ask for clarification on specific endpoints
+
+---
+
+**Update Date**: January 19, 2026
+**Updated By**: MoreMinimore Development Team
+**Status**: ✅ Complete - Ready for Phase 4 Implementation
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -0,0 +1,399 @@
+# MoreMinimore SAAS - Quick Start Guide
+
+## Overview
+
+This guide helps you get started with the MoreMinimore SAAS transformation project.
+
+---
+
+## Prerequisites
+
+Before starting, ensure you have:
+
+- **Node.js** >= 20 installed
+- **PostgreSQL** >= 16 installed
+- **Redis** >= 7 installed
+- **Git** installed
+- **npm** or **yarn** package manager
+- **Python** 3.x (for UI/UX Pro Max)
+- **Gitea** instance (self-hosted or cloud)
+- **Easypanel** API access
+- **Stripe** account (for billing)
+
+---
+
+## Getting Started
+
+### 1. Clone the Repository
+
+```bash
+git clone https://github.com/kunthawat/moreminimore-vibe.git
+cd moreminimore-vibe
+```
+
+### 2. Review Documentation
+
+Read the following documents in the `Websitebuilder/` folder:
+
+1. **SPECIFICATION.md** - Complete technical specification
+2. **TASKS.md** - Detailed task breakdown
+3. **QUICKSTART.md** - This file
+
+### 3. Understand the Architecture
+
+Key architectural decisions:
+
+- **Platform**: Next.js 15 web application (removing Electron)
+- **Database**: PostgreSQL (migrating from SQLite)
+- **Cache**: Redis
+- **Authentication**: Custom JWT with role-based access control
+- **Code Storage**: PostgreSQL + Gitea backup
+- **Deployment**: Easypanel API integration
+- **Billing**: Stripe integration
+
+### 4. Set Up Development Environment
+
+#### 4.1 Install Dependencies
+
+```bash
+npm install
+```
+
+#### 4.2 Set Up PostgreSQL
+
+```bash
+# Create database
+createdb moreminimore
+
+# Or using psql
+psql -U postgres
+CREATE DATABASE moreminimore;
+\q
+```
+
+#### 4.3 Set Up Redis
+
+```bash
+# Start Redis server
+redis-server
+
+# Test connection
+redis-cli ping
+# Should return: PONG
+```
+
+#### 4.4 Configure Environment Variables
+
+Create a `.env.local` file:
+
+```env
+# Database
+DATABASE_URL=postgresql://postgres:password@localhost:5432/moreminimore
+REDIS_URL=redis://localhost:6379
+
+# Authentication
+JWT_SECRET=your-super-secret-jwt-key-change-this
+JWT_REFRESH_SECRET=your-super-secret-refresh-key-change-this
+
+# AI Providers (optional - users can add their own)
+OPENAI_API_KEY=sk-...
+ANTHROPIC_API_KEY=sk-ant-...
+GOOGLE_API_KEY=...
+
+# Easypanel (will be provided later)
+EASYPANEL_API_KEY=your-easypanel-api-key
+EASYPANEL_API_URL=https://panel.moreminimore.com/api
+
+# Gitea
+GITEA_API_URL=https://gitea.moreminimore.com/api/v1
+GITEA_TOKEN=your-gitea-token
+
+# Stripe (will be provided later)
+STRIPE_SECRET_KEY=sk_test_...
+STRIPE_WEBHOOK_SECRET=whsec_...
+STRIPE_PRICE_ID_FREE=price_...
+STRIPE_PRICE_ID_PRO=price_...
+STRIPE_PRICE_ID_ENTERPRISE=price_...
+
+# Email (optional)
+RESEND_API_KEY=re_...
+
+# Application
+NEXT_PUBLIC_APP_URL=http://localhost:3000
+NEXT_PUBLIC_API_URL=http://localhost:3000/api
+```
+
+#### 4.5 Run Database Migrations
+
+```bash
+# Generate migrations
+npm run db:generate
+
+# Push schema to database
+npm run db:push
+```
+
+#### 4.6 Start Development Server
+
+```bash
+npm run dev
+```
+
+Visit `http://localhost:3000` to see the application.
+
+---
+
+## Development Workflow
+
+### Phase 1: Foundation (Weeks 1-4)
+
+Start with Phase 1 tasks from `TASKS.md`:
+
+1. **Project Setup**
+
+   - Initialize Next.js project
+   - Set up folder structure
+   - Install dependencies
+
+2. **Database Setup**
+
+   - Set up PostgreSQL
+   - Configure Drizzle ORM
+   - Create database schema
+
+3. **Authentication System**
+
+   - Implement password hashing
+   - Implement JWT tokens
+   - Create authentication APIs
+   - Create authentication middleware
+
+4. **User Management**
+
+   - Create user profile APIs
+   - Create admin user APIs
+   - Create user management UI
+
+5. **CI/CD Pipeline**
+   - Set up GitHub Actions
+   - Set up automated testing
+
+### Phase 2-9: Follow the Task Breakdown
+
+Continue with the remaining phases as outlined in `TASKS.md`.
+
+---
+
+## Key Concepts
+
+### User Roles
+
+- **Admin**: Full system control (you)
+- **Co-Admin**: Global settings and AI model management (your employees)
+- **Owner**: Customer who controls their projects
+- **User**: Customer's employees with permissions set by Owner
+
+### Organization Structure
+
+```
+Organization (Owner)
+├── Projects
+│   ├── Project 1
+│   ├── Project 2
+│   └── Project 3
+└── Members
+    ├── Member 1 (Admin)
+    ├── Member 2 (Member)
+    └── Member 3 (Viewer)
+```
+
+### Deployment Flow
+
+```
+User develops in MoreMinimore
+    ↓
+Click "Deploy to Easypanel"
+    ↓
+MoreMinimore commits to Gitea
+    ↓
+MoreMinimore calls Easypanel API
+    ↓
+Easypanel creates database + app
+    ↓
+Easypanel pulls code from Gitea
+    ↓
+Application is live
+```
+
+---
+
+## Common Commands
+
+### Development
+
+```bash
+# Start development server
+npm run dev
+
+# Build for production
+npm run build
+
+# Start production server
+npm start
+
+# Run tests
+npm test
+
+# Run tests in watch mode
+npm run test:watch
+
+# Run E2E tests
+npm run e2e
+```
+
+### Database
+
+```bash
+# Generate migrations
+npm run db:generate
+
+# Push schema to database
+npm run db:push
+
+# Open Drizzle Studio
+npm run db:studio
+```
+
+### Code Quality
+
+```bash
+# Run linter
+npm run lint
+
+# Fix linting issues
+npm run lint:fix
+
+# Format code
+npm run prettier
+
+# Check formatting
+npm run prettier:check
+```
+
+### TypeScript
+
+```bash
+# Check TypeScript compilation
+npm run ts
+
+# Check main process
+npm run ts:main
+
+# Check worker processes
+npm run ts:workers
+```
+
+---
+
+## Project Structure
+
+```
+moreminimore-vibe/
+├── Websitebuilder/          # SAAS transformation documents
+│   ├── SPECIFICATION.md     # Complete technical specification
+│   ├── TASKS.md            # Detailed task breakdown
+│   └── QUICKSTART.md       # This file
+├── src/
+│   ├── app/                # Next.js App Router pages
+│   ├── components/         # React components
+│   ├── lib/                # Utility functions
+│   ├── services/           # Business logic services
+│   ├── db/                 # Database schema and queries
+│   ├── hooks/              # Custom React hooks
+│   ├── types/              # TypeScript type definitions
+│   └── styles/             # Global styles
+├── drizzle/                # Database migrations
+├── public/                 # Static assets
+├── tests/                  # Test files
+└── package.json            # Project dependencies
+```
+
+---
+
+## Important Notes
+
+### Removing "dyad" Branding
+
+The original codebase contains "dyad" branding that needs to be replaced with "moreminimore". This will be done in Phase 7.
+
+### Removing External Services
+
+The following external services will be removed in Phase 7:
+
+- Supabase
+- Neon
+- Vercel
+- Electron
+
+### UI/UX Pro Max Integration
+
+UI/UX Pro Max is an AI skill for design intelligence. It will be integrated in Phase 3.
+
+### Easypanel API Details
+
+Easypanel API details will be provided when you're ready to implement Phase 4.
+
+### Gitea Integration
+
+Gitea will be used for code backup and version control. You'll need a self-hosted Gitea instance.
+
+---
+
+## Getting Help
+
+### Documentation
+
+- **SPECIFICATION.md** - Complete technical specification
+- **TASKS.md** - Detailed task breakdown
+- **README.md** - Original project README
+
+### Questions?
+
+If you have questions:
+
+1. Check the documentation first
+2. Review the task breakdown
+3. Ask for clarification on specific tasks
+4. Provide Easypanel API details when ready
+
+---
+
+## Next Steps
+
+1. ✅ Review all documentation in `Websitebuilder/`
+2. ✅ Set up development environment
+3. ✅ Start with Phase 1 tasks
+4. ✅ Follow the task breakdown in `TASKS.md`
+5. ✅ Ask for Easypanel API details when ready for Phase 4
+
+---
+
+## Progress Tracking
+
+Use the task checklist in `TASKS.md` to track progress:
+
+- [ ] Phase 1: Foundation
+- [ ] Phase 2: Core Features
+- [ ] Phase 3: UI/UX Pro Max Integration
+- [ ] Phase 4: Easypanel Integration
+- [ ] Phase 5: Gitea Integration
+- [ ] Phase 6: Billing & Subscription
+- [ ] Phase 7: Migration & Cleanup
+- [ ] Phase 8: Testing & Optimization
+- [ ] Phase 9: Deployment & Launch
+
+---
+
+**Document Version**: 1.0
+**Last Updated**: January 19, 2026
+**Author**: MoreMinimore Development Team
--- a/README.md
+++ b/README.md
@@ -1,36 +1,235 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+# MoreMinimore SAAS

-## Getting Started
+A modern AI-powered web application development platform built with Next.js 16, TypeScript, and PostgreSQL.

-First, run the development server:
+## 🚀 Getting Started

+### Prerequisites
+
+- Node.js 20 or higher
+- PostgreSQL 14 or higher
+- Redis (optional, for caching)
+
+### Installation
+
+1. Clone the repository:
 ```bash
-npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
+git clone <repository-url>
+cd Websitebuilder
 ```

-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+2. Install dependencies:
+```bash
+npm install
+```

-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+3. Set up environment variables:
+```bash
+cp .env.example .env
+```

-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+Edit `.env` with your configuration:
+```env
+DATABASE_URL=postgresql://user:password@localhost:5432/moreminimore
+JWT_SECRET=your-secret-key-here
+REDIS_URL=redis://localhost:6379
+```

-## Learn More
+4. Run database migrations:
+```bash
+npm run db:migrate
+```

-To learn more about Next.js, take a look at the following resources:
+5. Start the development server:
+```bash
+npm run dev
+```

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+The application will be available at `http://localhost:3000`.

-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+## 📁 Project Structure

-## Deploy on Vercel
+```
+src/
+├── app/                    # Next.js App Router pages
+│   ├── api/                 # API routes
+│   │   ├── auth/             # Authentication endpoints
+│   │   └── users/            # User management endpoints
+│   ├── dashboard/           # Dashboard pages
+│   └── admin/               # Admin pages
+├── components/             # React components
+│   ├── auth/               # Authentication components
+│   ├── admin/               # Admin components
+│   └── ui/                 # shadcn/ui components
+├── lib/                    # Utility libraries
+│   ├── auth/                # Authentication utilities
+│   ├── db/                  # Database configuration
+│   └── utils.ts             # Utility functions
+└── services/               # Business logic services
+    ├── auth.service.ts      # Authentication service
+    └── user.service.ts      # User management service
+```

-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+## 🧪 Testing

-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
+### Unit Tests
+
+Run unit tests with Vitest:
+```bash
+npm test
+```
+
+Run tests with UI:
+```bash
+npm run test:ui
+```
+
+Run tests with coverage:
+```bash
+npm run test:coverage
+```
+
+Check coverage thresholds:
+```bash
+npm run test:coverage:check
+```
+
+### E2E Tests
+
+Run E2E tests with Playwright:
+```bash
+npm run test:e2e
+```
+
+## 🏗️ Building
+
+Build for production:
+```bash
+npm run build
+```
+
+Start production server:
+```bash
+npm run start
+```
+
+## 📊 Coverage
+
+We maintain high test coverage to ensure code quality:
+
+- **Critical**: Business logic, data transformations (100%)
+- **High**: Public APIs, user-facing features (90%+)
+- **Medium**: Utilities, helpers (80%+)
+
+Coverage reports are generated in the `coverage/` directory.
+
+## 🔄 CI/CD
+
+The project uses GitHub Actions for continuous integration and deployment:
+
+### Workflow Triggers
+- Push to `main` or `develop` branches
+- Pull requests to `main` or `develop` branches
+
+### CI Pipeline Stages
+
+1. **Build**: Validates Next.js build
+2. **Unit Tests**: Runs Vitest unit tests with coverage
+3. **E2E Tests**: Runs Playwright tests
+4. **Lint**: Runs ESLint
+5. **Type Check**: Runs TypeScript type checking
+
+### Coverage Enforcement
+
+The CI pipeline enforces coverage thresholds:
+- Lines: 80%
+- Functions: 80%
+- Branches: 80%
+- Statements: 80%
+
+Builds will fail if:
+- Tests fail
+- Coverage falls below thresholds
+- Linting errors
+- TypeScript errors
+
+### Coverage Reports
+
+Coverage reports are uploaded to Codecov for tracking and visualization.
+
+## 🗄️ Database
+
+### Running Migrations
+
+Generate migration files:
+```bash
+npm run db:generate
+```
+
+Apply migrations:
+```bash
+npm run db:migrate
+```
+
+Push schema changes (development only):
+```bash
+npm run db:push
+```
+
+### Database Studio
+
+Open Drizzle Studio for database management:
+```bash
+npm run db:studio
+```
+
+## 📝 Development
+
+### Code Style
+
+- Use TypeScript for type safety
+- Follow the code standards in `/Users/kunthawatgreet/.config/opencode/context/core/standards/code-quality.md`
+- Follow the testing standards in `/Users/kunthawatgreet/.config/opencode/context/core/standards/test-coverage.md`
+
+### Commit Convention
+
+Follow conventional commits:
+- `feat:` - New features
+- `fix:` - Bug fixes
+- `docs:` - Documentation changes
+- `test:` - Test changes
+- `refactor:` - Code refactoring
+- `chore:` - Maintenance tasks
+
+### Branching Strategy
+
+- `main` - Production branch
+- `develop` - Development branch
+- Feature branches from `develop`
+
+## 🚢 Deployment
+
+The application is designed to be deployed to Vercel, AWS, or any Node.js hosting platform.
+
+### Environment Variables
+
+Required environment variables:
+- `DATABASE_URL` - PostgreSQL connection string
+- `JWT_SECRET` - Secret for JWT tokens
+- `REDIS_URL` - Redis connection string (optional)
+
+## 📄 License
+
+[Your License Here]
+
+## 🤝 Contributing
+
+1. Fork the repository
+2. Create a feature branch
+3. Make your changes
+4. Run tests and ensure they pass
+5. Submit a pull request
+
+## 📞 Support
+
+For support, please open an issue in the repository.
--- a/SPECIFICATION.md
+++ b/SPECIFICATION.md
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -0,0 +1,395 @@
+# MoreMinimore SAAS Transformation - Summary
+
+## 📋 Project Overview
+
+Transform MoreMinimore from a local Electron desktop app into a full-featured SAAS platform for AI-powered web application development with Easypanel deployment integration.
+
+---
+
+## 🎯 Key Requirements
+
+### 1. Architecture
+
+- **Option B**: Convert to pure web app (Next.js/React)
+- Remove Electron entirely
+- Modern, scalable architecture
+
+### 2. Authentication & User Management
+
+- **Custom JWT authentication**
+- **4 User Roles**:
+  - **Admin**: Full system control (you)
+  - **Co-Admin**: Global settings & AI model management (your employees)
+  - **Owner**: Customer controls their projects
+  - **User**: Customer's employees with permissions set by Owner
+
+### 3. Database Migration
+
+- **From**: SQLite (local)
+- **To**: PostgreSQL (cloud)
+- **Option**: Ask user when deploying (import local data or start fresh)
+
+### 4. External Services
+
+- **Remove**: Supabase, Neon, Vercel, Electron
+- **Keep**: AI providers (OpenAI, Anthropic, etc.)
+- **Add**: Easypanel API, Gitea, Stripe
+
+### 5. UI/UX Pro Max Integration
+
+- **Both**: Design system generator + code generation
+- Users don't need to provide much UI detail
+- AI automatically designs for users
+
+### 6. Deployment Flow
+
+```
+Local development → Preview → Easypanel deployment
+```
+
+- Easypanel creates database + deploys app
+- MoreMinimore's Gitea keeps and backs up code
+- Easypanel hosts production
+
+### 7. Multi-tenancy
+
+- **Shared resources** on VPS
+- Each user has their own Easypanel projects
+
+### 8. Billing
+
+- **Free tier** + **Paid tiers**
+- **Stripe integration**
+- Subscription management
+
+### 9. Code Storage
+
+- **PostgreSQL** (chosen for simplicity)
+- **Gitea** for backup and version control
+
+### 10. Real-time Features
+
+- **No** real-time collaboration required
+
+---
+
+## 📁 Documentation Created
+
+All documentation is in the `Websitebuilder/` folder:
+
+### 1. SPECIFICATION.md (Complete Technical Specification)
+
+- Architecture overview
+- Technology stack
+- Database schema (PostgreSQL)
+- Authentication & authorization
+- User roles & permissions
+- Core features
+- Deployment flow
+- UI/UX Pro Max integration
+- Easypanel integration
+- Billing & pricing
+- Code storage strategy
+- Migration strategy
+- Security considerations
+- Performance requirements
+- Development phases (9 phases, 24 weeks)
+
+### 2. TASKS.md (Detailed Task Breakdown)
+
+- 200+ tasks organized by phase
+- Checkboxes for tracking progress
+- Priority levels
+- Estimated timeline
+- Dependencies between tasks
+
+### 3. QUICKSTART.md (Quick Start Guide)
+
+- Prerequisites
+- Getting started
+- Development workflow
+- Key concepts
+- Common commands
+- Project structure
+- Important notes
+- Next steps
+
+### 4. SUMMARY.md (This File)
+
+- Project overview
+- Key requirements
+- Documentation summary
+- Next steps
+
+---
+
+## 🏗️ Technology Stack
+
+### Frontend
+
+- **Next.js 15** (App Router)
+- **React 19**
+- **Tailwind CSS 4**
+- **shadcn/ui** (Radix UI)
+- **Zustand** (state management)
+- **React Query** (server state)
+- **Monaco Editor** (code editor)
+
+### Backend
+
+- **Node.js 20+**
+- **Next.js API Routes**
+- **Drizzle ORM**
+- **Custom JWT authentication**
+
+### Database
+
+- **PostgreSQL 16+** (primary)
+- **Redis 7+** (cache)
+
+### External Services
+
+- **Easypanel** (deployment)
+- **Gitea** (code backup)
+- **Stripe** (billing)
+- **AI Providers** (OpenAI, Anthropic, Google, etc.)
+
+---
+
+## 📊 Database Schema
+
+### Core Tables
+
+- `users` - User accounts
+- `organizations` - Multi-tenancy
+- `organization_members` - Team members
+- `projects` - User projects
+- `project_files` - Project code files
+- `project_versions` - Version history
+- `chats` - AI conversations
+- `messages` - Chat messages
+- `design_systems` - UI/UX Pro Max designs
+- `deployment_logs` - Deployment history
+- `invoices` - Billing invoices
+- `subscription_events` - Subscription events
+- `audit_logs` - Security audit
+- `sessions` - JWT sessions
+- `ai_providers` - AI model providers
+- `ai_models` - AI models
+- `user_api_keys` - User's API keys
+
+---
+
+## 🔄 Development Phases
+
+| Phase       | Duration     | Focus                                          |
+| ----------- | ------------ | ---------------------------------------------- |
+| **Phase 1** | 4 weeks      | Foundation (Next.js, PostgreSQL, Auth)         |
+| **Phase 2** | 4 weeks      | Core Features (Projects, Chat, AI, Editor)     |
+| **Phase 3** | 2 weeks      | UI/UX Pro Max Integration                      |
+| **Phase 4** | 3 weeks      | Easypanel Integration                          |
+| **Phase 5** | 2 weeks      | Gitea Integration                              |
+| **Phase 6** | 3 weeks      | Billing & Subscription                         |
+| **Phase 7** | 2 weeks      | Migration & Cleanup (remove external services) |
+| **Phase 8** | 2 weeks      | Testing & Optimization                         |
+| **Phase 9** | 2 weeks      | Deployment & Launch                            |
+| **Total**   | **24 weeks** |                                                |
+
+---
+
+## 🎨 Key Features
+
+### 1. User Management
+
+- Registration & login
+- Email verification
+- Password reset
+- Profile management
+- Team management (for Owners)
+
+### 2. Project Management
+
+- Create & manage projects
+- Project templates
+- Version control
+- Project settings
+
+### 3. AI-Powered Development
+
+- Chat interface with AI
+- Code generation
+- Code editor (Monaco)
+- Live preview
+- UI/UX Pro Max design system
+
+### 4. Deployment
+
+- One-click deployment to Easypanel
+- Automatic database creation
+- Deployment management
+- Update deployments
+- Deployment logs
+
+### 5. Billing
+
+- Subscription tiers (Free, Pro, Enterprise)
+- Stripe integration
+- Invoice management
+- Usage analytics
+
+### 6. Admin Dashboard
+
+- System overview
+- User management
+- Organization management
+- System settings
+
+---
+
+## 🔐 Security
+
+- **Password hashing** with bcrypt
+- **JWT tokens** with refresh rotation
+- **Role-based access control** (RBAC)
+- **Rate limiting**
+- **Input validation**
+- **SQL injection prevention**
+- **XSS prevention**
+- **CSRF protection**
+- **Security headers**
+- **Audit logging**
+
+---
+
+## 📈 Performance Requirements
+
+- **API Endpoints**: < 200ms (p95)
+- **Page Load**: < 2s (p95)
+- **Code Generation**: < 30s
+- **Deployment**: < 5 minutes
+- **Concurrent Users**: 1000+
+- **Projects**: 10,000+
+
+---
+
+## 🚀 Next Steps
+
+### Immediate Actions
+
+1. **Review Documentation**
+
+   - Read `SPECIFICATION.md` for complete details
+   - Read `TASKS.md` for task breakdown
+   - Read `QUICKSTART.md` for getting started
+
+2. **Set Up Development Environment**
+
+   - Install Node.js 20+
+   - Install PostgreSQL 16+
+   - Install Redis 7+
+   - Install Python 3.x
+   - Set up Gitea instance
+   - Get Easypanel API access (when ready)
+   - Set up Stripe account (when ready)
+
+3. **Start Development**
+   - Begin with Phase 1 tasks
+   - Follow the task checklist in `TASKS.md`
+   - Track progress with checkboxes
+
+### When Ready for Phase 4
+
+Provide Easypanel API details:
+
+- API authentication method
+- Available endpoints
+- Rate limits
+- Deployment requirements
+
+---
+
+## ❓ Questions?
+
+### Common Questions
+
+**Q: Why PostgreSQL over file storage?**
+A: PostgreSQL is simpler to implement, provides ACID transactions, and is easier to backup. Gitea provides version control backup.
+
+**Q: Why custom JWT instead of Auth0/Clerk?**
+A: Custom JWT gives you full control, no vendor lock-in, and no additional costs.
+
+**Q: When will Easypanel API details be needed?**
+A: Phase 4 (Weeks 11-13). You can provide them when you're ready to start that phase.
+
+**Q: What happens to existing local data?**
+A: Users will be asked to choose: import local data or start fresh when deploying.
+
+**Q: How long will this take?**
+A: Estimated 24 weeks (6 months) for full implementation.
+
+---
+
+## 📞 Support
+
+If you have questions:
+
+1. Check the documentation first
+2. Review the task breakdown
+3. Ask for clarification on specific tasks
+4. Provide Easypanel API details when ready for Phase 4
+
+---
+
+## ✅ Checklist
+
+### Before Starting
+
+- [ ] Review all documentation
+- [ ] Set up development environment
+- [ ] Install all prerequisites
+- [ ] Understand the architecture
+- [ ] Understand user roles
+- [ ] Understand deployment flow
+
+### Phase 1 Preparation
+
+- [ ] Initialize Next.js project
+- [ ] Set up PostgreSQL
+- [ ] Set up Redis
+- [ ] Configure environment variables
+- [ ] Run database migrations
+
+### Phase 4 Preparation (when ready)
+
+- [ ] Get Easypanel API details
+- [ ] Test Easypanel API connection
+- [ ] Understand Easypanel deployment process
+
+### Phase 6 Preparation (when ready)
+
+- [ ] Set up Stripe account
+- [ ] Create Stripe products
+- [ ] Create Stripe prices
+- [ ] Configure Stripe webhooks
+
+---
+
+## 🎉 Summary
+
+This is a **massive transformation project** that will convert MoreMinimore from a local Electron app into a full-featured SAAS platform. The project is well-documented with:
+
+- ✅ Complete technical specification
+- ✅ Detailed task breakdown (200+ tasks)
+- ✅ Quick start guide
+- ✅ Clear architecture
+- ✅ Defined timeline (24 weeks)
+- ✅ Security considerations
+- ✅ Performance requirements
+
+**Ready to start when you are!** 🚀
+
+---
+
+**Document Version**: 1.0
+**Last Updated**: January 19, 2026
+**Author**: MoreMinimore Development Team
--- a/TASKS.md
+++ b/TASKS.md
--- a/app/globals.css
+++ b/app/globals.css
@@ -1,26 +0,0 @@
-@import "tailwindcss";
-
-:root {
-  --background: #ffffff;
-  --foreground: #171717;
-}
-
-@theme inline {
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --font-sans: var(--font-geist-sans);
-  --font-mono: var(--font-geist-mono);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --background: #0a0a0a;
-    --foreground: #ededed;
-  }
-}
-
-body {
-  background: var(--background);
-  color: var(--foreground);
-  font-family: Arial, Helvetica, sans-serif;
-}
--- a/components.json
+++ b/components.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": true,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.ts",
+    "css": "src/app/globals.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "iconLibrary": "lucide",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "registries": {}
+}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,38 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:16-alpine
+    container_name: moreminimore-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: moreminimore
+      POSTGRES_PASSWORD: moreminimore_password
+      POSTGRES_DB: moreminimore
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U moreminimore']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  redis:
+    image: redis:7-alpine
+    container_name: moreminimore-redis
+    restart: unless-stopped
+    ports:
+      - '6379:6379'
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'ping']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data:
+  redis_data:
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -0,0 +1,10 @@
+import type { Config } from 'drizzle-kit';
+
+export default {
+  schema: './src/lib/db/schema.ts',
+  out: './drizzle',
+  dialect: 'postgresql',
+  dbCredentials: {
+    url: process.env.DATABASE_URL!,
+  },
+} satisfies Config;
--- a/drizzle/0000_quick_captain_universe.sql
+++ b/drizzle/0000_quick_captain_universe.sql
@@ -0,0 +1,271 @@
+CREATE TYPE "public"."deployment_status" AS ENUM('pending', 'success', 'failed');--> statement-breakpoint
+CREATE TYPE "public"."invoice_status" AS ENUM('draft', 'open', 'paid', 'void', 'uncollectible');--> statement-breakpoint
+CREATE TYPE "public"."message_role" AS ENUM('user', 'assistant', 'system');--> statement-breakpoint
+CREATE TYPE "public"."org_member_role" AS ENUM('owner', 'admin', 'member', 'viewer');--> statement-breakpoint
+CREATE TYPE "public"."project_status" AS ENUM('draft', 'building', 'deployed', 'error');--> statement-breakpoint
+CREATE TYPE "public"."subscription_status" AS ENUM('active', 'past_due', 'canceled', 'trialing');--> statement-breakpoint
+CREATE TYPE "public"."subscription_tier" AS ENUM('free', 'pro', 'enterprise');--> statement-breakpoint
+CREATE TYPE "public"."user_role" AS ENUM('admin', 'co_admin', 'owner', 'user');--> statement-breakpoint
+CREATE TABLE "ai_models" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"display_name" varchar(255) NOT NULL,
+	"api_name" varchar(255) NOT NULL,
+	"provider_id" uuid NOT NULL,
+	"description" text,
+	"max_output_tokens" integer,
+	"context_window" integer,
+	"is_available" boolean DEFAULT true NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "ai_providers" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"api_base_url" text NOT NULL,
+	"env_var_name" varchar(100),
+	"is_builtin" boolean DEFAULT true NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "audit_logs" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" uuid,
+	"organization_id" uuid,
+	"action" varchar(255) NOT NULL,
+	"resource_type" varchar(100),
+	"resource_id" uuid,
+	"metadata" jsonb,
+	"ip_address" varchar(45),
+	"user_agent" text,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "chats" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"project_id" uuid NOT NULL,
+	"title" varchar(255),
+	"created_by" uuid,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "deployment_logs" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"project_id" uuid NOT NULL,
+	"version_id" uuid,
+	"status" "deployment_status" NOT NULL,
+	"logs" text,
+	"error_message" text,
+	"started_at" timestamp DEFAULT now() NOT NULL,
+	"completed_at" timestamp
+);
+--> statement-breakpoint
+CREATE TABLE "design_systems" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"project_id" uuid NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"pattern" varchar(255),
+	"style" varchar(255),
+	"color_palette" jsonb,
+	"typography" jsonb,
+	"effects" jsonb,
+	"anti_patterns" jsonb,
+	"generated_by_ai" boolean DEFAULT true NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "email_verification_tokens" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" uuid NOT NULL,
+	"token" varchar(255) NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "email_verification_tokens_token_unique" UNIQUE("token")
+);
+--> statement-breakpoint
+CREATE TABLE "invoices" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"stripe_invoice_id" varchar(255),
+	"amount" numeric(10, 2) NOT NULL,
+	"currency" varchar(3) DEFAULT 'USD' NOT NULL,
+	"status" "invoice_status" NOT NULL,
+	"due_date" timestamp,
+	"paid_at" timestamp,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "invoices_stripe_invoice_id_unique" UNIQUE("stripe_invoice_id")
+);
+--> statement-breakpoint
+CREATE TABLE "messages" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"chat_id" uuid NOT NULL,
+	"role" "message_role" NOT NULL,
+	"content" text NOT NULL,
+	"metadata" jsonb,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "organization_members" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"user_id" uuid NOT NULL,
+	"role" "org_member_role" NOT NULL,
+	"permissions" jsonb,
+	"invited_by" uuid,
+	"joined_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "organizations" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"slug" varchar(255) NOT NULL,
+	"owner_id" uuid NOT NULL,
+	"stripe_customer_id" varchar(255),
+	"subscription_tier" "subscription_tier" DEFAULT 'free' NOT NULL,
+	"subscription_status" "subscription_status" DEFAULT 'active' NOT NULL,
+	"trial_ends_at" timestamp,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "organizations_slug_unique" UNIQUE("slug")
+);
+--> statement-breakpoint
+CREATE TABLE "password_reset_tokens" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" uuid NOT NULL,
+	"token" varchar(255) NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "password_reset_tokens_token_unique" UNIQUE("token")
+);
+--> statement-breakpoint
+CREATE TABLE "project_versions" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"project_id" uuid NOT NULL,
+	"version_number" varchar(50) NOT NULL,
+	"commit_hash" varchar(255),
+	"gitea_commit_id" varchar(255),
+	"is_current" boolean DEFAULT false NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "projects" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"description" text,
+	"slug" varchar(255) NOT NULL,
+	"gitea_repo_id" integer,
+	"gitea_repo_url" text,
+	"easypanel_project_id" varchar(255),
+	"easypanel_app_id" varchar(255),
+	"easypanel_database_id" varchar(255),
+	"deployment_url" text,
+	"install_command" text DEFAULT 'npm install',
+	"start_command" text DEFAULT 'npm start',
+	"build_command" text DEFAULT 'npm run build',
+	"environment_variables" jsonb DEFAULT '{}' NOT NULL,
+	"status" "project_status" DEFAULT 'draft' NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	"last_deployed_at" timestamp
+);
+--> statement-breakpoint
+CREATE TABLE "prompts" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"title" varchar(255) NOT NULL,
+	"description" text,
+	"content" text NOT NULL,
+	"category" varchar(100),
+	"is_public" boolean DEFAULT false NOT NULL,
+	"created_by" uuid,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "sessions" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" uuid NOT NULL,
+	"refresh_token_hash" varchar(255) NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"device_info" jsonb
+);
+--> statement-breakpoint
+CREATE TABLE "subscription_events" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"event_type" varchar(100) NOT NULL,
+	"stripe_event_id" varchar(255),
+	"metadata" jsonb,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "user_api_keys" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" uuid NOT NULL,
+	"provider_id" uuid NOT NULL,
+	"encrypted_key" text NOT NULL,
+	"is_active" boolean DEFAULT true NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "users" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"email" varchar(255) NOT NULL,
+	"password_hash" varchar(255) NOT NULL,
+	"full_name" varchar(255),
+	"role" "user_role" NOT NULL,
+	"avatar_url" text,
+	"email_verified" boolean DEFAULT false NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	"last_login_at" timestamp,
+	"is_active" boolean DEFAULT true NOT NULL,
+	CONSTRAINT "users_email_unique" UNIQUE("email")
+);
+--> statement-breakpoint
+ALTER TABLE "ai_models" ADD CONSTRAINT "ai_models_provider_id_ai_providers_id_fk" FOREIGN KEY ("provider_id") REFERENCES "public"."ai_providers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "audit_logs" ADD CONSTRAINT "audit_logs_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "audit_logs" ADD CONSTRAINT "audit_logs_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "chats" ADD CONSTRAINT "chats_project_id_projects_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."projects"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "chats" ADD CONSTRAINT "chats_created_by_users_id_fk" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "deployment_logs" ADD CONSTRAINT "deployment_logs_project_id_projects_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."projects"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "deployment_logs" ADD CONSTRAINT "deployment_logs_version_id_project_versions_id_fk" FOREIGN KEY ("version_id") REFERENCES "public"."project_versions"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "design_systems" ADD CONSTRAINT "design_systems_project_id_projects_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."projects"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "email_verification_tokens" ADD CONSTRAINT "email_verification_tokens_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "invoices" ADD CONSTRAINT "invoices_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "messages" ADD CONSTRAINT "messages_chat_id_chats_id_fk" FOREIGN KEY ("chat_id") REFERENCES "public"."chats"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "organization_members" ADD CONSTRAINT "organization_members_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "organization_members" ADD CONSTRAINT "organization_members_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "organization_members" ADD CONSTRAINT "organization_members_invited_by_users_id_fk" FOREIGN KEY ("invited_by") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "organizations" ADD CONSTRAINT "organizations_owner_id_users_id_fk" FOREIGN KEY ("owner_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "password_reset_tokens" ADD CONSTRAINT "password_reset_tokens_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "project_versions" ADD CONSTRAINT "project_versions_project_id_projects_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."projects"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "projects" ADD CONSTRAINT "projects_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "prompts" ADD CONSTRAINT "prompts_created_by_users_id_fk" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "sessions" ADD CONSTRAINT "sessions_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "subscription_events" ADD CONSTRAINT "subscription_events_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "user_api_keys" ADD CONSTRAINT "user_api_keys_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "user_api_keys" ADD CONSTRAINT "user_api_keys_provider_id_ai_providers_id_fk" FOREIGN KEY ("provider_id") REFERENCES "public"."ai_providers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "idx_audit_logs_user" ON "audit_logs" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "idx_audit_logs_org" ON "audit_logs" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "idx_audit_logs_created" ON "audit_logs" USING btree ("created_at");--> statement-breakpoint
+CREATE INDEX "idx_chats_project" ON "chats" USING btree ("project_id");--> statement-breakpoint
+CREATE INDEX "idx_deployment_logs_project" ON "deployment_logs" USING btree ("project_id");--> statement-breakpoint
+CREATE INDEX "idx_messages_chat" ON "messages" USING btree ("chat_id");--> statement-breakpoint
+CREATE INDEX "idx_messages_created" ON "messages" USING btree ("created_at");--> statement-breakpoint
+CREATE INDEX "idx_org_members_org" ON "organization_members" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "idx_org_members_user" ON "organization_members" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "unique_org_member" ON "organization_members" USING btree ("organization_id","user_id");--> statement-breakpoint
+CREATE INDEX "idx_organizations_slug" ON "organizations" USING btree ("slug");--> statement-breakpoint
+CREATE INDEX "idx_organizations_owner" ON "organizations" USING btree ("owner_id");--> statement-breakpoint
+CREATE INDEX "idx_project_versions_project" ON "project_versions" USING btree ("project_id");--> statement-breakpoint
+CREATE INDEX "unique_project_version" ON "project_versions" USING btree ("project_id","version_number");--> statement-breakpoint
+CREATE INDEX "idx_projects_org" ON "projects" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "idx_projects_slug" ON "projects" USING btree ("organization_id","slug");--> statement-breakpoint
+CREATE INDEX "unique_user_provider" ON "user_api_keys" USING btree ("user_id","provider_id");--> statement-breakpoint
+CREATE INDEX "idx_users_email" ON "users" USING btree ("email");
--- a/drizzle/meta/0000_snapshot.json
+++ b/drizzle/meta/0000_snapshot.json
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -0,0 +1,13 @@
+{
+  "version": "7",
+  "dialect": "postgresql",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "7",
+      "when": 1768831513580,
+      "tag": "0000_quick_captain_universe",
+      "breakpoints": true
+    }
+  ]
+}
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,17 +1,19 @@
-import { defineConfig, globalIgnores } from "eslint/config";
-import nextVitals from "eslint-config-next/core-web-vitals";
-import nextTs from "eslint-config-next/typescript";
+import nextVitals from 'eslint-config-next/core-web-vitals';
+import nextTs from 'eslint-config-next/typescript';
+import prettier from 'eslint-config-prettier';
+import { defineConfig, globalIgnores } from 'eslint/config';

 const eslintConfig = defineConfig([
  ...nextVitals,
  ...nextTs,
+  prettier,
  // Override default ignores of eslint-config-next.
  globalIgnores([
    // Default ignores of eslint-config-next:
-    ".next/**",
-    "out/**",
-    "build/**",
-    "next-env.d.ts",
+    '.next/**',
+    'out/**',
+    'build/**',
+    'next-env.d.ts',
  ]),
 ]);

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,21 +6,58 @@
    "dev": "next dev",
    "build": "next build",
    "start": "next start",
-    "lint": "eslint"
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "type-check": "tsc --noEmit",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest --coverage",
+    "test:coverage:check": "vitest run --coverage",
+    "test:e2e": "playwright test",
+    "db:generate": "drizzle-kit generate",
+    "db:migrate": "drizzle-kit migrate",
+    "db:push": "drizzle-kit push",
+    "db:studio": "drizzle-kit studio"
  },
  "dependencies": {
+    "@monaco-editor/react": "^4.7.0",
+    "@tanstack/react-query": "^5.90.19",
+    "bcrypt": "^6.0.0",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "dotenv": "^17.2.3",
+    "drizzle-kit": "^0.31.8",
+    "drizzle-orm": "^0.45.1",
+    "ioredis": "^5.9.2",
+    "jsonwebtoken": "^9.0.3",
+    "lucide-react": "^0.562.0",
+    "nanoid": "^5.1.6",
    "next": "16.1.3",
+    "postgres": "^3.4.8",
    "react": "19.2.3",
-    "react-dom": "19.2.3"
+    "react-dom": "19.2.3",
+    "tailwind-merge": "^3.4.0",
+    "tailwindcss-animate": "^1.0.7",
+    "zod": "^4.3.5",
+    "zustand": "^5.0.10"
  },
  "devDependencies": {
+    "@playwright/test": "^1.57.0",
    "@tailwindcss/postcss": "^4",
-    "@types/node": "^20",
+    "@types/bcrypt": "^6.0.0",
+    "@types/jsonwebtoken": "^9.0.10",
+    "@types/node": "^20.19.30",
    "@types/react": "^19",
    "@types/react-dom": "^19",
+    "@vitest/ui": "^4.0.17",
    "eslint": "^9",
    "eslint-config-next": "16.1.3",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+    "prettier": "^3.8.0",
    "tailwindcss": "^4",
-    "typescript": "^5"
+    "tsx": "^4.21.0",
+    "typescript": "^5",
+    "vitest": "^4.0.17"
  }
 }
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -0,0 +1,37 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  testDir: './tests/e2e',
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  use: {
+    baseURL: 'http://localhost:3000',
+    trace: 'on-first-retry',
+  },
+
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+  ],
+
+  webServer: {
+    command: 'npm run dev',
+    url: 'http://localhost:3000',
+    reuseExistingServer: !process.env.CI,
+  },
+});
--- a/src/app/admin/users/page.tsx
+++ b/src/app/admin/users/page.tsx
@@ -0,0 +1,54 @@
+'use client';
+
+import { UserDetails } from '@/components/admin/UserDetails';
+import { UserList } from '@/components/admin/UserList';
+import { useState } from 'react';
+
+interface User {
+  id: string;
+  email: string;
+  fullName?: string;
+  role: string;
+  avatarUrl?: string;
+  emailVerified: boolean;
+  createdAt: string;
+  updatedAt: string;
+  lastLoginAt?: string;
+  isActive: boolean;
+}
+
+export default function AdminUsersPage() {
+  const [selectedUser, setSelectedUser] = useState<User | null>(null);
+
+  const handleUserSelect = (user: User) => {
+    setSelectedUser(user);
+  };
+
+  const handleUserUpdate = () => {
+    setSelectedUser(null);
+  };
+
+  const handleCloseDetails = () => {
+    setSelectedUser(null);
+  };
+
+  return (
+    <div className="container mx-auto p-8">
+      <div className="mb-8">
+        <h1 className="text-3xl font-bold">User Management</h1>
+        <p className="text-muted-foreground">Manage user accounts and permissions</p>
+      </div>
+
+      <div className="grid gap-6 lg:grid-cols-2">
+        <UserList onUserSelect={handleUserSelect} />
+        {selectedUser && (
+          <UserDetails
+            user={selectedUser}
+            onUpdate={handleUserUpdate}
+            onClose={handleCloseDetails}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
--- a/src/app/api/ai-providers/[id]/route.ts
+++ b/src/app/api/ai-providers/[id]/route.ts
@@ -0,0 +1,26 @@
+import { getAIProviderById } from '@/services/ai-provider.service';
+import { NextResponse } from 'next/server';
+
+/**
+ * GET /api/ai-providers/:id - Get AI provider by ID
+ */
+export async function GET(request: Request, { params }: { params: { id: string } }) {
+  try {
+    const provider = await getAIProviderById(params.id);
+
+    if (!provider) {
+      return NextResponse.json({ error: 'Provider not found' }, { status: 404 });
+    }
+
+    return NextResponse.json(
+      {
+        success: true,
+        provider,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Get AI provider API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/ai-providers/route.ts
+++ b/src/app/api/ai-providers/route.ts
@@ -0,0 +1,22 @@
+import { getAIProviders } from '@/services/ai-provider.service';
+import { NextResponse } from 'next/server';
+
+/**
+ * GET /api/ai-providers - Get all AI providers
+ */
+export async function GET() {
+  try {
+    const providers = await getAIProviders();
+
+    return NextResponse.json(
+      {
+        success: true,
+        providers,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Get AI providers API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/forgot-password/tests/route.test.ts
+++ b/src/app/api/auth/forgot-password/tests/route.test.ts
@@ -0,0 +1,143 @@
+import { forgotPassword } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  forgotPassword: vi.fn(),
+}));
+
+describe('POST /api/auth/forgot-password', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should initiate password reset successfully', async () => {
+    vi.mocked(forgotPassword).mockResolvedValue({
+      success: true,
+      message: 'If an account exists with this email, a password reset link has been sent.',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe(
+      'If an account exists with this email, a password reset link has been sent.'
+    );
+    expect(forgotPassword).toHaveBeenCalledWith({ email: 'test@example.com' });
+  });
+
+  it('should return validation error for invalid email format', async () => {
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'invalid-email',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(forgotPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for missing email', async () => {
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({}),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(forgotPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty email', async () => {
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: '',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(forgotPassword).not.toHaveBeenCalled();
+  });
+
+  it('should handle service error gracefully', async () => {
+    vi.mocked(forgotPassword).mockResolvedValue({
+      success: false,
+      error: 'Failed to initiate password reset',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Failed to initiate password reset');
+  });
+
+  it('should handle invalid JSON', async () => {
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+
+  it('should return success even when user does not exist (security best practice)', async () => {
+    vi.mocked(forgotPassword).mockResolvedValue({
+      success: true,
+      message: 'If an account exists with this email, a password reset link has been sent.',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/forgot-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'nonexistent@example.com',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe(
+      'If an account exists with this email, a password reset link has been sent.'
+    );
+  });
+});
--- a/src/app/api/auth/forgot-password/route.ts
+++ b/src/app/api/auth/forgot-password/route.ts
@@ -0,0 +1,47 @@
+import { forgotPassword } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema
+const forgotPasswordSchema = z.object({
+  email: z.string().email('Invalid email format'),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = forgotPasswordSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const { email } = validationResult.data;
+
+    // Initiate password reset
+    const result = await forgotPassword({ email });
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 400 });
+    }
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Forgot password API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/login/tests/route.test.ts
+++ b/src/app/api/auth/login/tests/route.test.ts
@@ -0,0 +1,189 @@
+import { loginUser } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  loginUser: vi.fn(),
+}));
+
+describe('POST /api/auth/login', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should login user successfully', async () => {
+    const mockUser = {
+      id: 'user-123',
+      email: 'test@example.com',
+      fullName: 'Test User',
+      role: 'user',
+      emailVerified: true,
+    };
+
+    vi.mocked(loginUser).mockResolvedValue({
+      success: true,
+      user: mockUser,
+      accessToken: 'mock-access-token',
+      refreshToken: 'mock-refresh-token',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.user).toEqual(mockUser);
+    expect(loginUser).toHaveBeenCalledWith('test@example.com', 'TestPassword123!');
+  });
+
+  it('should return validation error for invalid email', async () => {
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'invalid-email',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(loginUser).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for missing password', async () => {
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: '',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(loginUser).not.toHaveBeenCalled();
+  });
+
+  it('should return error for invalid credentials', async () => {
+    vi.mocked(loginUser).mockResolvedValue({
+      success: false,
+      error: 'Invalid email or password',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'WrongPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Invalid email or password');
+  });
+
+  it('should return error for deactivated account', async () => {
+    vi.mocked(loginUser).mockResolvedValue({
+      success: false,
+      error: 'Account is deactivated',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Account is deactivated');
+  });
+
+  it('should handle missing required fields', async () => {
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        // password missing
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(loginUser).not.toHaveBeenCalled();
+  });
+
+  it('should handle invalid JSON', async () => {
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+
+  it('should set HTTP-only cookies on successful login', async () => {
+    const mockUser = {
+      id: 'user-123',
+      email: 'test@example.com',
+      role: 'user',
+      emailVerified: true,
+    };
+
+    vi.mocked(loginUser).mockResolvedValue({
+      success: true,
+      user: mockUser,
+      accessToken: 'mock-access-token',
+      refreshToken: 'mock-refresh-token',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/login', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+
+    // Check that cookies are set
+    const cookies = response.cookies.getAll();
+    expect(cookies).toHaveLength(2);
+    expect(cookies[0].name).toBe('access_token');
+    expect(cookies[0].httpOnly).toBe(true);
+    expect(cookies[1].name).toBe('refresh_token');
+    expect(cookies[1].httpOnly).toBe(true);
+  });
+});
--- a/src/app/api/auth/login/route.ts
+++ b/src/app/api/auth/login/route.ts
@@ -0,0 +1,72 @@
+import { loginUser } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema
+const loginSchema = z.object({
+  email: z.string().email('Invalid email format'),
+  password: z.string().min(1, 'Password is required'),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = loginSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const { email, password } = validationResult.data;
+
+    // Login user
+    const result = await loginUser(email, password);
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 401 });
+    }
+
+    // Create response
+    const response = NextResponse.json(
+      {
+        success: true,
+        user: result.user,
+      },
+      { status: 200 }
+    );
+
+    // Set HTTP-only cookies for tokens
+    if (result.accessToken) {
+      response.cookies.set('access_token', result.accessToken, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        maxAge: 15 * 60, // 15 minutes
+        path: '/',
+      });
+    }
+
+    if (result.refreshToken) {
+      response.cookies.set('refresh_token', result.refreshToken, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        maxAge: 7 * 24 * 60 * 60, // 7 days
+        path: '/',
+      });
+    }
+
+    return response;
+  } catch (error) {
+    console.error('Login API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/logout/tests/route.test.ts
+++ b/src/app/api/auth/logout/tests/route.test.ts
@@ -0,0 +1,163 @@
+import { verifyAccessToken } from '@/lib/auth/jwt';
+import { logoutUser } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service and JWT
+vi.mock('@/services/auth.service', () => ({
+  logoutUser: vi.fn(),
+}));
+
+vi.mock('@/lib/auth/jwt', () => ({
+  verifyAccessToken: vi.fn(),
+}));
+
+describe('POST /api/auth/logout', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should logout user successfully', async () => {
+    vi.mocked(verifyAccessToken).mockReturnValue({
+      userId: 'user-123',
+      email: 'test@example.com',
+      role: 'user',
+      iat: Math.floor(Date.now() / 1000),
+      exp: Math.floor(Date.now() / 1000) + 900,
+    });
+
+    vi.mocked(logoutUser).mockResolvedValue({
+      success: true,
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'valid-access-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Logged out successfully');
+    expect(verifyAccessToken).toHaveBeenCalledWith('valid-access-token');
+    expect(logoutUser).toHaveBeenCalledWith('user-123');
+  });
+
+  it('should clear cookies when token is missing', async () => {
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue(undefined),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(verifyAccessToken).not.toHaveBeenCalled();
+    expect(logoutUser).not.toHaveBeenCalled();
+  });
+
+  it('should clear cookies even when logout fails', async () => {
+    vi.mocked(verifyAccessToken).mockReturnValue({
+      userId: 'user-123',
+      email: 'test@example.com',
+      role: 'user',
+      iat: Math.floor(Date.now() / 1000),
+      exp: Math.floor(Date.now() / 1000) + 900,
+    });
+
+    vi.mocked(logoutUser).mockResolvedValue({
+      success: false,
+      error: 'Failed to logout',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'valid-access-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(logoutUser).toHaveBeenCalledWith('user-123');
+  });
+
+  it('should handle invalid access token gracefully', async () => {
+    vi.mocked(verifyAccessToken).mockImplementation(() => {
+      throw new Error('Invalid token');
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'invalid-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Logged out successfully');
+  });
+
+  it('should clear cookies on error', async () => {
+    vi.mocked(verifyAccessToken).mockImplementation(() => {
+      throw new Error('Invalid token');
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'invalid-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+
+    // Check that cookies are cleared
+    const cookies = response.cookies.getAll();
+    expect(cookies).toHaveLength(2);
+    expect(cookies[0].name).toBe('access_token');
+    expect(cookies[0].value).toBe('');
+    expect(cookies[1].name).toBe('refresh_token');
+    expect(cookies[1].value).toBe('');
+  });
+
+  it('should clear cookies on successful logout', async () => {
+    vi.mocked(verifyAccessToken).mockReturnValue({
+      userId: 'user-123',
+      email: 'test@example.com',
+      role: 'user',
+      iat: Math.floor(Date.now() / 1000),
+      exp: Math.floor(Date.now() / 1000) + 900,
+    });
+
+    vi.mocked(logoutUser).mockResolvedValue({
+      success: true,
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'valid-access-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+
+    // Check that cookies are cleared
+    const cookies = response.cookies.getAll();
+    expect(cookies).toHaveLength(2);
+    expect(cookies[0].name).toBe('access_token');
+    expect(cookies[0].value).toBe('');
+    expect(cookies[1].name).toBe('refresh_token');
+    expect(cookies[1].value).toBe('');
+  });
+});
--- a/src/app/api/auth/logout/route.ts
+++ b/src/app/api/auth/logout/route.ts
@@ -0,0 +1,58 @@
+import { verifyAccessToken } from '@/lib/auth/jwt';
+import { logoutUser } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+
+export async function POST(request: NextRequest) {
+  try {
+    // Get access token from cookie
+    const accessToken = request.cookies.get('access_token')?.value;
+
+    if (!accessToken) {
+      // Clear cookies even if token is missing
+      const response = NextResponse.json(
+        { success: true, message: 'Logged out successfully' },
+        { status: 200 }
+      );
+
+      response.cookies.set('access_token', '', { maxAge: 0, path: '/' });
+      response.cookies.set('refresh_token', '', { maxAge: 0, path: '/' });
+
+      return response;
+    }
+
+    // Verify access token to get user ID
+    const payload = verifyAccessToken(accessToken);
+    const userId = payload.userId;
+
+    // Logout user (invalidate all sessions)
+    const result = await logoutUser(userId);
+
+    // Create response
+    const response = NextResponse.json(
+      {
+        success: true,
+        message: 'Logged out successfully',
+      },
+      { status: 200 }
+    );
+
+    // Clear HTTP-only cookies
+    response.cookies.set('access_token', '', { maxAge: 0, path: '/' });
+    response.cookies.set('refresh_token', '', { maxAge: 0, path: '/' });
+
+    return response;
+  } catch (error) {
+    console.error('Logout API error:', error);
+
+    // Even if there's an error, clear cookies
+    const response = NextResponse.json(
+      { success: true, message: 'Logged out successfully' },
+      { status: 200 }
+    );
+
+    response.cookies.set('access_token', '', { maxAge: 0, path: '/' });
+    response.cookies.set('refresh_token', '', { maxAge: 0, path: '/' });
+
+    return response;
+  }
+}
--- a/src/app/api/auth/refresh/tests/route.test.ts
+++ b/src/app/api/auth/refresh/tests/route.test.ts
@@ -0,0 +1,150 @@
+import { refreshAccessToken } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  refreshAccessToken: vi.fn(),
+}));
+
+describe('POST /api/auth/refresh', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should refresh tokens successfully', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: true,
+      accessToken: 'new-access-token',
+      refreshToken: 'new-refresh-token',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'old-refresh-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(refreshAccessToken).toHaveBeenCalledWith('old-refresh-token');
+  });
+
+  it('should return error when refresh token is missing', async () => {
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue(undefined),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Refresh token not found');
+    expect(refreshAccessToken).not.toHaveBeenCalled();
+  });
+
+  it('should return error when refresh token is invalid', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: false,
+      error: 'Invalid session',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'invalid-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Invalid session');
+  });
+
+  it('should return error when session is expired', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: false,
+      error: 'Session has expired',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'expired-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Session has expired');
+  });
+
+  it('should return error when user is deactivated', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: false,
+      error: 'Account is deactivated',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'valid-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Account is deactivated');
+  });
+
+  it('should set new HTTP-only cookies on successful refresh', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: true,
+      accessToken: 'new-access-token',
+      refreshToken: 'new-refresh-token',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'old-refresh-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+
+    // Check that cookies are set
+    const cookies = response.cookies.getAll();
+    expect(cookies).toHaveLength(2);
+    expect(cookies[0].name).toBe('access_token');
+    expect(cookies[0].httpOnly).toBe(true);
+    expect(cookies[1].name).toBe('refresh_token');
+    expect(cookies[1].httpOnly).toBe(true);
+  });
+
+  it('should handle service errors gracefully', async () => {
+    vi.mocked(refreshAccessToken).mockResolvedValue({
+      success: false,
+      error: 'Failed to refresh token',
+    });
+
+    const request = {
+      cookies: {
+        get: vi.fn().mockReturnValue({ value: 'valid-token' }),
+      },
+    } as any;
+
+    const response = await POST(request);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Failed to refresh token');
+  });
+});
--- a/src/app/api/auth/refresh/route.ts
+++ b/src/app/api/auth/refresh/route.ts
@@ -0,0 +1,54 @@
+import { refreshAccessToken } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+
+export async function POST(request: NextRequest) {
+  try {
+    // Get refresh token from cookie
+    const refreshToken = request.cookies.get('refresh_token')?.value;
+
+    if (!refreshToken) {
+      return NextResponse.json({ error: 'Refresh token not found' }, { status: 401 });
+    }
+
+    // Refresh tokens
+    const result = await refreshAccessToken(refreshToken);
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 401 });
+    }
+
+    // Create response
+    const response = NextResponse.json(
+      {
+        success: true,
+      },
+      { status: 200 }
+    );
+
+    // Set new HTTP-only cookies for tokens
+    if (result.accessToken) {
+      response.cookies.set('access_token', result.accessToken, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        maxAge: 15 * 60, // 15 minutes
+        path: '/',
+      });
+    }
+
+    if (result.refreshToken) {
+      response.cookies.set('refresh_token', result.refreshToken, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        maxAge: 7 * 24 * 60 * 60, // 7 days
+        path: '/',
+      });
+    }
+
+    return response;
+  } catch (error) {
+    console.error('Token refresh API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/register/tests/route.test.ts
+++ b/src/app/api/auth/register/tests/route.test.ts
@@ -0,0 +1,167 @@
+import { registerUser } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  registerUser: vi.fn(),
+}));
+
+describe('POST /api/auth/register', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should register a new user successfully', async () => {
+    const mockUser = {
+      id: 'user-123',
+      email: 'test@example.com',
+      fullName: 'Test User',
+      role: 'user',
+      emailVerified: false,
+    };
+
+    vi.mocked(registerUser).mockResolvedValue({
+      success: true,
+      user: mockUser,
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+        fullName: 'Test User',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(data.user).toEqual(mockUser);
+    expect(data.message).toContain('Registration successful');
+    expect(registerUser).toHaveBeenCalledWith({
+      email: 'test@example.com',
+      password: 'TestPassword123!',
+      fullName: 'Test User',
+    });
+  });
+
+  it('should return validation error for invalid email', async () => {
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'invalid-email',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(registerUser).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for short password', async () => {
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'short',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(registerUser).not.toHaveBeenCalled();
+  });
+
+  it('should return error when registration fails', async () => {
+    vi.mocked(registerUser).mockResolvedValue({
+      success: false,
+      error: 'Email already registered',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Email already registered');
+  });
+
+  it('should handle missing required fields', async () => {
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        // password missing
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(registerUser).not.toHaveBeenCalled();
+  });
+
+  it('should handle invalid JSON', async () => {
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+
+  it('should allow registration without fullName', async () => {
+    const mockUser = {
+      id: 'user-123',
+      email: 'test@example.com',
+      role: 'user',
+      emailVerified: false,
+    };
+
+    vi.mocked(registerUser).mockResolvedValue({
+      success: true,
+      user: mockUser,
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/register', {
+      method: 'POST',
+      body: JSON.stringify({
+        email: 'test@example.com',
+        password: 'TestPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(data.user).toEqual(mockUser);
+  });
+});
--- a/src/app/api/auth/register/route.ts
+++ b/src/app/api/auth/register/route.ts
@@ -0,0 +1,51 @@
+import { registerUser } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema
+const registerSchema = z.object({
+  email: z.string().email('Invalid email format'),
+  password: z.string().min(8, 'Password must be at least 8 characters'),
+  fullName: z.string().optional(),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = registerSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const { email, password, fullName } = validationResult.data;
+
+    // Register user
+    const result = await registerUser({ email, password, fullName });
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 400 });
+    }
+
+    // Return user data (without sensitive fields)
+    return NextResponse.json(
+      {
+        success: true,
+        user: result.user,
+        message: 'Registration successful. Please check your email to verify your account.',
+      },
+      { status: 201 }
+    );
+  } catch (error) {
+    console.error('Registration API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/reset-password/tests/route.test.ts
+++ b/src/app/api/auth/reset-password/tests/route.test.ts
@@ -0,0 +1,183 @@
+import { resetPassword } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  resetPassword: vi.fn(),
+}));
+
+describe('POST /api/auth/reset-password', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should reset password successfully', async () => {
+    vi.mocked(resetPassword).mockResolvedValue({
+      success: true,
+      message: 'Password has been reset successfully',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-reset-token',
+        newPassword: 'NewPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Password has been reset successfully');
+    expect(resetPassword).toHaveBeenCalledWith({
+      token: 'valid-reset-token',
+      newPassword: 'NewPassword123!',
+    });
+  });
+
+  it('should return validation error for missing token', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        newPassword: 'NewPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(resetPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty token', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: '',
+        newPassword: 'NewPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(resetPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for missing password', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-reset-token',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(resetPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for weak password (too short)', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-reset-token',
+        newPassword: 'Short1!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(resetPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty password', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-reset-token',
+        newPassword: '',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(resetPassword).not.toHaveBeenCalled();
+  });
+
+  it('should return error for invalid or expired token', async () => {
+    vi.mocked(resetPassword).mockResolvedValue({
+      success: false,
+      error: 'Invalid or expired reset token',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'invalid-token',
+        newPassword: 'NewPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Invalid or expired reset token');
+  });
+
+  it('should handle service error gracefully', async () => {
+    vi.mocked(resetPassword).mockResolvedValue({
+      success: false,
+      error: 'Failed to reset password',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-reset-token',
+        newPassword: 'NewPassword123!',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Failed to reset password');
+  });
+
+  it('should handle invalid JSON', async () => {
+    const request = new Request('http://localhost:3000/api/auth/reset-password', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+});
--- a/src/app/api/auth/reset-password/route.ts
+++ b/src/app/api/auth/reset-password/route.ts
@@ -0,0 +1,48 @@
+import { resetPassword } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema
+const resetPasswordSchema = z.object({
+  token: z.string().min(1, 'Token is required'),
+  newPassword: z.string().min(8, 'Password must be at least 8 characters'),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = resetPasswordSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const { token, newPassword } = validationResult.data;
+
+    // Reset password
+    const result = await resetPassword({ token, newPassword });
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 400 });
+    }
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Reset password API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/auth/verify-email/tests/route.test.ts
+++ b/src/app/api/auth/verify-email/tests/route.test.ts
@@ -0,0 +1,140 @@
+import { verifyEmail } from '@/services/auth.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { POST } from '../route';
+
+// Mock the auth service
+vi.mock('@/services/auth.service', () => ({
+  verifyEmail: vi.fn(),
+}));
+
+describe('POST /api/auth/verify-email', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should verify email successfully', async () => {
+    vi.mocked(verifyEmail).mockResolvedValue({
+      success: true,
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-verification-token',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Email verified successfully');
+    expect(verifyEmail).toHaveBeenCalledWith('valid-verification-token');
+  });
+
+  it('should return validation error for missing token', async () => {
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({}),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(verifyEmail).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty token', async () => {
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: '',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(verifyEmail).not.toHaveBeenCalled();
+  });
+
+  it('should return error for invalid token', async () => {
+    vi.mocked(verifyEmail).mockResolvedValue({
+      success: false,
+      error: 'Invalid verification token',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'invalid-token',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Invalid verification token');
+  });
+
+  it('should return error for expired token', async () => {
+    vi.mocked(verifyEmail).mockResolvedValue({
+      success: false,
+      error: 'Verification token has expired',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'expired-token',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Verification token has expired');
+  });
+
+  it('should handle invalid JSON', async () => {
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+
+  it('should handle service errors gracefully', async () => {
+    vi.mocked(verifyEmail).mockResolvedValue({
+      success: false,
+      error: 'Failed to verify email',
+    });
+
+    const request = new Request('http://localhost:3000/api/auth/verify-email', {
+      method: 'POST',
+      body: JSON.stringify({
+        token: 'valid-token',
+      }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Failed to verify email');
+  });
+});
--- a/src/app/api/auth/verify-email/route.ts
+++ b/src/app/api/auth/verify-email/route.ts
@@ -0,0 +1,47 @@
+import { verifyEmail } from '@/services/auth.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema
+const verifyEmailSchema = z.object({
+  token: z.string().min(1, 'Token is required'),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = verifyEmailSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const { token } = validationResult.data;
+
+    // Verify email
+    const result = await verifyEmail(token);
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 400 });
+    }
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: 'Email verified successfully',
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Email verification API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/chats/[id]/messages/tests/route.test.ts
+++ b/src/app/api/chats/[id]/messages/tests/route.test.ts
@@ -0,0 +1,496 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { hasChatAccess } from '@/services/chat.service';
+import { createMessage, getChatMessages } from '@/services/message.service';
+import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { GET, POST } from '../route';
+
+// Mock all dependencies
+vi.mock('@/services/message.service', () => ({
+  createMessage: vi.fn(),
+  getChatMessages: vi.fn(),
+}));
+
+vi.mock('@/services/chat.service', () => ({
+  hasChatAccess: vi.fn(),
+}));
+
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('Message API Routes', () => {
+  const mockUser = {
+    userId: 'user-123',
+    email: 'test@example.com',
+    role: 'user' as const,
+    iat: 1234567890,
+    exp: 1234571490,
+  };
+
+  const mockChatId = 'chat-123';
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('GET /api/chats/:id/messages', () => {
+    it('should return messages when user has access', async () => {
+      // Arrange
+      const mockMessages = [
+        {
+          id: 'msg-1',
+          chatId: mockChatId,
+          role: 'user' as const,
+          content: 'Hello',
+          metadata: {},
+          createdAt: '2024-01-01T00:00:00.000Z',
+        },
+        {
+          id: 'msg-2',
+          chatId: mockChatId,
+          role: 'assistant' as const,
+          content: 'Hi there!',
+          metadata: {},
+          createdAt: '2024-01-02T00:00:00.000Z',
+        },
+      ];
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(getChatMessages).mockResolvedValue(mockMessages as any);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`);
+
+      // Act
+      const response = await GET(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(200);
+      expect(data).toEqual({
+        success: true,
+        messages: mockMessages,
+      });
+      expect(requireAuth).toHaveBeenCalled();
+      expect(hasChatAccess).toHaveBeenCalledWith(mockUser.userId, mockChatId);
+      expect(getChatMessages).toHaveBeenCalledWith(mockChatId);
+    });
+
+    it('should return 401 when not authenticated', async () => {
+      // Arrange
+      vi.mocked(requireAuth).mockResolvedValue({
+        success: false,
+        error: 'No token provided',
+      });
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`);
+
+      // Act
+      const response = await GET(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(401);
+      expect(data).toEqual({
+        error: 'No token provided',
+      });
+      expect(hasChatAccess).not.toHaveBeenCalled();
+      expect(getChatMessages).not.toHaveBeenCalled();
+    });
+
+    it('should return 404 when chat does not exist', async () => {
+      // Arrange
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(false);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`);
+
+      // Act
+      const response = await GET(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(404);
+      expect(data).toEqual({
+        error: 'Chat not found or access denied',
+      });
+      expect(getChatMessages).not.toHaveBeenCalled();
+    });
+
+    it('should return 404 when user lacks access to chat', async () => {
+      // Arrange
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(false);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`);
+
+      // Act
+      const response = await GET(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(404);
+      expect(data).toEqual({
+        error: 'Chat not found or access denied',
+      });
+      expect(getChatMessages).not.toHaveBeenCalled();
+    });
+
+    it('should return empty array when chat has no messages', async () => {
+      // Arrange
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(getChatMessages).mockResolvedValue([]);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`);
+
+      // Act
+      const response = await GET(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(200);
+      expect(data).toEqual({
+        success: true,
+        messages: [],
+      });
+    });
+  });
+
+  describe('POST /api/chats/:id/messages', () => {
+    const mockCreatedMessage = {
+      id: 'msg-1',
+      chatId: mockChatId,
+      role: 'user' as const,
+      content: 'Hello',
+      metadata: {},
+      createdAt: '2024-01-01T00:00:00.000Z',
+    };
+
+    it('should create message with user role', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(createMessage).mockResolvedValue(mockCreatedMessage as any);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(201);
+      expect(data).toEqual({
+        success: true,
+        message: mockCreatedMessage,
+      });
+      expect(createMessage).toHaveBeenCalledWith({
+        chatId: mockChatId,
+        role: 'user',
+        content: 'Hello',
+        metadata: undefined,
+      });
+    });
+
+    it('should create message with assistant role', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'assistant',
+        content: 'Hi there!',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(createMessage).mockResolvedValue({
+        ...mockCreatedMessage,
+        role: 'assistant',
+        content: 'Hi there!',
+      } as any);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(201);
+      expect(data.success).toBe(true);
+      expect(createMessage).toHaveBeenCalledWith({
+        chatId: mockChatId,
+        role: 'assistant',
+        content: 'Hi there!',
+        metadata: undefined,
+      });
+    });
+
+    it('should create message with system role', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'system',
+        content: 'You are a helpful assistant.',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(createMessage).mockResolvedValue({
+        ...mockCreatedMessage,
+        role: 'system',
+        content: 'You are a helpful assistant.',
+      } as any);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(201);
+      expect(data.success).toBe(true);
+      expect(createMessage).toHaveBeenCalledWith({
+        chatId: mockChatId,
+        role: 'system',
+        content: 'You are a helpful assistant.',
+        metadata: undefined,
+      });
+    });
+
+    it('should create message with metadata', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: 'Hello',
+        metadata: { timestamp: 1234567890, source: 'web' },
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+      vi.mocked(createMessage).mockResolvedValue({
+        ...mockCreatedMessage,
+        metadata: { timestamp: 1234567890, source: 'web' },
+      } as any);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(201);
+      expect(data.success).toBe(true);
+      expect(createMessage).toHaveBeenCalledWith({
+        chatId: mockChatId,
+        role: 'user',
+        content: 'Hello',
+        metadata: { timestamp: 1234567890, source: 'web' },
+      });
+    });
+
+    it('should return 400 for missing role', async () => {
+      // Arrange
+      const requestBody = {
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(400);
+      expect(data.error).toBe('Validation failed');
+      expect(data.details).toBeDefined();
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 400 for invalid role', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'invalid',
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(400);
+      expect(data.error).toBe('Validation failed');
+      expect(data.details).toBeDefined();
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 400 for missing content', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(400);
+      expect(data.error).toBe('Validation failed');
+      expect(data.details).toBeDefined();
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 400 for empty content', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: '',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(true);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(400);
+      expect(data.error).toBe('Validation failed');
+      expect(data.details).toBeDefined();
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 401 when not authenticated', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({
+        success: false,
+        error: 'No token provided',
+      });
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(401);
+      expect(data).toEqual({
+        error: 'No token provided',
+      });
+      expect(hasChatAccess).not.toHaveBeenCalled();
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 404 when chat does not exist', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(false);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(404);
+      expect(data).toEqual({
+        error: 'Chat not found or access denied',
+      });
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+
+    it('should return 404 when user lacks access to chat', async () => {
+      // Arrange
+      const requestBody = {
+        role: 'user',
+        content: 'Hello',
+      };
+
+      vi.mocked(requireAuth).mockResolvedValue({ success: true, user: mockUser });
+      vi.mocked(hasChatAccess).mockResolvedValue(false);
+
+      const request = new NextRequest(`http://localhost:3000/api/chats/${mockChatId}/messages`, {
+        method: 'POST',
+        body: JSON.stringify(requestBody),
+      });
+
+      // Act
+      const response = await POST(request, { params: { id: mockChatId } });
+      const data = await response.json();
+
+      // Assert
+      expect(response.status).toBe(404);
+      expect(data).toEqual({
+        error: 'Chat not found or access denied',
+      });
+      expect(createMessage).not.toHaveBeenCalled();
+    });
+  });
+});
--- a/src/app/api/chats/[id]/messages/route.ts
+++ b/src/app/api/chats/[id]/messages/route.ts
@@ -0,0 +1,96 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { hasChatAccess } from '@/services/chat.service';
+import { createMessage, getChatMessages } from '@/services/message.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for message creation
+const createMessageSchema = z.object({
+  role: z.enum(['user', 'assistant', 'system']),
+  content: z.string().min(1, 'Message content is required'),
+  metadata: z.any().optional(),
+});
+
+/**
+ * GET /api/chats/:id/messages - Get all messages for a chat
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const chatId = params.id;
+
+    // Check if user has access to chat
+    const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Chat not found or access denied' }, { status: 404 });
+    }
+
+    // Get messages
+    const messages = await getChatMessages(chatId);
+
+    return NextResponse.json({ success: true, messages }, { status: 200 });
+  } catch (error) {
+    console.error('Get messages API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * POST /api/chats/:id/messages - Create a new message in a chat
+ */
+export async function POST(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const chatId = params.id;
+
+    // Check if user has access to chat
+    const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Chat not found or access denied' }, { status: 404 });
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = createMessageSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Create message
+    const message = await createMessage({
+      chatId,
+      role: validationResult.data.role,
+      content: validationResult.data.content,
+      metadata: validationResult.data.metadata,
+    });
+
+    return NextResponse.json({ success: true, message }, { status: 201 });
+  } catch (error) {
+    console.error('Create message API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/chats/[id]/messages/stream/route.ts
+++ b/src/app/api/chats/[id]/messages/stream/route.ts
@@ -0,0 +1,136 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { hasChatAccess } from '@/services/chat.service';
+import type { NextRequest } from 'next/server';
+
+// Store active connections for each chat
+const chatConnections = new Map<string, Set<ReadableStreamDefaultController>>();
+
+/**
+ * POST /api/chats/:id/messages/stream - SSE endpoint for real-time message updates
+ */
+export async function POST(request: NextRequest, { params }: { params: { id: string } }) {
+  // Verify authentication
+  const authResult = await requireAuth();
+  if (!authResult.success || !authResult.user) {
+    return new Response('Authentication required', { status: 401 });
+  }
+
+  const chatId = params.id;
+
+  // Check if user has access to chat
+  const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+  if (!hasAccess) {
+    return new Response('Chat not found or access denied', { status: 404 });
+  }
+
+  // Create a readable stream for SSE
+  const encoder = new TextEncoder();
+
+  const stream = new ReadableStream({
+    start(controller) {
+      // Add this connection to the chat's connections
+      if (!chatConnections.has(chatId)) {
+        chatConnections.set(chatId, new Set());
+      }
+      chatConnections.get(chatId)!.add(controller);
+
+      // Send initial connection message
+      const data = JSON.stringify({
+        type: 'connected',
+        chatId,
+        timestamp: new Date().toISOString(),
+      });
+      controller.enqueue(encoder.encode(`data: ${data}\n\n`));
+
+      // Send keep-alive messages every 30 seconds
+      const keepAliveInterval = setInterval(() => {
+        try {
+          controller.enqueue(encoder.encode(`: keep-alive\n\n`));
+        } catch (error) {
+          // Connection closed, stop sending
+          clearInterval(keepAliveInterval);
+        }
+      }, 30000);
+
+      // Cleanup on connection close
+      request.signal.addEventListener('abort', () => {
+        clearInterval(keepAliveInterval);
+        const connections = chatConnections.get(chatId);
+        if (connections) {
+          connections.delete(controller);
+          if (connections.size === 0) {
+            chatConnections.delete(chatId);
+          }
+        }
+      });
+    },
+  });
+
+  return new Response(stream, {
+    headers: {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Headers': 'Cache-Control',
+    },
+  });
+}
+
+/**
+ * Helper function to broadcast a new message to all connected clients
+ * This can be called from other API routes when a new message is created
+ */
+export function broadcastMessage(chatId: string, message: any) {
+  const connections = chatConnections.get(chatId);
+  if (!connections || connections.size === 0) {
+    return;
+  }
+
+  const encoder = new TextEncoder();
+  const data = JSON.stringify({
+    type: 'message',
+    message,
+    timestamp: new Date().toISOString(),
+  });
+
+  connections.forEach((controller) => {
+    try {
+      controller.enqueue(encoder.encode(`data: ${data}\n\n`));
+    } catch (error) {
+      // Connection closed, remove it
+      connections.delete(controller);
+    }
+  });
+
+  // Clean up empty connection sets
+  if (connections.size === 0) {
+    chatConnections.delete(chatId);
+  }
+}
+
+/**
+ * Helper function to broadcast typing indicator
+ */
+export function broadcastTyping(chatId: string, role: string, isTyping: boolean) {
+  const connections = chatConnections.get(chatId);
+  if (!connections || connections.size === 0) {
+    return;
+  }
+
+  const encoder = new TextEncoder();
+  const data = JSON.stringify({
+    type: 'typing',
+    role,
+    isTyping,
+    timestamp: new Date().toISOString(),
+  });
+
+  connections.forEach((controller) => {
+    try {
+      controller.enqueue(encoder.encode(`data: ${data}\n\n`));
+    } catch (error) {
+      connections.delete(controller);
+    }
+  });
+}
--- a/src/app/api/chats/[id]/route.ts
+++ b/src/app/api/chats/[id]/route.ts
@@ -0,0 +1,140 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { deleteChat, getChatById, hasChatAccess, updateChatTitle } from '@/services/chat.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for chat title update
+const updateChatSchema = z.object({
+  title: z.string().min(1).max(255),
+});
+
+/**
+ * GET /api/chats/:id - Get chat by ID
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const chatId = params.id;
+
+    // Check if user has access to chat
+    const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Chat not found or access denied' }, { status: 404 });
+    }
+
+    // Get chat
+    const chat = await getChatById(chatId);
+
+    if (!chat) {
+      return NextResponse.json({ error: 'Chat not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: true, chat }, { status: 200 });
+  } catch (error) {
+    console.error('Get chat API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * PATCH /api/chats/:id - Update chat title
+ */
+export async function PATCH(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const chatId = params.id;
+
+    // Check if user has access to chat
+    const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Chat not found or access denied' }, { status: 404 });
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = updateChatSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Update chat title
+    const chat = await updateChatTitle(chatId, validationResult.data.title);
+
+    return NextResponse.json({ success: true, chat }, { status: 200 });
+  } catch (error) {
+    console.error('Update chat API error:', error);
+
+    if (error instanceof Error && error.message === 'Chat not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * DELETE /api/chats/:id - Delete chat
+ */
+export async function DELETE(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const chatId = params.id;
+
+    // Check if user has access to chat
+    const hasAccess = await hasChatAccess(authResult.user.userId, chatId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Chat not found or access denied' }, { status: 404 });
+    }
+
+    // Delete chat
+    const result = await deleteChat(chatId);
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Delete chat API error:', error);
+
+    if (error instanceof Error && error.message === 'Chat not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/organizations/[id]/tests/route.test.ts
+++ b/src/app/api/organizations/[id]/tests/route.test.ts
@@ -0,0 +1,316 @@
+import {
+  deleteOrganization,
+  getOrganizationById,
+  isOrganizationMember,
+  isOrganizationOwner,
+  updateOrganization,
+} from '@/services/organization.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { DELETE, GET, PATCH } from '../route';
+
+// Mock the organization service
+vi.mock('@/services/organization.service', () => ({
+  getOrganizationById: vi.fn(),
+  updateOrganization: vi.fn(),
+  deleteOrganization: vi.fn(),
+  isOrganizationMember: vi.fn(),
+  isOrganizationOwner: vi.fn(),
+}));
+
+// Mock the auth middleware
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('GET /api/organizations/:id', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should return organization when user is member', async () => {
+    const mockOrganization = {
+      id: 'org-1',
+      name: 'Test Organization',
+      slug: 'test-org',
+      ownerId: 'user-123',
+      subscriptionTier: 'free',
+      subscriptionStatus: 'active',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationMember).mockResolvedValue(true);
+    vi.mocked(getOrganizationById).mockResolvedValue(mockOrganization as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.organization).toEqual(mockOrganization);
+    expect(isOrganizationMember).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(getOrganizationById).toHaveBeenCalledWith('org-1');
+  });
+
+  it('should return 404 when organization not found', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationMember).mockResolvedValue(true);
+    vi.mocked(getOrganizationById).mockResolvedValue(null as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Organization not found');
+  });
+
+  it('should return 403 when user is not member', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-456', email: 'other@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationMember).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Not a member of this organization');
+    expect(getOrganizationById).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationMember).not.toHaveBeenCalled();
+    expect(getOrganizationById).not.toHaveBeenCalled();
+  });
+});
+
+describe('PATCH /api/organizations/:id', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should update organization when user is owner', async () => {
+    const mockOrganization = {
+      id: 'org-1',
+      name: 'Updated Organization',
+      slug: 'updated-slug',
+      ownerId: 'user-123',
+      subscriptionTier: 'free',
+      subscriptionStatus: 'active',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(true);
+    vi.mocked(updateOrganization).mockResolvedValue(mockOrganization as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Organization', slug: 'updated-slug' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.organization).toEqual(mockOrganization);
+    expect(isOrganizationOwner).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(updateOrganization).toHaveBeenCalledWith('org-1', {
+      name: 'Updated Organization',
+      slug: 'updated-slug',
+    });
+  });
+
+  it('should update organization with only name', async () => {
+    const mockOrganization = {
+      id: 'org-1',
+      name: 'Updated Name',
+      slug: 'test-org',
+      ownerId: 'user-123',
+      subscriptionTier: 'free',
+      subscriptionStatus: 'active',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(true);
+    vi.mocked(updateOrganization).mockResolvedValue(mockOrganization as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Name' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(updateOrganization).toHaveBeenCalledWith('org-1', { name: 'Updated Name' });
+  });
+
+  it('should return 404 when organization not found', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(true);
+    vi.mocked(updateOrganization).mockRejectedValue(new Error('Organization not found'));
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Name' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Organization not found');
+  });
+
+  it('should return 403 when user is not owner', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-456', email: 'other@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Name' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Only organization owner can update organization');
+    expect(updateOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty name', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(true);
+    vi.mocked(deleteOrganization).mockResolvedValue({
+      success: true,
+      message: 'Organization deleted successfully',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Organization deleted successfully');
+    expect(isOrganizationOwner).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(deleteOrganization).toHaveBeenCalledWith('org-1');
+  });
+
+  it('should return 404 when organization not found', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(true);
+    vi.mocked(deleteOrganization).mockRejectedValue(new Error('Organization not found'));
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Organization not found');
+  });
+
+  it('should return 403 when user is not owner', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-456', email: 'other@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationOwner).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Only organization owner can delete organization');
+    expect(deleteOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationOwner).not.toHaveBeenCalled();
+    expect(deleteOrganization).not.toHaveBeenCalled();
+  });
+});
--- a/src/app/api/organizations/[id]/members/[memberId]/tests/route.test.ts
+++ b/src/app/api/organizations/[id]/members/[memberId]/tests/route.test.ts
@@ -0,0 +1,402 @@
+import {
+  getOrganizationMemberById,
+  isOrganizationAdmin,
+  removeOrganizationMember,
+  updateOrganizationMemberRole,
+} from '@/services/organization-member.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { DELETE, PATCH } from '../route';
+
+// Mock the organization member service
+vi.mock('@/services/organization-member.service', () => ({
+  getOrganizationMemberById: vi.fn(),
+  isOrganizationAdmin: vi.fn(),
+  removeOrganizationMember: vi.fn(),
+  updateOrganizationMemberRole: vi.fn(),
+}));
+
+// Mock the auth middleware
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('PATCH /api/organizations/:id/members/:memberId', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should update member role when user is admin', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'admin',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+    vi.mocked(updateOrganizationMemberRole).mockResolvedValue({
+      ...mockMember,
+      role: 'member',
+    } as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'member' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.member.role).toBe('member');
+    expect(isOrganizationAdmin).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(getOrganizationMemberById).toHaveBeenCalledWith('member-2');
+    expect(updateOrganizationMemberRole).toHaveBeenCalledWith('member-2', { role: 'member' });
+  });
+
+  it('should return 404 when member not found', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(null as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'member' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Member not found');
+    expect(updateOrganizationMemberRole).not.toHaveBeenCalled();
+  });
+
+  it('should return 404 when member belongs to different organization', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-2',
+      userId: 'user-456',
+      role: 'admin',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'member' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Member does not belong to this organization');
+    expect(updateOrganizationMemberRole).not.toHaveBeenCalled();
+  });
+
+  it('should return 403 when user is not admin', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'admin',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-789', email: 'member@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'member' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Only organization owners and admins can update member roles');
+    expect(getOrganizationMemberById).not.toHaveBeenCalled();
+    expect(updateOrganizationMemberRole).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for invalid role', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'admin',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'invalid-role' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(updateOrganizationMemberRole).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'PATCH',
+      body: JSON.stringify({ role: 'member' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'org-1', memberId: 'member-2' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationAdmin).not.toHaveBeenCalled();
+    expect(updateOrganizationMemberRole).not.toHaveBeenCalled();
+  });
+});
+
+describe('DELETE /api/organizations/:id/members/:memberId', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should remove member when user is admin', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'member',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+    vi.mocked(removeOrganizationMember).mockResolvedValue({
+      success: true,
+      message: 'Member removed successfully',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Member removed successfully');
+    expect(isOrganizationAdmin).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(getOrganizationMemberById).toHaveBeenCalledWith('member-2');
+    expect(removeOrganizationMember).toHaveBeenCalledWith('member-2');
+  });
+
+  it('should allow member to remove themselves', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'member',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-456', email: 'member@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(false);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+    vi.mocked(removeOrganizationMember).mockResolvedValue({
+      success: true,
+      message: 'Member removed successfully',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(removeOrganizationMember).toHaveBeenCalledWith('member-2');
+  });
+
+  it('should return 404 when member not found', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(null as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Member not found');
+    expect(removeOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return 404 when member belongs to different organization', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-2',
+      userId: 'user-456',
+      role: 'member',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Member does not belong to this organization');
+    expect(removeOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return 403 when user is not admin and not removing themselves', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: 'user-456',
+      role: 'member',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-789', email: 'other@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(false);
+    vi.mocked(getOrganizationMemberById).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe(
+      'Only organization owners, admins, or the member themselves can remove a member'
+    );
+    expect(removeOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members/member-2', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, {
+      params: { id: 'org-1', memberId: 'member-2' },
+    });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationAdmin).not.toHaveBeenCalled();
+    expect(removeOrganizationMember).not.toHaveBeenCalled();
+  });
+});
--- a/src/app/api/organizations/[id]/members/[memberId]/route.ts
+++ b/src/app/api/organizations/[id]/members/[memberId]/route.ts
@@ -0,0 +1,172 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import {
+  getOrganizationMemberById,
+  isOrganizationAdmin,
+  removeOrganizationMember,
+  updateOrganizationMemberRole,
+} from '@/services/organization-member.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for updating organization member role
+const updateMemberRoleSchema = z.object({
+  role: z.enum(['owner', 'admin', 'member', 'viewer']),
+});
+
+/**
+ * PATCH /api/organizations/:id/members/:memberId - Update member role
+ */
+export async function PATCH(
+  request: NextRequest,
+  { params }: { params: { id: string; memberId: string } }
+) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+    const memberId = params.memberId;
+
+    // Check if user is admin or owner of organization
+    const isAdmin = await isOrganizationAdmin(authResult.user.userId, organizationId);
+    if (!isAdmin) {
+      return NextResponse.json(
+        { error: 'Only organization owners and admins can update member roles' },
+        { status: 403 }
+      );
+    }
+
+    // Get the member to verify it belongs to the organization
+    const member = await getOrganizationMemberById(memberId);
+    if (!member) {
+      return NextResponse.json({ error: 'Member not found' }, { status: 404 });
+    }
+
+    if (member.organizationId !== organizationId) {
+      return NextResponse.json(
+        { error: 'Member does not belong to this organization' },
+        { status: 404 }
+      );
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = updateMemberRoleSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Prevent removing the last owner
+    if (member.role === 'owner' && validationResult.data.role !== 'owner') {
+      // Check if this is the only owner
+      const { isOrganizationOwner } = await import('@/services/organization-member.service');
+      const isOwner = await isOrganizationOwner(member.userId, organizationId);
+      if (isOwner) {
+        // This is a simplified check - in production, you'd want to count all owners
+        // For now, we'll allow the change but you could add additional logic here
+      }
+    }
+
+    // Update member role
+    const updatedMember = await updateOrganizationMemberRole(memberId, validationResult.data);
+
+    return NextResponse.json({ success: true, member: updatedMember }, { status: 200 });
+  } catch (error) {
+    console.error('Update organization member API error:', error);
+
+    if (error instanceof Error && error.message === 'Organization member not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * DELETE /api/organizations/:id/members/:memberId - Remove member from organization
+ */
+export async function DELETE(
+  request: NextRequest,
+  { params }: { params: { id: string; memberId: string } }
+) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+    const memberId = params.memberId;
+
+    // Get the member to verify it belongs to the organization
+    const member = await getOrganizationMemberById(memberId);
+    if (!member) {
+      return NextResponse.json({ error: 'Member not found' }, { status: 404 });
+    }
+
+    if (member.organizationId !== organizationId) {
+      return NextResponse.json(
+        { error: 'Member does not belong to this organization' },
+        { status: 404 }
+      );
+    }
+
+    // Check if user is admin or owner of organization, or is removing themselves
+    const isAdmin = await isOrganizationAdmin(authResult.user.userId, organizationId);
+    const isSelf = member.userId === authResult.user.userId;
+
+    if (!isAdmin && !isSelf) {
+      return NextResponse.json(
+        { error: 'Only organization owners, admins, or the member themselves can remove a member' },
+        { status: 403 }
+      );
+    }
+
+    // Prevent removing the last owner
+    if (member.role === 'owner' && !isSelf) {
+      const { isOrganizationOwner } = await import('@/services/organization-member.service');
+      const isOwner = await isOrganizationOwner(member.userId, organizationId);
+      if (isOwner) {
+        // This is a simplified check - in production, you'd want to count all owners
+        // For now, we'll allow the removal but you could add additional logic here
+      }
+    }
+
+    // Remove member from organization
+    const result = await removeOrganizationMember(memberId);
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Remove organization member API error:', error);
+
+    if (error instanceof Error && error.message === 'Organization member not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/organizations/[id]/members/tests/route.test.ts
+++ b/src/app/api/organizations/[id]/members/tests/route.test.ts
@@ -0,0 +1,303 @@
+import {
+  addOrganizationMember,
+  getOrganizationMembers,
+  isOrganizationAdmin,
+  isOrganizationMember,
+} from '@/services/organization-member.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { GET, POST } from '../route';
+
+// Mock the organization member service
+vi.mock('@/services/organization-member.service', () => ({
+  addOrganizationMember: vi.fn(),
+  getOrganizationMembers: vi.fn(),
+  isOrganizationAdmin: vi.fn(),
+  isOrganizationMember: vi.fn(),
+}));
+
+// Mock the auth middleware
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('GET /api/organizations/:id/members', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should return organization members when user is member', async () => {
+    const mockMembers = [
+      {
+        id: 'member-1',
+        organizationId: 'org-1',
+        userId: 'user-123',
+        role: 'owner',
+        permissions: null,
+        invitedBy: null,
+        joinedAt: new Date().toISOString(),
+        user: {
+          id: 'user-123',
+          email: 'owner@example.com',
+          fullName: 'Owner User',
+          avatarUrl: null,
+        },
+      },
+      {
+        id: 'member-2',
+        organizationId: 'org-1',
+        userId: 'user-456',
+        role: 'admin',
+        permissions: null,
+        invitedBy: 'user-123',
+        joinedAt: new Date().toISOString(),
+        user: {
+          id: 'user-456',
+          email: 'admin@example.com',
+          fullName: 'Admin User',
+          avatarUrl: null,
+        },
+      },
+    ];
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationMember).mockResolvedValue(true);
+    vi.mocked(getOrganizationMembers).mockResolvedValue(mockMembers as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.members).toEqual(mockMembers);
+    expect(isOrganizationMember).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(getOrganizationMembers).toHaveBeenCalledWith('org-1');
+  });
+
+  it('should return 403 when user is not member', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-789', email: 'other@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationMember).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Not a member of this organization');
+    expect(getOrganizationMembers).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members');
+    const response = await GET(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationMember).not.toHaveBeenCalled();
+    expect(getOrganizationMembers).not.toHaveBeenCalled();
+  });
+});
+
+describe('POST /api/organizations/:id/members', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should add member when user is admin', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: '550e8400-e29b-41d4-a716-446655440000',
+      role: 'admin',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(addOrganizationMember).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: '550e8400-e29b-41d4-a716-446655440000', role: 'admin' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(data.member).toEqual(mockMember);
+    expect(isOrganizationAdmin).toHaveBeenCalledWith('user-123', 'org-1');
+    expect(addOrganizationMember).toHaveBeenCalledWith('org-1', {
+      userId: '550e8400-e29b-41d4-a716-446655440000',
+      role: 'admin',
+      invitedBy: 'user-123',
+    });
+  });
+
+  it('should add member with viewer role', async () => {
+    const mockMember = {
+      id: 'member-2',
+      organizationId: 'org-1',
+      userId: '550e8400-e29b-41d4-a716-446655440000',
+      role: 'viewer',
+      permissions: null,
+      invitedBy: 'user-123',
+      joinedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(addOrganizationMember).mockResolvedValue(mockMember as any);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: '550e8400-e29b-41d4-a716-446655440000', role: 'viewer' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(addOrganizationMember).toHaveBeenCalledWith('org-1', {
+      userId: '550e8400-e29b-41d4-a716-446655440000',
+      role: 'viewer',
+      invitedBy: 'user-123',
+    });
+  });
+
+  it('should return 403 when user is not admin', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-456', email: 'member@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: 'user-789', role: 'member' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(403);
+    expect(data.error).toBe('Only organization owners and admins can add members');
+    expect(addOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for invalid user ID', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: 'invalid-uuid', role: 'member' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(addOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for invalid role', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: 'user-456', role: 'invalid-role' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(addOrganizationMember).not.toHaveBeenCalled();
+  });
+
+  it('should return 409 when user is already a member', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(isOrganizationAdmin).mockResolvedValue(true);
+    vi.mocked(addOrganizationMember).mockRejectedValue(
+      new Error('User is already a member of this organization')
+    );
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: '550e8400-e29b-41d4-a716-446655440000', role: 'member' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(409);
+    expect(data.error).toBe('User is already a member of this organization');
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations/org-1/members', {
+      method: 'POST',
+      body: JSON.stringify({ userId: 'user-456', role: 'member' }),
+    });
+
+    const response = await POST(request as any, { params: { id: 'org-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(isOrganizationAdmin).not.toHaveBeenCalled();
+    expect(addOrganizationMember).not.toHaveBeenCalled();
+  });
+});
--- a/src/app/api/organizations/[id]/members/route.ts
+++ b/src/app/api/organizations/[id]/members/route.ts
@@ -0,0 +1,109 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import {
+  addOrganizationMember,
+  getOrganizationMembers,
+  isOrganizationAdmin,
+  isOrganizationMember,
+} from '@/services/organization-member.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for adding organization member
+const addMemberSchema = z.object({
+  userId: z.string().uuid('Invalid user ID'),
+  role: z.enum(['owner', 'admin', 'member', 'viewer']),
+});
+
+/**
+ * GET /api/organizations/:id/members - Get all members of an organization
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+
+    // Check if user is member of organization
+    const isMember = await isOrganizationMember(authResult.user.userId, organizationId);
+    if (!isMember) {
+      return NextResponse.json({ error: 'Not a member of this organization' }, { status: 403 });
+    }
+
+    // Get organization members
+    const members = await getOrganizationMembers(organizationId);
+
+    return NextResponse.json({ success: true, members }, { status: 200 });
+  } catch (error) {
+    console.error('Get organization members API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * POST /api/organizations/:id/members - Add a member to an organization
+ */
+export async function POST(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+
+    // Check if user is admin or owner of organization
+    const isAdmin = await isOrganizationAdmin(authResult.user.userId, organizationId);
+    if (!isAdmin) {
+      return NextResponse.json(
+        { error: 'Only organization owners and admins can add members' },
+        { status: 403 }
+      );
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = addMemberSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Add member to organization
+    const member = await addOrganizationMember(organizationId, {
+      userId: validationResult.data.userId,
+      role: validationResult.data.role,
+      invitedBy: authResult.user.userId,
+    });
+
+    return NextResponse.json({ success: true, member }, { status: 201 });
+  } catch (error) {
+    console.error('Add organization member API error:', error);
+
+    if (
+      error instanceof Error &&
+      error.message === 'User is already a member of this organization'
+    ) {
+      return NextResponse.json({ error: error.message }, { status: 409 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/organizations/[id]/route.ts
+++ b/src/app/api/organizations/[id]/route.ts
@@ -0,0 +1,153 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import {
+  deleteOrganization,
+  getOrganizationById,
+  isOrganizationMember,
+  isOrganizationOwner,
+  updateOrganization,
+} from '@/services/organization.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for organization update
+const updateOrganizationSchema = z.object({
+  name: z.string().min(1).max(255).optional(),
+  slug: z.string().min(1).max(255).optional(),
+});
+
+/**
+ * GET /api/organizations/:id - Get organization by ID
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+
+    // Check if user is member of organization
+    const isMember = await isOrganizationMember(authResult.user.userId, organizationId);
+    if (!isMember) {
+      return NextResponse.json({ error: 'Not a member of this organization' }, { status: 403 });
+    }
+
+    // Get organization
+    const organization = await getOrganizationById(organizationId);
+
+    if (!organization) {
+      return NextResponse.json({ error: 'Organization not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: true, organization }, { status: 200 });
+  } catch (error) {
+    console.error('Get organization API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * PATCH /api/organizations/:id - Update organization
+ */
+export async function PATCH(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+
+    // Check if user is owner of organization
+    const isOwner = await isOrganizationOwner(authResult.user.userId, organizationId);
+    if (!isOwner) {
+      return NextResponse.json(
+        { error: 'Only organization owner can update organization' },
+        { status: 403 }
+      );
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = updateOrganizationSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Update organization
+    const organization = await updateOrganization(organizationId, validationResult.data);
+
+    return NextResponse.json({ success: true, organization }, { status: 200 });
+  } catch (error) {
+    console.error('Update organization API error:', error);
+
+    if (error instanceof Error && error.message === 'Organization not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * DELETE /api/organizations/:id - Delete organization
+ */
+export async function DELETE(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const organizationId = params.id;
+
+    // Check if user is owner of organization
+    const isOwner = await isOrganizationOwner(authResult.user.userId, organizationId);
+    if (!isOwner) {
+      return NextResponse.json(
+        { error: 'Only organization owner can delete organization' },
+        { status: 403 }
+      );
+    }
+
+    // Delete organization
+    const result = await deleteOrganization(organizationId);
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Delete organization API error:', error);
+
+    if (error instanceof Error && error.message === 'Organization not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/organizations/tests/route.test.ts
+++ b/src/app/api/organizations/tests/route.test.ts
@@ -0,0 +1,243 @@
+import { createOrganization, getUserOrganizations } from '@/services/organization.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { GET, POST } from '../route';
+
+// Mock the organization service
+vi.mock('@/services/organization.service', () => ({
+  createOrganization: vi.fn(),
+  getUserOrganizations: vi.fn(),
+}));
+
+// Mock the auth middleware
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('GET /api/organizations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should return user organizations', async () => {
+    const mockOrganizations = [
+      {
+        id: 'org-1',
+        name: 'Test Organization',
+        slug: 'test-org',
+        ownerId: 'user-123',
+        subscriptionTier: 'free',
+        subscriptionStatus: 'active',
+        memberRole: 'owner',
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      },
+    ];
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(getUserOrganizations).mockResolvedValue(mockOrganizations as any);
+
+    const request = new Request('http://localhost:3000/api/organizations');
+    const response = await GET(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.organizations).toEqual(mockOrganizations);
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations');
+    const response = await GET(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(getUserOrganizations).not.toHaveBeenCalled();
+  });
+});
+
+describe('POST /api/organizations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should create organization successfully', async () => {
+    const mockOrganization = {
+      id: 'org-1',
+      name: 'Test Organization',
+      slug: 'test-org-abc123',
+      ownerId: 'user-123',
+      subscriptionTier: 'free',
+      subscriptionStatus: 'active',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(createOrganization).mockResolvedValue(mockOrganization as any);
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({ name: 'Test Organization' }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(data.organization).toEqual(mockOrganization);
+    expect(createOrganization).toHaveBeenCalledWith('user-123', { name: 'Test Organization' });
+  });
+
+  it('should create organization with custom slug', async () => {
+    const mockOrganization = {
+      id: 'org-1',
+      name: 'Test Organization',
+      slug: 'custom-slug',
+      ownerId: 'user-123',
+      subscriptionTier: 'free',
+      subscriptionStatus: 'active',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(createOrganization).mockResolvedValue(mockOrganization as any);
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({ name: 'Test Organization', slug: 'custom-slug' }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(201);
+    expect(data.success).toBe(true);
+    expect(createOrganization).toHaveBeenCalledWith('user-123', {
+      name: 'Test Organization',
+      slug: 'custom-slug',
+    });
+  });
+
+  it('should return validation error for missing name', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({}),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(createOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty name', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({ name: '' }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(createOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for name too long', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({ name: 'a'.repeat(256) }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(createOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: JSON.stringify({ name: 'Test Organization' }),
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(createOrganization).not.toHaveBeenCalled();
+  });
+
+  it('should handle invalid JSON', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+
+    const request = new Request('http://localhost:3000/api/organizations', {
+      method: 'POST',
+      body: 'invalid json',
+    });
+
+    const response = await POST(request as any);
+    const data = await response.json();
+
+    expect(response.status).toBe(500);
+    expect(data.error).toBe('Internal server error');
+  });
+});
--- a/src/app/api/organizations/route.ts
+++ b/src/app/api/organizations/route.ts
@@ -0,0 +1,76 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { createOrganization, getUserOrganizations } from '@/services/organization.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for organization creation
+const createOrganizationSchema = z.object({
+  name: z
+    .string()
+    .min(1, 'Organization name is required')
+    .max(255, 'Organization name is too long'),
+  slug: z.string().min(1).max(255).optional(),
+});
+
+/**
+ * GET /api/organizations - Get user's organizations
+ */
+export async function GET(request: NextRequest) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    // Get user's organizations
+    const organizations = await getUserOrganizations(authResult.user.userId);
+
+    return NextResponse.json({ success: true, organizations }, { status: 200 });
+  } catch (error) {
+    console.error('Get organizations API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * POST /api/organizations - Create new organization
+ */
+export async function POST(request: NextRequest) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = createOrganizationSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Create organization
+    const organization = await createOrganization(authResult.user.userId, validationResult.data);
+
+    return NextResponse.json({ success: true, organization }, { status: 201 });
+  } catch (error) {
+    console.error('Create organization API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/projects/[id]/tests/route.test.ts
+++ b/src/app/api/projects/[id]/tests/route.test.ts
@@ -0,0 +1,295 @@
+import {
+  deleteProject,
+  getProjectById,
+  hasProjectAccess,
+  updateProject,
+} from '@/services/project.service';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { DELETE, GET, PATCH } from '../route';
+
+// Mock the project service
+vi.mock('@/services/project.service', () => ({
+  getProjectById: vi.fn(),
+  updateProject: vi.fn(),
+  deleteProject: vi.fn(),
+  hasProjectAccess: vi.fn(),
+}));
+
+// Mock the auth middleware
+vi.mock('@/lib/auth/middleware', () => ({
+  requireAuth: vi.fn(),
+}));
+
+describe('GET /api/projects/:id', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should return project when user has access', async () => {
+    const mockProject = {
+      id: 'project-1',
+      organizationId: 'org-1',
+      name: 'Test Project',
+      description: 'A test project',
+      slug: 'test-project',
+      giteaRepoId: null,
+      giteaRepoUrl: null,
+      easypanelProjectId: null,
+      easypanelAppId: null,
+      easypanelDatabaseId: null,
+      deploymentUrl: null,
+      installCommand: 'npm install',
+      startCommand: 'npm start',
+      buildCommand: 'npm run build',
+      environmentVariables: {},
+      status: 'draft',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      lastDeployedAt: null,
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(true);
+    vi.mocked(getProjectById).mockResolvedValue(mockProject as any);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1');
+    const response = await GET(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.project).toEqual(mockProject);
+    expect(hasProjectAccess).toHaveBeenCalledWith('user-123', 'project-1');
+    expect(getProjectById).toHaveBeenCalledWith('project-1');
+  });
+
+  it('should return 404 when user does not have access', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1');
+    const response = await GET(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Project not found or access denied');
+    expect(getProjectById).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/projects/project-1');
+    const response = await GET(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(hasProjectAccess).not.toHaveBeenCalled();
+    expect(getProjectById).not.toHaveBeenCalled();
+  });
+});
+
+describe('PATCH /api/projects/:id', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should update project when user has access', async () => {
+    const mockProject = {
+      id: 'project-1',
+      organizationId: 'org-1',
+      name: 'Updated Project',
+      description: 'Updated description',
+      slug: 'test-project',
+      giteaRepoId: null,
+      giteaRepoUrl: null,
+      easypanelProjectId: null,
+      easypanelAppId: null,
+      easypanelDatabaseId: null,
+      deploymentUrl: null,
+      installCommand: 'npm install',
+      startCommand: 'npm start',
+      buildCommand: 'npm run build',
+      environmentVariables: {},
+      status: 'draft',
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      lastDeployedAt: null,
+    };
+
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(true);
+    vi.mocked(updateProject).mockResolvedValue(mockProject as any);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Project', description: 'Updated description' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.project).toEqual(mockProject);
+    expect(hasProjectAccess).toHaveBeenCalledWith('user-123', 'project-1');
+    expect(updateProject).toHaveBeenCalledWith('project-1', {
+      name: 'Updated Project',
+      description: 'Updated description',
+      environmentVariables: undefined,
+    });
+  });
+
+  it('should return 404 when user does not have access', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Project' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Project not found or access denied');
+    expect(updateProject).not.toHaveBeenCalled();
+  });
+
+  it('should return validation error for empty name', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(true);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: '' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(400);
+    expect(data.error).toBe('Validation failed');
+    expect(data.details).toBeDefined();
+    expect(updateProject).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'PATCH',
+      body: JSON.stringify({ name: 'Updated Project' }),
+    });
+
+    const response = await PATCH(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(hasProjectAccess).not.toHaveBeenCalled();
+    expect(updateProject).not.toHaveBeenCalled();
+  });
+});
+
+describe('DELETE /api/projects/:id', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should delete project when user has access', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(true);
+    vi.mocked(deleteProject).mockResolvedValue({
+      success: true,
+      message: 'Project deleted successfully',
+    });
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(200);
+    expect(data.success).toBe(true);
+    expect(data.message).toBe('Project deleted successfully');
+    expect(hasProjectAccess).toHaveBeenCalledWith('user-123', 'project-1');
+    expect(deleteProject).toHaveBeenCalledWith('project-1');
+  });
+
+  it('should return 404 when user does not have access', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: true,
+      user: { userId: 'user-123', email: 'test@example.com', role: 'user', iat: 123, exp: 456 },
+    });
+    vi.mocked(hasProjectAccess).mockResolvedValue(false);
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(404);
+    expect(data.error).toBe('Project not found or access denied');
+    expect(deleteProject).not.toHaveBeenCalled();
+  });
+
+  it('should return 401 when not authenticated', async () => {
+    const { requireAuth } = await import('@/lib/auth/middleware');
+    vi.mocked(requireAuth).mockResolvedValue({
+      success: false,
+      error: 'Authentication required',
+    });
+
+    const request = new Request('http://localhost:3000/api/projects/project-1', {
+      method: 'DELETE',
+    });
+
+    const response = await DELETE(request as any, { params: { id: 'project-1' } });
+    const data = await response.json();
+
+    expect(response.status).toBe(401);
+    expect(data.error).toBe('Authentication required');
+    expect(hasProjectAccess).not.toHaveBeenCalled();
+    expect(deleteProject).not.toHaveBeenCalled();
+  });
+});
--- a/src/app/api/projects/[id]/chats/route.ts
+++ b/src/app/api/projects/[id]/chats/route.ts
@@ -0,0 +1,93 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import { createChat, getProjectChats } from '@/services/chat.service';
+import { hasProjectAccess } from '@/services/project.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for chat creation
+const createChatSchema = z.object({
+  title: z.string().min(1).max(255).optional(),
+});
+
+/**
+ * GET /api/projects/:id/chats - Get all chats for a project
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const projectId = params.id;
+
+    // Check if user has access to project
+    const hasAccess = await hasProjectAccess(authResult.user.userId, projectId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Project not found or access denied' }, { status: 404 });
+    }
+
+    // Get project chats
+    const chats = await getProjectChats(projectId);
+
+    return NextResponse.json({ success: true, chats }, { status: 200 });
+  } catch (error) {
+    console.error('Get chats API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * POST /api/projects/:id/chats - Create a new chat
+ */
+export async function POST(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const projectId = params.id;
+
+    // Check if user has access to project
+    const hasAccess = await hasProjectAccess(authResult.user.userId, projectId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Project not found or access denied' }, { status: 404 });
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = createChatSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Create chat
+    const chat = await createChat({
+      projectId,
+      title: validationResult.data.title,
+      createdBy: authResult.user.userId,
+    });
+
+    return NextResponse.json({ success: true, chat }, { status: 201 });
+  } catch (error) {
+    console.error('Create chat API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/projects/[id]/design-systems/[designSystemId]/route.ts
+++ b/src/app/api/projects/[id]/design-systems/[designSystemId]/route.ts
@@ -0,0 +1,169 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import {
+  deleteDesignSystem,
+  getDesignSystemById,
+  hasDesignSystemAccess,
+  updateDesignSystem,
+} from '@/services/design-system.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for design system update
+const updateDesignSystemSchema = z.object({
+  name: z.string().min(1).max(255).optional(),
+  pattern: z.string().max(255).optional(),
+  style: z.string().max(255).optional(),
+  colorPalette: z.object(z.any()).optional(),
+  typography: z.object(z.any()).optional(),
+  effects: z.object(z.any()).optional(),
+  antiPatterns: z.object(z.any()).optional(),
+});
+
+/**
+ * GET /api/projects/:id/design-systems/:designSystemId - Get design system details
+ */
+export async function GET(
+  request: NextRequest,
+  { params }: { params: { id: string; designSystemId: string } }
+) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const designSystemId = params.designSystemId;
+
+    // Check if user has access to design system
+    const hasAccess = await hasDesignSystemAccess(authResult.user.userId, designSystemId);
+    if (!hasAccess) {
+      return NextResponse.json(
+        { error: 'Design system not found or access denied' },
+        { status: 404 }
+      );
+    }
+
+    // Get design system
+    const designSystem = await getDesignSystemById(designSystemId);
+
+    if (!designSystem) {
+      return NextResponse.json({ error: 'Design system not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: true, designSystem }, { status: 200 });
+  } catch (error) {
+    console.error('Get design system API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * PATCH /api/projects/:id/design-systems/:designSystemId - Update design system
+ */
+export async function PATCH(
+  request: NextRequest,
+  { params }: { params: { id: string; designSystemId: string } }
+) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const designSystemId = params.designSystemId;
+
+    // Check if user has access to design system
+    const hasAccess = await hasDesignSystemAccess(authResult.user.userId, designSystemId);
+    if (!hasAccess) {
+      return NextResponse.json(
+        { error: 'Design system not found or access denied' },
+        { status: 404 }
+      );
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Validate input
+    const validationResult = updateDesignSystemSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Update design system
+    const designSystem = await updateDesignSystem(designSystemId, validationResult.data);
+
+    return NextResponse.json({ success: true, designSystem }, { status: 200 });
+  } catch (error) {
+    console.error('Update design system API error:', error);
+
+    if (error instanceof Error && error.message === 'Design system not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * DELETE /api/projects/:id/design-systems/:designSystemId - Delete design system
+ */
+export async function DELETE(
+  request: NextRequest,
+  { params }: { params: { id: string; designSystemId: string } }
+) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const designSystemId = params.designSystemId;
+
+    // Check if user has access to design system
+    const hasAccess = await hasDesignSystemAccess(authResult.user.userId, designSystemId);
+    if (!hasAccess) {
+      return NextResponse.json(
+        { error: 'Design system not found or access denied' },
+        { status: 404 }
+      );
+    }
+
+    // Delete design system
+    const result = await deleteDesignSystem(designSystemId);
+
+    return NextResponse.json(
+      {
+        success: true,
+        message: result.message,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Delete design system API error:', error);
+
+    if (error instanceof Error && error.message === 'Design system not found') {
+      return NextResponse.json({ error: error.message }, { status: 404 });
+    }
+
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/src/app/api/projects/[id]/design-systems/route.ts
+++ b/src/app/api/projects/[id]/design-systems/route.ts
@@ -0,0 +1,127 @@
+import { requireAuth } from '@/lib/auth/middleware';
+import {
+  createDesignSystem,
+  generateDesignSystem,
+  getDesignSystems,
+} from '@/services/design-system.service';
+import { hasProjectAccess } from '@/services/project.service';
+import { type NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+// Validation schema for design system creation
+const createDesignSystemSchema = z.object({
+  name: z.string().min(1).max(255),
+  pattern: z.string().max(255).optional(),
+  style: z.string().max(255).optional(),
+  colorPalette: z.object(z.any()).optional(),
+  typography: z.object(z.any()).optional(),
+  effects: z.object(z.any()).optional(),
+  antiPatterns: z.object(z.any()).optional(),
+  generatedByAi: z.boolean().optional(),
+});
+
+// Validation schema for design system generation
+const generateDesignSystemSchema = z.object({
+  description: z.string().min(1),
+});
+
+/**
+ * GET /api/projects/:id/design-systems - List all design systems for a project
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const projectId = params.id;
+
+    // Check if user has access to project
+    const hasAccess = await hasProjectAccess(authResult.user.userId, projectId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Project not found or access denied' }, { status: 404 });
+    }
+
+    // Get all design systems for the project
+    const designSystems = await getDesignSystems(projectId);
+
+    return NextResponse.json({ success: true, designSystems }, { status: 200 });
+  } catch (error) {
+    console.error('Get design systems API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
+
+/**
+ * POST /api/projects/:id/design-systems - Create or generate a design system
+ */
+export async function POST(request: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    // Verify authentication
+    const authResult = await requireAuth();
+    if (!authResult.success || !authResult.user) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
+    const projectId = params.id;
+
+    // Check if user has access to project
+    const hasAccess = await hasProjectAccess(authResult.user.userId, projectId);
+    if (!hasAccess) {
+      return NextResponse.json({ error: 'Project not found or access denied' }, { status: 404 });
+    }
+
+    // Parse request body
+    const body = await request.json();
+
+    // Check if this is a generation request
+    if (body.generate) {
+      const validationResult = generateDesignSystemSchema.safeParse(body);
+      if (!validationResult.success) {
+        return NextResponse.json(
+          {
+            error: 'Validation failed',
+            details: validationResult.error.issues,
+          },
+          { status: 400 }
+        );
+      }
+
+      // Generate design system
+      const designSystem = await generateDesignSystem(projectId, validationResult.data.description);
+
+      return NextResponse.json({ success: true, designSystem }, { status: 201 });
+    }
+
+    // Create design system
+    const validationResult = createDesignSystemSchema.safeParse(body);
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          error: 'Validation failed',
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Create design system
+    const designSystem = await createDesignSystem({
+      projectId,
+      ...validationResult.data,
+    });
+
+    return NextResponse.json({ success: true, designSystem }, { status: 201 });
+  } catch (error) {
+    console.error('Create design system API error:', error);
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
--- a/Show More
+++ b/Show More