v3.1.1

### Added
- Support for GITHUB_EXCLUDED_ORGS environment variable
- New textarea UI component for configuration forms

### Fixed
- Mirror strategy configuration test failures
- Organization repository routing logic
- Starred repositories organization routing
- SSO and OIDC authentication issues

### Improved
- Organization configuration for repository routing
- Mirror strategy handling in tests
- Authentication error handling

🤖 Generated with Claude Code

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

.claude/commands/new_release.md

@@ -0,0 +1,5 @@
+Evaluate all the updates being made.
+Update CHANGELOG.md
+Use the chnages in the git log to determine if its a major, minor or a patch release.
+Update the package.json first before you push the tag.
+Never mention Claude Code in the release notes or in commit messages.

.claude/commands/release_notes.md

@@ -0,0 +1,3 @@
+Generate release notes for the latest release.
+Use a temp md file to write the release notes.
+Do not check that file into git.

.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(docker build:*)"
+    ],
+    "deny": []
+  }
+}

.env.example

@@ -1,29 +1,53 @@
-# Docker Registry Configuration
-DOCKER_REGISTRY=ghcr.io
-DOCKER_IMAGE=arunavo4/gitea-mirror
-DOCKER_TAG=latest
+# Gitea Mirror Configuration
+# Copy this to .env and update with your values
+
+# ===========================================
+# CORE CONFIGURATION
+# ===========================================
 
 # Application Configuration
 NODE_ENV=production
 HOST=0.0.0.0
 PORT=4321
+
+# Database Configuration
+# For self-hosted, SQLite is used by default
 DATABASE_URL=sqlite://data/gitea-mirror.db
 
 # Security
-JWT_SECRET=change-this-to-a-secure-random-string-in-production
+# Generate with: openssl rand -base64 32
+BETTER_AUTH_SECRET=change-this-to-a-secure-random-string-in-production
+BETTER_AUTH_URL=http://localhost:4321
+# ENCRYPTION_SECRET=optional-encryption-key-for-token-encryption # Generate with: openssl rand -base64 48
 
-# Optional GitHub/Gitea Mirror Configuration (for docker-compose, can also be set via web UI)
-# Uncomment and set as needed. These are passed as environment variables to the container.
+# ===========================================
+# DOCKER CONFIGURATION (Optional)
+# ===========================================
+
+# Docker Registry Configuration
+DOCKER_REGISTRY=ghcr.io
+DOCKER_IMAGE=arunavo4/gitea-mirror
+DOCKER_TAG=latest
+
+# ===========================================
+# MIRROR CONFIGURATION (Optional)
+# Can also be configured via web UI
+# ===========================================
+
+# GitHub Configuration
 # GITHUB_USERNAME=your-github-username
 # GITHUB_TOKEN=your-github-personal-access-token
 # SKIP_FORKS=false
 # PRIVATE_REPOSITORIES=false
 # MIRROR_ISSUES=false
+# MIRROR_WIKI=false
 # MIRROR_STARRED=false
 # MIRROR_ORGANIZATIONS=false
 # PRESERVE_ORG_STRUCTURE=false
 # ONLY_MIRROR_ORGS=false
 # SKIP_STARRED_ISSUES=false
+
+# Gitea Configuration
 # GITEA_URL=http://gitea:3000
 # GITEA_TOKEN=your-local-gitea-token
 # GITEA_USERNAME=your-local-gitea-username
@@ -31,8 +55,27 @@ JWT_SECRET=change-this-to-a-secure-random-string-in-production
 # GITEA_ORG_VISIBILITY=public
 # DELAY=3600
 
-# Optional Database Cleanup Configuration (configured via web UI)
-# These environment variables are optional and only used as defaults
-# Users can configure cleanup settings through the web interface
+# ===========================================
+# OPTIONAL FEATURES
+# ===========================================
+
+# Database Cleanup Configuration
 # CLEANUP_ENABLED=false
 # CLEANUP_RETENTION_DAYS=7
+
+# TLS/SSL Configuration
+# GITEA_SKIP_TLS_VERIFY=false  # WARNING: Only use for testing
+
+# ===========================================
+# AUTHENTICATION CONFIGURATION
+# ===========================================
+
+# Header Authentication (for Reverse Proxy SSO)
+# Enable automatic authentication via reverse proxy headers
+# HEADER_AUTH_ENABLED=false
+# HEADER_AUTH_USER_HEADER=X-Authentik-Username
+# HEADER_AUTH_EMAIL_HEADER=X-Authentik-Email
+# HEADER_AUTH_NAME_HEADER=X-Authentik-Name
+# HEADER_AUTH_AUTO_PROVISION=false
+# HEADER_AUTH_ALLOWED_DOMAINS=example.com,company.org
+

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [arunavo4] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/astro-build-test.yml

@@ -12,6 +12,10 @@ on:
       - 'README.md'
       - 'docs/**'
 
+permissions:
+  contents: read
+  actions: read
+
 jobs:
   build-and-test:
     name: Build and Test Astro Project

.github/workflows/docker-build.yml

@@ -1,14 +1,29 @@
-name: Build and Push Docker Images
+name: Docker Build, Push & Security Scan
 
 on:
   push:
     branches: [main]
     tags: ['v*']
+    paths:
+      - 'Dockerfile'
+      - '.dockerignore'
+      - 'package.json'
+      - 'bun.lock*'
+      - '.github/workflows/docker-build.yml'
   pull_request:
+    paths:
+      - 'Dockerfile'
+      - '.dockerignore'
+      - 'package.json'
+      - 'bun.lock*'
+      - '.github/workflows/docker-build.yml'
+  schedule:
+    - cron: '0 0 * * 0'  # Weekly security scan on Sunday at midnight
 
 env:
   REGISTRY: ghcr.io
   IMAGE: ${{ github.repository }}
+  SHA: ${{ github.event.pull_request.head.sha || github.event.after }}
 
 jobs:
   docker:
@@ -17,19 +32,37 @@ jobs:
     permissions:
       contents: write
       packages: write
+      security-events: write
+      pull-requests: write
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.SHA }}
 
-      - uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
 
-      - uses: docker/login-action@v3
+      - name: Log into registry
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      # Login to Docker Hub for Docker Scout (optional - provides better vulnerability data)
+      # Add DOCKERHUB_USERNAME and DOCKERHUB_TOKEN secrets to enable this
+      - name: Log into Docker Hub
+        uses: docker/login-action@v3
+        continue-on-error: true
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       # Extract version from tag if present
       - name: Extract version from tag
         id: tag_version
@@ -42,12 +75,88 @@ jobs:
             echo "No version tag, using 'latest'"
           fi
 
-      - uses: docker/build-push-action@v5
+      # Extract metadata for Docker
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE }}
+          labels: |
+            org.opencontainers.image.revision=${{ env.SHA }}
+          tags: |
+            type=edge,branch=$repo.default_branch
+            type=semver,pattern=v{{version}}
+            type=sha,prefix=,suffix=,format=short
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=${{ steps.tag_version.outputs.VERSION }}
+
+      # Build and push Docker image
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ github.event_name == 'pull_request' && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.tag_version.outputs.VERSION }}
+          load: ${{ github.event_name == 'pull_request' }}
+          tags: ${{ github.event_name == 'pull_request' && 'gitea-mirror:scan' || steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      # Wait for image to be available in registry
+      - name: Wait for image availability
+        if: github.event_name != 'pull_request'
+        run: |
+          echo "Waiting for image to be available in registry..."
+          sleep 5
+
+      # Docker Scout comprehensive security analysis
+      - name: Docker Scout - Vulnerability Analysis & Recommendations
+        uses: docker/scout-action@v1
+        if: github.event_name != 'pull_request'
+        with:
+          command: cves,recommendations
+          image: ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+          sarif-file: scout-results.sarif
+          summary: true
+          exit-code: false
+          only-severities: critical,high
+          write-comment: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Docker Scout for Pull Requests (using local image)
+      - name: Docker Scout - Vulnerability Analysis (PR)
+        uses: docker/scout-action@v1
+        if: github.event_name == 'pull_request'
+        with:
+          command: cves,recommendations
+          image: local://gitea-mirror:scan
+          sarif-file: scout-results.sarif
+          summary: true
+          exit-code: false
+          only-severities: critical,high
+          write-comment: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Compare to latest for PRs and pushes
+      - name: Docker Scout - Compare to Latest
+        uses: docker/scout-action@v1
+        if: github.event_name == 'pull_request'
+        with:
+          command: compare
+          image: local://gitea-mirror:scan
+          to: ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+          ignore-unchanged: true
+          only-severities: critical,high
+          write-comment: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Upload security scan results to GitHub Security tab
+      - name: Upload Docker Scout scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        if: always()
+        continue-on-error: true
+        with:
+          sarif_file: scout-results.sarif
+

.github/workflows/docker-scan.yml

@@ -1,53 +0,0 @@
-name: Docker Security Scan
-
-on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'Dockerfile'
-      - '.dockerignore'
-      - 'package.json'
-      - 'bun.lock*'
-  pull_request:
-    branches: [ main ]
-    paths:
-      - 'Dockerfile'
-      - '.dockerignore'
-      - 'package.json'
-      - 'bun.lock*'
-  schedule:
-    - cron: '0 0 * * 0'  # Run weekly on Sunday at midnight
-
-jobs:
-  scan:
-    name: Scan Docker Image
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
-
-      - name: Build Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: false
-          load: true
-          tags: gitea-mirror:scan
-          # Disable GitHub Actions cache for this workflow
-          no-cache: true
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: gitea-mirror:scan
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'

.gitignore

@@ -25,3 +25,10 @@ data/gitea-mirror.db
 
 # jetbrains setting folder
 .idea/
+
+# Custom CA certificates (exclude actual certs but keep README)
+certs/*.crt
+certs/*.pem
+certs/*.cer
+!certs/README.md
+

CHANGELOG.md

@@ -5,6 +5,290 @@ All notable changes to the Gitea Mirror project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [3.1.0] - 2025-07-21
+
+### Added
+- Support for GITHUB_EXCLUDED_ORGS environment variable to filter out specific organizations during discovery
+- New textarea UI component for improved form inputs in configuration
+
+### Fixed
+- Fixed test failures related to mirror strategy configuration location
+- Corrected organization repository routing logic for different mirror strategies
+- Fixed starred repositories organization routing bug
+- Resolved SSO and OIDC authentication issues
+
+### Improved
+- Enhanced organization configuration for better repository routing control
+- Better handling of mirror strategies in test suite
+- Improved error handling in authentication flows
+
+## [3.0.0] - 2025-07-17
+
+### 🔴 Breaking Changes
+- **Authentication System Overhaul**: Migrated from JWT to Better Auth session-based authentication
+- **Login Method Changed**: Users now log in with email instead of username
+- **Environment Variables**: `JWT_SECRET` renamed to `BETTER_AUTH_SECRET`, new `BETTER_AUTH_URL` required
+- **API Endpoints**: Authentication endpoints moved from `/api/auth/login` to `/api/auth/[...all]`
+
+### Added
+- **Token Encryption**: All GitHub and Gitea tokens now encrypted with AES-256-GCM
+- **SSO/OIDC Support**: Enterprise authentication with OAuth providers (Google, Azure AD, Okta, Authentik, etc.)
+- **Header Authentication**: Support for reverse proxy authentication headers (Authentik, Authelia, Traefik Forward Auth)
+- **OAuth Provider**: Gitea Mirror can act as an OIDC provider for other applications
+- **Automated Migration**: Docker containers auto-migrate from v2 to v3
+- **Session Management**: Improved security with session-based authentication
+- **Database Migration System**: Drizzle Kit for better schema management
+- **Zod v4 Compatibility**: Updated to Zod v4 for schema validation
+
+### Improved
+- **Security**: Enhanced error handling and security practices throughout
+- **Documentation**: Comprehensive migration guide for v2 to v3 upgrade
+- **User Management**: Better Auth provides improved user lifecycle management
+- **Database Schema**: Optimized with proper indexes and relationships
+- **Password Hashing**: Using bcrypt via Better Auth for secure password storage
+
+### Fixed
+- Mirroring issues for starred repositories
+- Various security vulnerabilities in authentication system
+- Improved error handling across all API endpoints
+
+### Migration Required
+- All users must re-authenticate after upgrade
+- Existing tokens will be automatically encrypted
+- Database schema updates applied automatically
+- See [Migration Guide](MIGRATION_GUIDE.md) for detailed instructions
+
+## [2.22.0] - 2025-07-07
+
+### Added
+- Comprehensive mobile and responsive design support across the entire application
+- New drawer UI component for enhanced mobile navigation
+- Mobile-specific layouts for major components (ActivityLog, Header, Organization, Repository)
+- Mobile screenshots in documentation showcasing responsive design
+
+### Improved
+- Enhanced mobile user experience with optimized layouts for smaller screens
+- Updated organization list cards with better mobile responsiveness
+- Better touch interaction support throughout the application
+
+### Fixed
+- Type definition issues resolved
+- Removed unnecessary console.log statements
+
+### Documentation
+- Updated README with mobile usage instructions and screenshots
+- Added mobile-specific documentation sections
+
+## [2.20.1] - 2025-07-07
+
+### Fixed
+- Fixed mixed mode organization strategy not persisting after page refresh
+  - Added missing "mixed" case handler in GiteaConfigForm component
+  - Enhanced getMirrorStrategy function to properly detect mixed mode configuration
+- Updated dependencies to latest versions
+
+## [2.20.0] - 2025-07-07
+
+### Changed
+- **BREAKING**: Repository moved from `arunavo4/gitea-mirror` to `RayLabsHQ/gitea-mirror`
+- Docker images now hosted at `ghcr.io/raylabshq/gitea-mirror`
+- Updated all repository references and links to new organization
+- License changed from MIT to GNU General Public License v3.0
+
+### Fixed
+- Updated GitHub API endpoint for version checking to use new repository location
+- Corrected all documentation references to point to RayLabsHQ organization
+
+### Security
+- Removed test security script after confirming vulnerability resolution
+- Updated base Docker image to version 1.2.18-alpine
+
+### Documentation
+- Added repository migration notice in README
+- Updated quickstart guide with new repository URLs
+- Updated LXC deployment documentation with new repository location
+
+## [2.18.0] - 2025-06-24
+
+### Added
+- Fourth organization strategy "Mixed Mode" that combines aspects of existing strategies
+  - Personal repositories go to a single configurable organization
+  - Organization repositories preserve their GitHub organization structure
+- "Override Options" info button in Organization Strategy component explaining customization features
+  - Organization overrides via edit buttons on organization cards
+  - Repository overrides via inline destination editor
+  - Starred repositories behavior and priority hierarchy
+
+### Improved
+- Simplified mixed strategy implementation to reuse existing database fields
+- Enhanced organization strategy UI with comprehensive override documentation
+- Better visual indicators for the new mixed strategy with orange color theme
+
+## [2.17.0] - 2025-06-24
+
+### Added
+- Custom destination control for individual repositories with inline editing
+- Organization-level destination overrides with visual destination editor
+- Personal repositories organization override configuration option
+- Visual indicators for starred repositories (⭐ icon) in repository list
+- Repository-level destination override API endpoint
+- Destination customization priority hierarchy system
+- "View on Gitea" buttons for organizations with smart tooltip states
+
+### Changed
+- Enhanced repository table with destination column showing both GitHub org and Gitea destination
+- Updated organization cards to display custom destinations with visual indicators
+- Improved getGiteaRepoOwnerAsync to support repository-level destination overrides
+
+### Improved
+- Better visual feedback for custom destinations with badges and inline editing
+- Enhanced user experience with hover-based edit buttons
+- Comprehensive destination customization documentation in README
+
+## [2.16.3] - 2025-06-20
+
+### Added
+- Custom 404 error page with helpful navigation links
+- HoverCard components for better UX in configuration forms
+
+### Improved
+- Replaced popover components with hover cards for information tooltips
+- Enhanced user experience with responsive hover interactions
+
+## [2.16.2] - 2025-06-17
+
+### Added
+- Bulk actions for repository management with selection support
+
+### Improved
+- Enhanced organization card display with status badges and improved layout
+
+## [2.16.1] - 2025-06-17
+
+### Improved
+- Improved repository owner handling and mirror strategy in Gitea integration
+- Updated label for starred repositories organization for consistency
+
+## [2.16.0] - 2025-06-17
+
+### Added
+- Enhanced OrganizationConfiguration component with improved layout and metadata options
+- New GitHubMirrorSettings component with better organization and flexibility
+- Enhanced starred repositories content selection and improved layout
+
+### Improved
+- Enhanced configuration interface layout and spacing across multiple components
+- Streamlined OrganizationStrategy component with cleaner imports and better organization
+- Improved responsive layout for larger screens in configuration forms
+- Better icon usage and clarity in configuration components
+- Enhanced tooltip descriptions and component organization
+- Improved version comparison logic in health API
+- Enhanced issue mirroring logic for starred repositories
+
+### Fixed
+- Fixed mirror to single organization functionality
+- Resolved organization strategy layout issues
+- Cleaned up unused imports across multiple components
+
+### Refactored
+- Simplified component structures by removing unused imports and dependencies
+- Enhanced layout flexibility in GitHubConfigForm and GiteaConfigForm components
+- Improved component organization and code clarity
+- Removed ConnectionsForm and useMirror hook for better code organization
+
+## [2.14.0] - 2025-06-17
+
+### Added
+- Enhanced UI components with @radix-ui/react-accordion dependency for improved configuration interface
+
+### Fixed
+- Mirror strategies now properly route repositories based on selected strategy
+- Starred repositories now correctly go to the designated starred repos organization
+- Organization routing for single-org and flat-user strategies
+
+### Improved
+- Documentation now explains all three mirror strategies (preserve, single-org, flat-user)
+- Added detailed mirror strategy configuration guide
+- Updated CLAUDE.md with mirror strategy architecture information
+- Enhanced Docker Compose development configuration
+
+## [2.13.2] - 2025-06-15
+
+### Improved
+- Enhanced documentation design and layout
+- Updated README with improved formatting and content
+
+## [2.13.1] - 2025-06-15
+
+### Added
+- Docker Hub authentication for Docker Scout security scanning
+- Comprehensive Docker workflow consolidation with build, push & security scan
+
+### Improved
+- Enhanced CI/CD pipeline reliability with better error handling
+- Updated Bun base image to latest version for improved security
+- Migrated from Trivy to Docker Scout for more comprehensive security scanning
+- Enhanced Docker workflow with wait steps for image availability
+
+### Fixed
+- Docker Scout action integration issues and image reference problems
+- Workflow reliability improvements with proper error handling
+- Security scanning workflow now continues on security issues without failing the build
+
+### Changed
+- Updated package dependencies to latest versions
+- Consolidated multiple Docker workflows into single comprehensive workflow
+- Enhanced security scanning with Docker Scout integration
+
+## [2.13.0] - 2025-06-15
+
+### Added
+- Enhanced Configuration Interface with collapsible components and improved organization strategy UI
+- Wiki Mirroring Support in configuration settings
+- Auto-Save Functionality for all config forms, eliminating manual save buttons
+- Live Refresh functionality with configuration status hooks and enhanced UI components
+- Enhanced API Config Handling with mapping functions for UI and database structures
+- Secure Error Responses with createSecureErrorResponse for consistent error handling
+- Automatic Database Cleanup feature with configuration options and API support
+- Enhanced Job Recovery with improved database schema and recovery mechanisms
+- Fork tags to repository UI and enhanced organization cards with repository breakdown
+- Skeleton loaders and better loading state management across the application
+
+### Improved
+- Navigation context and component loading states across the application
+- Card components alignment and styling consistency
+- Error logging and structured error message parsing
+- HTTP client standardization across the application
+- Database initialization and management processes
+- Visual consistency with updated icons and custom logo integration
+
+### Fixed
+- Repository mirroring status inconsistencies
+- Organizations getting stuck on mirroring status when empty
+- JSON parsing errors and improved error handling
+- Broken documentation links in README
+- Various UI contrast and alignment issues
+
+### Changed
+- Migrated testing framework to Bun and updated test configurations
+- Implemented graceful shutdown and enhanced job recovery capabilities
+- Replaced SiGitea icons with custom logo
+- Updated various dependencies for improved stability and performance
+
+## [2.12.0] - 2025-01-27
+
+### Fixed
+- Fixed SQLite "no such table: mirror_jobs" error during application startup
+- Implemented automatic database table creation during database initialization
+- Resolved database schema inconsistencies between development and production environments
+
+### Improved
+- Enhanced database initialization process with automatic table creation and indexing
+- Added comprehensive error handling for database table creation
+- Integrated database repair functionality into application startup for better reliability
+
 ## [2.5.3] - 2025-05-22
 
 ### Added

CLAUDE.md

@@ -0,0 +1,219 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+DONT HALLUCIATE THINGS. IF YOU DONT KNOW LOOK AT THE CODE OR ASK FOR DOCS
+
+## Project Overview
+
+Gitea Mirror is a web application that automatically mirrors repositories from GitHub to self-hosted Gitea instances. It uses Astro for SSR, React for UI, SQLite for data storage, and Bun as the JavaScript runtime.
+
+## Essential Commands
+
+### Development
+```bash
+bun run dev          # Start development server (port 3000)
+bun run build        # Build for production
+bun run preview      # Preview production build
+```
+
+### Testing
+```bash
+bun test             # Run all tests
+bun test:watch       # Run tests in watch mode
+bun test:coverage    # Run tests with coverage
+```
+
+### Database Management
+```bash
+bun run init-db      # Initialize database
+bun run reset-users  # Reset user accounts (development)
+bun run cleanup-db   # Remove database files
+```
+
+### Production
+```bash
+bun run start        # Start production server
+```
+
+## Architecture & Key Concepts
+
+### Technology Stack
+- **Frontend**: Astro (SSR) + React + Tailwind CSS v4 + Shadcn UI
+- **Backend**: Bun runtime + SQLite + Drizzle ORM
+- **APIs**: GitHub (Octokit) and Gitea APIs
+- **Auth**: Better Auth with email/password, SSO, and OIDC provider support
+
+### Project Structure
+- `/src/pages/api/` - API endpoints (Astro API routes)
+- `/src/components/` - React components organized by feature
+- `/src/lib/db/` - Database queries and schema (Drizzle ORM)
+- `/src/hooks/` - Custom React hooks for data fetching
+- `/data/` - SQLite database storage location
+
+### Key Architectural Patterns
+
+1. **API Routes**: All API endpoints follow the pattern `/api/[resource]/[action]` and use `createSecureErrorResponse` for consistent error handling:
+```typescript
+import { createSecureErrorResponse } from '@/lib/utils/error-handler';
+
+export async function POST({ request }: APIContext) {
+  try {
+    // Implementation
+  } catch (error) {
+    return createSecureErrorResponse(error);
+  }
+}
+```
+
+2. **Database Queries**: Located in `/src/lib/db/queries/` organized by domain (users, repositories, etc.)
+
+3. **Real-time Updates**: Server-Sent Events (SSE) endpoint at `/api/events` for live dashboard updates
+
+4. **Authentication System**: 
+   - Built on Better Auth library
+   - Three authentication methods:
+     - Email & Password (traditional auth)
+     - SSO (authenticate via external OIDC providers)
+     - OIDC Provider (act as OIDC provider for other apps)
+   - Session-based authentication with secure cookies
+   - First user signup creates admin account
+   - Protected routes use Better Auth session validation
+
+5. **Mirror Process**:
+   - Discovers repos from GitHub (user/org)
+   - Creates/updates mirror in Gitea
+   - Tracks status in database
+   - Supports scheduled automatic mirroring
+
+6. **Mirror Strategies**: Four ways to organize repositories in Gitea:
+   - **preserve**: Maintains GitHub structure (default)
+     - Organization repos → Same organization name in Gitea
+     - Personal repos → Under your Gitea username
+   - **single-org**: All repos go to one organization
+     - All repos → Single configured organization
+   - **flat-user**: All repos go under user account
+     - All repos → Under your Gitea username
+   - **mixed**: Hybrid approach
+     - Organization repos → Preserve structure
+     - Personal repos → Single configured organization
+   - Starred repos always go to separate organization (starredReposOrg, default: "starred")
+   - Routing logic in `getGiteaRepoOwner()` function
+
+### Database Schema (SQLite)
+- `users` - User accounts and authentication
+- `configs` - GitHub/Gitea connection settings
+- `repositories` - Repository mirror status and metadata
+- `organizations` - Organization structure preservation
+- `mirror_jobs` - Scheduled mirror operations
+- `events` - Activity log and notifications
+
+### Testing Approach
+- Uses Bun's native test runner (`bun:test`)
+- Test files use `.test.ts` or `.test.tsx` extension
+- Setup file at `/src/tests/setup.bun.ts`
+- Mock utilities available for API testing.
+
+### Development Tips
+- Environment variables in `.env` (copy from `.env.example`)
+- BETTER_AUTH_SECRET required for session signing
+- Database auto-initializes on first run
+- Use `bun run dev:clean` for fresh database start
+- Tailwind CSS v4 configured with Vite plugin
+
+### Authentication Setup
+- **Better Auth** handles all authentication
+- Configuration in `/src/lib/auth.ts` (server) and `/src/lib/auth-client.ts` (client)
+- Auth endpoints available at `/api/auth/*`
+- SSO providers configured through the web UI
+- OIDC provider functionality for external applications
+
+### Common Tasks
+
+**Adding a new API endpoint:**
+1. Create file in `/src/pages/api/[resource]/[action].ts`
+2. Use `createSecureErrorResponse` for error handling
+3. Add corresponding database query in `/src/lib/db/queries/`
+4. Update types in `/src/types/` if needed
+
+**Adding a new component:**
+1. Create in appropriate `/src/components/[feature]/` directory
+2. Use Shadcn UI components from `/src/components/ui/`
+3. Follow existing naming patterns (e.g., `RepositoryCard`, `ConfigTabs`)
+
+**Modifying database schema:**
+1. Update schema in `/src/lib/db/schema.ts`
+2. Run `bun run init-db` to recreate database
+3. Update related queries in `/src/lib/db/queries/`
+
+## Configuration Options
+
+### GitHub Configuration (UI Fields)
+
+#### Basic Settings (`githubConfig`)
+- **username**: GitHub username
+- **token**: GitHub personal access token (requires repo and admin:org scopes)
+- **privateRepositories**: Include private repositories
+- **mirrorStarred**: Mirror starred repositories
+
+### Gitea Configuration (UI Fields)
+- **url**: Gitea instance URL
+- **username**: Gitea username
+- **token**: Gitea access token
+- **organization**: Destination organization (for single-org/mixed strategies)
+- **starredReposOrg**: Organization for starred repositories (default: "starred")
+- **visibility**: Organization visibility - "public", "private", "limited"
+- **mirrorStrategy**: Repository organization strategy (set via UI)
+- **preserveOrgStructure**: Automatically set based on mirrorStrategy
+
+### Schedule Configuration (`scheduleConfig`)
+- **enabled**: Enable automatic mirroring (default: false)
+- **interval**: Cron expression or seconds (default: "0 2 * * *" - 2 AM daily)
+- **concurrent**: Allow concurrent mirror operations (default: false)
+- **batchSize**: Number of repos to process in parallel (default: 10)
+
+### Database Cleanup Configuration (`cleanupConfig`)
+- **enabled**: Enable automatic cleanup (default: false)
+- **retentionDays**: Days to keep events (stored as seconds internally)
+
+### Mirror Options (UI Fields)
+- **mirrorReleases**: Mirror GitHub releases to Gitea
+- **mirrorMetadata**: Enable metadata mirroring (master toggle)
+- **metadataComponents** (only available when mirrorMetadata is enabled):
+  - **issues**: Mirror issues
+  - **pullRequests**: Mirror pull requests  
+  - **labels**: Mirror labels
+  - **milestones**: Mirror milestones
+  - **wiki**: Mirror wiki content
+
+### Advanced Options (UI Fields)
+- **skipForks**: Skip forked repositories (default: false)
+- **skipStarredIssues**: Skip issues for starred repositories (default: false) - enables "Lightweight mode" for starred repos
+
+### Authentication Configuration
+
+#### SSO Provider Configuration
+- **issuerUrl**: OIDC issuer URL (e.g., https://accounts.google.com)
+- **domain**: Email domain for this provider
+- **providerId**: Unique identifier for the provider
+- **clientId**: OAuth client ID from provider
+- **clientSecret**: OAuth client secret from provider
+- **authorizationEndpoint**: OAuth authorization URL (auto-discovered if supported)
+- **tokenEndpoint**: OAuth token exchange URL (auto-discovered if supported)
+- **jwksEndpoint**: JSON Web Key Set URL (optional, auto-discovered)
+- **userInfoEndpoint**: User information endpoint (optional, auto-discovered)
+
+#### OIDC Provider Settings (for external apps)
+- **allowedRedirectUris**: Comma-separated list of allowed redirect URIs
+- **clientId**: Generated client ID for the application
+- **clientSecret**: Generated client secret for the application
+- **scopes**: Available scopes (openid, profile, email)
+
+#### Environment Variables
+- **BETTER_AUTH_SECRET**: Secret key for signing sessions (required)
+- **BETTER_AUTH_URL**: Base URL for authentication (default: http://localhost:4321)
+
+## Security Guidelines
+
+- **Confidentiality Guidelines**:
+  - Dont ever say Claude Code or generated with AI anyhwere.

CONTRIBUTING.md

@@ -0,0 +1,182 @@
+# Contributing to Gitea Mirror
+
+Thank you for your interest in contributing to Gitea Mirror! This document provides guidelines and instructions for contributing to the open-source version of the project.
+
+## 🎯 Project Overview
+
+Gitea Mirror is an open-source, self-hosted solution for mirroring GitHub repositories to Gitea instances. This guide provides everything you need to know about contributing to the project.
+
+## 🚀 Getting Started
+
+1. Fork the repository
+2. Clone your fork:
+   ```bash
+   git clone https://github.com/yourusername/gitea-mirror.git
+   cd gitea-mirror
+   ```
+
+3. Install dependencies:
+   ```bash
+   bun install
+   ```
+
+4. Set up your environment:
+   ```bash
+   cp .env.example .env
+   # Edit .env with your configuration
+   ```
+
+5. Start development:
+   ```bash
+   bun run dev
+   ```
+
+## 🛠 Development Workflow
+
+### Running the Application
+
+```bash
+# Development mode
+bun run dev
+
+# Build for production
+bun run build
+
+# Run tests
+bun test
+```
+
+### Database Management
+
+```bash
+# Initialize database
+bun run init-db
+
+# Reset database
+bun run cleanup-db && bun run init-db
+```
+
+## 📝 Code Guidelines
+
+### General Principles
+
+1. **Keep it Simple**: Gitea Mirror should remain easy to self-host
+2. **Focus on Core Features**: Prioritize repository mirroring and synchronization
+3. **Database**: Use SQLite for simplicity and portability
+4. **Dependencies**: Minimize external dependencies for easier deployment
+
+### Code Style
+
+- Use TypeScript for all new code
+- Follow the existing code formatting (Prettier is configured)
+- Write meaningful commit messages
+- Add tests for new features
+
+### Scope of Contributions
+
+This project focuses on personal/small team use cases. Please keep contributions aligned with:
+- Core mirroring functionality
+- Self-hosted simplicity
+- Minimal external dependencies
+- SQLite as the database
+- Single-instance deployments
+
+## 🐛 Reporting Issues
+
+1. Check existing issues first
+2. Use issue templates when available
+3. Provide clear reproduction steps
+4. Include relevant logs and screenshots
+
+## 🎯 Pull Request Process
+
+1. Create a feature branch:
+   ```bash
+   git checkout -b feature/your-feature-name
+   ```
+
+2. Make your changes following the code guidelines
+
+3. Test your changes:
+   ```bash
+   # Run tests
+   bun test
+   
+   # Build and check
+   bun run build:oss
+   ```
+
+4. Commit your changes:
+   ```bash
+   git commit -m "feat: add new feature"
+   ```
+
+5. Push to your fork and create a Pull Request
+
+### PR Requirements
+
+- Clear description of changes
+- Tests for new functionality
+- Documentation updates if needed
+- No breaking changes without discussion
+- Passes all CI checks
+
+## 🏗 Architecture Overview
+
+```
+src/
+├── components/     # React components
+├── lib/           # Core utilities
+│   ├── db/        # Database queries (SQLite only)
+│   ├── github/    # GitHub API integration
+│   ├── gitea/     # Gitea API integration
+│   └── utils/     # Helper functions
+├── pages/         # Astro pages
+│   └── api/       # API endpoints
+└── types/         # TypeScript types
+```
+
+## 🧪 Testing
+
+```bash
+# Run all tests
+bun test
+
+# Run tests in watch mode
+bun test:watch
+
+# Run with coverage
+bun test:coverage
+```
+
+## 📚 Documentation
+
+- Update README.md for user-facing changes
+- Add JSDoc comments for new functions
+- Update .env.example for new environment variables
+
+## 💡 Feature Requests
+
+We welcome feature requests! When proposing new features, please consider:
+- Does it enhance the core mirroring functionality?
+- Will it benefit self-hosted users?
+- Can it be implemented without complex external dependencies?
+- Does it maintain the project's simplicity?
+
+## 🤝 Community
+
+- Be respectful and constructive
+- Help others in issues and discussions
+- Share your use cases and feedback
+
+## 📄 License
+
+By contributing, you agree that your contributions will be licensed under the same license as the project (MIT).
+
+## Questions?
+
+Feel free to open an issue for any questions about contributing!
+
+---
+
+Thank you for helping make Gitea Mirror better! 🎉

Dockerfile

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1.4
 
-FROM oven/bun:1.2.14-alpine AS base
+FROM oven/bun:1.2.18-alpine AS base
 WORKDIR /app
-RUN apk add --no-cache libc6-compat python3 make g++ gcc wget sqlite openssl
+RUN apk add --no-cache libc6-compat python3 make g++ gcc wget sqlite openssl ca-certificates
 
 # ----------------------------
 FROM base AS deps
@@ -31,17 +31,21 @@ COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/package.json ./package.json
 COPY --from=builder /app/docker-entrypoint.sh ./docker-entrypoint.sh
 COPY --from=builder /app/scripts ./scripts
+COPY --from=builder /app/drizzle ./drizzle
 
 ENV NODE_ENV=production
 ENV HOST=0.0.0.0
 ENV PORT=4321
 ENV DATABASE_URL=file:data/gitea-mirror.db
 
-RUN chmod +x ./docker-entrypoint.sh && \
+# Create directories and setup permissions
+RUN mkdir -p /app/certs && \
+    chmod +x ./docker-entrypoint.sh && \
     mkdir -p /app/data && \
     addgroup --system --gid 1001 nodejs && \
     adduser --system --uid 1001 gitea-mirror && \
-    chown -R gitea-mirror:nodejs /app/data
+    chown -R gitea-mirror:nodejs /app/data && \
+    chown -R gitea-mirror:nodejs /app/certs
 
 USER gitea-mirror
 

LICENSE

@@ -1,21 +1,619 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2025 ARUNAVO RAY
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

README.md

@@ -1,563 +1,308 @@
 <p align="center">
-  <img src=".github/assets/logo.png" alt="Gitea Mirror Logo" width="120" />
+  <img src=".github/assets/logo-no-bg.png" alt="Gitea Mirror Logo" width="120" />
   <h1>Gitea Mirror</h1>
-  <p><i>A modern web app for automatically mirroring repositories from GitHub to your self-hosted Gitea.</i></p>
+  <p><i>Automatically mirror repositories from GitHub to your self-hosted Gitea instance.</i></p>
   <p align="center">
-    <a href="https://github.com/arunavo4/gitea-mirror/releases/latest"><img src="https://img.shields.io/github/v/tag/arunavo4/gitea-mirror?label=release" alt="release"/></a>
-    <a href="https://github.com/arunavo4/gitea-mirror/actions/workflows/astro-build-test.yml"><img src="https://img.shields.io/github/actions/workflow/status/arunavo4/gitea-mirror/astro-build-test.yml?branch=main" alt="build"/></a>
-    <a href="https://github.com/arunavo4/gitea-mirror/pkgs/container/gitea-mirror"><img src="https://img.shields.io/badge/ghcr.io-container-blue?logo=github" alt="container"/></a>
-    <a href="https://github.com/arunavo4/gitea-mirror/blob/main/LICENSE"><img src="https://img.shields.io/github/license/arunavo4/gitea-mirror" alt="license"/></a>
+    <a href="https://github.com/RayLabsHQ/gitea-mirror/releases/latest"><img src="https://img.shields.io/github/v/tag/RayLabsHQ/gitea-mirror?label=release" alt="release"/></a>
+    <a href="https://github.com/RayLabsHQ/gitea-mirror/actions/workflows/astro-build-test.yml"><img src="https://img.shields.io/github/actions/workflow/status/RayLabsHQ/gitea-mirror/astro-build-test.yml?branch=main" alt="build"/></a>
+    <a href="https://github.com/RayLabsHQ/gitea-mirror/pkgs/container/gitea-mirror"><img src="https://img.shields.io/badge/ghcr.io-container-blue?logo=github" alt="container"/></a>
+    <a href="https://github.com/RayLabsHQ/gitea-mirror/blob/main/LICENSE"><img src="https://img.shields.io/github/license/RayLabsHQ/gitea-mirror" alt="license"/></a>
   </p>
 </p>
 
+> [!IMPORTANT]
+> **Upgrading to v3?** v3 requires a fresh start with a new data volume. Please read the [Upgrade Guide](UPGRADE.md) for instructions.
+
+
 ## 🚀 Quick Start
 
 ```bash
-# Using Docker (recommended)
-docker compose up -d
+# Fastest way - using the simplified Docker setup
+docker compose -f docker-compose.alt.yml up -d
 
-# Using Bun
-bun run setup && bun run dev
+# Access at http://localhost:4321
+```
 
-# Using LXC Containers
-# For Proxmox VE (online) - Community script by Tobias ([CrazyWolf13](https://github.com/CrazyWolf13))
-curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/gitea-mirror-install.sh | bash
-
-# For local testing (offline-friendly)
-sudo LOCAL_REPO_DIR=~/Development/gitea-mirror ./scripts/gitea-mirror-lxc-local.sh
-````
-
-See the [LXC Container Deployment Guide](scripts/README-lxc.md).
+First user signup becomes admin. Configure GitHub and Gitea through the web interface!
 
 <p align="center">
-  <img src=".github/assets/dashboard.png" alt="Dashboard" width="full"/>
+  <img src=".github/assets/dashboard.png" alt="Dashboard" width="600" />
+  <img src=".github/assets/dashboard_mobile.png" alt="Dashboard Mobile" width="200" />
 </p>
 
 ## ✨ Features
 
-- 🔁 Sync public, private, or starred GitHub repos to Gitea
-- 🏢 Mirror entire organizations with structure preservation
-- 🐞 Optional mirroring of issues and labels
-- 🌟 Mirror your starred repositories
-- 🕹️ Modern user interface with toast notifications and smooth experience
-- 🧠 Smart filtering and job queue with detailed logs
-- 🛠️ Works with personal access tokens (GitHub + Gitea)
-- 🔒 First-time user signup experience with secure authentication
-- 🐳 Fully Dockerized + can be self-hosted in minutes
-- 📊 Dashboard with real-time status updates
+- 🔁 Mirror public, private, and starred GitHub repos to Gitea
+- 🏢 Mirror entire organizations with flexible strategies
+- 🎯 Custom destination control for repos and organizations
+- 🔐 Secure authentication with Better Auth (email/password, SSO, OIDC)
+- 📊 Real-time dashboard with activity logs
 - ⏱️ Scheduled automatic mirroring
+- 🐳 Dockerized with multi-arch support (AMD64/ARM64)
 
 ## 📸 Screenshots
 
-<p align="center">
-  <img src=".github/assets/repositories.png" width="49%"/>
-  <img src=".github/assets/organisations.png" width="49%"/>
-</p>
-<p align="center">
-  <img src=".github/assets/configuration.png" width="49%"/>
-  <img src=".github/assets/activity.png" width="49%"/>
-</p>
+<div align="center">
+  <img src=".github/assets/repositories.png" alt="Repositories" width="600" />
+  <img src=".github/assets/repositories_mobile.png" alt="Rrepositories Mobile" width="200" />
+</div>
 
-### Dashboard
-The dashboard provides an overview of your mirroring status, including total repositories, successfully mirrored repositories, and recent activity.
+<div align="center">
+  <img src=".github/assets/organisation.png" alt="Organisations" width="600" />
+  <img src=".github/assets/organisation_mobile.png" alt="Organisations Mobile" width="200" />
+</div>
 
-### Repository Management
-Manage all your repositories in one place. Filter by status, search by name, and trigger manual mirroring operations.
+## Installation
 
-### Configuration
-Easily configure your GitHub and Gitea connections, set up automatic mirroring schedules, and manage organization mirroring.
+### Docker (Recommended)
 
-## Getting Started
+We provide two Docker Compose options:
 
-See the [Quick Start Guide](src/content/docs/quickstart.md) for detailed instructions on getting up and running quickly.
-
-### Prerequisites
-
-- Bun 1.2.9 or later
-- A GitHub account with a personal access token
-- A Gitea instance with an access token
-
-
-#### Database
-
-The database (`data/gitea-mirror.db`) is created when the application first runs. It starts empty and is populated as you configure and use the application.
-
-
-> [!NOTE]
-> On first launch, you'll be guided through creating an admin account with your chosen credentials.
-
-#### Production Database
-
-The production database (`data/gitea-mirror.db`) is created when the application runs in production mode. It starts empty and is populated as you configure and use the application.
-
-
-> [!IMPORTANT]
-> The production database file is excluded from the Git repository as it may contain sensitive information like GitHub and Gitea tokens. **Never commit this file to the repository.**
-
-##### Database Initialization
-
-Before running the application in production mode for the first time, you need to initialize the database:
+#### Option 1: Quick Start (docker-compose.alt.yml)
+Perfect for trying out Gitea Mirror or simple deployments:
 
 ```bash
-# Initialize the database for production mode
-bun run setup
-```
-
-This will create the necessary tables. On first launch, you'll be guided through creating your admin account with a secure password.
-
-### Installation
-
-#### Using Docker (Recommended)
-
-Gitea Mirror provides multi-architecture Docker images that work on both ARM64 (e.g., Apple Silicon, Raspberry Pi) and x86_64 (Intel/AMD) platforms.
-
-##### Using Docker Compose (Recommended)
-
-```bash
-# Start the application using Docker Compose
-docker compose up -d
-
-# For development mode (requires configuration)
-# Ensure you have run bun run setup first
-docker compose -f docker-compose.dev.yml up -d
-```
-
-
-> [!IMPORTANT]
-> **Docker Compose is the recommended method for running Gitea Mirror** as it provides a consistent environment with proper volume management for the SQLite database.
-
-
-> [!NOTE]
-> The examples above use the modern `docker compose` syntax (without hyphen) which is the recommended approach for Docker Compose V2. If you're using an older version of Docker Compose (V1), you may need to use `docker-compose` (with hyphen) instead.
-
-##### Using Pre-built Images from GitHub Container Registry
-
-If you want to run the container directly without Docker Compose:
-
-```bash
-# Pull the latest multi-architecture image
-docker pull ghcr.io/arunavo4/gitea-mirror:latest
-
-# Run the application with a volume for persistent data
-docker run -d -p 4321:4321 \
-  -v gitea-mirror-data:/app/data \
-  ghcr.io/arunavo4/gitea-mirror:latest
-```
-
-##### Building Docker Images Manually
-
-The project includes a build script to create and manage multi-architecture Docker images:
-
-```bash
-# Copy example environment file if you don't have one
-cp .env.example .env
-
-# Edit .env file with your preferred settings
-# DOCKER_REGISTRY, DOCKER_IMAGE, DOCKER_TAG, etc.
-
-# Build and load into local Docker
-./scripts/build-docker.sh --load
-
-# OR: Build and push to a registry (requires authentication)
-./scripts/build-docker.sh --push
-
-# Then run with Docker Compose
-docker compose up -d
-```
-
-See [Docker build documentation](./scripts/README-docker.md) for more details.
-
-##### Using LXC Containers
-
-Gitea Mirror offers two deployment options for LXC containers:
-
-**1. Proxmox VE (online, recommended for production)**
-
-```bash
-# One-command installation on Proxmox VE
-# Uses the community-maintained script by Tobias ([CrazyWolf13](https://github.com/CrazyWolf13))
-# at [community-scripts/ProxmoxVED](https://github.com/community-scripts/ProxmoxVED)
-curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/gitea-mirror-install.sh | bash
-```
-
-**2. Local testing (offline-friendly, works on developer laptops)**
-
-```bash
-# Download the script
-curl -fsSL https://raw.githubusercontent.com/arunavo4/gitea-mirror/main/scripts/gitea-mirror-lxc-local.sh -o gitea-mirror-lxc-local.sh
-chmod +x gitea-mirror-lxc-local.sh
-
-# Run with your local repo directory
-sudo LOCAL_REPO_DIR=~/Development/gitea-mirror ./gitea-mirror-lxc-local.sh
-```
-
-Both scripts:
-- Set up a privileged Ubuntu 22.04 LXC container
-- Install Bun runtime environment
-- Build the application
-- Configure a systemd service
-- Start the service automatically
-
-The application includes a health check endpoint at `/api/health` for monitoring.
-
-See the [LXC Container Deployment Guide](scripts/README-lxc.md) for detailed instructions.
-
-##### Building Your Own Image
-
-For manual Docker builds (without the helper script):
-
-```bash
-# Build the Docker image for your current architecture
-docker build -t gitea-mirror:latest .
-
-# Build multi-architecture images (requires Docker Buildx)
-docker buildx create --name multiarch --driver docker-container --use
-docker buildx build --platform linux/amd64,linux/arm64 -t gitea-mirror:latest --load .
-
-# If you encounter issues with Buildx, you can try these workarounds:
-# 1. Retry with network settings
-docker buildx build --platform linux/amd64,linux/arm64 -t gitea-mirror:latest --network=host --load .
-
-# 2. Build one platform at a time if you're having resource issues
-docker buildx build --platform linux/amd64 -t gitea-mirror:amd64 --load .
-docker buildx build --platform linux/arm64 -t gitea-mirror:arm64 --load .
-
-# Create a named volume for database persistence
-docker volume create gitea-mirror-data
-```
-
-##### Environment Variables
-
-The Docker container can be configured with the following environment variables:
-
-- `DATABASE_URL`: SQLite database URL (default: `file:data/gitea-mirror.db`)
-- `HOST`: Host to bind to (default: `0.0.0.0`)
-- `PORT`: Port to listen on (default: `4321`)
-- `JWT_SECRET`: Secret key for JWT token generation (auto-generated if not provided)
-
-> [!TIP]
-> For security, Gitea Mirror will automatically generate a secure random JWT secret on first run if one isn't provided or if the default value is used. This generated secret is stored in the data directory for persistence across container restarts.
-
-#### Manual Installation
-
-```bash
-# Clone the repository
-git clone https://github.com/arunavo4/gitea-mirror.git
+# Clone repository
+git clone https://github.com/RayLabsHQ/gitea-mirror.git
 cd gitea-mirror
 
-# Quick setup (installs dependencies and initializes the database)
-bun run setup
+# Start with simplified setup
+docker compose -f docker-compose.alt.yml up -d
 
-# Development Mode Options
-
-# Run in development mode
-bun run dev
-
-# Run in development mode with clean database (removes existing DB first)
-bun run dev:clean
-
-# Production Mode Options
-
-# Build the application
-bun run build
-
-# Preview the production build
-bun run preview
-
-# Start the production server (default)
-bun run start
-
-# Start the production server with a clean setup
-bun run start:fresh
-
-# Database Management
-
-# Initialize the database
-bun run init-db
-
-# Reset users for testing first-time signup
-bun run reset-users
-
-# Check database status
-bun run check-db
+# Access at http://localhost:4321
 ```
 
-##### Database Permissions for Direct Installation
+**Features:**
+- ✅ Pre-built image - no building required
+- ✅ Minimal configuration needed
+- ✅ Data stored in `./data` directory
+- ✅ Configure everything through web UI
+- ✅ Automatic user/group ID mapping
 
-> [!IMPORTANT]
-> **If you're running the application directly** (not using Docker), you may encounter SQLite permission errors. This is because SQLite requires both read/write access to the database file and write access to the directory containing the database.
+**Best for:**
+- First-time users
+- Testing and evaluation
+- Simple deployments
+- When you prefer web-based configuration
 
-**Common Error:**
-```
-Error: [ERROR] SQLiteError: attempt to write a readonly database
-```
-
-**Solution:**
-```bash
-# Ensure the data directory exists and has proper permissions
-mkdir -p data
-chmod 755 data
-
-# If the database file already exists, ensure it's writable
-chmod 644 data/gitea-mirror.db
-
-# Make sure the user running the application owns the data directory
-chown -R $(whoami) data/
-```
-
-**Why Docker doesn't have this issue:**
-- Docker containers run with a dedicated user (`gitea-mirror`) that owns the `/app/data` directory
-- The container setup ensures proper permissions are set during image build
-- Volume mounts are handled by Docker with appropriate permissions
-
-**Recommended approach:** Use Docker or Docker Compose for deployment to avoid permission issues entirely.
-
-### Configuration
-
-Gitea Mirror can be configured through environment variables or through the web UI. See the [Configuration Guide](src/content/docs/configuration.md) for more details.
-
-Key configuration options include:
-
-- GitHub connection settings (username, token, repository filters)
-- Gitea connection settings (URL, token, organization)
-- Mirroring options (issues, starred repositories, organizations)
-- Scheduling options for automatic mirroring
-
-> [!IMPORTANT]
-> **SQLite is the only database required for Gitea Mirror**, handling both data storage and real-time event notifications.
-
-## 🚀 Development
-
-### Local Development Setup
+#### Option 2: Full Setup (docker-compose.yml)
+For production deployments with environment-based configuration:
 
 ```bash
-# Install dependencies
-bun run setup
+# Start with full configuration options
+docker compose up -d
+```
 
-# Start the development server
+**Features:**
+- ✅ Build from source or use pre-built image
+- ✅ Complete environment variable configuration
+- ✅ Support for custom CA certificates
+- ✅ Advanced mirror settings (forks, wiki, issues)
+- ✅ Multi-registry support
+
+**Best for:**
+- Production deployments
+- Automated/scripted setups
+- Advanced mirror configurations
+- When using self-signed certificates
+
+#### Using Pre-built Image Directly
+
+```bash
+docker pull ghcr.io/raylabshq/gitea-mirror:v3.1.1
+```
+
+### Configuration Options
+
+#### Quick Start Configuration (docker-compose.alt.yml)
+
+Minimal `.env` file (optional - has sensible defaults):
+
+```bash
+# Custom port (default: 4321)
+PORT=4321
+
+# User/Group IDs for file permissions (default: 1000)
+PUID=1000
+PGID=1000
+
+# Session secret (auto-generated if not set)
+BETTER_AUTH_SECRET=your-secret-key-change-this-in-production
+```
+
+All other settings are configured through the web interface after starting.
+
+#### Full Setup Configuration (docker-compose.yml)
+
+Supports extensive environment variables for automated deployment. See the full [docker-compose.yml](docker-compose.yml) for all available options including GitHub tokens, Gitea URLs, mirror settings, and more.
+
+### LXC Container (Proxmox)
+
+```bash
+# One-line install on Proxmox VE
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/gitea-mirror.sh)"
+```
+
+See the [Proxmox VE Community Scripts](https://community-scripts.github.io/ProxmoxVE/scripts?id=gitea-mirror) for more details.
+
+### Manual Installation
+
+```bash
+# Install Bun
+curl -fsSL https://bun.sh/install | bash
+
+# Setup and run
+bun run setup
 bun run dev
 ```
 
+## Usage
 
-### Setting Up a Local Gitea Instance for Testing
+1. **First Time Setup**
+   - Navigate to http://localhost:4321
+   - Create admin account (first user signup)
+   - Configure GitHub and Gitea connections
 
-For full end-to-end testing, you can set up a local Gitea instance using Docker:
-
-```bash
-# Create a Docker network for Gitea and Gitea Mirror to communicate
-# Using the --label flag ensures proper Docker Compose compatibility
-docker network create --label com.docker.compose.network=gitea-network gitea-network
-
-# Create volumes for Gitea data persistence
-docker volume create gitea-data
-docker volume create gitea-config
-
-# Run Gitea container
-docker run -d \
-  --name gitea \
-  --network gitea-network \
-  -p 3001:3000 \
-  -p 2222:22 \
-  -v gitea-data:/data \
-  -v gitea-config:/etc/gitea \
-  -e USER_UID=1000 \
-  -e USER_GID=1000 \
-  -e GITEA__database__DB_TYPE=sqlite3 \
-  -e GITEA__database__PATH=/data/gitea.db \
-  -e GITEA__server__DOMAIN=localhost \
-  -e GITEA__server__ROOT_URL=http://localhost:3001/ \
-  -e GITEA__server__SSH_DOMAIN=localhost \
-  -e GITEA__server__SSH_PORT=2222 \
-  -e GITEA__server__START_SSH_SERVER=true \
-  -e GITEA__security__INSTALL_LOCK=true \
-  -e GITEA__service__DISABLE_REGISTRATION=false \
-  gitea/gitea:latest
-```
-
-
-> [!TIP]
-> After Gitea is running:
-> 1. Access Gitea at http://localhost:3001/
-> 2. Register a new user
-> 3. Create a personal access token in Gitea (Settings > Applications > Generate New Token)
-> 4. Run Gitea Mirror with the local Gitea configuration:
-
-```bash
-# Run Gitea Mirror connected to the local Gitea instance
-docker run -d \
-  --name gitea-mirror-dev \
-  --network gitea-network \
-  -p 4321:4321 \
-  -v gitea-mirror-data:/app/data \
-  -e NODE_ENV=development \
-  -e JWT_SECRET=dev-secret-key \
-  -e GITHUB_TOKEN=your-github-token \
-  -e GITHUB_USERNAME=your-github-username \
-  -e GITEA_URL=http://gitea:3000 \
-  -e GITEA_TOKEN=your-local-gitea-token \
-  -e GITEA_USERNAME=your-local-gitea-username \
-  arunavo4/gitea-mirror:latest
-```
-
-> [!NOTE]
-> This setup allows you to test the full mirroring functionality with a local Gitea instance.
-
-### Using Docker Compose for Development
-
-
-For convenience, a dedicated development docker-compose file is provided that sets up both Gitea Mirror and a local Gitea instance:
-
-```bash
-# Start with development environment and local Gitea instance
-docker compose -f docker-compose.dev.yml up -d
-```
-
-
-> [!TIP]
-> You can also create a `.env` file with your GitHub and Gitea credentials:
->
-> ```env
-> # GitHub credentials
-> GITHUB_TOKEN=your-github-token
-> GITHUB_USERNAME=your-github-username
->
-> # Gitea credentials (will be set up after you create a user in the local Gitea instance)
-> GITEA_TOKEN=your-local-gitea-token
-> GITEA_USERNAME=your-local-gitea-username
-> ```
-
-## Technologies Used
-
-- **Frontend**: Astro, React, Shadcn UI, Tailwind CSS v4
-- **Backend**: Bun
-- **Database**: SQLite (handles both data storage and event notifications)
-- **API Integration**: GitHub API (Octokit), Gitea API
-- **Deployment Options**: Docker containers, LXC containers (Proxmox VE and local testing)
-
-## Contributing
-
-Contributions are welcome! Please feel free to submit a Pull Request.
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+2. **Mirror Strategies**
+   - **Preserve Structure**: Maintains GitHub organization structure
+   - **Single Organization**: All repos go to one Gitea organization
+   - **Flat User**: All repos under your Gitea user account
+   - **Mixed Mode**: Personal repos in one org, organization repos preserve structure
 
+3. **Customization**
+   - Click edit buttons on organization cards to set custom destinations
+   - Override individual repository destinations in the table view
+   - Starred repositories automatically go to a dedicated organization
 
 ## Troubleshooting
 
-### Docker Compose Network Issues
+### Reverse Proxy Configuration
 
-> [!WARNING]
-> If you encounter network-related warnings or errors when running Docker Compose, such as:
->
-> ```
-> WARN[0095] a network with name gitea-network exists but was not created by compose.
-> Set `external: true` to use an existing network
-> ```
->
-> or
->
-> ```
-> network gitea-network was found but has incorrect label com.docker.compose.network set to "" (expected: "gitea-network")
-> ```
+If using a reverse proxy (e.g., nginx proxy manager) and experiencing issues with JavaScript files not loading properly, try enabling HTTP/2 support in your proxy configuration. While not required by the application, some proxy configurations may have better compatibility with HTTP/2 enabled. See [issue #43](https://github.com/RayLabsHQ/gitea-mirror/issues/43) for reference.
 
-Try the following steps:
+## Development
 
-1. Stop the current Docker Compose stack:
-   ```bash
-   docker compose -f docker-compose.dev.yml down
-   ```
+```bash
+# Install dependencies
+bun install
 
-2. Remove the existing network:
-   ```bash
-   docker network rm gitea-network
-   ```
+# Run development server
+bun run dev
 
-3. Restart the Docker Compose stack:
-   ```bash
-   docker compose -f docker-compose.dev.yml up -d
-   ```
+# Run tests
+bun test
 
-> [!TIP]
-> If you need to share the network with other Docker Compose projects, you can modify the `docker-compose.dev.yml` file to mark the network as external:
->
-> ```yaml
-> networks:
->   gitea-network:
->     name: gitea-network
->     external: true
-> ```
+# Build for production
+bun run build
+```
 
-### Database Persistence
+## Technologies
 
-> [!TIP]
-> The application uses SQLite for all data storage and event notifications. Make sure the database file is properly mounted when using Docker:
->
-> ```bash
-> # Run with a volume for persistent data storage
-> docker run -d -p 4321:4321 \
->   -v gitea-mirror-data:/app/data \
->   ghcr.io/arunavo4/gitea-mirror:latest
-> ```
->
-> For homelab/self-hosted setups, you can use the standard Docker Compose file which includes automatic database cleanup:
->
-> ```bash
-> # Clone the repository
-> git clone https://github.com/arunavo4/gitea-mirror.git
-> cd gitea-mirror
->
-> # Start the application with Docker Compose
-> docker compose up -d
-> ```
->
-> This setup provides a complete containerized deployment for the Gitea Mirror application.
+- **Frontend**: Astro, React, Shadcn UI, Tailwind CSS v4
+- **Backend**: Bun runtime, SQLite, Drizzle ORM
+- **APIs**: GitHub (Octokit), Gitea REST API
+- **Auth**: Better Auth with session-based authentication
 
+## Security
 
-#### Database Maintenance
+### Token Encryption
+- All GitHub and Gitea API tokens are encrypted at rest using AES-256-GCM
+- Encryption is automatic and transparent to users
+- Set `ENCRYPTION_SECRET` environment variable for production deployments
+- Falls back to `BETTER_AUTH_SECRET` if not set
 
-> [!TIP]
-> For database maintenance, you can use the provided scripts:
->
-> ```bash
-> # Check database integrity
-> bun run check-db
->
-> # Fix database issues
-> bun run fix-db
->
-> # Reset user accounts (for development)
-> bun run reset-users
-> ```
->
-> **Note:** For cleaning up old activities and events, use the cleanup button in the Activity Log page of the web interface.
+### Password Security
+- User passwords are securely hashed by Better Auth
+- Never stored in plaintext
+- Secure cookie-based session management
 
+## Authentication
 
-> [!NOTE]
-> This implementation provides:
-> - Automatic retry with exponential backoff
-> - Better error logging
-> - Connection event handling
-> - Proper timeout settings
+Gitea Mirror supports multiple authentication methods. **Email/password authentication is the default and always enabled.**
 
+### 1. Email & Password (Default)
+The standard authentication method. First user to sign up becomes the admin.
 
-### Container Health Checks
+### 2. Single Sign-On (SSO) with OIDC
+Enable users to sign in with external identity providers like Google, Azure AD, Okta, Authentik, or any OIDC-compliant service.
 
-> [!TIP]
-> If containers are not starting properly, check their health status:
->
-> ```bash
-> docker ps --format "{{.Names}}: {{.Status}}"
-> ```
->
-> For more detailed logs:
->
-> ```bash
-> docker logs gitea-mirror-dev
-> ```
+**Configuration:**
+1. Navigate to Settings → Authentication & SSO
+2. Click "Add Provider"
+3. Enter your OIDC provider details:
+   - Issuer URL (e.g., `https://accounts.google.com`)
+   - Client ID and Secret from your provider
+   - Use the "Discover" button to auto-fill endpoints
 
-## Acknowledgements
+**Redirect URL for your provider:**
+```
+https://your-domain.com/api/auth/sso/callback/{provider-id}
+```
 
-- [Octokit](https://github.com/octokit/rest.js/) - GitHub REST API client for JavaScript
-- [Shadcn UI](https://ui.shadcn.com/) - For the beautiful UI components
-- [Astro](https://astro.build/) - For the excellent web framework
+### 3. Header Authentication (Reverse Proxy)
+Perfect for automatic authentication when using reverse proxies like Authentik, Authelia, or Traefik Forward Auth.
+
+**Environment Variables:**
+```bash
+# Enable header authentication
+HEADER_AUTH_ENABLED=true
+
+# Header names (customize based on your proxy)
+HEADER_AUTH_USER_HEADER=X-Authentik-Username
+HEADER_AUTH_EMAIL_HEADER=X-Authentik-Email
+HEADER_AUTH_NAME_HEADER=X-Authentik-Name
+
+# Auto-provision new users
+HEADER_AUTH_AUTO_PROVISION=true
+
+# Restrict to specific email domains (optional)
+HEADER_AUTH_ALLOWED_DOMAINS=example.com,company.org
+```
+
+**How it works:**
+- Users authenticated by your reverse proxy are automatically logged in
+- No additional login step required
+- New users can be auto-provisioned if enabled
+- Falls back to regular authentication if headers are missing
+
+**Example Authentik Configuration:**
+```nginx
+# In your reverse proxy configuration
+proxy_set_header X-Authentik-Username $authentik_username;
+proxy_set_header X-Authentik-Email $authentik_email;
+proxy_set_header X-Authentik-Name $authentik_name;
+```
+
+### 4. OAuth Applications (Act as Identity Provider)
+Gitea Mirror can also act as an OIDC provider for other applications. Register OAuth applications in Settings → Authentication & SSO → OAuth Applications tab.
+
+**Use cases:**
+- Allow other services to authenticate using Gitea Mirror accounts
+- Create service-to-service authentication
+- Build integrations with your Gitea Mirror instance
+
+## Contributing
+
+Contributions are welcome! Please read our [Contributing Guidelines](CONTRIBUTING.md) for details on our code of conduct and the process for submitting pull requests.
+
+## License
+
+GNU General Public License v3.0 - see [LICENSE](LICENSE) file for details.
+
+## Star History
+
+<a href="https://www.star-history.com/#RayLabsHQ/gitea-mirror&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=RayLabsHQ/gitea-mirror&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=RayLabsHQ/gitea-mirror&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=RayLabsHQ/gitea-mirror&type=Date" />
+ </picture>
+</a>
+
+## Support
+
+- 📖 [Documentation](https://github.com/RayLabsHQ/gitea-mirror/tree/main/docs)
+- 🔐 [Custom CA Certificates](docs/CA_CERTIFICATES.md)
+- 🐛 [Report Issues](https://github.com/RayLabsHQ/gitea-mirror/issues)
+- 💬 [Discussions](https://github.com/RayLabsHQ/gitea-mirror/discussions)
+- 🔧 [Proxmox VE Script](https://community-scripts.github.io/ProxmoxVE/scripts?id=gitea-mirror)

UPGRADE.md

@@ -0,0 +1,74 @@
+# Upgrade Guide
+
+## Upgrading to v3.0
+
+> **⚠️ IMPORTANT**: v3.0 requires a fresh start. There is no automated migration from v2.x to v3.0.
+
+### Why No Migration?
+
+v3.0 introduces fundamental changes to the application architecture:
+- **Authentication**: Switched from JWT to Better Auth
+- **Database**: Now uses Drizzle ORM with proper migrations
+- **Security**: All tokens are now encrypted
+- **Features**: Added SSO support and OIDC provider functionality
+
+Due to these extensive changes, we recommend starting fresh with v3.0 for the best experience.
+
+### Upgrade Steps
+
+1. **Stop your v2.x container**
+   ```bash
+   docker stop gitea-mirror
+   docker rm gitea-mirror
+   ```
+
+2. **Backup your v2.x data (optional)**
+   ```bash
+   # If you want to keep your v2 data for reference
+   docker run --rm -v gitea-mirror-data:/data -v $(pwd):/backup alpine tar czf /backup/gitea-mirror-v2-backup.tar.gz -C /data .
+   ```
+
+3. **Create a new volume for v3**
+   ```bash
+   docker volume create gitea-mirror-v3-data
+   ```
+
+4. **Run v3 with the new volume**
+   ```bash
+   docker run -d \
+     --name gitea-mirror \
+     -p 4321:4321 \
+     -v gitea-mirror-v3-data:/app/data \
+     -e BETTER_AUTH_SECRET=your-secret-key \
+     -e ENCRYPTION_SECRET=your-encryption-key \
+     arunavo4/gitea-mirror:latest
+   ```
+
+5. **Set up your configuration again**
+   - Navigate to http://localhost:4321
+   - Create a new admin account
+   - Re-enter your GitHub and Gitea credentials
+   - Configure your mirror settings
+
+### What Happens to My Existing Mirrors?
+
+Your existing mirrors in Gitea are **not affected**. The application will:
+- Recognize existing repositories when you re-import
+- Skip creating duplicates
+- Resume normal mirror operations
+
+### Environment Variable Changes
+
+v3.0 uses different environment variables:
+
+| v2.x | v3.0 | Notes |
+|------|------|-------|
+| `JWT_SECRET` | `BETTER_AUTH_SECRET` | Required for session management |
+| - | `ENCRYPTION_SECRET` | New - required for token encryption |
+
+### Need Help?
+
+If you have questions about upgrading:
+1. Check the [README](README.md) for v3 setup instructions
+2. Review your v2 configuration before upgrading
+3. Open an issue if you encounter problems

certs/README.md

@@ -0,0 +1,236 @@
+# CA Certificates Configuration
+
+This document explains how to configure custom Certificate Authority (CA) certificates for Gitea Mirror when connecting to self-signed or privately signed Gitea instances.
+
+## Overview
+
+When your Gitea instance uses a self-signed certificate or a certificate signed by a private Certificate Authority (CA), you need to configure Gitea Mirror to trust these certificates.
+
+## Common SSL/TLS Errors
+
+If you encounter any of these errors, you need to configure CA certificates:
+
+- `UNABLE_TO_VERIFY_LEAF_SIGNATURE`
+- `SELF_SIGNED_CERT_IN_CHAIN`
+- `UNABLE_TO_GET_ISSUER_CERT_LOCALLY`
+- `CERT_UNTRUSTED`
+- `unable to verify the first certificate`
+
+## Configuration by Deployment Method
+
+### Docker
+
+#### Method 1: Volume Mount (Recommended)
+
+1. Create a certificates directory:
+   ```bash
+   mkdir -p ./certs
+   ```
+
+2. Copy your CA certificate(s):
+   ```bash
+   cp /path/to/your-ca-cert.crt ./certs/
+   ```
+
+3. Update `docker-compose.yml`:
+   ```yaml
+   version: '3.8'
+   services:
+     gitea-mirror:
+       image: raylabs/gitea-mirror:latest
+       volumes:
+         - ./data:/app/data
+         - ./certs:/usr/local/share/ca-certificates:ro
+       environment:
+         - NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/your-ca-cert.crt
+   ```
+
+4. Restart the container:
+   ```bash
+   docker-compose down && docker-compose up -d
+   ```
+
+#### Method 2: Custom Docker Image
+
+Create a `Dockerfile`:
+
+```dockerfile
+FROM raylabs/gitea-mirror:latest
+
+# Copy CA certificates
+COPY ./certs/*.crt /usr/local/share/ca-certificates/
+
+# Update CA certificates
+RUN update-ca-certificates
+
+# Set environment variable
+ENV NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/your-ca-cert.crt
+```
+
+Build and use:
+```bash
+docker build -t my-gitea-mirror .
+```
+
+### Native/Bun
+
+#### Method 1: Environment Variable
+
+```bash
+export NODE_EXTRA_CA_CERTS=/path/to/your-ca-cert.crt
+bun run start
+```
+
+#### Method 2: .env File
+
+Add to your `.env` file:
+```
+NODE_EXTRA_CA_CERTS=/path/to/your-ca-cert.crt
+```
+
+#### Method 3: System CA Store
+
+**Ubuntu/Debian:**
+```bash
+sudo cp your-ca-cert.crt /usr/local/share/ca-certificates/
+sudo update-ca-certificates
+```
+
+**RHEL/CentOS/Fedora:**
+```bash
+sudo cp your-ca-cert.crt /etc/pki/ca-trust/source/anchors/
+sudo update-ca-trust
+```
+
+**macOS:**
+```bash
+sudo security add-trusted-cert -d -r trustRoot \
+  -k /Library/Keychains/System.keychain your-ca-cert.crt
+```
+
+### LXC Container (Proxmox VE)
+
+1. Enter the container:
+   ```bash
+   pct enter <container-id>
+   ```
+
+2. Create certificates directory:
+   ```bash
+   mkdir -p /usr/local/share/ca-certificates
+   ```
+
+3. Copy your CA certificate:
+   ```bash
+   cat > /usr/local/share/ca-certificates/your-ca.crt
+   ```
+   (Paste certificate content and press Ctrl+D)
+
+4. Update the systemd service:
+   ```bash
+   cat >> /etc/systemd/system/gitea-mirror.service << EOF
+   Environment="NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/your-ca.crt"
+   EOF
+   ```
+
+5. Reload and restart:
+   ```bash
+   systemctl daemon-reload
+   systemctl restart gitea-mirror
+   ```
+
+## Multiple CA Certificates
+
+### Option 1: Bundle Certificates
+
+```bash
+cat ca-cert1.crt ca-cert2.crt ca-cert3.crt > ca-bundle.crt
+export NODE_EXTRA_CA_CERTS=/path/to/ca-bundle.crt
+```
+
+### Option 2: System CA Store
+
+```bash
+# Copy all certificates
+cp *.crt /usr/local/share/ca-certificates/
+update-ca-certificates
+```
+
+## Verification
+
+### 1. Test Gitea Connection
+Use the "Test Connection" button in the Gitea configuration section.
+
+### 2. Check Logs
+
+**Docker:**
+```bash
+docker logs gitea-mirror
+```
+
+**Native:**
+Check terminal output
+
+**LXC:**
+```bash
+journalctl -u gitea-mirror -f
+```
+
+### 3. Manual Certificate Test
+
+```bash
+openssl s_client -connect your-gitea-domain.com:443 -CAfile /path/to/ca-cert.crt
+```
+
+## Best Practices
+
+1. **Certificate Security**
+   - Keep CA certificates secure
+   - Use read-only mounts in Docker
+   - Limit certificate file permissions
+   - Regularly update certificates
+
+2. **Certificate Management**
+   - Use descriptive certificate filenames
+   - Document certificate purposes
+   - Track certificate expiration dates
+   - Maintain certificate backups
+
+3. **Production Deployment**
+   - Use proper SSL certificates when possible
+   - Consider Let's Encrypt for public instances
+   - Implement certificate rotation procedures
+   - Monitor certificate expiration
+
+## Troubleshooting
+
+### Certificate not being recognized
+- Ensure the certificate is in PEM format
+- Check that `NODE_EXTRA_CA_CERTS` points to the correct file
+- Restart the application after adding certificates
+
+### Still getting SSL errors
+- Verify the complete certificate chain is included
+- Check if intermediate certificates are needed
+- Ensure the certificate matches the server hostname
+
+### Certificate expired
+- Check validity: `openssl x509 -in cert.crt -noout -dates`
+- Update with new certificate from your CA
+- Restart Gitea Mirror after updating
+
+## Certificate Format
+
+Certificates must be in PEM format. Example:
+
+```
+-----BEGIN CERTIFICATE-----
+MIIDXTCCAkWgAwIBAgIJAKl8bUgMdErlMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+[... certificate content ...]
+-----END CERTIFICATE-----
+```
+
+If your certificate is in DER format, convert it:
+```bash
+openssl x509 -inform der -in certificate.cer -out certificate.crt
+```

docker-compose.alt.yml

@@ -0,0 +1,24 @@
+# Gitea Mirror alternate deployment configuration
+# Standard deployment with host path and minimal environments
+services:
+  gitea-mirror:
+    image: ghcr.io/raylabshq/gitea-mirror:latest
+    container_name: gitea-mirror
+    restart: unless-stopped
+    ports:
+      - "${PORT:-4321}:4321"
+    user: ${PUID:-1000}:${PGID:-1000}
+    volumes:
+      - ./data:/app/data
+    environment:
+      - NODE_ENV=production
+      - DATABASE_URL=file:data/gitea-mirror.db
+      - HOST=0.0.0.0
+      - PORT=4321
+      - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET:-your-secret-key-change-this-in-production}
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=3", "--spider", "http://localhost:4321/api/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 15s

docker-compose.dev.yml

@@ -7,11 +7,12 @@ services:
     image: gitea/gitea:latest
     container_name: gitea
     restart: unless-stopped
+    entrypoint: ["/tmp/gitea-dev-init.sh"]
     environment:
       - USER_UID=1000
       - USER_GID=1000
       - GITEA__database__DB_TYPE=sqlite3
-      - GITEA__database__PATH=/data/gitea.db
+      - GITEA__database__PATH=/data/gitea/gitea.db
       - GITEA__server__DOMAIN=localhost
       - GITEA__server__ROOT_URL=http://localhost:3001/
       - GITEA__server__SSH_DOMAIN=localhost
@@ -19,20 +20,24 @@ services:
       - GITEA__server__START_SSH_SERVER=true
       - GITEA__security__INSTALL_LOCK=true
       - GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__log__MODE=console
+      - GITEA__log__LEVEL=Info
     ports:
       - "3001:3000"
       - "2222:22"
     volumes:
       - gitea-data:/data
       - gitea-config:/etc/gitea
+      - ./scripts/gitea-app.ini:/tmp/app.ini:ro
+      - ./scripts/gitea-dev-init.sh:/tmp/gitea-dev-init.sh:ro
     networks:
       - gitea-network
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/api/healthz"]
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/"]
       interval: 30s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 60s
 
   # Development service connected to local Gitea
   gitea-mirror-dev:
@@ -49,6 +54,11 @@ services:
       - "4321:4321"
     volumes:
       - gitea-mirror-data:/app/data
+      # Mount custom CA certificates - choose one option:
+      # Option 1: Mount individual CA certificates from certs directory
+      # - ./certs:/app/certs:ro
+      # Option 2: Mount system CA bundle (if your CA is already in system store)
+      # - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
     depends_on:
       - gitea
     environment:
@@ -56,13 +66,15 @@ services:
       - DATABASE_URL=file:data/gitea-mirror.db
       - HOST=0.0.0.0
       - PORT=4321
-      - JWT_SECRET=dev-secret-key
+      - BETTER_AUTH_SECRET=dev-secret-key
       # GitHub/Gitea Mirror Config
       - GITHUB_USERNAME=${GITHUB_USERNAME:-your-github-username}
       - GITHUB_TOKEN=${GITHUB_TOKEN:-your-github-token}
+      - GITHUB_EXCLUDED_ORGS=${GITHUB_EXCLUDED_ORGS:-}
       - SKIP_FORKS=${SKIP_FORKS:-false}
       - PRIVATE_REPOSITORIES=${PRIVATE_REPOSITORIES:-false}
       - MIRROR_ISSUES=${MIRROR_ISSUES:-false}
+      - MIRROR_WIKI=${MIRROR_WIKI:-false}
       - MIRROR_STARRED=${MIRROR_STARRED:-false}
       - MIRROR_ORGANIZATIONS=${MIRROR_ORGANIZATIONS:-false}
       - PRESERVE_ORG_STRUCTURE=${PRESERVE_ORG_STRUCTURE:-false}
@@ -74,6 +86,8 @@ services:
       - GITEA_ORGANIZATION=${GITEA_ORGANIZATION:-github-mirrors}
       - GITEA_ORG_VISIBILITY=${GITEA_ORG_VISIBILITY:-public}
       - DELAY=${DELAY:-3600}
+      # Optional: Skip TLS verification (insecure, use only for testing)
+      # - GITEA_SKIP_TLS_VERIFY=${GITEA_SKIP_TLS_VERIFY:-false}
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4321/api/health"]
       interval: 30s

docker-compose.yml

@@ -3,7 +3,7 @@
 
 services:
   gitea-mirror:
-    image: ${DOCKER_REGISTRY:-ghcr.io}/${DOCKER_IMAGE:-arunavo4/gitea-mirror}:${DOCKER_TAG:-latest}
+    image: ${DOCKER_REGISTRY:-ghcr.io}/${DOCKER_IMAGE:-raylabshq/gitea-mirror}:${DOCKER_TAG:-latest}
     build:
       context: .
       dockerfile: Dockerfile
@@ -11,25 +11,35 @@ services:
         - linux/amd64
         - linux/arm64
       cache_from:
-        - ${DOCKER_REGISTRY:-ghcr.io}/${DOCKER_IMAGE:-arunavo4/gitea-mirror}:${DOCKER_TAG:-latest}
+        - ${DOCKER_REGISTRY:-ghcr.io}/${DOCKER_IMAGE:-raylabshq/gitea-mirror}:${DOCKER_TAG:-latest}
     container_name: gitea-mirror
     restart: unless-stopped
     ports:
       - "4321:4321"
     volumes:
       - gitea-mirror-data:/app/data
+      # Mount custom CA certificates - choose one option:
+      # Option 1: Mount individual CA certificates from certs directory
+      # - ./certs:/app/certs:ro
+      # Option 2: Mount system CA bundle (if your CA is already in system store)
+      # - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
     environment:
       - NODE_ENV=production
       - DATABASE_URL=file:data/gitea-mirror.db
       - HOST=0.0.0.0
       - PORT=4321
-      - JWT_SECRET=${JWT_SECRET:-your-secret-key-change-this-in-production}
+      - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET:-your-secret-key-change-this-in-production}
+      - BETTER_AUTH_URL=${BETTER_AUTH_URL:-http://localhost:4321}
+      # Optional: ENCRYPTION_SECRET will be auto-generated if not provided
+      # - ENCRYPTION_SECRET=${ENCRYPTION_SECRET:-}
       # GitHub/Gitea Mirror Config
       - GITHUB_USERNAME=${GITHUB_USERNAME:-}
       - GITHUB_TOKEN=${GITHUB_TOKEN:-}
+      - GITHUB_EXCLUDED_ORGS=${GITHUB_EXCLUDED_ORGS:-}
       - SKIP_FORKS=${SKIP_FORKS:-false}
       - PRIVATE_REPOSITORIES=${PRIVATE_REPOSITORIES:-false}
       - MIRROR_ISSUES=${MIRROR_ISSUES:-false}
+      - MIRROR_WIKI=${MIRROR_WIKI:-false}
       - MIRROR_STARRED=${MIRROR_STARRED:-false}
       - MIRROR_ORGANIZATIONS=${MIRROR_ORGANIZATIONS:-false}
       - PRESERVE_ORG_STRUCTURE=${PRESERVE_ORG_STRUCTURE:-false}
@@ -41,6 +51,15 @@ services:
       - GITEA_ORGANIZATION=${GITEA_ORGANIZATION:-github-mirrors}
       - GITEA_ORG_VISIBILITY=${GITEA_ORG_VISIBILITY:-public}
       - DELAY=${DELAY:-3600}
+      # Optional: Skip TLS verification (insecure, use only for testing)
+      # - GITEA_SKIP_TLS_VERIFY=${GITEA_SKIP_TLS_VERIFY:-false}
+      # Header Authentication (for Reverse Proxy SSO)
+      - HEADER_AUTH_ENABLED=${HEADER_AUTH_ENABLED:-false}
+      - HEADER_AUTH_USER_HEADER=${HEADER_AUTH_USER_HEADER:-X-Authentik-Username}
+      - HEADER_AUTH_EMAIL_HEADER=${HEADER_AUTH_EMAIL_HEADER:-X-Authentik-Email}
+      - HEADER_AUTH_NAME_HEADER=${HEADER_AUTH_NAME_HEADER:-X-Authentik-Name}
+      - HEADER_AUTH_AUTO_PROVISION=${HEADER_AUTH_AUTO_PROVISION:-false}
+      - HEADER_AUTH_ALLOWED_DOMAINS=${HEADER_AUTH_ALLOWED_DOMAINS:-}
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=3", "--spider", "http://localhost:4321/api/health"]
       interval: 30s

docker-entrypoint.sh

@@ -5,15 +5,73 @@ set -e
 # Ensure data directory exists
 mkdir -p /app/data
 
-# Generate a secure JWT secret if one isn't provided or is using the default value
-JWT_SECRET_FILE="/app/data/.jwt_secret"
-if [ "$JWT_SECRET" = "your-secret-key-change-this-in-production" ] || [ -z "$JWT_SECRET" ]; then
+# Handle custom CA certificates
+if [ -d "/app/certs" ] && [ "$(ls -A /app/certs/*.crt 2>/dev/null)" ]; then
+  echo "Custom CA certificates found, configuring Node.js to use them..."
+  
+  # Combine all CA certificates into a bundle for Node.js
+  CA_BUNDLE="/app/certs/ca-bundle.crt"
+  > "$CA_BUNDLE"
+  
+  for cert in /app/certs/*.crt; do
+    if [ -f "$cert" ]; then
+      echo "Adding certificate: $(basename "$cert")"
+      cat "$cert" >> "$CA_BUNDLE"
+      echo "" >> "$CA_BUNDLE"  # Add newline between certificates
+    fi
+  done
+  
+  # Set Node.js to use the custom CA bundle
+  export NODE_EXTRA_CA_CERTS="$CA_BUNDLE"
+  echo "NODE_EXTRA_CA_CERTS set to: $NODE_EXTRA_CA_CERTS"
+  
+  # For Bun compatibility, also set the CA bundle in system location if writable
+  if [ -f "/etc/ssl/certs/ca-certificates.crt" ] && [ -w "/etc/ssl/certs/" ]; then
+    echo "Appending custom certificates to system CA bundle..."
+    cat "$CA_BUNDLE" >> /etc/ssl/certs/ca-certificates.crt
+  fi
+  
+else
+  echo "No custom CA certificates found in /app/certs"
+fi
+
+# Check if system CA bundle is mounted and use it
+if [ -f "/etc/ssl/certs/ca-certificates.crt" ] && [ ! -L "/etc/ssl/certs/ca-certificates.crt" ]; then
+  # Check if it's a mounted file (not the default symlink)
+  if [ "$(stat -c '%d' /etc/ssl/certs/ca-certificates.crt 2>/dev/null)" != "$(stat -c '%d' / 2>/dev/null)" ] || \
+     [ "$(stat -f '%d' /etc/ssl/certs/ca-certificates.crt 2>/dev/null)" != "$(stat -f '%d' / 2>/dev/null)" ]; then
+    echo "System CA bundle mounted, configuring Node.js to use it..."
+    export NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"
+    echo "NODE_EXTRA_CA_CERTS set to: $NODE_EXTRA_CA_CERTS"
+  fi
+fi
+
+# Optional: If GITEA_SKIP_TLS_VERIFY is set, configure accordingly
+if [ "$GITEA_SKIP_TLS_VERIFY" = "true" ]; then
+  echo "Warning: GITEA_SKIP_TLS_VERIFY is set to true. This is insecure!"
+  export NODE_TLS_REJECT_UNAUTHORIZED=0
+fi
+
+# Generate a secure BETTER_AUTH_SECRET if one isn't provided or is using the default value
+BETTER_AUTH_SECRET_FILE="/app/data/.better_auth_secret"
+JWT_SECRET_FILE="/app/data/.jwt_secret"  # Old file for backward compatibility
+
+if [ "$BETTER_AUTH_SECRET" = "your-secret-key-change-this-in-production" ] || [ -z "$BETTER_AUTH_SECRET" ]; then
   # Check if we have a previously generated secret
-  if [ -f "$JWT_SECRET_FILE" ]; then
-    echo "Using previously generated JWT secret"
-    export JWT_SECRET=$(cat "$JWT_SECRET_FILE")
+  if [ -f "$BETTER_AUTH_SECRET_FILE" ]; then
+    echo "Using previously generated BETTER_AUTH_SECRET"
+    export BETTER_AUTH_SECRET=$(cat "$BETTER_AUTH_SECRET_FILE")
+  # Check for old JWT_SECRET file for backward compatibility
+  elif [ -f "$JWT_SECRET_FILE" ]; then
+    echo "Migrating from old JWT_SECRET to BETTER_AUTH_SECRET"
+    export BETTER_AUTH_SECRET=$(cat "$JWT_SECRET_FILE")
+    # Save to new file
+    echo "$BETTER_AUTH_SECRET" > "$BETTER_AUTH_SECRET_FILE"
+    chmod 600 "$BETTER_AUTH_SECRET_FILE"
+    # Optionally remove old file after successful migration
+    rm -f "$JWT_SECRET_FILE"
   else
-    echo "Generating a secure random JWT secret"
+    echo "Generating a secure random BETTER_AUTH_SECRET"
     # Try to generate a secure random string using OpenSSL
     if command -v openssl >/dev/null 2>&1; then
       GENERATED_SECRET=$(openssl rand -hex 32)
@@ -22,12 +80,38 @@ if [ "$JWT_SECRET" = "your-secret-key-change-this-in-production" ] || [ -z "$JWT
       echo "OpenSSL not found, using fallback method for random generation"
       GENERATED_SECRET=$(head -c 32 /dev/urandom | sha256sum | cut -d' ' -f1)
     fi
-    export JWT_SECRET="$GENERATED_SECRET"
+    export BETTER_AUTH_SECRET="$GENERATED_SECRET"
     # Save the secret to a file for persistence across container restarts
-    echo "$GENERATED_SECRET" > "$JWT_SECRET_FILE"
-    chmod 600 "$JWT_SECRET_FILE"
+    echo "$GENERATED_SECRET" > "$BETTER_AUTH_SECRET_FILE"
+    chmod 600 "$BETTER_AUTH_SECRET_FILE"
   fi
-  echo "JWT_SECRET has been set to a secure random value"
+  echo "BETTER_AUTH_SECRET has been set to a secure random value"
+fi
+
+# Generate a secure ENCRYPTION_SECRET if one isn't provided
+ENCRYPTION_SECRET_FILE="/app/data/.encryption_secret"
+
+if [ -z "$ENCRYPTION_SECRET" ]; then
+  # Check if we have a previously generated secret
+  if [ -f "$ENCRYPTION_SECRET_FILE" ]; then
+    echo "Using previously generated ENCRYPTION_SECRET"
+    export ENCRYPTION_SECRET=$(cat "$ENCRYPTION_SECRET_FILE")
+  else
+    echo "Generating a secure random ENCRYPTION_SECRET"
+    # Generate a 48-character secret for encryption
+    if command -v openssl >/dev/null 2>&1; then
+      GENERATED_ENCRYPTION_SECRET=$(openssl rand -base64 36)
+    else
+      # Fallback to using /dev/urandom if openssl is not available
+      echo "OpenSSL not found, using fallback method for encryption secret generation"
+      GENERATED_ENCRYPTION_SECRET=$(head -c 36 /dev/urandom | base64 | tr -d '\n' | head -c 48)
+    fi
+    export ENCRYPTION_SECRET="$GENERATED_ENCRYPTION_SECRET"
+    # Save the secret to a file for persistence across container restarts
+    echo "$GENERATED_ENCRYPTION_SECRET" > "$ENCRYPTION_SECRET_FILE"
+    chmod 600 "$ENCRYPTION_SECRET_FILE"
+  fi
+  echo "ENCRYPTION_SECRET has been set to a secure random value"
 fi
 
 
@@ -185,19 +269,7 @@ else
     bun scripts/manage-db.ts fix
   fi
 
-  # Run database migrations
-  echo "Running database migrations..."
-
-  # Update mirror_jobs table with new columns for resilience
-  if [ -f "dist/scripts/update-mirror-jobs-table.js" ]; then
-    echo "Updating mirror_jobs table..."
-    bun dist/scripts/update-mirror-jobs-table.js
-  elif [ -f "scripts/update-mirror-jobs-table.ts" ]; then
-    echo "Updating mirror_jobs table using TypeScript script..."
-    bun scripts/update-mirror-jobs-table.ts
-  else
-    echo "Warning: Could not find mirror_jobs table update script."
-  fi
+  echo "Database exists, checking integrity..."
 fi
 
 # Extract version from package.json and set as environment variable
@@ -232,6 +304,28 @@ else
   echo "❌ Startup recovery failed with exit code $RECOVERY_EXIT_CODE"
 fi
 
+# Run repository status repair to fix any inconsistent mirroring states
+echo "Running repository status repair..."
+if [ -f "dist/scripts/repair-mirrored-repos.js" ]; then
+  echo "Running repository repair using compiled script..."
+  bun dist/scripts/repair-mirrored-repos.js --startup
+  REPAIR_EXIT_CODE=$?
+elif [ -f "scripts/repair-mirrored-repos.ts" ]; then
+  echo "Running repository repair using TypeScript script..."
+  bun scripts/repair-mirrored-repos.ts --startup
+  REPAIR_EXIT_CODE=$?
+else
+  echo "Warning: Repository repair script not found. Skipping repair."
+  REPAIR_EXIT_CODE=0
+fi
+
+# Log repair result
+if [ $REPAIR_EXIT_CODE -eq 0 ]; then
+  echo "✅ Repository status repair completed successfully"
+else
+  echo "⚠️  Repository status repair completed with warnings (exit code $REPAIR_EXIT_CODE)"
+fi
+
 # Function to handle shutdown signals
 shutdown_handler() {
   echo "🛑 Received shutdown signal, forwarding to application..."

docs/BETTER_AUTH_MIGRATION.md

@@ -0,0 +1,175 @@
+# Better Auth Migration Guide
+
+This document describes the migration from the legacy authentication system to Better Auth.
+
+## Overview
+
+Gitea Mirror has been migrated to use Better Auth, a modern authentication library that provides:
+- Built-in support for email/password authentication
+- Session management with secure cookies
+- Database adapter with Drizzle ORM
+- Ready for OAuth2, OIDC, and SSO integrations
+- Type-safe authentication throughout the application
+
+## Key Changes
+
+### 1. Database Schema
+
+New tables added:
+- `sessions` - User session management
+- `accounts` - Authentication providers (credentials, OAuth, etc.)
+- `verification_tokens` - Email verification and password reset tokens
+
+Modified tables:
+- `users` - Added `emailVerified` field
+
+### 2. Authentication Flow
+
+**Login:**
+- Users now log in with email instead of username
+- Endpoint: `/api/auth/sign-in/email`
+- Session cookies are automatically managed
+
+**Registration:**
+- Users register with username, email, and password
+- Username is stored as an additional field
+- Endpoint: `/api/auth/sign-up/email`
+
+### 3. API Routes
+
+All auth routes are now handled by Better Auth's catch-all handler:
+- `/api/auth/[...all].ts` handles all authentication endpoints
+
+Legacy routes have been backed up to `/src/pages/api/auth/legacy-backup/`
+
+### 4. Session Management
+
+Sessions are now managed by Better Auth:
+- Middleware automatically populates `context.locals.user` and `context.locals.session`
+- Use `useAuth()` hook in React components for client-side auth
+- Sessions expire after 30 days by default
+
+## Future OIDC/SSO Configuration
+
+The project is now ready for OIDC and SSO integrations. To enable:
+
+### 1. Enable SSO Plugin
+
+```typescript
+// src/lib/auth.ts
+import { sso } from "better-auth/plugins/sso";
+
+export const auth = betterAuth({
+  // ... existing config
+  plugins: [
+    sso({
+      provisionUser: async (data) => {
+        // Custom user provisioning logic
+        return data;
+      },
+    }),
+  ],
+});
+```
+
+### 2. Register OIDC Providers
+
+```typescript
+// Example: Register an OIDC provider
+await authClient.sso.register({
+  issuer: "https://idp.example.com",
+  domain: "example.com",
+  clientId: "your-client-id",
+  clientSecret: "your-client-secret",
+  providerId: "example-provider",
+});
+```
+
+### 3. Enable OIDC Provider Mode
+
+To make Gitea Mirror act as an OIDC provider:
+
+```typescript
+// src/lib/auth.ts
+import { oidcProvider } from "better-auth/plugins/oidc";
+
+export const auth = betterAuth({
+  // ... existing config
+  plugins: [
+    oidcProvider({
+      loginPage: "/signin",
+      consentPage: "/oauth/consent",
+      metadata: {
+        issuer: process.env.BETTER_AUTH_URL || "http://localhost:3000",
+      },
+    }),
+  ],
+});
+```
+
+### 4. Database Migration for SSO
+
+When enabling SSO/OIDC, run migrations to add required tables:
+
+```bash
+# Generate the schema
+bun drizzle-kit generate
+
+# Apply the migration
+bun drizzle-kit migrate
+```
+
+New tables that will be added:
+- `sso_providers` - SSO provider configurations
+- `oauth_applications` - OAuth2 client applications
+- `oauth_access_tokens` - OAuth2 access tokens
+- `oauth_consents` - User consent records
+
+## Environment Variables
+
+Required environment variables:
+
+```env
+# Better Auth configuration
+BETTER_AUTH_SECRET=your-secret-key
+BETTER_AUTH_URL=http://localhost:3000
+
+# Legacy (kept for compatibility)
+JWT_SECRET=your-secret-key
+```
+
+## Migration Script
+
+To migrate existing users to Better Auth:
+
+```bash
+bun run migrate:better-auth
+```
+
+This script:
+1. Creates credential accounts for existing users
+2. Moves password hashes to the accounts table
+3. Preserves user creation dates
+
+## Troubleshooting
+
+### Login Issues
+- Ensure users log in with email, not username
+- Check that BETTER_AUTH_SECRET is set
+- Verify database migrations have been applied
+
+### Session Issues
+- Clear browser cookies if experiencing session problems
+- Check middleware is properly configured
+- Ensure auth routes are accessible at `/api/auth/*`
+
+### Development Tips
+- Use `bun db:studio` to inspect database tables
+- Check `/api/auth/session` to verify current session
+- Enable debug logging in Better Auth for troubleshooting
+
+## Resources
+
+- [Better Auth Documentation](https://better-auth.com)
+- [Better Auth Astro Integration](https://better-auth.com/docs/integrations/astro)
+- [Better Auth Plugins](https://better-auth.com/docs/plugins)

docs/BUILD_GUIDE.md

@@ -0,0 +1,206 @@
+# Build Guide
+
+This guide covers building the open-source version of Gitea Mirror.
+
+## Prerequisites
+
+- **Bun** >= 1.2.9 (primary runtime)
+- **Node.js** >= 20 (for compatibility)
+- **Git**
+
+## Quick Start
+
+```bash
+# Clone repository
+git clone https://github.com/yourusername/gitea-mirror.git
+cd gitea-mirror
+
+# Install dependencies
+bun install
+
+# Initialize database
+bun run init-db
+
+# Build for production
+bun run build
+
+# Start the application
+bun run start
+```
+
+## Build Commands
+
+| Command | Description |
+|---------|-------------|
+| `bun run build` | Production build |
+| `bun run dev` | Development server |
+| `bun run preview` | Preview production build |
+| `bun test` | Run tests |
+| `bun run cleanup-db` | Remove database files |
+
+## Build Output
+
+The build creates:
+- `dist/` - Production-ready server files
+- `.astro/` - Build cache (git-ignored)
+- `data/` - SQLite database location
+
+## Development Build
+
+For active development with hot reload:
+
+```bash
+bun run dev
+```
+
+Access the application at http://localhost:4321
+
+## Production Build
+
+```bash
+# Build
+bun run build
+
+# Test the build
+bun run preview
+
+# Run in production
+bun run start
+```
+
+## Docker Build
+
+```dockerfile
+# Build Docker image
+docker build -t gitea-mirror:latest .
+
+# Run container
+docker run -p 3000:3000 gitea-mirror:latest
+```
+
+## Environment Variables
+
+Create a `.env` file:
+
+```env
+# Database
+DATABASE_PATH=./data/gitea-mirror.db
+
+# Authentication
+JWT_SECRET=your-secret-here
+
+# GitHub Configuration
+GITHUB_TOKEN=ghp_...
+GITHUB_WEBHOOK_SECRET=...
+GITHUB_EXCLUDED_ORGS=org1,org2,org3  # Optional: Comma-separated list of organizations to exclude from sync
+
+# Gitea Configuration
+GITEA_URL=https://your-gitea.com
+GITEA_TOKEN=...
+```
+
+## Common Build Issues
+
+### Missing Dependencies
+
+```bash
+# Solution
+bun install
+```
+
+### Database Not Initialized
+
+```bash
+# Solution
+bun run init-db
+```
+
+### Port Already in Use
+
+```bash
+# Change port
+PORT=3001 bun run dev
+```
+
+### Build Cache Issues
+
+```bash
+# Clear cache
+rm -rf .astro/ dist/
+bun run build
+```
+
+## Build Optimization
+
+### Development Speed
+
+- Use `bun run dev` for hot reload
+- Skip type checking during rapid development
+- Keep `.astro/` cache between builds
+
+### Production Optimization
+
+- Minification enabled automatically
+- Tree shaking removes unused code
+- Image optimization with Sharp
+
+## Validation
+
+After building, verify:
+
+```bash
+# Check build output
+ls -la dist/
+
+# Test server starts
+bun run start
+
+# Check health endpoint
+curl http://localhost:3000/api/health
+```
+
+## CI/CD Build
+
+Example GitHub Actions workflow:
+
+```yaml
+name: Build and Test
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      - run: bun install
+      - run: bun run build
+      - run: bun test
+```
+
+## Troubleshooting
+
+### Build Fails
+
+1. Check Bun version: `bun --version`
+2. Clear dependencies: `rm -rf node_modules && bun install`
+3. Check for syntax errors: `bunx tsc --noEmit`
+
+### Runtime Errors
+
+1. Check environment variables
+2. Verify database exists
+3. Check file permissions
+
+## Performance
+
+Expected build times:
+- Clean build: ~5-10 seconds
+- Incremental build: ~2-5 seconds
+- Development startup: ~1-2 seconds
+
+## Next Steps
+
+- Configure with [Configuration Guide](./CONFIGURATION.md)
+- Deploy with [Deployment Guide](./DEPLOYMENT.md)
+- Set up authentication with [SSO Guide](./SSO-OIDC-SETUP.md)

docs/CA_CERTIFICATES.md

@@ -0,0 +1 @@
+../certs/README.md

docs/DEVELOPMENT_WORKFLOW.md

@@ -0,0 +1,355 @@
+# Development Workflow
+
+This guide covers the development workflow for the open-source Gitea Mirror.
+
+## Getting Started
+
+### Prerequisites
+
+- Bun >= 1.2.9
+- Node.js >= 20
+- Git
+- GitHub account (for API access)
+- Gitea instance (for testing)
+
+### Initial Setup
+
+1. **Clone the repository**:
+```bash
+git clone https://github.com/yourusername/gitea-mirror.git
+cd gitea-mirror
+```
+
+2. **Install dependencies**:
+```bash
+bun install
+```
+
+3. **Initialize database**:
+```bash
+bun run init-db
+```
+
+4. **Configure environment**:
+```bash
+cp .env.example .env
+# Edit .env with your settings
+```
+
+5. **Start development server**:
+```bash
+bun run dev
+```
+
+## Development Commands
+
+| Command | Description |
+|---------|-------------|
+| `bun run dev` | Start development server with hot reload |
+| `bun run build` | Build for production |
+| `bun run preview` | Preview production build |
+| `bun test` | Run all tests |
+| `bun test:watch` | Run tests in watch mode |
+| `bun run db:studio` | Open database GUI |
+
+## Project Structure
+
+```
+gitea-mirror/
+├── src/
+│   ├── components/      # React components
+│   ├── pages/          # Astro pages & API routes
+│   ├── lib/            # Core logic
+│   │   ├── db/         # Database queries
+│   │   ├── utils/      # Helper functions
+│   │   └── modules/    # Module system
+│   ├── hooks/          # React hooks
+│   └── types/          # TypeScript types
+├── public/             # Static assets
+├── scripts/            # Utility scripts
+└── tests/              # Test files
+```
+
+## Feature Development
+
+### Adding a New Feature
+
+1. **Create feature branch**:
+```bash
+git checkout -b feature/my-feature
+```
+
+2. **Plan your changes**:
+- UI components in `/src/components/`
+- API endpoints in `/src/pages/api/`
+- Database queries in `/src/lib/db/queries/`
+- Types in `/src/types/`
+
+3. **Implement the feature**:
+
+**Example: Adding a new API endpoint**
+```typescript
+// src/pages/api/my-endpoint.ts
+import type { APIRoute } from 'astro';
+import { getUserFromCookie } from '@/lib/auth-utils';
+
+export const GET: APIRoute = async ({ request }) => {
+  const user = await getUserFromCookie(request);
+  if (!user) {
+    return new Response('Unauthorized', { status: 401 });
+  }
+
+  // Your logic here
+  return new Response(JSON.stringify({ data: 'success' }), {
+    headers: { 'Content-Type': 'application/json' }
+  });
+};
+```
+
+4. **Write tests**:
+```typescript
+// src/lib/my-feature.test.ts
+import { describe, it, expect } from 'bun:test';
+
+describe('My Feature', () => {
+  it('should work correctly', () => {
+    expect(myFunction()).toBe('expected');
+  });
+});
+```
+
+5. **Update documentation**:
+- Add JSDoc comments
+- Update README if needed
+- Document API changes
+
+## Database Development
+
+### Schema Changes
+
+1. **Modify schema**:
+```typescript
+// src/lib/db/schema.ts
+export const myTable = sqliteTable('my_table', {
+  id: text('id').primaryKey(),
+  name: text('name').notNull(),
+  createdAt: integer('created_at').notNull(),
+});
+```
+
+2. **Generate migration**:
+```bash
+bun run db:generate
+```
+
+3. **Apply migration**:
+```bash
+bun run db:migrate
+```
+
+### Writing Queries
+
+```typescript
+// src/lib/db/queries/my-queries.ts
+import { db } from '../index';
+import { myTable } from '../schema';
+
+export async function getMyData(userId: string) {
+  return db.select()
+    .from(myTable)
+    .where(eq(myTable.userId, userId));
+}
+```
+
+## Testing
+
+### Unit Tests
+
+```bash
+# Run all tests
+bun test
+
+# Run specific test file
+bun test auth
+
+# Watch mode
+bun test:watch
+
+# Coverage
+bun test:coverage
+```
+
+### Manual Testing Checklist
+
+- [ ] Feature works as expected
+- [ ] No console errors
+- [ ] Responsive on mobile
+- [ ] Handles errors gracefully
+- [ ] Loading states work
+- [ ] Form validation works
+- [ ] API returns correct status codes
+
+## Debugging
+
+### VSCode Configuration
+
+Create `.vscode/launch.json`:
+```json
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "bun",
+      "request": "launch", 
+      "name": "Debug Bun",
+      "program": "${workspaceFolder}/src/index.ts",
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "NODE_ENV": "development"
+      }
+    }
+  ]
+}
+```
+
+### Debug Logging
+
+```typescript
+// Development only logging
+if (import.meta.env.DEV) {
+  console.log('[Debug]', data);
+}
+```
+
+## Code Style
+
+### TypeScript
+
+- Use strict mode
+- Define interfaces for all data structures
+- Avoid `any` type
+- Use proper error handling
+
+### React Components
+
+- Use functional components
+- Implement proper loading states
+- Handle errors with error boundaries
+- Use TypeScript for props
+
+### API Routes
+
+- Always validate input
+- Return proper status codes
+- Use consistent error format
+- Document with JSDoc
+
+## Git Workflow
+
+### Commit Messages
+
+Follow conventional commits:
+```
+feat: add repository filtering
+fix: resolve sync timeout issue
+docs: update API documentation
+style: format code with prettier
+refactor: simplify auth logic
+test: add user creation tests
+chore: update dependencies
+```
+
+### Pull Request Process
+
+1. Create feature branch
+2. Make changes
+3. Write/update tests
+4. Update documentation
+5. Create PR with description
+6. Address review feedback
+7. Squash and merge
+
+## Performance
+
+### Development Tips
+
+- Use React DevTools
+- Monitor bundle size
+- Profile database queries
+- Check memory usage
+
+### Optimization
+
+- Lazy load components
+- Optimize images
+- Use database indexes
+- Cache API responses
+
+## Common Issues
+
+### Port Already in Use
+
+```bash
+# Use different port
+PORT=3001 bun run dev
+```
+
+### Database Locked
+
+```bash
+# Reset database
+bun run cleanup-db
+bun run init-db
+```
+
+### Type Errors
+
+```bash
+# Check types
+bunx tsc --noEmit
+```
+
+## Release Process
+
+1. **Update version**:
+```bash
+npm version patch  # or minor/major
+```
+
+2. **Update CHANGELOG.md**
+
+3. **Build and test**:
+```bash
+bun run build
+bun test
+```
+
+4. **Create release**:
+```bash
+git tag v2.23.0
+git push origin v2.23.0
+```
+
+5. **Create GitHub release**
+
+## Contributing
+
+1. Fork the repository
+2. Create your feature branch
+3. Commit your changes
+4. Push to your fork
+5. Create a Pull Request
+
+## Resources
+
+- [Astro Documentation](https://docs.astro.build)
+- [Bun Documentation](https://bun.sh/docs)
+- [Drizzle ORM](https://orm.drizzle.team)
+- [React Documentation](https://react.dev)
+- [TypeScript Handbook](https://www.typescriptlang.org/docs/)
+
+## Getting Help
+
+- Check existing [issues](https://github.com/yourusername/gitea-mirror/issues)
+- Join [discussions](https://github.com/yourusername/gitea-mirror/discussions)
+- Read the [FAQ](./FAQ.md)

docs/EXTENDING.md

@@ -0,0 +1,77 @@
+# Extending Gitea Mirror
+
+Gitea Mirror is designed with extensibility in mind through a module system.
+
+## Module System
+
+The application provides a module interface that allows extending functionality:
+
+```typescript
+export interface Module {
+  name: string;
+  version: string;
+  init(app: AppContext): Promise<void>;
+  cleanup?(): Promise<void>;
+}
+```
+
+## Creating Custom Modules
+
+You can create custom modules to add features:
+
+```typescript
+// my-module.ts
+export class MyModule implements Module {
+  name = 'my-module';
+  version = '1.0.0';
+
+  async init(app: AppContext) {
+    // Add your functionality
+    app.addRoute('/api/my-endpoint', this.handler);
+  }
+
+  async handler(context) {
+    return new Response('Hello from my module!');
+  }
+}
+```
+
+## Module Context
+
+Modules receive an `AppContext` with:
+- Database access
+- Event system
+- Route registration
+- Configuration
+
+## Private Extensions
+
+If you're developing private extensions:
+
+1. Create a separate package/repository
+2. Implement the module interface
+3. Use Bun's linking feature for development:
+   ```bash
+   # In your extension
+   bun link
+   
+   # In gitea-mirror
+   bun link your-extension
+   ```
+
+## Best Practices
+
+- Keep modules focused on a single feature
+- Use TypeScript for type safety
+- Handle errors gracefully
+- Clean up resources in `cleanup()`
+- Document your module's API
+
+## Community Modules
+
+Share your modules with the community:
+- Create a GitHub repository
+- Tag it with `gitea-mirror-module`
+- Submit a PR to list it in our docs
+
+For more details on the module system, see the source code in `/src/lib/modules/`.

docs/README.md

@@ -0,0 +1,118 @@
+# Gitea Mirror Documentation
+
+Welcome to the Gitea Mirror documentation. This guide covers everything you need to know about developing, building, and deploying the open-source version of Gitea Mirror.
+
+## Documentation Overview
+
+### Getting Started
+
+- **[Development Workflow](./DEVELOPMENT_WORKFLOW.md)** - Set up your development environment and start contributing
+- **[Build Guide](./BUILD_GUIDE.md)** - Build Gitea Mirror from source
+- **[Configuration Guide](./CONFIGURATION.md)** - Configure all available options
+
+### Deployment
+
+- **[Deployment Guide](./DEPLOYMENT.md)** - Deploy to production environments
+- **[Docker Guide](./DOCKER.md)** - Container-based deployment
+- **[Reverse Proxy Setup](./REVERSE_PROXY.md)** - Configure with nginx/Caddy
+
+### Features
+
+- **[SSO/OIDC Setup](./SSO-OIDC-SETUP.md)** - Configure authentication providers
+- **[Sponsor Integration](./SPONSOR_INTEGRATION.md)** - GitHub Sponsors integration
+- **[Webhook Configuration](./WEBHOOKS.md)** - Set up GitHub webhooks
+
+### Architecture
+
+- **[Architecture Overview](./ARCHITECTURE.md)** - System design and components
+- **[API Documentation](./API.md)** - REST API endpoints
+- **[Database Schema](./DATABASE.md)** - SQLite structure
+
+### Maintenance
+
+- **[Migration Guide](../MIGRATION_GUIDE.md)** - Upgrade from previous versions
+- **[Better Auth Migration](./BETTER_AUTH_MIGRATION.md)** - Migrate authentication system
+- **[Troubleshooting](./TROUBLESHOOTING.md)** - Common issues and solutions
+- **[Backup & Restore](./BACKUP.md)** - Data management
+
+## Quick Start
+
+1. **Clone and install**:
+```bash
+git clone https://github.com/yourusername/gitea-mirror.git
+cd gitea-mirror
+bun install
+```
+
+2. **Configure**:
+```bash
+cp .env.example .env
+# Edit .env with your GitHub and Gitea tokens
+```
+
+3. **Initialize and run**:
+```bash
+bun run init-db
+bun run dev
+```
+
+4. **Access**: Open http://localhost:4321
+
+## Key Features
+
+- 🔄 **Automatic Mirroring** - Keep repositories synchronized
+- 🗂️ **Organization Support** - Mirror entire organizations
+- ⭐ **Starred Repos** - Mirror your starred repositories
+- 🔐 **Self-Hosted** - Full control over your data
+- 🚀 **Fast** - Built with Bun for optimal performance
+- 🔒 **Secure** - JWT authentication, encrypted tokens
+
+## Technology Stack
+
+- **Runtime**: Bun
+- **Framework**: Astro with React
+- **Database**: SQLite with Drizzle ORM
+- **Styling**: Tailwind CSS v4
+- **Authentication**: Better Auth
+
+## System Requirements
+
+- Bun >= 1.2.9
+- Node.js >= 20 (optional, for compatibility)
+- SQLite 3
+- 512MB RAM minimum
+- 1GB disk space
+
+## Contributing
+
+We welcome contributions! Please see our [Contributing Guide](../CONTRIBUTING.md) for details.
+
+### Development Setup
+
+1. Fork the repository
+2. Create a feature branch
+3. Make your changes
+4. Add tests
+5. Submit a pull request
+
+### Code of Conduct
+
+Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing.
+
+## Support
+
+- **Issues**: [GitHub Issues](https://github.com/yourusername/gitea-mirror/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/yourusername/gitea-mirror/discussions)
+- **Wiki**: [GitHub Wiki](https://github.com/yourusername/gitea-mirror/wiki)
+
+## Security
+
+For security issues, please see [SECURITY.md](../SECURITY.md).
+
+## License
+
+Gitea Mirror is open source software licensed under the [MIT License](../LICENSE).
+
+---
+
+For detailed information on any topic, please refer to the specific documentation guides listed above.

docs/SPONSOR_INTEGRATION.md

@@ -0,0 +1,91 @@
+# GitHub Sponsors Integration
+
+This guide shows how GitHub Sponsors is integrated into the open-source version of Gitea Mirror.
+
+## Components
+
+### GitHubSponsors Card
+
+A card component that displays in the sidebar or dashboard:
+
+```tsx
+import { GitHubSponsors } from '@/components/sponsors/GitHubSponsors';
+
+// In your layout or dashboard
+<GitHubSponsors />
+```
+
+### SponsorButton
+
+A smaller button for headers or navigation:
+
+```tsx
+import { SponsorButton } from '@/components/sponsors/GitHubSponsors';
+
+// In your header
+<SponsorButton />
+```
+
+## Integration Points
+
+### 1. Dashboard Sidebar
+
+Add the sponsor card to the dashboard sidebar for visibility:
+
+```tsx
+// src/components/layout/DashboardLayout.tsx
+<aside>
+  {/* Other sidebar content */}
+  <GitHubSponsors />
+</aside>
+```
+
+### 2. Header Navigation
+
+Add the sponsor button to the main navigation:
+
+```tsx
+// src/components/layout/Header.tsx
+<nav>
+  {/* Other nav items */}
+  <SponsorButton />
+</nav>
+```
+
+### 3. Settings Page
+
+Add a support section in settings:
+
+```tsx
+// src/components/settings/SupportSection.tsx
+<Card>
+  <CardHeader>
+    <CardTitle>Support Development</CardTitle>
+  </CardHeader>
+  <CardContent>
+    <GitHubSponsors />
+  </CardContent>
+</Card>
+```
+
+## Behavior
+
+- **Only appears in self-hosted mode**: The components automatically hide in hosted mode
+- **Non-intrusive**: Designed to be helpful without being annoying
+- **Multiple options**: GitHub Sponsors, Buy Me a Coffee, and starring the repo
+
+## Customization
+
+You can customize the sponsor components by:
+
+1. Updating the GitHub Sponsors URL
+2. Adding/removing donation platforms
+3. Changing the styling to match your theme
+4. Adjusting the placement based on user feedback
+
+## Best Practices
+
+1. **Don't be pushy**: Show sponsor options tastefully
+2. **Provide value first**: Ensure the tool is useful before asking for support
+3. **Be transparent**: Explain how sponsorships help the project
+4. **Thank sponsors**: Acknowledge supporters in README or releases

docs/SSO-OIDC-SETUP.md

@@ -0,0 +1,205 @@
+# SSO and OIDC Setup Guide
+
+This guide explains how to configure Single Sign-On (SSO) and OpenID Connect (OIDC) provider functionality in Gitea Mirror.
+
+## Overview
+
+Gitea Mirror supports three authentication methods:
+
+1. **Email & Password** - Traditional authentication (always enabled)
+2. **SSO (Single Sign-On)** - Allow users to authenticate using external OIDC providers
+3. **OIDC Provider** - Allow other applications to authenticate users through Gitea Mirror
+
+## Configuration
+
+All SSO and OIDC settings are managed through the web UI in the Configuration page under the "Authentication" tab.
+
+## Setting up SSO (Single Sign-On)
+
+SSO allows your users to sign in using external identity providers like Google, Okta, Azure AD, etc.
+
+### Adding an SSO Provider
+
+1. Navigate to Configuration → Authentication → SSO Providers
+2. Click "Add Provider"
+3. Fill in the provider details:
+
+#### Required Fields
+
+- **Issuer URL**: The OIDC issuer URL (e.g., `https://accounts.google.com`)
+- **Domain**: The email domain for this provider (e.g., `example.com`)
+- **Provider ID**: A unique identifier for this provider (e.g., `google-sso`)
+- **Client ID**: The OAuth client ID from your provider
+- **Client Secret**: The OAuth client secret from your provider
+
+#### Auto-Discovery
+
+If your provider supports OIDC discovery, you can:
+1. Enter the Issuer URL
+2. Click "Discover"
+3. The system will automatically fetch the authorization and token endpoints
+
+#### Manual Configuration
+
+For providers without discovery support, manually enter:
+- **Authorization Endpoint**: The OAuth authorization URL
+- **Token Endpoint**: The OAuth token exchange URL
+- **JWKS Endpoint**: The JSON Web Key Set URL (optional)
+- **UserInfo Endpoint**: The user information endpoint (optional)
+
+### Redirect URL
+
+When configuring your SSO provider, use this redirect URL:
+```
+https://your-domain.com/api/auth/sso/callback/{provider-id}
+```
+
+Replace `{provider-id}` with your chosen Provider ID.
+
+### Example: Google SSO Setup
+
+1. Go to [Google Cloud Console](https://console.cloud.google.com/)
+2. Create a new OAuth 2.0 Client ID
+3. Add authorized redirect URI: `https://your-domain.com/api/auth/sso/callback/google-sso`
+4. In Gitea Mirror:
+   - Issuer URL: `https://accounts.google.com`
+   - Domain: `your-company.com`
+   - Provider ID: `google-sso`
+   - Client ID: [Your Google Client ID]
+   - Client Secret: [Your Google Client Secret]
+   - Click "Discover" to auto-fill endpoints
+
+### Example: Okta SSO Setup
+
+1. In Okta Admin Console, create a new OIDC Web Application
+2. Set redirect URI: `https://your-domain.com/api/auth/sso/callback/okta-sso`
+3. In Gitea Mirror:
+   - Issuer URL: `https://your-okta-domain.okta.com`
+   - Domain: `your-company.com`
+   - Provider ID: `okta-sso`
+   - Client ID: [Your Okta Client ID]
+   - Client Secret: [Your Okta Client Secret]
+   - Click "Discover" to auto-fill endpoints
+
+## Setting up OIDC Provider
+
+The OIDC Provider feature allows other applications to use Gitea Mirror as their authentication provider.
+
+### Creating OAuth Applications
+
+1. Navigate to Configuration → Authentication → OAuth Applications
+2. Click "Create Application"
+3. Fill in the application details:
+   - **Application Name**: Display name for the application
+   - **Application Type**: Web, Mobile, or Desktop
+   - **Redirect URLs**: One or more redirect URLs (one per line)
+
+4. After creation, you'll receive:
+   - **Client ID**: Share this with the application
+   - **Client Secret**: Keep this secure and share only once
+
+### OIDC Endpoints
+
+Applications can use these standard OIDC endpoints:
+
+- **Discovery**: `https://your-domain.com/.well-known/openid-configuration`
+- **Authorization**: `https://your-domain.com/api/auth/oauth2/authorize`
+- **Token**: `https://your-domain.com/api/auth/oauth2/token`
+- **UserInfo**: `https://your-domain.com/api/auth/oauth2/userinfo`
+- **JWKS**: `https://your-domain.com/api/auth/jwks`
+
+### Supported Scopes
+
+- `openid` - Required, provides user ID
+- `profile` - User's name, username, and profile picture
+- `email` - User's email address and verification status
+
+### Example: Configuring Another Application
+
+For an application to use Gitea Mirror as its OIDC provider:
+
+```javascript
+// Example configuration for another app
+const oidcConfig = {
+  issuer: 'https://gitea-mirror.example.com',
+  clientId: 'client_xxxxxxxxxxxxx',
+  clientSecret: 'secret_xxxxxxxxxxxxx',
+  redirectUri: 'https://myapp.com/auth/callback',
+  scope: 'openid profile email'
+};
+```
+
+## User Experience
+
+### Logging In with SSO
+
+When SSO is configured:
+
+1. Users see tabs for "Email" and "SSO" on the login page
+2. In the SSO tab, they can:
+   - Click a specific provider button (if configured)
+   - Enter their work email to be redirected to the appropriate provider
+
+### OAuth Consent Flow
+
+When an application requests authentication:
+
+1. Users are redirected to Gitea Mirror
+2. If not logged in, they authenticate first
+3. They see a consent screen showing:
+   - Application name
+   - Requested permissions
+   - Option to approve or deny
+
+## Security Considerations
+
+1. **Client Secrets**: Store OAuth client secrets securely
+2. **Redirect URLs**: Only add trusted redirect URLs for applications
+3. **Scopes**: Applications only receive the data for approved scopes
+4. **Token Security**: Access tokens expire and can be revoked
+
+## Troubleshooting
+
+### SSO Login Issues
+
+1. **"Invalid origin" error**: Check that your Gitea Mirror URL matches the configured redirect URI
+2. **"Provider not found" error**: Ensure the provider is properly configured and enabled
+3. **Redirect loop**: Verify the redirect URI in both Gitea Mirror and the SSO provider match exactly
+
+### OIDC Provider Issues
+
+1. **Application not found**: Ensure the client ID is correct
+2. **Invalid redirect URI**: The redirect URI must match exactly what's configured
+3. **Consent not working**: Check browser cookies are enabled
+
+## Managing Access
+
+### Revoking SSO Access
+
+Currently, SSO sessions are managed through the identity provider. To revoke access:
+1. Log out of Gitea Mirror
+2. Revoke access in your identity provider's settings
+
+### Disabling OAuth Applications
+
+To disable an application:
+1. Go to Configuration → Authentication → OAuth Applications
+2. Find the application
+3. Click the delete button
+
+This immediately prevents the application from authenticating new users.
+
+## Best Practices
+
+1. **Use HTTPS**: Always use HTTPS in production for security
+2. **Regular Audits**: Periodically review configured SSO providers and OAuth applications
+3. **Principle of Least Privilege**: Only grant necessary scopes to applications
+4. **Monitor Usage**: Keep track of which applications are accessing your OIDC provider
+5. **Secure Storage**: Store client secrets in a secure location, never in code
+
+## Migration Notes
+
+If migrating from the previous JWT-based authentication:
+- Existing users remain unaffected
+- Users can continue using email/password authentication
+- SSO can be added as an additional authentication method

drizzle.config.ts

@@ -0,0 +1,16 @@
+import { defineConfig } from "drizzle-kit";
+
+export default defineConfig({
+  dialect: "sqlite",
+  schema: "./src/lib/db/schema.ts",
+  out: "./drizzle",
+  dbCredentials: {
+    url: "./data/gitea-mirror.db",
+  },
+  verbose: true,
+  strict: true,
+  migrations: {
+    table: "__drizzle_migrations",
+    schema: "main",
+  },
+});

drizzle/0000_init.sql

@@ -0,0 +1,180 @@
+CREATE TABLE `accounts` (
+	`id` text PRIMARY KEY NOT NULL,
+	`account_id` text NOT NULL,
+	`user_id` text NOT NULL,
+	`provider_id` text NOT NULL,
+	`provider_user_id` text,
+	`access_token` text,
+	`refresh_token` text,
+	`expires_at` integer,
+	`password` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_accounts_account_id` ON `accounts` (`account_id`);--> statement-breakpoint
+CREATE INDEX `idx_accounts_user_id` ON `accounts` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_accounts_provider` ON `accounts` (`provider_id`,`provider_user_id`);--> statement-breakpoint
+CREATE TABLE `configs` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`name` text NOT NULL,
+	`is_active` integer DEFAULT true NOT NULL,
+	`github_config` text NOT NULL,
+	`gitea_config` text NOT NULL,
+	`include` text DEFAULT '["*"]' NOT NULL,
+	`exclude` text DEFAULT '[]' NOT NULL,
+	`schedule_config` text NOT NULL,
+	`cleanup_config` text NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE TABLE `events` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`channel` text NOT NULL,
+	`payload` text NOT NULL,
+	`read` integer DEFAULT false NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_events_user_channel` ON `events` (`user_id`,`channel`);--> statement-breakpoint
+CREATE INDEX `idx_events_created_at` ON `events` (`created_at`);--> statement-breakpoint
+CREATE INDEX `idx_events_read` ON `events` (`read`);--> statement-breakpoint
+CREATE TABLE `mirror_jobs` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`repository_id` text,
+	`repository_name` text,
+	`organization_id` text,
+	`organization_name` text,
+	`details` text,
+	`status` text DEFAULT 'imported' NOT NULL,
+	`message` text NOT NULL,
+	`timestamp` integer DEFAULT (unixepoch()) NOT NULL,
+	`job_type` text DEFAULT 'mirror' NOT NULL,
+	`batch_id` text,
+	`total_items` integer,
+	`completed_items` integer DEFAULT 0,
+	`item_ids` text,
+	`completed_item_ids` text DEFAULT '[]',
+	`in_progress` integer DEFAULT false NOT NULL,
+	`started_at` integer,
+	`completed_at` integer,
+	`last_checkpoint` integer,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_mirror_jobs_user_id` ON `mirror_jobs` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_mirror_jobs_batch_id` ON `mirror_jobs` (`batch_id`);--> statement-breakpoint
+CREATE INDEX `idx_mirror_jobs_in_progress` ON `mirror_jobs` (`in_progress`);--> statement-breakpoint
+CREATE INDEX `idx_mirror_jobs_job_type` ON `mirror_jobs` (`job_type`);--> statement-breakpoint
+CREATE INDEX `idx_mirror_jobs_timestamp` ON `mirror_jobs` (`timestamp`);--> statement-breakpoint
+CREATE TABLE `organizations` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`config_id` text NOT NULL,
+	`name` text NOT NULL,
+	`avatar_url` text NOT NULL,
+	`membership_role` text DEFAULT 'member' NOT NULL,
+	`is_included` integer DEFAULT true NOT NULL,
+	`destination_org` text,
+	`status` text DEFAULT 'imported' NOT NULL,
+	`last_mirrored` integer,
+	`error_message` text,
+	`repository_count` integer DEFAULT 0 NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action,
+	FOREIGN KEY (`config_id`) REFERENCES `configs`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_organizations_user_id` ON `organizations` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_organizations_config_id` ON `organizations` (`config_id`);--> statement-breakpoint
+CREATE INDEX `idx_organizations_status` ON `organizations` (`status`);--> statement-breakpoint
+CREATE INDEX `idx_organizations_is_included` ON `organizations` (`is_included`);--> statement-breakpoint
+CREATE TABLE `repositories` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`config_id` text NOT NULL,
+	`name` text NOT NULL,
+	`full_name` text NOT NULL,
+	`url` text NOT NULL,
+	`clone_url` text NOT NULL,
+	`owner` text NOT NULL,
+	`organization` text,
+	`mirrored_location` text DEFAULT '',
+	`is_private` integer DEFAULT false NOT NULL,
+	`is_fork` integer DEFAULT false NOT NULL,
+	`forked_from` text,
+	`has_issues` integer DEFAULT false NOT NULL,
+	`is_starred` integer DEFAULT false NOT NULL,
+	`is_archived` integer DEFAULT false NOT NULL,
+	`size` integer DEFAULT 0 NOT NULL,
+	`has_lfs` integer DEFAULT false NOT NULL,
+	`has_submodules` integer DEFAULT false NOT NULL,
+	`language` text,
+	`description` text,
+	`default_branch` text NOT NULL,
+	`visibility` text DEFAULT 'public' NOT NULL,
+	`status` text DEFAULT 'imported' NOT NULL,
+	`last_mirrored` integer,
+	`error_message` text,
+	`destination_org` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action,
+	FOREIGN KEY (`config_id`) REFERENCES `configs`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_repositories_user_id` ON `repositories` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_config_id` ON `repositories` (`config_id`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_status` ON `repositories` (`status`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_owner` ON `repositories` (`owner`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_organization` ON `repositories` (`organization`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_is_fork` ON `repositories` (`is_fork`);--> statement-breakpoint
+CREATE INDEX `idx_repositories_is_starred` ON `repositories` (`is_starred`);--> statement-breakpoint
+CREATE TABLE `sessions` (
+	`id` text PRIMARY KEY NOT NULL,
+	`token` text NOT NULL,
+	`user_id` text NOT NULL,
+	`expires_at` integer NOT NULL,
+	`ip_address` text,
+	`user_agent` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `sessions_token_unique` ON `sessions` (`token`);--> statement-breakpoint
+CREATE INDEX `idx_sessions_user_id` ON `sessions` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_sessions_token` ON `sessions` (`token`);--> statement-breakpoint
+CREATE INDEX `idx_sessions_expires_at` ON `sessions` (`expires_at`);--> statement-breakpoint
+CREATE TABLE `users` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text,
+	`email` text NOT NULL,
+	`email_verified` integer DEFAULT false NOT NULL,
+	`image` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`username` text
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `users_email_unique` ON `users` (`email`);--> statement-breakpoint
+CREATE TABLE `verification_tokens` (
+	`id` text PRIMARY KEY NOT NULL,
+	`token` text NOT NULL,
+	`identifier` text NOT NULL,
+	`type` text NOT NULL,
+	`expires_at` integer NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `verification_tokens_token_unique` ON `verification_tokens` (`token`);--> statement-breakpoint
+CREATE INDEX `idx_verification_tokens_token` ON `verification_tokens` (`token`);--> statement-breakpoint
+CREATE INDEX `idx_verification_tokens_identifier` ON `verification_tokens` (`identifier`);

drizzle/0001_polite_exodus.sql

@@ -0,0 +1,64 @@
+CREATE TABLE `oauth_access_tokens` (
+	`id` text PRIMARY KEY NOT NULL,
+	`access_token` text NOT NULL,
+	`refresh_token` text,
+	`access_token_expires_at` integer NOT NULL,
+	`refresh_token_expires_at` integer,
+	`client_id` text NOT NULL,
+	`user_id` text NOT NULL,
+	`scopes` text NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_oauth_access_tokens_access_token` ON `oauth_access_tokens` (`access_token`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_access_tokens_user_id` ON `oauth_access_tokens` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_access_tokens_client_id` ON `oauth_access_tokens` (`client_id`);--> statement-breakpoint
+CREATE TABLE `oauth_applications` (
+	`id` text PRIMARY KEY NOT NULL,
+	`client_id` text NOT NULL,
+	`client_secret` text NOT NULL,
+	`name` text NOT NULL,
+	`redirect_urls` text NOT NULL,
+	`metadata` text,
+	`type` text NOT NULL,
+	`disabled` integer DEFAULT false NOT NULL,
+	`user_id` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `oauth_applications_client_id_unique` ON `oauth_applications` (`client_id`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_applications_client_id` ON `oauth_applications` (`client_id`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_applications_user_id` ON `oauth_applications` (`user_id`);--> statement-breakpoint
+CREATE TABLE `oauth_consent` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`client_id` text NOT NULL,
+	`scopes` text NOT NULL,
+	`consent_given` integer NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+CREATE INDEX `idx_oauth_consent_user_id` ON `oauth_consent` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_consent_client_id` ON `oauth_consent` (`client_id`);--> statement-breakpoint
+CREATE INDEX `idx_oauth_consent_user_client` ON `oauth_consent` (`user_id`,`client_id`);--> statement-breakpoint
+CREATE TABLE `sso_providers` (
+	`id` text PRIMARY KEY NOT NULL,
+	`issuer` text NOT NULL,
+	`domain` text NOT NULL,
+	`oidc_config` text NOT NULL,
+	`user_id` text NOT NULL,
+	`provider_id` text NOT NULL,
+	`organization_id` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `sso_providers_provider_id_unique` ON `sso_providers` (`provider_id`);--> statement-breakpoint
+CREATE INDEX `idx_sso_providers_provider_id` ON `sso_providers` (`provider_id`);--> statement-breakpoint
+CREATE INDEX `idx_sso_providers_domain` ON `sso_providers` (`domain`);--> statement-breakpoint
+CREATE INDEX `idx_sso_providers_issuer` ON `sso_providers` (`issuer`);

drizzle/meta/_journal.json

@@ -0,0 +1,20 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1752171873627,
+      "tag": "0000_init",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1752173351102,
+      "tag": "0001_polite_exodus",
+      "breakpoints": true
+    }
+  ]
+}

env.d.ts

@@ -0,0 +1,9 @@
+/// <reference path="./.astro/types.d.ts" />
+/// <reference types="astro/client" />
+
+declare namespace App {
+  interface Locals {
+    user: import("better-auth").User | null;
+    session: import("better-auth").Session | null;
+  }
+}

package.json

@@ -1,13 +1,13 @@
 {
   "name": "gitea-mirror",
   "type": "module",
-  "version": "2.9.3",
+  "version": "3.1.1",
   "engines": {
     "bun": ">=1.2.9"
   },
   "scripts": {
     "setup": "bun install && bun run manage-db init",
-    "dev": "bunx --bun astro dev",
+    "dev": "bunx --bun astro dev --port 9876",
     "dev:clean": "bun run cleanup-db && bun run manage-db init && bunx --bun astro dev",
     "build": "bunx --bun astro build",
     "cleanup-db": "rm -f gitea-mirror.db data/gitea-mirror.db",
@@ -16,7 +16,12 @@
     "check-db": "bun scripts/manage-db.ts check",
     "fix-db": "bun scripts/manage-db.ts fix",
     "reset-users": "bun scripts/manage-db.ts reset-users",
-
+    "db:generate": "bun drizzle-kit generate",
+    "db:migrate": "bun drizzle-kit migrate",
+    "db:push": "bun drizzle-kit push",
+    "db:pull": "bun drizzle-kit pull",
+    "db:check": "bun drizzle-kit check",
+    "db:studio": "bun drizzle-kit studio",
     "startup-recovery": "bun scripts/startup-recovery.ts",
     "startup-recovery-force": "bun scripts/startup-recovery.ts --force",
     "test-recovery": "bun scripts/test-recovery.ts",
@@ -32,58 +37,70 @@
     "astro": "bunx --bun astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.2.6",
-    "@astrojs/node": "^9.2.1",
-    "@astrojs/react": "^4.2.7",
-    "@octokit/rest": "^21.1.1",
-    "@radix-ui/react-avatar": "^1.1.9",
-    "@radix-ui/react-checkbox": "^1.3.1",
-    "@radix-ui/react-dialog": "^1.1.13",
-    "@radix-ui/react-dropdown-menu": "^2.1.14",
-    "@radix-ui/react-label": "^2.1.6",
-    "@radix-ui/react-popover": "^1.1.13",
-    "@radix-ui/react-radio-group": "^1.3.6",
-    "@radix-ui/react-select": "^2.2.4",
-    "@radix-ui/react-slot": "^1.2.2",
+    "@astrojs/check": "^0.9.4",
+    "@astrojs/mdx": "^4.3.0",
+    "@astrojs/node": "9.3.0",
+    "@astrojs/react": "^4.3.0",
+    "@better-auth/sso": "^1.3.2",
+    "@octokit/rest": "^22.0.0",
+    "@radix-ui/react-accordion": "^1.2.11",
+    "@radix-ui/react-avatar": "^1.1.10",
+    "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-collapsible": "^1.1.11",
+    "@radix-ui/react-dialog": "^1.1.14",
+    "@radix-ui/react-dropdown-menu": "^2.1.15",
+    "@radix-ui/react-hover-card": "^1.1.14",
+    "@radix-ui/react-label": "^2.1.7",
+    "@radix-ui/react-popover": "^1.1.14",
+    "@radix-ui/react-radio-group": "^1.3.7",
+    "@radix-ui/react-scroll-area": "^1.2.9",
+    "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
+    "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-switch": "^1.2.5",
-    "@radix-ui/react-tabs": "^1.1.11",
-    "@radix-ui/react-tooltip": "^1.2.6",
-    "@tailwindcss/vite": "^4.1.7",
-    "@tanstack/react-virtual": "^3.13.8",
+    "@radix-ui/react-tabs": "^1.1.12",
+    "@radix-ui/react-tooltip": "^1.2.7",
+    "@tailwindcss/vite": "^4.1.11",
+    "@tanstack/react-virtual": "^3.13.12",
     "@types/canvas-confetti": "^1.9.0",
-    "@types/react": "^19.1.4",
-    "@types/react-dom": "^19.1.5",
-    "astro": "^5.7.13",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "astro": "5.11.2",
     "bcryptjs": "^3.0.2",
+    "better-auth": "^1.2.12",
     "canvas-confetti": "^1.9.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "drizzle-orm": "^0.43.1",
+    "drizzle-orm": "^0.44.3",
     "fuse.js": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
-    "lucide-react": "^0.511.0",
+    "lucide-react": "^0.525.0",
     "next-themes": "^0.4.6",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-icons": "^5.5.0",
-    "sonner": "^2.0.3",
-    "tailwind-merge": "^3.3.0",
-    "tailwindcss": "^4.1.7",
-    "tw-animate-css": "^1.3.0",
+    "sonner": "^2.0.6",
+    "tailwind-merge": "^3.3.1",
+    "tailwindcss": "^4.1.11",
+    "tw-animate-css": "^1.3.5",
+    "typescript": "^5.8.3",
     "uuid": "^11.1.0",
-    "zod": "^3.25.7"
+    "vaul": "^1.1.2",
+    "zod": "^4.0.5"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@types/bcryptjs": "^3.0.0",
-    "@types/jsonwebtoken": "^9.0.9",
+    "@types/bun": "^1.2.18",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/uuid": "^10.0.0",
-    "@vitejs/plugin-react": "^4.4.1",
+    "@vitejs/plugin-react": "^4.6.0",
+    "drizzle-kit": "^0.31.4",
     "jsdom": "^26.1.0",
-    "tsx": "^4.19.4",
-    "vitest": "^3.1.4"
+    "tsx": "^4.20.3",
+    "vitest": "^3.2.4"
   },
-  "packageManager": "bun@1.2.9"
+  "packageManager": "bun@1.2.18"
 }

scripts/README-dev.md

@@ -0,0 +1,56 @@
+# Development Environment Setup
+
+This directory contains scripts to help set up a development environment with a pre-configured Gitea instance.
+
+## Default Credentials
+
+For development convenience, the Gitea instance is pre-configured with:
+
+- **Admin Username**: `admin`
+- **Admin Password**: `admin123`
+- **Gitea URL**: http://localhost:3001
+
+## Files
+
+- `gitea-app.ini` - Pre-configured Gitea settings for development
+- `gitea-dev-init.sh` - Initialization script that copies the config on first run
+- `gitea-init.sql` - SQL script to create default admin user (not currently used)
+
+## Usage
+
+1. Start the development environment:
+   ```bash
+   docker compose -f docker-compose.dev.yml down
+   docker volume rm gitea-mirror_gitea-data gitea-mirror_gitea-config
+   docker compose -f docker-compose.dev.yml up -d
+   ```
+
+2. Wait for Gitea to start (check logs):
+   ```bash
+   docker logs -f gitea
+   ```
+
+3. Access Gitea at http://localhost:3001 and login with:
+   - Username: `admin`
+   - Password: `admin123`
+
+4. Generate an API token:
+   - Go to Settings → Applications
+   - Generate New Token
+   - Give it a name like "gitea-mirror"
+   - Select all permissions (for development)
+   - Copy the token
+
+5. Configure gitea-mirror with the token in your `.env` file or through the web UI.
+
+## Troubleshooting
+
+If Gitea doesn't start properly:
+
+1. Check logs: `docker logs gitea`
+2. Ensure volumes are clean: `docker volume rm gitea-mirror_gitea-data gitea-mirror_gitea-config`
+3. Restart: `docker compose -f docker-compose.dev.yml up -d`
+
+## Security Note
+
+⚠️ **These credentials are for development only!** Never use these settings in production.

scripts/README-lxc.md

@@ -1,42 +1,47 @@
 # LXC Container Deployment Guide
 
 ## Overview
-Run **Gitea Mirror** in an isolated LXC container, either:
+Run **Gitea Mirror** in an isolated LXC container:
 
-1. **Online, on a Proxmox VE host** – script pulls everything from GitHub
-2. **Offline / LAN-only, on a developer laptop** – script pushes your local checkout + Bun ZIP
+1. **Proxmox VE (Recommended)** – Using the community-maintained script
+2. **Local Development** – Using the local LXC script for testing
 
 ---
 
-## 1. Proxmox VE (online, recommended for prod)
+## 1. Proxmox VE Installation (Recommended)
 
 ### Prerequisites
-* Proxmox VE node with the default `vmbr0` bridge
-* Root shell on the node
-* Ubuntu 22.04 LXC template present (`pveam update && pveam download ...`)
+* Proxmox VE host with internet access
+* Root shell access on the Proxmox node
 
 ### One-command install
 
 ```bash
-# Community-maintained script for Proxmox VE by Tobias ([CrazyWolf13](https://github.com/CrazyWolf13))
-# at [community-scripts/ProxmoxVED](https://github.com/community-scripts/ProxmoxVED)
-sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/gitea-mirror-install.sh)"
+# Community-maintained script from the Proxmox VE Community Scripts project
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/gitea-mirror.sh)"
 ```
 
-What it does:
+### What the script does:
 
-* Uses the community-maintained script from ProxmoxVED
-* Installs dependencies and Bun runtime
-* Clones & builds `arunavo4/gitea-mirror`
-* Creates a systemd service and starts it
-* Sets up a random `JWT_SECRET` for security
+* Creates a privileged Alpine Linux LXC container
+* Installs Bun runtime environment
+* Clones the Gitea Mirror repository
+* Builds the application
+* Configures a systemd service for automatic startup
+* Sets up the application to run on port 4321
+* Generates a secure `JWT_SECRET` automatically
 
-Browse to:
+### Accessing Gitea Mirror:
 
 ```
 http://<container-ip>:4321
 ```
 
+### Additional Information:
+* **Script Source**: [Community Scripts for Proxmox VE](https://github.com/community-scripts/ProxmoxVE)
+* **Documentation**: [Gitea Mirror Script Documentation](https://community-scripts.github.io/ProxmoxVE/scripts?id=gitea-mirror)
+* **Support**: [Community Scripts Discord](https://discord.gg/fiXVvSHnBU)
+
 ---
 
 ## 2. Local testing (LXD on a workstation, works offline)
@@ -51,7 +56,7 @@ http://<container-ip>:4321
 ### Offline installer script
 
 ```bash
-git clone https://github.com/arunavo4/gitea-mirror.git   # if not already
+git clone https://github.com/RayLabsHQ/gitea-mirror.git   # if not already
 curl -fsSL https://raw.githubusercontent.com/arunavo4/gitea-mirror/main/scripts/gitea-mirror-lxc-local.sh -o gitea-mirror-lxc-local.sh
 chmod +x gitea-mirror-lxc-local.sh
 

scripts/cleanup-duplicate-repos.ts

@@ -0,0 +1,129 @@
+#!/usr/bin/env bun
+
+/**
+ * Script to find and clean up duplicate repositories in the database
+ * Keeps the most recent entry and removes older duplicates
+ * 
+ * Usage: bun scripts/cleanup-duplicate-repos.ts [--dry-run] [--repo-name=<name>]
+ */
+
+import { db, repositories, mirrorJobs } from "@/lib/db";
+import { eq, and, desc } from "drizzle-orm";
+
+const isDryRun = process.argv.includes("--dry-run");
+const specificRepo = process.argv.find(arg => arg.startsWith("--repo-name="))?.split("=")[1];
+
+async function findDuplicateRepositories() {
+  console.log("🔍 Finding duplicate repositories");
+  console.log("=" .repeat(40));
+  
+  if (isDryRun) {
+    console.log("🔍 DRY RUN MODE - No changes will be made");
+    console.log("");
+  }
+
+  if (specificRepo) {
+    console.log(`🎯 Targeting specific repository: ${specificRepo}`);
+    console.log("");
+  }
+
+  try {
+    // Find all repositories, grouped by name and fullName
+    let allRepos = await db.select().from(repositories);
+
+    if (specificRepo) {
+      allRepos = allRepos.filter(repo => repo.name === specificRepo);
+    }
+
+    // Group repositories by name and fullName
+    const repoGroups = new Map<string, typeof allRepos>();
+    
+    for (const repo of allRepos) {
+      const key = `${repo.name}|${repo.fullName}`;
+      if (!repoGroups.has(key)) {
+        repoGroups.set(key, []);
+      }
+      repoGroups.get(key)!.push(repo);
+    }
+
+    // Find groups with duplicates
+    const duplicateGroups = Array.from(repoGroups.entries())
+      .filter(([_, repos]) => repos.length > 1);
+
+    if (duplicateGroups.length === 0) {
+      console.log("✅ No duplicate repositories found");
+      return;
+    }
+
+    console.log(`📋 Found ${duplicateGroups.length} sets of duplicate repositories:`);
+    console.log("");
+
+    let totalDuplicates = 0;
+    let totalRemoved = 0;
+
+    for (const [key, repos] of duplicateGroups) {
+      const [name, fullName] = key.split("|");
+      console.log(`🔄 Processing duplicates for: ${name} (${fullName})`);
+      console.log(`   Found ${repos.length} entries:`);
+
+      // Sort by updatedAt descending to keep the most recent
+      repos.sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
+
+      const keepRepo = repos[0];
+      const removeRepos = repos.slice(1);
+
+      console.log(`   ✅ Keeping: ID ${keepRepo.id} (Status: ${keepRepo.status}, Updated: ${new Date(keepRepo.updatedAt).toISOString()})`);
+
+      for (const repo of removeRepos) {
+        console.log(`   ❌ Removing: ID ${repo.id} (Status: ${repo.status}, Updated: ${new Date(repo.updatedAt).toISOString()})`);
+        
+        if (!isDryRun) {
+          try {
+            // First, delete related mirror jobs
+            await db
+              .delete(mirrorJobs)
+              .where(eq(mirrorJobs.repositoryId, repo.id!));
+
+            // Then delete the repository
+            await db
+              .delete(repositories)
+              .where(eq(repositories.id, repo.id!));
+
+            console.log(`     🗑️  Deleted repository and related mirror jobs`);
+            totalRemoved++;
+          } catch (error) {
+            console.log(`     ❌ Error deleting repository: ${error instanceof Error ? error.message : String(error)}`);
+          }
+        } else {
+          console.log(`     🗑️  Would delete repository and related mirror jobs`);
+          totalRemoved++;
+        }
+      }
+
+      totalDuplicates += removeRepos.length;
+      console.log("");
+    }
+
+    console.log("📊 Cleanup Summary:");
+    console.log(`   Duplicate sets found: ${duplicateGroups.length}`);
+    console.log(`   Total duplicates: ${totalDuplicates}`);
+    console.log(`   ${isDryRun ? 'Would remove' : 'Removed'}: ${totalRemoved}`);
+
+    if (isDryRun && totalRemoved > 0) {
+      console.log("");
+      console.log("💡 To apply these changes, run the script without --dry-run");
+    }
+
+  } catch (error) {
+    console.error("❌ Error during cleanup process:", error);
+  }
+}
+
+// Run the cleanup
+findDuplicateRepositories().then(() => {
+  console.log("Cleanup process complete.");
+  process.exit(0);
+}).catch((error) => {
+  console.error("Fatal error:", error);
+  process.exit(1);
+});

scripts/fix-interrupted-jobs.ts

@@ -10,7 +10,7 @@
  */
 
 import { db, mirrorJobs } from "../src/lib/db";
-import { eq } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
 
 // Parse command line arguments
 const args = process.argv.slice(2);
@@ -21,18 +21,19 @@ async function fixInterruptedJobs() {
     console.log("Checking for interrupted jobs...");
 
     // Build the query
-    let query = db
-      .select()
-      .from(mirrorJobs)
-      .where(eq(mirrorJobs.inProgress, true));
+    const whereConditions = userId 
+      ? and(eq(mirrorJobs.inProgress, true), eq(mirrorJobs.userId, userId))
+      : eq(mirrorJobs.inProgress, true);
 
     if (userId) {
       console.log(`Filtering for user: ${userId}`);
-      query = query.where(eq(mirrorJobs.userId, userId));
     }
 
     // Find all in-progress jobs
-    const inProgressJobs = await query;
+    const inProgressJobs = await db
+      .select()
+      .from(mirrorJobs)
+      .where(whereConditions);
 
     if (inProgressJobs.length === 0) {
       console.log("No interrupted jobs found.");
@@ -45,7 +46,7 @@ async function fixInterruptedJobs() {
     });
 
     // Mark all in-progress jobs as failed
-    let updateQuery = db
+    await db
       .update(mirrorJobs)
       .set({
         inProgress: false,
@@ -53,13 +54,7 @@ async function fixInterruptedJobs() {
         status: "failed",
         message: "Job interrupted and marked as failed by cleanup script"
       })
-      .where(eq(mirrorJobs.inProgress, true));
-
-    if (userId) {
-      updateQuery = updateQuery.where(eq(mirrorJobs.userId, userId));
-    }
-
-    await updateQuery;
+      .where(whereConditions);
 
     console.log(`✅ Successfully marked ${inProgressJobs.length} interrupted jobs as failed.`);
     console.log("These jobs can now be deleted through the normal cleanup process.");

scripts/generate-better-auth-schema.ts

@@ -0,0 +1,110 @@
+#!/usr/bin/env bun
+
+import { betterAuth } from "better-auth";
+import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import Database from "bun:sqlite";
+import { drizzle } from "drizzle-orm/bun-sqlite";
+import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+
+// Create a minimal auth instance just for schema generation
+const tempDb = new Database(":memory:");
+const db = drizzle({ client: tempDb });
+
+// Minimal auth config for schema generation
+const auth = betterAuth({
+  database: drizzleAdapter(db, {
+    provider: "sqlite",
+    usePlural: true,
+  }),
+  emailAndPassword: {
+    enabled: true,
+  },
+});
+
+// Generate the schema
+// Note: $internal API is not available in current better-auth version
+// const schema = auth.$internal.schema;
+
+console.log("Better Auth Tables Required:");
+console.log("============================");
+
+// Convert Better Auth schema to Drizzle schema definitions
+const drizzleSchemaCode = `// Better Auth Tables - Generated Schema
+import { sqliteTable, text, integer, index } from "drizzle-orm/sqlite-core";
+import { sql } from "drizzle-orm";
+
+// Sessions table
+export const sessions = sqliteTable("sessions", {
+  id: text("id").primaryKey(),
+  token: text("token").notNull().unique(),
+  userId: text("user_id").notNull().references(() => users.id),
+  expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
+  ipAddress: text("ip_address"),
+  userAgent: text("user_agent"),
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .default(sql\`(unixepoch())\`),
+  updatedAt: integer("updated_at", { mode: "timestamp" })
+    .notNull()
+    .default(sql\`(unixepoch())\`),
+}, (table) => {
+  return {
+    userIdIdx: index("idx_sessions_user_id").on(table.userId),
+    tokenIdx: index("idx_sessions_token").on(table.token),
+    expiresAtIdx: index("idx_sessions_expires_at").on(table.expiresAt),
+  };
+});
+
+// Accounts table (for OAuth providers and credentials)
+export const accounts = sqliteTable("accounts", {
+  id: text("id").primaryKey(),
+  userId: text("user_id").notNull().references(() => users.id),
+  providerId: text("provider_id").notNull(),
+  providerUserId: text("provider_user_id").notNull(),
+  accessToken: text("access_token"),
+  refreshToken: text("refresh_token"),
+  expiresAt: integer("expires_at", { mode: "timestamp" }),
+  password: text("password"), // For credential provider
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .default(sql\`(unixepoch())\`),
+  updatedAt: integer("updated_at", { mode: "timestamp" })
+    .notNull()
+    .default(sql\`(unixepoch())\`),
+}, (table) => {
+  return {
+    userIdIdx: index("idx_accounts_user_id").on(table.userId),
+    providerIdx: index("idx_accounts_provider").on(table.providerId, table.providerUserId),
+  };
+});
+
+// Verification tokens table
+export const verificationTokens = sqliteTable("verification_tokens", {
+  id: text("id").primaryKey(),
+  token: text("token").notNull().unique(),
+  identifier: text("identifier").notNull(),
+  type: text("type").notNull(), // email, password-reset, etc
+  expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .default(sql\`(unixepoch())\`),
+}, (table) => {
+  return {
+    tokenIdx: index("idx_verification_tokens_token").on(table.token),
+    identifierIdx: index("idx_verification_tokens_identifier").on(table.identifier),
+  };
+});
+
+// Future: SSO and OIDC Provider tables will be added when we enable those plugins
+`;
+
+console.log(drizzleSchemaCode);
+
+// Output information about the schema
+console.log("\n\nSummary:");
+console.log("=========");
+console.log("- Better Auth will modify the existing 'users' table");
+console.log("- New tables required: sessions, accounts, verification_tokens");
+console.log("\nNote: The 'users' table needs emailVerified field added");
+
+tempDb.close();

scripts/gitea-app.ini

@@ -0,0 +1,68 @@
+APP_NAME = Gitea: Git with a cup of tea
+RUN_MODE = prod
+
+[database]
+DB_TYPE = sqlite3
+PATH = /data/gitea/gitea.db
+
+[repository]
+ROOT = /data/git/repositories
+
+[server]
+SSH_DOMAIN = localhost
+DOMAIN = localhost
+HTTP_PORT = 3000
+ROOT_URL = http://localhost:3001/
+DISABLE_SSH = false
+SSH_PORT = 22
+LFS_START_SERVER = true
+LFS_JWT_SECRET = _oaWNP5sCH5cSECa-K_HvCXeXhg-zN5H0cU5vVQAZr4
+OFFLINE_MODE = false
+
+[security]
+INSTALL_LOCK = true
+SECRET_KEY = vLu5OuX0EweZjDNxKPQ5V9DXXXX8cJiKpJyQylKkMVTrNdFAzlUlNdYLYfiCybu
+INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE3MjgzMTk1MDB9.Lz0cJB_DCLmJFh8FqDX0z9IUcxfY9jPftHEGvz_WeHo
+PASSWORD_HASH_ALGO = pbkdf2
+
+[service]
+DISABLE_REGISTRATION = false
+REQUIRE_SIGNIN_VIEW = false
+REGISTER_EMAIL_CONFIRM = false
+ENABLE_NOTIFY_MAIL = false
+ALLOW_ONLY_EXTERNAL_REGISTRATION = false
+ENABLE_CAPTCHA = false
+DEFAULT_KEEP_EMAIL_PRIVATE = false
+DEFAULT_ALLOW_CREATE_ORGANIZATION = true
+DEFAULT_ENABLE_TIMETRACKING = true
+NO_REPLY_ADDRESS = noreply.localhost
+
+[oauth2]
+JWT_SECRET = gQXt_D8B-VJGCvFfJ9xEj5yp8mOd6fAza8TKc9rJJYw
+
+[lfs]
+PATH = /data/git/lfs
+
+[mailer]
+ENABLED = false
+
+[openid]
+ENABLE_OPENID_SIGNIN = true
+ENABLE_OPENID_SIGNUP = true
+
+[session]
+PROVIDER = file
+
+[log]
+MODE = console
+LEVEL = Info
+ROOT_PATH = /data/gitea/log
+
+[repository.pull-request]
+DEFAULT_MERGE_STYLE = merge
+
+[repository.signing]
+DEFAULT_TRUST_MODEL = committer
+
+[actions]
+ENABLED = false

scripts/gitea-create-admin.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Create admin user for Gitea development instance
+
+echo "Creating admin user for Gitea..."
+docker exec -u git gitea gitea admin user create \
+  --username admin \
+  --password admin123 \
+  --email admin@localhost \
+  --admin \
+  --must-change-password=false
+
+echo "Admin user created!"
+echo "Username: admin"
+echo "Password: admin123"

scripts/gitea-dev-init.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+# Initialize Gitea for development with pre-configured settings
+
+# Create necessary directories
+mkdir -p /data/gitea/conf
+
+# Copy pre-configured app.ini if it doesn't exist
+if [ ! -f /data/gitea/conf/app.ini ]; then
+    echo "Initializing Gitea with development configuration..."
+    cp /tmp/app.ini /data/gitea/conf/app.ini
+    chown 1000:1000 /data/gitea/conf/app.ini
+fi
+
+# Start Gitea in background
+/usr/bin/entrypoint "$@" &
+GITEA_PID=$!
+
+# Wait for Gitea to be ready
+echo "Waiting for Gitea to start..."
+until wget --no-verbose --tries=1 --spider http://localhost:3000/ 2>/dev/null; do
+    sleep 2
+done
+
+# Create admin user if it doesn't exist
+if [ ! -f /data/.admin_created ]; then
+    echo "Creating default admin user..."
+    su git -c "gitea admin user create --username admin --password admin123 --email admin@localhost --admin --must-change-password=false" && \
+    touch /data/.admin_created
+fi
+
+# Keep Gitea running in foreground
+wait $GITEA_PID

scripts/gitea-mirror-lxc-local.sh

@@ -7,7 +7,7 @@ CONTAINER="gitea-test"
 IMAGE="ubuntu:22.04"
 INSTALL_DIR="/opt/gitea-mirror"
 PORT=4321
-JWT_SECRET="$(openssl rand -hex 32)"
+BETTER_AUTH_SECRET="$(openssl rand -hex 32)"
 
 BUN_ZIP="/tmp/bun-linux-x64.zip"
 BUN_URL="https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64.zip"
@@ -73,7 +73,7 @@ Environment=NODE_ENV=production
 Environment=HOST=0.0.0.0
 Environment=PORT=$PORT
 Environment=DATABASE_URL=file:data/gitea-mirror.db
-Environment=JWT_SECRET=$JWT_SECRET
+Environment=BETTER_AUTH_SECRET=$BETTER_AUTH_SECRET
 [Install]
 WantedBy=multi-user.target
 SERVICE

scripts/investigate-repo.ts

@@ -0,0 +1,178 @@
+#!/usr/bin/env bun
+
+/**
+ * Script to investigate a specific repository's mirroring status
+ * Usage: bun scripts/investigate-repo.ts [repository-name]
+ */
+
+import { db, repositories, mirrorJobs, configs } from "@/lib/db";
+import { eq, desc, and } from "drizzle-orm";
+
+const repoName = process.argv[2] || "EruditionPaper";
+
+async function investigateRepository() {
+  console.log(`🔍 Investigating repository: ${repoName}`);
+  console.log("=" .repeat(50));
+
+  try {
+    // Find the repository in the database
+    const repos = await db
+      .select()
+      .from(repositories)
+      .where(eq(repositories.name, repoName));
+
+    if (repos.length === 0) {
+      console.log(`❌ Repository "${repoName}" not found in database`);
+      return;
+    }
+
+    const repo = repos[0];
+    console.log(`✅ Found repository: ${repo.name}`);
+    console.log(`   ID: ${repo.id}`);
+    console.log(`   Full Name: ${repo.fullName}`);
+    console.log(`   Owner: ${repo.owner}`);
+    console.log(`   Organization: ${repo.organization || "None"}`);
+    console.log(`   Status: ${repo.status}`);
+    console.log(`   Is Private: ${repo.isPrivate}`);
+    console.log(`   Is Forked: ${repo.isForked}`);
+    console.log(`   Mirrored Location: ${repo.mirroredLocation || "Not set"}`);
+    console.log(`   Last Mirrored: ${repo.lastMirrored ? new Date(repo.lastMirrored).toISOString() : "Never"}`);
+    console.log(`   Error Message: ${repo.errorMessage || "None"}`);
+    console.log(`   Created At: ${new Date(repo.createdAt).toISOString()}`);
+    console.log(`   Updated At: ${new Date(repo.updatedAt).toISOString()}`);
+
+    console.log("\n📋 Recent Mirror Jobs:");
+    console.log("-".repeat(30));
+
+    // Find recent mirror jobs for this repository
+    const jobs = await db
+      .select()
+      .from(mirrorJobs)
+      .where(eq(mirrorJobs.repositoryId, repo.id))
+      .orderBy(desc(mirrorJobs.timestamp))
+      .limit(10);
+
+    if (jobs.length === 0) {
+      console.log("   No mirror jobs found for this repository");
+    } else {
+      jobs.forEach((job, index) => {
+        console.log(`   ${index + 1}. ${new Date(job.timestamp).toISOString()}`);
+        console.log(`      Status: ${job.status}`);
+        console.log(`      Message: ${job.message}`);
+        if (job.details) {
+          console.log(`      Details: ${job.details}`);
+        }
+        console.log("");
+      });
+    }
+
+    // Get user configuration
+    console.log("⚙️ User Configuration:");
+    console.log("-".repeat(20));
+
+    const config = await db
+      .select()
+      .from(configs)
+      .where(eq(configs.id, repo.configId))
+      .limit(1);
+
+    if (config.length > 0) {
+      const userConfig = config[0];
+      console.log(`   User ID: ${userConfig.userId}`);
+      console.log(`   GitHub Owner: ${userConfig.githubConfig?.owner || "Not set"}`);
+      console.log(`   Gitea URL: ${userConfig.giteaConfig?.url || "Not set"}`);
+      console.log(`   Gitea Default Owner: ${userConfig.giteaConfig?.defaultOwner || "Not set"}`);
+      console.log(`   Mirror Strategy: ${userConfig.githubConfig?.mirrorStrategy || "preserve"}`);
+      console.log(`   Include Starred: ${userConfig.githubConfig?.includeStarred || false}`);
+    }
+
+    // Check for any active jobs
+    console.log("\n🔄 Active Jobs:");
+    console.log("-".repeat(15));
+
+    const activeJobs = await db
+      .select()
+      .from(mirrorJobs)
+      .where(
+        and(
+          eq(mirrorJobs.repositoryId, repo.id),
+          eq(mirrorJobs.inProgress, true)
+        )
+      );
+
+    if (activeJobs.length === 0) {
+      console.log("   No active jobs found");
+    } else {
+      activeJobs.forEach((job, index) => {
+        console.log(`   ${index + 1}. Job ID: ${job.id}`);
+        console.log(`      Type: ${job.jobType || "mirror"}`);
+        console.log(`      Batch ID: ${job.batchId || "None"}`);
+        console.log(`      Started: ${job.startedAt ? new Date(job.startedAt).toISOString() : "Unknown"}`);
+        console.log(`      Last Checkpoint: ${job.lastCheckpoint ? new Date(job.lastCheckpoint).toISOString() : "None"}`);
+        console.log(`      Progress: ${job.completedItems || 0}/${job.totalItems || 0}`);
+        console.log("");
+      });
+    }
+
+    // Check if repository exists in Gitea
+    if (config.length > 0) {
+      const userConfig = config[0];
+      console.log("\n🔗 Gitea Repository Check:");
+      console.log("-".repeat(25));
+
+      try {
+        const giteaUrl = userConfig.giteaConfig?.url;
+        const giteaToken = userConfig.giteaConfig?.token;
+        const giteaUsername = userConfig.giteaConfig?.defaultOwner;
+
+        if (giteaUrl && giteaToken && giteaUsername) {
+          const checkUrl = `${giteaUrl}/api/v1/repos/${giteaUsername}/${repo.name}`;
+          console.log(`   Checking: ${checkUrl}`);
+
+          const response = await fetch(checkUrl, {
+            headers: {
+              Authorization: `token ${giteaToken}`,
+            },
+          });
+
+          console.log(`   Response Status: ${response.status} ${response.statusText}`);
+
+          if (response.ok) {
+            const repoData = await response.json();
+            console.log(`   ✅ Repository exists in Gitea`);
+            console.log(`   Name: ${repoData.name}`);
+            console.log(`   Full Name: ${repoData.full_name}`);
+            console.log(`   Private: ${repoData.private}`);
+            console.log(`   Mirror: ${repoData.mirror}`);
+            console.log(`   Clone URL: ${repoData.clone_url}`);
+            console.log(`   Created: ${new Date(repoData.created_at).toISOString()}`);
+            console.log(`   Updated: ${new Date(repoData.updated_at).toISOString()}`);
+            if (repoData.mirror_updated) {
+              console.log(`   Mirror Updated: ${new Date(repoData.mirror_updated).toISOString()}`);
+            }
+          } else {
+            console.log(`   ❌ Repository not found in Gitea`);
+            const errorText = await response.text();
+            console.log(`   Error: ${errorText}`);
+          }
+        } else {
+          console.log("   ⚠️ Missing Gitea configuration");
+        }
+      } catch (error) {
+        console.log(`   ❌ Error checking Gitea: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+
+  } catch (error) {
+    console.error("❌ Error investigating repository:", error);
+  }
+}
+
+// Run the investigation
+investigateRepository().then(() => {
+  console.log("Investigation complete.");
+  process.exit(0);
+}).catch((error) => {
+  console.error("Fatal error:", error);
+  process.exit(1);
+});

scripts/manage-db.ts

@@ -1,7 +1,12 @@
 import fs from "fs";
 import path from "path";
 import { Database } from "bun:sqlite";
+import { drizzle } from "drizzle-orm/bun-sqlite";
+import { migrate } from "drizzle-orm/bun-sqlite/migrator";
 import { v4 as uuidv4 } from "uuid";
+import { users, configs, repositories, organizations, mirrorJobs, events } from "../src/lib/db/schema";
+import bcrypt from "bcryptjs";
+import { eq } from "drizzle-orm";
 
 // Command line arguments
 const args = process.argv.slice(2);
@@ -13,750 +18,222 @@ if (!fs.existsSync(dataDir)) {
   fs.mkdirSync(dataDir, { recursive: true });
 }
 
-// Database paths
-const rootDbFile = path.join(process.cwd(), "gitea-mirror.db");
-const rootDevDbFile = path.join(process.cwd(), "gitea-mirror-dev.db");
-const dataDbFile = path.join(dataDir, "gitea-mirror.db");
-const dataDevDbFile = path.join(dataDir, "gitea-mirror-dev.db");
-
 // Database path - ensure we use absolute path
 const dbPath = path.join(dataDir, "gitea-mirror.db");
 
 /**
- * Ensure all required tables exist
+ * Initialize database with migrations
  */
-async function ensureTablesExist() {
-  // Create or open the database
-  const db = new Database(dbPath);
-
-  const requiredTables = [
-    "users",
-    "configs",
-    "repositories",
-    "organizations",
-    "mirror_jobs",
-    "events",
-  ];
-
-  for (const table of requiredTables) {
-    try {
-      // Check if table exists
-      const result = db.query(`SELECT name FROM sqlite_master WHERE type='table' AND name='${table}'`).get();
-
-      if (!result) {
-        console.warn(`⚠️  Table '${table}' is missing. Creating it now...`);
-
-        switch (table) {
-          case "users":
-            db.exec(`
-              CREATE TABLE users (
-                id TEXT PRIMARY KEY,
-                username TEXT NOT NULL,
-                password TEXT NOT NULL,
-                email TEXT NOT NULL,
-                created_at INTEGER NOT NULL,
-                updated_at INTEGER NOT NULL
-              )
-            `);
-            break;
-          case "configs":
-            db.exec(`
-              CREATE TABLE configs (
-                id TEXT PRIMARY KEY,
-                user_id TEXT NOT NULL,
-                name TEXT NOT NULL,
-                is_active INTEGER NOT NULL DEFAULT 1,
-                github_config TEXT NOT NULL,
-                gitea_config TEXT NOT NULL,
-                include TEXT NOT NULL DEFAULT '["*"]',
-                exclude TEXT NOT NULL DEFAULT '[]',
-                schedule_config TEXT NOT NULL,
-                created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                FOREIGN KEY (user_id) REFERENCES users(id)
-              )
-            `);
-            break;
-          case "repositories":
-            db.exec(`
-              CREATE TABLE repositories (
-                id TEXT PRIMARY KEY,
-                user_id TEXT NOT NULL,
-                config_id TEXT NOT NULL,
-                name TEXT NOT NULL,
-                full_name TEXT NOT NULL,
-                url TEXT NOT NULL,
-                clone_url TEXT NOT NULL,
-                owner TEXT NOT NULL,
-                organization TEXT,
-                mirrored_location TEXT DEFAULT '',
-                is_private INTEGER NOT NULL DEFAULT 0,
-                is_fork INTEGER NOT NULL DEFAULT 0,
-                forked_from TEXT,
-                has_issues INTEGER NOT NULL DEFAULT 0,
-                is_starred INTEGER NOT NULL DEFAULT 0,
-                is_archived INTEGER NOT NULL DEFAULT 0,
-                size INTEGER NOT NULL DEFAULT 0,
-                has_lfs INTEGER NOT NULL DEFAULT 0,
-                has_submodules INTEGER NOT NULL DEFAULT 0,
-                default_branch TEXT NOT NULL,
-                visibility TEXT NOT NULL DEFAULT 'public',
-                status TEXT NOT NULL DEFAULT 'imported',
-                last_mirrored INTEGER,
-                error_message TEXT,
-                created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                FOREIGN KEY (user_id) REFERENCES users(id),
-                FOREIGN KEY (config_id) REFERENCES configs(id)
-              )
-            `);
-            break;
-          case "organizations":
-            db.exec(`
-              CREATE TABLE organizations (
-                id TEXT PRIMARY KEY,
-                user_id TEXT NOT NULL,
-                config_id TEXT NOT NULL,
-                name TEXT NOT NULL,
-                avatar_url TEXT NOT NULL,
-                membership_role TEXT NOT NULL DEFAULT 'member',
-                is_included INTEGER NOT NULL DEFAULT 1,
-                status TEXT NOT NULL DEFAULT 'imported',
-                last_mirrored INTEGER,
-                error_message TEXT,
-                repository_count INTEGER NOT NULL DEFAULT 0,
-                created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                FOREIGN KEY (user_id) REFERENCES users(id),
-                FOREIGN KEY (config_id) REFERENCES configs(id)
-              )
-            `);
-            break;
-          case "mirror_jobs":
-            db.exec(`
-              CREATE TABLE mirror_jobs (
-                id TEXT PRIMARY KEY,
-                user_id TEXT NOT NULL,
-                repository_id TEXT,
-                repository_name TEXT,
-                organization_id TEXT,
-                organization_name TEXT,
-                details TEXT,
-                status TEXT NOT NULL DEFAULT 'imported',
-                message TEXT NOT NULL,
-                timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-                -- New fields for job resilience
-                job_type TEXT NOT NULL DEFAULT 'mirror',
-                batch_id TEXT,
-                total_items INTEGER,
-                completed_items INTEGER DEFAULT 0,
-                item_ids TEXT, -- JSON array as text
-                completed_item_ids TEXT DEFAULT '[]', -- JSON array as text
-                in_progress INTEGER NOT NULL DEFAULT 0, -- Boolean as integer
-                started_at TIMESTAMP,
-                completed_at TIMESTAMP,
-                last_checkpoint TIMESTAMP,
-
-                FOREIGN KEY (user_id) REFERENCES users(id)
-              )
-            `);
-
-            // Create indexes for better performance
-            db.exec(`
-              CREATE INDEX IF NOT EXISTS idx_mirror_jobs_user_id ON mirror_jobs(user_id);
-              CREATE INDEX IF NOT EXISTS idx_mirror_jobs_batch_id ON mirror_jobs(batch_id);
-              CREATE INDEX IF NOT EXISTS idx_mirror_jobs_in_progress ON mirror_jobs(in_progress);
-              CREATE INDEX IF NOT EXISTS idx_mirror_jobs_job_type ON mirror_jobs(job_type);
-              CREATE INDEX IF NOT EXISTS idx_mirror_jobs_timestamp ON mirror_jobs(timestamp);
-            `);
-            break;
-          case "events":
-            db.exec(`
-              CREATE TABLE events (
-                id TEXT PRIMARY KEY,
-                user_id TEXT NOT NULL,
-                channel TEXT NOT NULL,
-                payload TEXT NOT NULL,
-                read INTEGER NOT NULL DEFAULT 0,
-                created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-                FOREIGN KEY (user_id) REFERENCES users(id)
-              )
-            `);
-            db.exec(`
-              CREATE INDEX idx_events_user_channel ON events(user_id, channel);
-              CREATE INDEX idx_events_created_at ON events(created_at);
-              CREATE INDEX idx_events_read ON events(read);
-            `);
-            break;
-        }
-        console.log(`✅ Table '${table}' created successfully.`);
-      }
-    } catch (error) {
-      console.error(`❌ Error checking table '${table}':`, error);
-      process.exit(1);
-    }
+async function initDatabase() {
+  console.log("📦 Initializing database...");
+  
+  // Create an empty database file if it doesn't exist
+  if (!fs.existsSync(dbPath)) {
+    fs.writeFileSync(dbPath, "");
   }
 
-  // Migration: Add cleanup_config column to existing configs table
+  // Create SQLite instance
+  const sqlite = new Database(dbPath);
+  const db = drizzle({ client: sqlite });
+
+  // Run migrations
+  console.log("🔄 Running migrations...");
   try {
-    const db = new Database(dbPath);
-
-    // Check if cleanup_config column exists
-    const tableInfo = db.query(`PRAGMA table_info(configs)`).all();
-    const hasCleanupConfig = tableInfo.some((column: any) => column.name === 'cleanup_config');
-
-    if (!hasCleanupConfig) {
-      console.log("Adding cleanup_config column to configs table...");
-
-      // Add the column with a default value
-      const defaultCleanupConfig = JSON.stringify({
-        enabled: false,
-        retentionDays: 7,
-        lastRun: null,
-        nextRun: null,
-      });
-
-      db.exec(`ALTER TABLE configs ADD COLUMN cleanup_config TEXT NOT NULL DEFAULT '${defaultCleanupConfig}'`);
-      console.log("✅ cleanup_config column added successfully.");
-    }
+    migrate(db, { migrationsFolder: "./drizzle" });
+    console.log("✅ Migrations completed successfully");
   } catch (error) {
-    console.error("❌ Error during cleanup_config migration:", error);
-    // Don't exit here as this is not critical for basic functionality
+    console.error("❌ Error running migrations:", error);
+    throw error;
   }
+
+  sqlite.close();
+  console.log("✅ Database initialized successfully");
 }
 
 /**
  * Check database status
  */
 async function checkDatabase() {
-  console.log("Checking database status...");
-
-  // Check for database files in the root directory (which is incorrect)
-  if (fs.existsSync(rootDbFile)) {
-    console.warn(
-      "⚠️  WARNING: Database file found in root directory: gitea-mirror.db"
-    );
-    console.warn("This file should be in the data directory.");
-    console.warn(
-      'Run "bun run manage-db fix" to fix this issue or "bun run cleanup-db" to remove it.'
-    );
+  console.log("🔍 Checking database status...");
+  
+  if (!fs.existsSync(dbPath)) {
+    console.log("❌ Database does not exist at:", dbPath);
+    console.log("💡 Run 'bun run init-db' to create the database");
+    process.exit(1);
   }
 
-  // Check if database files exist in the data directory (which is correct)
-  if (fs.existsSync(dataDbFile)) {
-    console.log(
-      "✅ Database file found in data directory: data/gitea-mirror.db"
-    );
-
-    // Check for users
-    try {
-      const db = new Database(dbPath);
-
-      // Check for users
-      const userCountResult = db.query(`SELECT COUNT(*) as count FROM users`).get();
-      const userCount = userCountResult?.count || 0;
-
-      if (userCount === 0) {
-        console.log("ℹ️  No users found in the database.");
-        console.log(
-          "When you start the application, you will be directed to the signup page"
-        );
-        console.log("to create an initial admin account.");
-      } else {
-        console.log(`✅ ${userCount} user(s) found in the database.`);
-        console.log("The application will show the login page on startup.");
-      }
-
-      // Check for configurations
-      const configCountResult = db.query(`SELECT COUNT(*) as count FROM configs`).get();
-      const configCount = configCountResult?.count || 0;
-
-      if (configCount === 0) {
-        console.log("ℹ️  No configurations found in the database.");
-        console.log(
-          "You will need to set up your GitHub and Gitea configurations after login."
-        );
-      } else {
-        console.log(
-          `✅ ${configCount} configuration(s) found in the database.`
-        );
-      }
-    } catch (error) {
-      console.error("❌ Error connecting to the database:", error);
-      console.warn(
-        'The database file might be corrupted. Consider running "bun run manage-db init" to recreate it.'
-      );
-    }
-  } else {
-    console.warn("⚠️  WARNING: Database file not found in data directory.");
-    console.warn('Run "bun run manage-db init" to create it.');
-  }
-}
-
-// Database schema updates and migrations have been removed
-// since the application is not used by anyone yet
-
-/**
- * Initialize the database
- */
-async function initializeDatabase() {
-  // Check if database already exists first
-  if (fs.existsSync(dataDbFile)) {
-    console.log("⚠️  Database already exists at data/gitea-mirror.db");
-    console.log(
-      'If you want to recreate the database, run "bun run cleanup-db" first.'
-    );
-    console.log(
-      'Or use "bun run manage-db reset-users" to just remove users without recreating tables.'
-    );
-
-    // Check if we can connect to it
-    try {
-      const db = new Database(dbPath);
-      db.query(`SELECT COUNT(*) as count FROM users`).get();
-      console.log("✅ Database is valid and accessible.");
-      return;
-    } catch (error) {
-      console.error("❌ Error connecting to the existing database:", error);
-      console.log(
-        "The database might be corrupted. Proceeding with reinitialization..."
-      );
-    }
-  }
-
-  console.log(`Initializing database at ${dbPath}...`);
+  const sqlite = new Database(dbPath);
+  const db = drizzle({ client: sqlite });
 
   try {
-    const db = new Database(dbPath);
+    // Check tables
+    const tables = sqlite.query(
+      "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"
+    ).all() as Array<{name: string}>;
 
-    // Create tables if they don't exist
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS users (
-        id TEXT PRIMARY KEY,
-        username TEXT NOT NULL,
-        password TEXT NOT NULL,
-        email TEXT NOT NULL,
-        created_at INTEGER NOT NULL,
-        updated_at INTEGER NOT NULL
-      )
-    `);
+    console.log("\n📊 Tables found:");
+    for (const table of tables) {
+      const count = sqlite.query(`SELECT COUNT(*) as count FROM ${table.name}`).get() as {count: number};
+      console.log(`  - ${table.name}: ${count.count} records`);
+    }
 
-    // NOTE: We no longer create a default admin user - user will create one via signup page
+    // Check migrations
+    const migrations = sqlite.query(
+      "SELECT * FROM __drizzle_migrations ORDER BY created_at DESC LIMIT 5"
+    ).all() as Array<{hash: string, created_at: number}>;
 
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS configs (
-        id TEXT PRIMARY KEY,
-        user_id TEXT NOT NULL,
-        name TEXT NOT NULL,
-        is_active INTEGER NOT NULL DEFAULT 1,
-        github_config TEXT NOT NULL,
-        gitea_config TEXT NOT NULL,
-        include TEXT NOT NULL DEFAULT '["*"]',
-        exclude TEXT NOT NULL DEFAULT '[]',
-        schedule_config TEXT NOT NULL,
-        cleanup_config TEXT NOT NULL,
-        created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        FOREIGN KEY (user_id) REFERENCES users(id)
-      )
-    `);
-
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS repositories (
-        id TEXT PRIMARY KEY,
-        user_id TEXT NOT NULL,
-        config_id TEXT NOT NULL,
-        name TEXT NOT NULL,
-        full_name TEXT NOT NULL,
-        url TEXT NOT NULL,
-        clone_url TEXT NOT NULL,
-        owner TEXT NOT NULL,
-        organization TEXT,
-        mirrored_location TEXT DEFAULT '',
-        is_private INTEGER NOT NULL DEFAULT 0,
-        is_fork INTEGER NOT NULL DEFAULT 0,
-        forked_from TEXT,
-        has_issues INTEGER NOT NULL DEFAULT 0,
-        is_starred INTEGER NOT NULL DEFAULT 0,
-        is_archived INTEGER NOT NULL DEFAULT 0,
-        size INTEGER NOT NULL DEFAULT 0,
-        has_lfs INTEGER NOT NULL DEFAULT 0,
-        has_submodules INTEGER NOT NULL DEFAULT 0,
-        default_branch TEXT NOT NULL,
-        visibility TEXT NOT NULL DEFAULT 'public',
-        status TEXT NOT NULL DEFAULT 'imported',
-        last_mirrored INTEGER,
-        error_message TEXT,
-        created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        FOREIGN KEY (user_id) REFERENCES users(id),
-        FOREIGN KEY (config_id) REFERENCES configs(id)
-      )
-    `);
-
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS organizations (
-        id TEXT PRIMARY KEY,
-        user_id TEXT NOT NULL,
-        config_id TEXT NOT NULL,
-        name TEXT NOT NULL,
-        avatar_url TEXT NOT NULL,
-        membership_role TEXT NOT NULL DEFAULT 'member',
-        is_included INTEGER NOT NULL DEFAULT 1,
-        status TEXT NOT NULL DEFAULT 'imported',
-        last_mirrored INTEGER,
-        error_message TEXT,
-        repository_count INTEGER NOT NULL DEFAULT 0,
-        created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        updated_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        FOREIGN KEY (user_id) REFERENCES users(id),
-        FOREIGN KEY (config_id) REFERENCES configs(id)
-      )
-    `);
-
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS mirror_jobs (
-        id TEXT PRIMARY KEY,
-        user_id TEXT NOT NULL,
-        repository_id TEXT,
-        repository_name TEXT,
-        organization_id TEXT,
-        organization_name TEXT,
-        details TEXT,
-        status TEXT NOT NULL DEFAULT 'imported',
-        message TEXT NOT NULL,
-        timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users(id)
-      )
-    `);
-
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS events (
-        id TEXT PRIMARY KEY,
-        user_id TEXT NOT NULL,
-        channel TEXT NOT NULL,
-        payload TEXT NOT NULL,
-        read INTEGER NOT NULL DEFAULT 0,
-        created_at INTEGER NOT NULL DEFAULT (strftime('%s','now')),
-        FOREIGN KEY (user_id) REFERENCES users(id)
-      )
-    `);
-
-    db.exec(`
-      CREATE INDEX IF NOT EXISTS idx_events_user_channel ON events(user_id, channel);
-      CREATE INDEX IF NOT EXISTS idx_events_created_at ON events(created_at);
-      CREATE INDEX IF NOT EXISTS idx_events_read ON events(read);
-    `);
-
-    // Insert default config if none exists
-    const configCountResult = db.query(`SELECT COUNT(*) as count FROM configs`).get();
-    const configCount = configCountResult?.count || 0;
-
-    if (configCount === 0) {
-      // Get the first user
-      const firstUserResult = db.query(`SELECT id FROM users LIMIT 1`).get();
-
-      if (firstUserResult) {
-        const userId = firstUserResult.id;
-        const configId = uuidv4();
-        const githubConfig = JSON.stringify({
-          username: process.env.GITHUB_USERNAME || "",
-          token: process.env.GITHUB_TOKEN || "",
-          skipForks: false,
-          privateRepositories: false,
-          mirrorIssues: false,
-          mirrorStarred: true,
-          useSpecificUser: false,
-          preserveOrgStructure: true,
-          skipStarredIssues: false,
-        });
-        const giteaConfig = JSON.stringify({
-          url: process.env.GITEA_URL || "",
-          token: process.env.GITEA_TOKEN || "",
-          username: process.env.GITEA_USERNAME || "",
-          organization: "",
-          visibility: "public",
-          starredReposOrg: "github",
-        });
-        const include = JSON.stringify(["*"]);
-        const exclude = JSON.stringify([]);
-        const scheduleConfig = JSON.stringify({
-          enabled: false,
-          interval: 3600,
-          lastRun: null,
-          nextRun: null,
-        });
-        const cleanupConfig = JSON.stringify({
-          enabled: false,
-          retentionDays: 7,
-          lastRun: null,
-          nextRun: null,
-        });
-
-        const stmt = db.prepare(`
-          INSERT INTO configs (id, user_id, name, is_active, github_config, gitea_config, include, exclude, schedule_config, cleanup_config, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `);
-
-        stmt.run(
-          configId,
-          userId,
-          "Default Configuration",
-          1,
-          githubConfig,
-          giteaConfig,
-          include,
-          exclude,
-          scheduleConfig,
-          cleanupConfig,
-          Date.now(),
-          Date.now()
-        );
+    if (migrations.length > 0) {
+      console.log("\n📋 Recent migrations:");
+      for (const migration of migrations) {
+        const date = new Date(migration.created_at);
+        console.log(`  - ${migration.hash} (${date.toLocaleString()})`);
       }
     }
 
-    console.log("✅ Database initialization completed successfully.");
+    sqlite.close();
+    console.log("\n✅ Database check complete");
   } catch (error) {
-    console.error("❌ Error initializing database:", error);
+    console.error("❌ Error checking database:", error);
+    sqlite.close();
     process.exit(1);
   }
 }
 
 /**
- * Reset users in the database
+ * Reset user accounts (development only)
  */
 async function resetUsers() {
-  console.log(`Resetting users in database at ${dbPath}...`);
-
-  try {
-    // Check if the database exists
-    const doesDbExist = fs.existsSync(dbPath);
-
-    if (!doesDbExist) {
-      console.log(
-        "❌ Database file doesn't exist. Run 'bun run manage-db init' first to create it."
-      );
-      return;
-    }
-
-    const db = new Database(dbPath);
-
-    // Count existing users
-    const userCountResult = db.query(`SELECT COUNT(*) as count FROM users`).get();
-    const userCount = userCountResult?.count || 0;
-
-    if (userCount === 0) {
-      console.log("ℹ️  No users found in the database. Nothing to reset.");
-      return;
-    }
-
-    // Delete all users
-    db.exec(`DELETE FROM users`);
-    console.log(`✅ Deleted ${userCount} users from the database.`);
-
-    // Check dependent configurations that need to be removed
-    const configCountResult = db.query(`SELECT COUNT(*) as count FROM configs`).get();
-    const configCount = configCountResult?.count || 0;
-
-    if (configCount > 0) {
-      db.exec(`DELETE FROM configs`);
-      console.log(`✅ Deleted ${configCount} configurations.`);
-    }
-
-    // Check for dependent repositories
-    const repoCountResult = db.query(`SELECT COUNT(*) as count FROM repositories`).get();
-    const repoCount = repoCountResult?.count || 0;
-
-    if (repoCount > 0) {
-      db.exec(`DELETE FROM repositories`);
-      console.log(`✅ Deleted ${repoCount} repositories.`);
-    }
-
-    // Check for dependent organizations
-    const orgCountResult = db.query(`SELECT COUNT(*) as count FROM organizations`).get();
-    const orgCount = orgCountResult?.count || 0;
-
-    if (orgCount > 0) {
-      db.exec(`DELETE FROM organizations`);
-      console.log(`✅ Deleted ${orgCount} organizations.`);
-    }
-
-    // Check for dependent mirror jobs
-    const jobCountResult = db.query(`SELECT COUNT(*) as count FROM mirror_jobs`).get();
-    const jobCount = jobCountResult?.count || 0;
-
-    if (jobCount > 0) {
-      db.exec(`DELETE FROM mirror_jobs`);
-      console.log(`✅ Deleted ${jobCount} mirror jobs.`);
-    }
-
-    console.log(
-      "✅ Database has been reset. The application will now prompt for a new admin account setup on next run."
-    );
-  } catch (error) {
-    console.error("❌ Error resetting users:", error);
+  console.log("🗑️  Resetting all user accounts...");
+  
+  if (!fs.existsSync(dbPath)) {
+    console.log("❌ Database does not exist");
     process.exit(1);
   }
+
+  const sqlite = new Database(dbPath);
+  const db = drizzle({ client: sqlite });
+
+  try {
+    // Delete all data in order of foreign key dependencies
+    await db.delete(events);
+    await db.delete(mirrorJobs);
+    await db.delete(repositories);
+    await db.delete(organizations);
+    await db.delete(configs);
+    await db.delete(users);
+
+    console.log("✅ All user accounts and related data have been removed");
+    
+    sqlite.close();
+  } catch (error) {
+    console.error("❌ Error resetting users:", error);
+    sqlite.close();
+    process.exit(1);
+  }
+}
+
+/**
+ * Clean up database files
+ */
+async function cleanupDatabase() {
+  console.log("🧹 Cleaning up database files...");
+  
+  const filesToRemove = [
+    dbPath,
+    path.join(dataDir, "gitea-mirror-dev.db"),
+    path.join(process.cwd(), "gitea-mirror.db"),
+    path.join(process.cwd(), "gitea-mirror-dev.db"),
+  ];
+
+  for (const file of filesToRemove) {
+    if (fs.existsSync(file)) {
+      fs.unlinkSync(file);
+      console.log(`  - Removed: ${file}`);
+    }
+  }
+
+  console.log("✅ Database cleanup complete");
 }
 
 /**
  * Fix database location issues
  */
-async function fixDatabaseIssues() {
-  console.log("Checking for database issues...");
+async function fixDatabase() {
+  console.log("🔧 Fixing database location issues...");
+  
+  // Legacy database paths
+  const rootDbFile = path.join(process.cwd(), "gitea-mirror.db");
+  const rootDevDbFile = path.join(process.cwd(), "gitea-mirror-dev.db");
+  const dataDevDbFile = path.join(dataDir, "gitea-mirror-dev.db");
 
-  // Check for database files in the root directory
+  // Check for databases in wrong locations
   if (fs.existsSync(rootDbFile)) {
-    console.log("Found database file in root directory: gitea-mirror.db");
-
-    // If the data directory doesn't have the file, move it there
-    if (!fs.existsSync(dataDbFile)) {
-      console.log("Moving database file to data directory...");
-      fs.copyFileSync(rootDbFile, dataDbFile);
-      console.log("Database file moved successfully.");
+    console.log("📁 Found database in root directory");
+    if (!fs.existsSync(dbPath)) {
+      console.log("  → Moving to data directory...");
+      fs.renameSync(rootDbFile, dbPath);
+      console.log("✅ Database moved successfully");
     } else {
-      console.log(
-        "Database file already exists in data directory. Checking for differences..."
-      );
-
-      // Compare file sizes to see which is newer/larger
-      const rootStats = fs.statSync(rootDbFile);
-      const dataStats = fs.statSync(dataDbFile);
-
-      if (
-        rootStats.size > dataStats.size ||
-        rootStats.mtime > dataStats.mtime
-      ) {
-        console.log(
-          "Root database file is newer or larger. Backing up data directory file and replacing it..."
-        );
-        fs.copyFileSync(dataDbFile, `${dataDbFile}.backup-${Date.now()}`);
-        fs.copyFileSync(rootDbFile, dataDbFile);
-        console.log("Database file replaced successfully.");
-      }
+      console.log("  ⚠️  Database already exists in data directory");
+      console.log("  → Keeping existing data directory database");
+      fs.unlinkSync(rootDbFile);
+      console.log("  → Removed root directory database");
     }
-
-    // Remove the root file
-    console.log("Removing database file from root directory...");
-    fs.unlinkSync(rootDbFile);
-    console.log("Root database file removed.");
   }
 
-  // Do the same for dev database
+  // Clean up dev databases
   if (fs.existsSync(rootDevDbFile)) {
-    console.log(
-      "Found development database file in root directory: gitea-mirror-dev.db"
-    );
-
-    // If the data directory doesn't have the file, move it there
-    if (!fs.existsSync(dataDevDbFile)) {
-      console.log("Moving development database file to data directory...");
-      fs.copyFileSync(rootDevDbFile, dataDevDbFile);
-      console.log("Development database file moved successfully.");
-    } else {
-      console.log(
-        "Development database file already exists in data directory. Checking for differences..."
-      );
-
-      // Compare file sizes to see which is newer/larger
-      const rootStats = fs.statSync(rootDevDbFile);
-      const dataStats = fs.statSync(dataDevDbFile);
-
-      if (
-        rootStats.size > dataStats.size ||
-        rootStats.mtime > dataStats.mtime
-      ) {
-        console.log(
-          "Root development database file is newer or larger. Backing up data directory file and replacing it..."
-        );
-        fs.copyFileSync(dataDevDbFile, `${dataDevDbFile}.backup-${Date.now()}`);
-        fs.copyFileSync(rootDevDbFile, dataDevDbFile);
-        console.log("Development database file replaced successfully.");
-      }
-    }
-
-    // Remove the root file
-    console.log("Removing development database file from root directory...");
     fs.unlinkSync(rootDevDbFile);
-    console.log("Root development database file removed.");
+    console.log("  → Removed root dev database");
+  }
+  if (fs.existsSync(dataDevDbFile)) {
+    fs.unlinkSync(dataDevDbFile);
+    console.log("  → Removed data dev database");
   }
 
-  // Check if database files exist in the data directory
-  if (!fs.existsSync(dataDbFile)) {
-    console.warn(
-      "⚠️  WARNING: Production database file not found in data directory."
-    );
-    console.warn('Run "bun run manage-db init" to create it.');
-  } else {
-    console.log("✅ Production database file found in data directory.");
-
-    // Check if we can connect to the database
-    try {
-      // Try to query the database
-      const db = new Database(dbPath);
-      db.query(`SELECT 1 FROM sqlite_master LIMIT 1`).get();
-      console.log(`✅ Successfully connected to the database.`);
-    } catch (error) {
-      console.error("❌ Error connecting to the database:", error);
-      console.warn(
-        'The database file might be corrupted. Consider running "bun run manage-db init" to recreate it.'
-      );
-    }
-  }
-
-  console.log("Database check completed.");
+  console.log("✅ Database location fixed");
 }
 
 /**
- * Main function to handle the command
+ * Auto mode - check and initialize if needed
  */
-async function main() {
-  console.log(`Database Management Tool for Gitea Mirror`);
-
-  // Ensure all required tables exist
-  console.log("Ensuring all required tables exist...");
-  await ensureTablesExist();
-
-  switch (command) {
-    case "check":
-      await checkDatabase();
-      break;
-    case "init":
-      await initializeDatabase();
-      break;
-    case "fix":
-      await fixDatabaseIssues();
-      break;
-    case "reset-users":
-      await resetUsers();
-      break;
-    case "auto":
-      // Auto mode: check, fix, and initialize if needed
-      console.log("Running in auto mode: check, fix, and initialize if needed");
-      await fixDatabaseIssues();
-
-      if (!fs.existsSync(dataDbFile)) {
-        await initializeDatabase();
-      } else {
-        await checkDatabase();
-      }
-      break;
-    default:
-      console.log(`
-Available commands:
-  check        - Check database status
-  init         - Initialize the database (only if it doesn't exist)
-  fix          - Fix database location issues
-  reset-users  - Remove all users and their data
-  auto         - Automatic mode: check, fix, and initialize if needed
-
-Usage: bun run manage-db [command]
-`);
+async function autoMode() {
+  if (!fs.existsSync(dbPath)) {
+    console.log("📦 Database not found, initializing...");
+    await initDatabase();
+  } else {
+    console.log("✅ Database already exists");
+    await checkDatabase();
   }
 }
 
-main().catch((error) => {
-  console.error("Error during database management:", error);
-  process.exit(1);
-});
+// Execute command
+switch (command) {
+  case "init":
+    await initDatabase();
+    break;
+  case "check":
+    await checkDatabase();
+    break;
+  case "fix":
+    await fixDatabase();
+    break;
+  case "reset-users":
+    await resetUsers();
+    break;
+  case "cleanup":
+    await cleanupDatabase();
+    break;
+  case "auto":
+    await autoMode();
+    break;
+  default:
+    console.log("Available commands:");
+    console.log("  init         - Initialize database with migrations");
+    console.log("  check        - Check database status");
+    console.log("  fix          - Fix database location issues");
+    console.log("  reset-users  - Remove all users and related data");
+    console.log("  cleanup      - Remove all database files");
+    console.log("  auto         - Auto initialize if needed");
+    process.exit(1);
+}

scripts/repair-mirrored-repos.ts

@@ -0,0 +1,279 @@
+#!/usr/bin/env bun
+
+/**
+ * Script to repair repositories that exist in Gitea but have incorrect status in the database
+ * This fixes the issue where repositories show as "imported" but are actually mirrored in Gitea
+ * 
+ * Usage: bun scripts/repair-mirrored-repos.ts [--dry-run] [--repo-name=<name>]
+ */
+
+import { db, repositories, configs } from "@/lib/db";
+import { eq, and, or } from "drizzle-orm";
+import { createMirrorJob } from "@/lib/helpers";
+import { repoStatusEnum } from "@/types/Repository";
+
+const isDryRun = process.argv.includes("--dry-run");
+const specificRepo = process.argv.find(arg => arg.startsWith("--repo-name="))?.split("=")[1];
+const isStartupMode = process.argv.includes("--startup");
+
+async function checkRepoInGitea(config: any, owner: string, repoName: string): Promise<boolean> {
+  try {
+    if (!config.giteaConfig?.url || !config.giteaConfig?.token) {
+      return false;
+    }
+
+    const response = await fetch(
+      `${config.giteaConfig.url}/api/v1/repos/${owner}/${repoName}`,
+      {
+        headers: {
+          Authorization: `token ${config.giteaConfig.token}`,
+        },
+      }
+    );
+
+    return response.ok;
+  } catch (error) {
+    console.error(`Error checking repo ${owner}/${repoName} in Gitea:`, error);
+    return false;
+  }
+}
+
+async function getRepoDetailsFromGitea(config: any, owner: string, repoName: string): Promise<any> {
+  try {
+    if (!config.giteaConfig?.url || !config.giteaConfig?.token) {
+      return null;
+    }
+
+    const response = await fetch(
+      `${config.giteaConfig.url}/api/v1/repos/${owner}/${repoName}`,
+      {
+        headers: {
+          Authorization: `token ${config.giteaConfig.token}`,
+        },
+      }
+    );
+
+    if (response.ok) {
+      return await response.json();
+    }
+    return null;
+  } catch (error) {
+    console.error(`Error getting repo details for ${owner}/${repoName}:`, error);
+    return null;
+  }
+}
+
+async function repairMirroredRepositories() {
+  if (!isStartupMode) {
+    console.log("🔧 Repairing mirrored repositories database status");
+    console.log("=" .repeat(60));
+
+    if (isDryRun) {
+      console.log("🔍 DRY RUN MODE - No changes will be made");
+      console.log("");
+    }
+
+    if (specificRepo) {
+      console.log(`🎯 Targeting specific repository: ${specificRepo}`);
+      console.log("");
+    }
+  }
+
+  try {
+    // Find repositories that might need repair
+    const whereConditions = specificRepo
+      ? and(
+          or(
+            eq(repositories.status, "imported"),
+            eq(repositories.status, "failed")
+          ),
+          eq(repositories.name, specificRepo)
+        )
+      : or(
+          eq(repositories.status, "imported"),
+          eq(repositories.status, "failed")
+        );
+
+    const repos = await db
+      .select()
+      .from(repositories)
+      .where(whereConditions);
+
+    if (repos.length === 0) {
+      if (!isStartupMode) {
+        console.log("✅ No repositories found that need repair");
+      }
+      return;
+    }
+
+    if (!isStartupMode) {
+      console.log(`📋 Found ${repos.length} repositories to check:`);
+      console.log("");
+    }
+
+    let repairedCount = 0;
+    let skippedCount = 0;
+    let errorCount = 0;
+
+    for (const repo of repos) {
+      if (!isStartupMode) {
+        console.log(`🔍 Checking repository: ${repo.name}`);
+        console.log(`   Current status: ${repo.status}`);
+        console.log(`   Mirrored location: ${repo.mirroredLocation || "Not set"}`);
+      }
+
+      try {
+        // Get user configuration
+        const config = await db
+          .select()
+          .from(configs)
+          .where(eq(configs.id, repo.configId))
+          .limit(1);
+
+        if (config.length === 0) {
+          if (!isStartupMode) {
+            console.log(`   ❌ No configuration found for repository`);
+          }
+          errorCount++;
+          continue;
+        }
+
+        const userConfig = config[0];
+        const giteaUsername = userConfig.giteaConfig?.defaultOwner;
+
+        if (!giteaUsername) {
+          if (!isStartupMode) {
+            console.log(`   ❌ No Gitea username in configuration`);
+          }
+          errorCount++;
+          continue;
+        }
+
+        // Check if repository exists in Gitea (try both user and organization)
+        let existsInGitea = false;
+        let actualOwner = giteaUsername;
+        let giteaRepoDetails = null;
+
+        // First check user location
+        existsInGitea = await checkRepoInGitea(userConfig, giteaUsername, repo.name);
+        if (existsInGitea) {
+          giteaRepoDetails = await getRepoDetailsFromGitea(userConfig, giteaUsername, repo.name);
+        }
+
+        // If not found in user location and repo has organization, check organization
+        if (!existsInGitea && repo.organization) {
+          existsInGitea = await checkRepoInGitea(userConfig, repo.organization, repo.name);
+          if (existsInGitea) {
+            actualOwner = repo.organization;
+            giteaRepoDetails = await getRepoDetailsFromGitea(userConfig, repo.organization, repo.name);
+          }
+        }
+
+        if (!existsInGitea) {
+          if (!isStartupMode) {
+            console.log(`   ⏭️  Repository not found in Gitea - skipping`);
+          }
+          skippedCount++;
+          continue;
+        }
+
+        if (!isStartupMode) {
+          console.log(`   ✅ Repository found in Gitea at: ${actualOwner}/${repo.name}`);
+
+          if (giteaRepoDetails) {
+            console.log(`   📊 Gitea details:`);
+            console.log(`      Mirror: ${giteaRepoDetails.mirror}`);
+            console.log(`      Created: ${new Date(giteaRepoDetails.created_at).toISOString()}`);
+            console.log(`      Updated: ${new Date(giteaRepoDetails.updated_at).toISOString()}`);
+            if (giteaRepoDetails.mirror_updated) {
+              console.log(`      Mirror Updated: ${new Date(giteaRepoDetails.mirror_updated).toISOString()}`);
+            }
+          }
+        } else if (repairedCount === 0) {
+          // In startup mode, only log the first repair to indicate activity
+          console.log(`Repairing repository status inconsistencies...`);
+        }
+
+        if (!isDryRun) {
+          // Update repository status in database
+          const mirrorUpdated = giteaRepoDetails?.mirror_updated 
+            ? new Date(giteaRepoDetails.mirror_updated)
+            : new Date();
+
+          await db
+            .update(repositories)
+            .set({
+              status: repoStatusEnum.parse("mirrored"),
+              updatedAt: new Date(),
+              lastMirrored: mirrorUpdated,
+              errorMessage: null,
+              mirroredLocation: `${actualOwner}/${repo.name}`,
+            })
+            .where(eq(repositories.id, repo.id!));
+
+          // Create a mirror job log entry
+          await createMirrorJob({
+            userId: userConfig.userId || "",
+            repositoryId: repo.id,
+            repositoryName: repo.name,
+            message: `Repository status repaired - found existing mirror in Gitea`,
+            details: `Repository ${repo.name} was found to already exist in Gitea at ${actualOwner}/${repo.name} and database status was updated from ${repo.status} to mirrored.`,
+            status: "mirrored",
+          });
+
+          if (!isStartupMode) {
+            console.log(`   🔧 Repaired: Updated status to 'mirrored'`);
+          }
+        } else {
+          if (!isStartupMode) {
+            console.log(`   🔧 Would repair: Update status from '${repo.status}' to 'mirrored'`);
+          }
+        }
+
+        repairedCount++;
+
+      } catch (error) {
+        if (!isStartupMode) {
+          console.log(`   ❌ Error processing repository: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        errorCount++;
+      }
+
+      if (!isStartupMode) {
+        console.log("");
+      }
+    }
+
+    if (isStartupMode) {
+      // In startup mode, only log if there were repairs or errors
+      if (repairedCount > 0) {
+        console.log(`Repaired ${repairedCount} repository status inconsistencies`);
+      }
+      if (errorCount > 0) {
+        console.log(`Warning: ${errorCount} repositories had errors during repair`);
+      }
+    } else {
+      console.log("📊 Repair Summary:");
+      console.log(`   Repaired: ${repairedCount}`);
+      console.log(`   Skipped: ${skippedCount}`);
+      console.log(`   Errors: ${errorCount}`);
+
+      if (isDryRun && repairedCount > 0) {
+        console.log("");
+        console.log("💡 To apply these changes, run the script without --dry-run");
+      }
+    }
+
+  } catch (error) {
+    console.error("❌ Error during repair process:", error);
+  }
+}
+
+// Run the repair
+repairMirroredRepositories().then(() => {
+  console.log("Repair process complete.");
+  process.exit(0);
+}).catch((error) => {
+  console.error("Fatal error:", error);
+  process.exit(1);
+});

scripts/run-migration.ts

@@ -0,0 +1,31 @@
+import { Database } from "bun:sqlite";
+import { readFileSync } from "fs";
+import path from "path";
+
+const dbPath = path.join(process.cwd(), "data/gitea-mirror.db");
+const db = new Database(dbPath);
+
+// Read the migration file
+const migrationPath = path.join(process.cwd(), "drizzle/0001_polite_exodus.sql");
+const migration = readFileSync(migrationPath, "utf-8");
+
+// Split by statement-breakpoint and execute each statement
+const statements = migration.split("--> statement-breakpoint").map(s => s.trim()).filter(s => s);
+
+try {
+  db.run("BEGIN TRANSACTION");
+  
+  for (const statement of statements) {
+    console.log(`Executing: ${statement.substring(0, 50)}...`);
+    db.run(statement);
+  }
+  
+  db.run("COMMIT");
+  console.log("Migration completed successfully!");
+} catch (error) {
+  db.run("ROLLBACK");
+  console.error("Migration failed:", error);
+  process.exit(1);
+} finally {
+  db.close();
+}

scripts/test-graceful-shutdown.ts

@@ -47,7 +47,7 @@ async function createTestJob(): Promise<string> {
     jobType: "mirror",
     totalItems: 10,
     itemIds: ['item-1', 'item-2', 'item-3', 'item-4', 'item-5'],
-    completedItemIds: ['item-1', 'item-2'], // Simulate partial completion
+    completedItems: 2, // Simulate partial completion
     inProgress: true,
   });
   

src/components/NotFound.tsx

@@ -0,0 +1,80 @@
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { Home, ArrowLeft, GitBranch, BookOpen, Settings, FileQuestion } from "lucide-react";
+
+export function NotFound() {
+  return (
+    <div className="h-dvh bg-muted/30 flex items-center justify-center p-4">
+      <Card className="w-full max-w-md">
+        <CardHeader className="text-center pb-4">
+          <div className="mx-auto mb-4 h-16 w-16 rounded-full bg-muted flex items-center justify-center">
+            <FileQuestion className="h-8 w-8 text-muted-foreground" />
+          </div>
+          <h1 className="text-3xl font-bold">404</h1>
+          <h2 className="text-xl font-semibold mt-2">Page Not Found</h2>
+          <p className="text-muted-foreground mt-2">
+            The page you're looking for doesn't exist or has been moved.
+          </p>
+        </CardHeader>
+        
+        <CardContent className="space-y-6">
+          {/* Action Buttons */}
+          <div className="flex flex-col gap-3">
+            <Button asChild className="w-full">
+              <a href="/">
+                <Home className="mr-2 h-4 w-4" />
+                Go to Dashboard
+              </a>
+            </Button>
+            <Button variant="outline" className="w-full" onClick={() => window.history.back()}>
+              <ArrowLeft className="mr-2 h-4 w-4" />
+              Go Back
+            </Button>
+          </div>
+
+          {/* Divider */}
+          <div className="relative">
+            <div className="absolute inset-0 flex items-center">
+              <span className="w-full border-t" />
+            </div>
+            <div className="relative flex justify-center text-xs uppercase">
+              <span className="bg-card px-2 text-muted-foreground">or visit</span>
+            </div>
+          </div>
+
+          {/* Quick Links */}
+          <div className="grid grid-cols-3 gap-3">
+            <a 
+              href="/repositories" 
+              className="flex flex-col items-center gap-2 p-3 rounded-md hover:bg-muted transition-colors"
+            >
+              <GitBranch className="h-5 w-5 text-muted-foreground" />
+              <span className="text-xs">Repositories</span>
+            </a>
+            <a 
+              href="/config" 
+              className="flex flex-col items-center gap-2 p-3 rounded-md hover:bg-muted transition-colors"
+            >
+              <Settings className="h-5 w-5 text-muted-foreground" />
+              <span className="text-xs">Config</span>
+            </a>
+            <a 
+              href="/docs" 
+              className="flex flex-col items-center gap-2 p-3 rounded-md hover:bg-muted transition-colors"
+            >
+              <BookOpen className="h-5 w-5 text-muted-foreground" />
+              <span className="text-xs">Docs</span>
+            </a>
+          </div>
+
+          {/* Error Code */}
+          <div className="text-center pt-2">
+            <p className="text-xs text-muted-foreground">
+              Error Code: <code className="font-mono">404_NOT_FOUND</code>
+            </p>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

src/components/activity/ActivityList.tsx

@@ -3,11 +3,17 @@ import { useVirtualizer } from '@tanstack/react-virtual';
 import type { MirrorJob } from '@/lib/db/schema';
 import Fuse from 'fuse.js';
 import { Button } from '../ui/button';
-import { RefreshCw } from 'lucide-react';
+import { RefreshCw, Check, X, Loader2, Import } from 'lucide-react';
 import { Card } from '../ui/card';
 import { formatDate, getStatusColor } from '@/lib/utils';
 import { Skeleton } from '../ui/skeleton';
 import type { FilterParams } from '@/types/filter';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '../ui/tooltip';
 
 type MirrorJobWithKey = MirrorJob & { _rowKey: string };
 
@@ -73,7 +79,7 @@ export default function ActivityList({
     count: filteredActivities.length,
     getScrollElement: () => parentRef.current,
     estimateSize: (idx) =>
-      expandedItems.has(filteredActivities[idx]._rowKey) ? 217 : 120,
+      expandedItems.has(filteredActivities[idx]._rowKey) ? 217 : 100,
     overscan: 5,
     measureElement: (el) => el.getBoundingClientRect().height + 8,
   });
@@ -155,8 +161,8 @@ export default function ActivityList({
               }}
               className='border-b px-4 pt-4'
             >
-              <div className='flex items-start gap-4'>
-                <div className='relative mt-2'>
+              <div className='flex items-start gap-3 sm:gap-4'>
+                <div className='relative mt-2 flex-shrink-0'>
                   <div
                     className={`h-2 w-2 rounded-full ${getStatusColor(
                       activity.status,
@@ -164,25 +170,112 @@ export default function ActivityList({
                   />
                 </div>
 
-                <div className='flex-1'>
-                  <div className='mb-1 flex flex-col sm:flex-row sm:items-center sm:justify-between'>
-                    <p className='font-medium'>{activity.message}</p>
-                    <p className='text-sm text-muted-foreground'>
+                <div className='flex-1 min-w-0'>
+                  <div className='mb-1 flex items-start justify-between gap-2'>
+                    <div className='flex-1 min-w-0'>
+                      {/* Mobile: Show simplified status-based message */}
+                      <div className='block sm:hidden'>
+                        <p className='font-medium flex items-center gap-1.5'>
+                          {activity.status === 'synced' ? (
+                            <>
+                              <Check className='h-4 w-4 text-teal-600 dark:text-teal-400' />
+                              <span className='text-teal-600 dark:text-teal-400'>Sync successful</span>
+                            </>
+                          ) : activity.status === 'mirrored' ? (
+                            <>
+                              <Check className='h-4 w-4 text-emerald-600 dark:text-emerald-400' />
+                              <span className='text-emerald-600 dark:text-emerald-400'>Mirror successful</span>
+                            </>
+                          ) : activity.status === 'failed' ? (
+                            <>
+                              <X className='h-4 w-4 text-rose-600 dark:text-rose-400' />
+                              <span className='text-rose-600 dark:text-rose-400'>Operation failed</span>
+                            </>
+                          ) : activity.status === 'syncing' ? (
+                            <>
+                              <Loader2 className='h-4 w-4 text-indigo-600 dark:text-indigo-400 animate-spin' />
+                              <span className='text-indigo-600 dark:text-indigo-400'>Syncing in progress</span>
+                            </>
+                          ) : activity.status === 'mirroring' ? (
+                            <>
+                              <Loader2 className='h-4 w-4 text-yellow-600 dark:text-yellow-400 animate-spin' />
+                              <span className='text-yellow-600 dark:text-yellow-400'>Mirroring in progress</span>
+                            </>
+                          ) : activity.status === 'imported' ? (
+                            <>
+                              <Import className='h-4 w-4 text-blue-600 dark:text-blue-400' />
+                              <span className='text-blue-600 dark:text-blue-400'>Imported</span>
+                            </>
+                          ) : (
+                            <span>{activity.message}</span>
+                          )}
+                        </p>
+                      </div>
+                      {/* Desktop: Show status with icon and full message in tooltip */}
+                      <div className='hidden sm:block'>
+                        <TooltipProvider>
+                          <Tooltip>
+                            <TooltipTrigger asChild>
+                              <p className='font-medium flex items-center gap-1.5 cursor-help'>
+                                {activity.status === 'synced' ? (
+                                  <>
+                                    <Check className='h-4 w-4 text-teal-600 dark:text-teal-400 flex-shrink-0' />
+                                    <span className='text-teal-600 dark:text-teal-400'>Sync successful</span>
+                                  </>
+                                ) : activity.status === 'mirrored' ? (
+                                  <>
+                                    <Check className='h-4 w-4 text-emerald-600 dark:text-emerald-400 flex-shrink-0' />
+                                    <span className='text-emerald-600 dark:text-emerald-400'>Mirror successful</span>
+                                  </>
+                                ) : activity.status === 'failed' ? (
+                                  <>
+                                    <X className='h-4 w-4 text-rose-600 dark:text-rose-400 flex-shrink-0' />
+                                    <span className='text-rose-600 dark:text-rose-400'>Operation failed</span>
+                                  </>
+                                ) : activity.status === 'syncing' ? (
+                                  <>
+                                    <Loader2 className='h-4 w-4 text-indigo-600 dark:text-indigo-400 animate-spin flex-shrink-0' />
+                                    <span className='text-indigo-600 dark:text-indigo-400'>Syncing in progress</span>
+                                  </>
+                                ) : activity.status === 'mirroring' ? (
+                                  <>
+                                    <Loader2 className='h-4 w-4 text-yellow-600 dark:text-yellow-400 animate-spin flex-shrink-0' />
+                                    <span className='text-yellow-600 dark:text-yellow-400'>Mirroring in progress</span>
+                                  </>
+                                ) : activity.status === 'imported' ? (
+                                  <>
+                                    <Import className='h-4 w-4 text-blue-600 dark:text-blue-400 flex-shrink-0' />
+                                    <span className='text-blue-600 dark:text-blue-400'>Imported</span>
+                                  </>
+                                ) : (
+                                  <span className='truncate'>{activity.message}</span>
+                                )}
+                              </p>
+                            </TooltipTrigger>
+                            <TooltipContent side="bottom" align="start" className="max-w-[400px]">
+                              <p className="whitespace-pre-wrap break-words">{activity.message}</p>
+                            </TooltipContent>
+                          </Tooltip>
+                        </TooltipProvider>
+                      </div>
+                    </div>
+                    <p className='text-sm text-muted-foreground whitespace-nowrap flex-shrink-0 ml-2'>
                       {formatDate(activity.timestamp)}
                     </p>
                   </div>
 
-                  {activity.repositoryName && (
-                    <p className='mb-2 text-sm text-muted-foreground'>
-                      Repository: {activity.repositoryName}
-                    </p>
-                  )}
-
-                  {activity.organizationName && (
-                    <p className='mb-2 text-sm text-muted-foreground'>
-                      Organization: {activity.organizationName}
-                    </p>
-                  )}
+                  <div className='flex flex-col sm:flex-row sm:items-center gap-1 sm:gap-3'>
+                    {activity.repositoryName && (
+                      <p className='text-sm text-muted-foreground truncate'>
+                        <span className='font-medium'>Repo:</span> {activity.repositoryName}
+                      </p>
+                    )}
+                    {activity.organizationName && (
+                      <p className='text-sm text-muted-foreground truncate'>
+                        <span className='font-medium'>Org:</span> {activity.organizationName}
+                      </p>
+                    )}
+                  </div>
 
                   {activity.details && (
                     <div className='mt-2'>
@@ -199,7 +292,7 @@ export default function ActivityList({
                           })
                         }
                       >
-                        {isExpanded ? 'Hide Details' : 'Show Details'}
+                        {isExpanded ? 'Hide Details' : activity.status === 'failed' ? 'Show Error Details' : 'Show Details'}
                       </Button>
 
                       {isExpanded && (

src/components/activity/ActivityLog.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState, useRef } from 'react';
 import { Button } from '@/components/ui/button';
-import { ChevronDown, Download, RefreshCw, Search, Trash2 } from 'lucide-react';
+import { ChevronDown, Download, RefreshCw, Search, Trash2, Filter } from 'lucide-react';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -36,6 +36,16 @@ import { toast } from 'sonner';
 import { useLiveRefresh } from '@/hooks/useLiveRefresh';
 import { useConfigStatus } from '@/hooks/useConfigStatus';
 import { useNavigation } from '@/components/layout/MainLayout';
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from '@/components/ui/drawer';
 
 type MirrorJobWithKey = MirrorJob & { _rowKey: string };
 
@@ -343,18 +353,225 @@ export function ActivityLog() {
     setShowCleanupDialog(false);
   };
 
+  // Check if any filters are active
+  const hasActiveFilters = !!(filter.status || filter.type || filter.name);
+  const activeFilterCount = [filter.status, filter.type, filter.name].filter(Boolean).length;
+
+  // Clear all filters
+  const clearFilters = () => {
+    setFilter({
+      searchTerm: filter.searchTerm,
+      status: '',
+      type: '',
+      name: '',
+    });
+  };
+
   /* ------------------------------ UI ------------------------------ */
 
   return (
-    <div className='flex flex-col gap-y-8'>
-      <div className='flex w-full flex-row items-center gap-4'>
+    <div className='flex flex-col gap-y-4 sm:gap-y-8'>
+      {/* Mobile: Search bar with filter and action buttons */}
+      <div className="flex flex-col gap-2 sm:hidden">
+        <div className="flex items-center gap-2 w-full">
+          <div className="relative flex-grow">
+            <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+            <input
+              type="text"
+              placeholder="Search activities..."
+              className="pl-10 pr-3 h-10 w-full rounded-md border border-input bg-background text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              value={filter.searchTerm}
+              onChange={(e) =>
+                setFilter((prev) => ({ ...prev, searchTerm: e.target.value }))
+              }
+            />
+          </div>
+          
+          {/* Mobile Filter Drawer */}
+          <Drawer>
+            <DrawerTrigger asChild>
+              <Button 
+                variant="outline" 
+                size="icon" 
+                className="relative h-10 w-10 shrink-0"
+              >
+                <Filter className="h-4 w-4" />
+                {activeFilterCount > 0 && (
+                  <span className="absolute -top-1 -right-1 flex h-5 w-5 items-center justify-center rounded-full bg-primary text-[10px] font-medium text-primary-foreground">
+                    {activeFilterCount}
+                  </span>
+                )}
+              </Button>
+            </DrawerTrigger>
+            <DrawerContent className="max-h-[85vh]">
+              <DrawerHeader className="text-left">
+                <DrawerTitle className="text-lg font-semibold">Filter Activities</DrawerTitle>
+                <DrawerDescription className="text-sm text-muted-foreground">
+                  Narrow down your activity log
+                </DrawerDescription>
+              </DrawerHeader>
+              
+              <div className="px-4 py-6 space-y-6 overflow-y-auto">
+                {/* Active filters summary */}
+                {hasActiveFilters && (
+                  <div className="flex items-center justify-between p-3 bg-muted/50 rounded-lg">
+                    <span className="text-sm font-medium">
+                      {activeFilterCount} filter{activeFilterCount > 1 ? 's' : ''} active
+                    </span>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={clearFilters}
+                      className="h-7 px-2 text-xs"
+                    >
+                      Clear all
+                    </Button>
+                  </div>
+                )}
+
+                {/* Status Filter */}
+                <div className="space-y-2">
+                  <label className="text-sm font-medium flex items-center gap-2">
+                    <span className="text-muted-foreground">By</span> Status
+                    {filter.status && (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        {filter.status.charAt(0).toUpperCase() + filter.status.slice(1)}
+                      </span>
+                    )}
+                  </label>
+                  <Select
+                    value={filter.status || 'all'}
+                    onValueChange={(v) =>
+                      setFilter((p) => ({
+                        ...p,
+                        status: v === 'all' ? '' : (v as RepoStatus),
+                      }))
+                    }
+                  >
+                    <SelectTrigger className="w-full h-10">
+                      <SelectValue placeholder="All statuses" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {['all', ...repoStatusEnum.options].map((s) => (
+                        <SelectItem key={s} value={s}>
+                          <span className="flex items-center gap-2">
+                            {s !== 'all' && (
+                              <span className={`h-2 w-2 rounded-full ${
+                                s === 'synced' ? 'bg-green-500' :
+                                s === 'failed' ? 'bg-red-500' :
+                                s === 'syncing' ? 'bg-blue-500' :
+                                'bg-yellow-500'
+                              }`} />
+                            )}
+                            {s === 'all' ? 'All statuses' : s[0].toUpperCase() + s.slice(1)}
+                          </span>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                {/* Type Filter */}
+                <div className="space-y-2">
+                  <label className="text-sm font-medium flex items-center gap-2">
+                    <span className="text-muted-foreground">By</span> Type
+                    {filter.type && (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        {filter.type.charAt(0).toUpperCase() + filter.type.slice(1)}
+                      </span>
+                    )}
+                  </label>
+                  <Select
+                    value={filter.type || 'all'}
+                    onValueChange={(v) =>
+                      setFilter((p) => ({ ...p, type: v === 'all' ? '' : v }))
+                    }
+                  >
+                    <SelectTrigger className="w-full h-10">
+                      <SelectValue placeholder="All types" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {['all', 'repository', 'organization'].map((t) => (
+                        <SelectItem key={t} value={t}>
+                          <span className="flex items-center gap-2">
+                            {t !== 'all' && (
+                              <span className={`h-2 w-2 rounded-full ${
+                                t === 'repository' ? 'bg-blue-500' : 'bg-purple-500'
+                              }`} />
+                            )}
+                            {t === 'all' ? 'All types' : t[0].toUpperCase() + t.slice(1)}
+                          </span>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                {/* Name Filter */}
+                <div className="space-y-2">
+                  <label className="text-sm font-medium flex items-center gap-2">
+                    <span className="text-muted-foreground">By</span> Name
+                    {filter.name && (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        Selected
+                      </span>
+                    )}
+                  </label>
+                  <ActivityNameCombobox
+                    activities={activities}
+                    value={filter.name || ''}
+                    onChange={(name) => setFilter((p) => ({ ...p, name }))}
+                  />
+                </div>
+              </div>
+              
+              <DrawerFooter className="gap-2 px-4 pt-2 pb-4 border-t">
+                <DrawerClose asChild>
+                  <Button className="w-full" size="sm">
+                    Apply Filters
+                  </Button>
+                </DrawerClose>
+                <DrawerClose asChild>
+                  <Button variant="outline" className="w-full" size="sm">
+                    Cancel
+                  </Button>
+                </DrawerClose>
+              </DrawerFooter>
+            </DrawerContent>
+          </Drawer>
+          
+          
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={() => fetchActivities(false)}
+            title="Refresh activity log"
+            className="h-10 w-10 shrink-0"
+          >
+            <RefreshCw className="h-4 w-4" />
+          </Button>
+          
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={handleCleanupClick}
+            title="Delete all activities"
+            className="text-destructive hover:text-destructive h-10 w-10 shrink-0"
+          >
+            <Trash2 className="h-4 w-4" />
+          </Button>
+        </div>
+      </div>
+
+      {/* Desktop: Original layout */}
+      <div className="hidden sm:flex sm:flex-row sm:items-center sm:gap-4 sm:w-full">
         {/* search input */}
-        <div className='relative flex-1'>
-          <Search className='absolute left-2 top-2.5 h-4 w-4 text-muted-foreground' />
+        <div className="relative flex-1">
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
           <input
-            type='text'
-            placeholder='Search activities...'
-            className='h-9 w-full rounded-md border border-input bg-background px-3 py-1 pl-8 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring'
+            type="text"
+            placeholder="Search activities..."
+            className="pl-10 pr-3 h-10 w-full rounded-md border border-input bg-background text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
             value={filter.searchTerm}
             onChange={(e) =>
               setFilter((prev) => ({
@@ -365,27 +582,66 @@ export function ActivityLog() {
           />
         </div>
 
-        {/* status select */}
-        <Select
-          value={filter.status || 'all'}
-          onValueChange={(v) =>
-            setFilter((p) => ({
-              ...p,
-              status: v === 'all' ? '' : (v as RepoStatus),
-            }))
-          }
-        >
-          <SelectTrigger className='h-9 w-[140px] max-h-9'>
-            <SelectValue placeholder='All Status' />
-          </SelectTrigger>
-          <SelectContent>
-            {['all', ...repoStatusEnum.options].map((s) => (
-              <SelectItem key={s} value={s}>
-                {s === 'all' ? 'All Status' : s[0].toUpperCase() + s.slice(1)}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
+        {/* Filter controls */}
+        <div className="flex items-center gap-2">
+          {/* status select */}
+          <Select
+            value={filter.status || 'all'}
+            onValueChange={(v) =>
+              setFilter((p) => ({
+                ...p,
+                status: v === 'all' ? '' : (v as RepoStatus),
+              }))
+            }
+          >
+            <SelectTrigger className="w-[140px] h-10">
+              <SelectValue placeholder="All statuses" />
+            </SelectTrigger>
+            <SelectContent>
+              {['all', ...repoStatusEnum.options].map((s) => (
+                <SelectItem key={s} value={s}>
+                  <span className="flex items-center gap-2">
+                    {s !== 'all' && (
+                      <span className={`h-2 w-2 rounded-full ${
+                        s === 'synced' ? 'bg-green-500' :
+                        s === 'failed' ? 'bg-red-500' :
+                        s === 'syncing' ? 'bg-blue-500' :
+                        'bg-yellow-500'
+                      }`} />
+                    )}
+                    {s === 'all' ? 'All statuses' : s[0].toUpperCase() + s.slice(1)}
+                  </span>
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+
+          {/* type select */}
+          <Select
+            value={filter.type || 'all'}
+            onValueChange={(v) =>
+              setFilter((p) => ({ ...p, type: v === 'all' ? '' : v }))
+            }
+          >
+            <SelectTrigger className="w-[140px] h-10">
+              <SelectValue placeholder="All types" />
+            </SelectTrigger>
+            <SelectContent>
+              {['all', 'repository', 'organization'].map((t) => (
+                <SelectItem key={t} value={t}>
+                  <span className="flex items-center gap-2">
+                    {t !== 'all' && (
+                      <span className={`h-2 w-2 rounded-full ${
+                        t === 'repository' ? 'bg-blue-500' : 'bg-purple-500'
+                      }`} />
+                    )}
+                    {t === 'all' ? 'All types' : t[0].toUpperCase() + t.slice(1)}
+                  </span>
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
 
         {/* repo/org name combobox */}
         <ActivityNameCombobox
@@ -394,64 +650,49 @@ export function ActivityLog() {
           onChange={(name) => setFilter((p) => ({ ...p, name }))}
         />
 
-        {/* type select */}
-        <Select
-          value={filter.type || 'all'}
-          onValueChange={(v) =>
-            setFilter((p) => ({ ...p, type: v === 'all' ? '' : v }))
-          }
-        >
-          <SelectTrigger className='h-9 w-[140px] max-h-9'>
-            <SelectValue placeholder='All Types' />
-          </SelectTrigger>
-          <SelectContent>
-            {['all', 'repository', 'organization'].map((t) => (
-              <SelectItem key={t} value={t}>
-                {t === 'all' ? 'All Types' : t[0].toUpperCase() + t.slice(1)}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
+        {/* Action buttons */}
+        <div className="flex items-center gap-2 ml-auto">
+          {/* export dropdown */}
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="outline" size="sm" className="h-10">
+                <Download className="h-4 w-4 mr-2" />
+                Export
+                <ChevronDown className="h-4 w-4 ml-1" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={exportAsCSV}>
+                Export as CSV
+              </DropdownMenuItem>
+              <DropdownMenuItem onClick={exportAsJSON}>
+                Export as JSON
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
 
-        {/* export dropdown */}
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button variant='outline' className='flex items-center gap-1'>
-              <Download className='mr-1 h-4 w-4' />
-              Export
-              <ChevronDown className='ml-1 h-4 w-4' />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent>
-            <DropdownMenuItem onClick={exportAsCSV}>
-              Export as CSV
-            </DropdownMenuItem>
-            <DropdownMenuItem onClick={exportAsJSON}>
-              Export as JSON
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
+          {/* refresh */}
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={() => fetchActivities(false)}
+            title="Refresh activity log"
+            className="h-10 w-10"
+          >
+            <RefreshCw className="h-4 w-4" />
+          </Button>
 
-        {/* refresh */}
-        <Button
-          variant="outline"
-          size="icon"
-          onClick={() => fetchActivities(false)} // Manual refresh, show loading skeleton
-          title="Refresh activity log"
-        >
-          <RefreshCw className='h-4 w-4' />
-        </Button>
-
-        {/* cleanup all activities */}
-        <Button
-          variant="outline"
-          size="icon"
-          onClick={handleCleanupClick}
-          title="Delete all activities"
-          className="text-destructive hover:text-destructive"
-        >
-          <Trash2 className='h-4 w-4' />
-        </Button>
+          {/* cleanup all activities */}
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={handleCleanupClick}
+            title="Delete all activities"
+            className="text-destructive hover:text-destructive h-10 w-10"
+          >
+            <Trash2 className="h-4 w-4" />
+          </Button>
+        </div>
       </div>
 
       {/* activity list */}
@@ -486,6 +727,26 @@ export function ActivityLog() {
           </DialogFooter>
         </DialogContent>
       </Dialog>
+
+      {/* Mobile FAB for Export - only visible on mobile */}
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button 
+            className="fixed bottom-4 right-4 rounded-full h-12 w-12 shadow-lg p-0 z-10 sm:hidden"
+            variant="default"
+          >
+            <Download className="h-6 w-6" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end" side="top" className="mb-2">
+          <DropdownMenuItem onClick={exportAsCSV}>
+            Export as CSV
+          </DropdownMenuItem>
+          <DropdownMenuItem onClick={exportAsJSON}>
+            Export as JSON
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
     </div>
   );
 }

src/components/activity/ActivityNameCombobox.tsx

@@ -41,9 +41,14 @@ export function ActivityNameCombobox({ activities, value, onChange }: ActivityNa
           variant="outline"
           role="combobox"
           aria-expanded={open}
-          className="w-[180px] justify-between"
+          className="w-full sm:w-[180px] justify-between h-10"
         >
-          {value ? value : "All Names"}
+          <span className={cn(
+            "truncate",
+            !value && "text-muted-foreground"
+          )}>
+            {value || "All names"}
+          </span>
           <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
         </Button>
       </PopoverTrigger>
@@ -62,7 +67,7 @@ export function ActivityNameCombobox({ activities, value, onChange }: ActivityNa
                 }}
               >
                 <Check className={cn("mr-2 h-4 w-4", value === "" ? "opacity-100" : "opacity-0")} />
-                All Names
+                All names
               </CommandItem>
               {names.map((name) => (
                 <CommandItem

src/components/auth/LoginForm.tsx

@@ -1,53 +1,73 @@
 'use client';
 
 import * as React from 'react';
-import { useState, useEffect } from 'react';
+import { useState } from 'react';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
-import { SiGitea } from 'react-icons/si';
+import { useAuth } from '@/hooks/useAuth';
+import { useAuthMethods } from '@/hooks/useAuthMethods';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { authClient } from '@/lib/auth-client';
+import { Separator } from '@/components/ui/separator';
 import { toast, Toaster } from 'sonner';
 import { showErrorToast } from '@/lib/utils';
-import { FlipHorizontal } from 'lucide-react';
+import { Loader2, Mail, Globe } from 'lucide-react';
+
 
 export function LoginForm() {
   const [isLoading, setIsLoading] = useState(false);
+  const [ssoEmail, setSsoEmail] = useState('');
+  const { login } = useAuth();
+  const { authMethods, isLoading: isLoadingMethods } = useAuthMethods();
+
+  // Determine which tab to show by default
+  const getDefaultTab = () => {
+    if (authMethods.emailPassword) return 'email';
+    if (authMethods.sso.enabled) return 'sso';
+    return 'email'; // fallback
+  };
 
   async function handleLogin(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
     setIsLoading(true);
     const form = e.currentTarget;
     const formData = new FormData(form);
-    const username = formData.get('username') as string | null;
+    const email = formData.get('email') as string | null;
     const password = formData.get('password') as string | null;
 
-    if (!username || !password) {
-      toast.error('Please enter both username and password');
+    if (!email || !password) {
+      toast.error('Please enter both email and password');
       setIsLoading(false);
       return;
     }
 
-    const loginData = { username, password };
-
     try {
-      const response = await fetch('/api/auth/login', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(loginData),
-      });
+      await login(email, password);
+      toast.success('Login successful!');
+      // Small delay before redirecting to see the success message
+      setTimeout(() => {
+        window.location.href = '/';
+      }, 1000);
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setIsLoading(false);
+    }
+  }
 
-      const data = await response.json();
-
-      if (response.ok) {
-        toast.success('Login successful!');
-        // Small delay before redirecting to see the success message
-        setTimeout(() => {
-          window.location.href = '/';
-        }, 1000);
-      } else {
-        showErrorToast(data.error || 'Login failed. Please try again.', toast);
+  async function handleSSOLogin(domain?: string) {
+    setIsLoading(true);
+    try {
+      if (!domain && !ssoEmail) {
+        toast.error('Please enter your email or select a provider');
+        return;
       }
+
+      await authClient.signIn.sso({
+        email: ssoEmail || undefined,
+        domain: domain,
+        callbackURL: '/',
+      });
     } catch (error) {
       showErrorToast(error, toast);
     } finally {
@@ -60,52 +80,198 @@ export function LoginForm() {
       <Card className="w-full max-w-md">
         <CardHeader className="text-center">
           <div className="flex justify-center mb-4">
-            <SiGitea className="h-10 w-10" />
+            <img
+              src="/logo-light.svg"
+              alt="Gitea Mirror Logo"
+              className="h-10 w-10 dark:hidden"
+            />
+            <img
+              src="/logo-dark.svg"
+              alt="Gitea Mirror Logo"
+              className="h-10 w-10 hidden dark:block"
+            />
           </div>
           <CardTitle className="text-2xl">Gitea Mirror</CardTitle>
           <CardDescription>
             Log in to manage your GitHub to Gitea mirroring
           </CardDescription>
         </CardHeader>
-        <CardContent>
-          <form id="login-form" onSubmit={handleLogin}>
-            <div className="space-y-4">
-              <div>
-                <label htmlFor="username" className="block text-sm font-medium mb-1">
-                  Username
-                </label>
-                <input
-                  id="username"
-                  name="username"
-                  type="text"
-                  required
-                  className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-                  placeholder="Enter your username"
-                  disabled={isLoading}
-                />
-              </div>
-              <div>
-                <label htmlFor="password" className="block text-sm font-medium mb-1">
-                  Password
-                </label>
-                <input
-                  id="password"
-                  name="password"
-                  type="password"
-                  required
-                  className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-                  placeholder="Enter your password"
-                  disabled={isLoading}
-                />
-              </div>
+        
+        {isLoadingMethods ? (
+          <CardContent>
+            <div className="flex justify-center py-8">
+              <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
             </div>
-          </form>
-        </CardContent>
-        <CardFooter>
-          <Button type="submit" form="login-form" className="w-full" disabled={isLoading}>
-            {isLoading ? 'Logging in...' : 'Log In'}
-          </Button>
-        </CardFooter>
+          </CardContent>
+        ) : (
+          <>
+            {/* Show tabs only if multiple auth methods are available */}
+            {authMethods.sso.enabled && authMethods.emailPassword ? (
+              <Tabs defaultValue={getDefaultTab()} className="w-full">
+                <TabsList className="grid w-full grid-cols-2 mx-6" style={{ width: 'calc(100% - 3rem)' }}>
+                  <TabsTrigger value="email">
+                    <Mail className="h-4 w-4 mr-2" />
+                    Email
+                  </TabsTrigger>
+                  <TabsTrigger value="sso">
+                    <Globe className="h-4 w-4 mr-2" />
+                    SSO
+                  </TabsTrigger>
+                </TabsList>
+
+                <TabsContent value="email">
+                  <CardContent>
+                    <form id="login-form" onSubmit={handleLogin}>
+                      <div className="space-y-4">
+                        <div>
+                          <label htmlFor="email" className="block text-sm font-medium mb-1">
+                            Email
+                          </label>
+                          <input
+                            id="email"
+                            name="email"
+                            type="email"
+                            required
+                            className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                            placeholder="Enter your email"
+                            disabled={isLoading}
+                          />
+                        </div>
+                        <div>
+                          <label htmlFor="password" className="block text-sm font-medium mb-1">
+                            Password
+                          </label>
+                          <input
+                            id="password"
+                            name="password"
+                            type="password"
+                            required
+                            className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                            placeholder="Enter your password"
+                            disabled={isLoading}
+                          />
+                        </div>
+                      </div>
+                    </form>
+                  </CardContent>
+                  <CardFooter>
+                    <Button type="submit" form="login-form" className="w-full" disabled={isLoading}>
+                      {isLoading ? 'Logging in...' : 'Log In'}
+                    </Button>
+                  </CardFooter>
+                </TabsContent>
+
+                <TabsContent value="sso">
+                  <CardContent>
+                    <div className="space-y-4">
+                      {authMethods.sso.providers.length > 0 && (
+                        <>
+                          <div className="space-y-2">
+                            <p className="text-sm text-muted-foreground text-center">
+                              Sign in with your organization account
+                            </p>
+                            {authMethods.sso.providers.map(provider => (
+                              <Button
+                                key={provider.id}
+                                variant="outline"
+                                className="w-full"
+                                onClick={() => handleSSOLogin(provider.domain)}
+                                disabled={isLoading}
+                              >
+                                <Globe className="h-4 w-4 mr-2" />
+                                Sign in with {provider.domain}
+                              </Button>
+                            ))}
+                          </div>
+                          
+                          <div className="relative">
+                            <div className="absolute inset-0 flex items-center">
+                              <Separator />
+                            </div>
+                            <div className="relative flex justify-center text-xs uppercase">
+                              <span className="bg-background px-2 text-muted-foreground">Or</span>
+                            </div>
+                          </div>
+                        </>
+                      )}
+                      
+                      <div>
+                        <label htmlFor="sso-email" className="block text-sm font-medium mb-1">
+                          Work Email
+                        </label>
+                        <input
+                          id="sso-email"
+                          type="email"
+                          value={ssoEmail}
+                          onChange={(e) => setSsoEmail(e.target.value)}
+                          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                          placeholder="Enter your work email"
+                          disabled={isLoading}
+                        />
+                        <p className="text-xs text-muted-foreground mt-1">
+                          We'll redirect you to your organization's SSO provider
+                        </p>
+                      </div>
+                    </div>
+                  </CardContent>
+                  <CardFooter>
+                    <Button 
+                      className="w-full" 
+                      onClick={() => handleSSOLogin()}
+                      disabled={isLoading || !ssoEmail}
+                    >
+                      {isLoading ? 'Redirecting...' : 'Continue with SSO'}
+                    </Button>
+                  </CardFooter>
+                </TabsContent>
+              </Tabs>
+            ) : (
+              // Single auth method - show email/password only
+              <>
+                <CardContent>
+                  <form id="login-form" onSubmit={handleLogin}>
+                    <div className="space-y-4">
+                      <div>
+                        <label htmlFor="email" className="block text-sm font-medium mb-1">
+                          Email
+                        </label>
+                        <input
+                          id="email"
+                          name="email"
+                          type="email"
+                          required
+                          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                          placeholder="Enter your email"
+                          disabled={isLoading}
+                        />
+                      </div>
+                      <div>
+                        <label htmlFor="password" className="block text-sm font-medium mb-1">
+                          Password
+                        </label>
+                        <input
+                          id="password"
+                          name="password"
+                          type="password"
+                          required
+                          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                          placeholder="Enter your password"
+                          disabled={isLoading}
+                        />
+                      </div>
+                    </div>
+                  </form>
+                </CardContent>
+                <CardFooter>
+                  <Button type="submit" form="login-form" className="w-full" disabled={isLoading}>
+                    {isLoading ? 'Logging in...' : 'Log In'}
+                  </Button>
+                </CardFooter>
+              </>
+            )}
+          </>
+        )}
+        
         <div className="px-6 pb-6 text-center">
           <p className="text-sm text-muted-foreground">
             Don't have an account? Contact your administrator.

src/components/auth/LoginPage.tsx

@@ -0,0 +1,10 @@
+import { LoginForm } from './LoginForm';
+import Providers from '@/components/layout/Providers';
+
+export function LoginPage() {
+  return (
+    <Providers>
+      <LoginForm />
+    </Providers>
+  );
+}

src/components/auth/SignupForm.tsx

@@ -3,24 +3,24 @@
 import { useState } from 'react';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
-import { GitMerge } from 'lucide-react';
 import { toast, Toaster } from 'sonner';
 import { showErrorToast } from '@/lib/utils';
+import { useAuth } from '@/hooks/useAuth';
 
 export function SignupForm() {
   const [isLoading, setIsLoading] = useState(false);
+  const { register } = useAuth();
 
   async function handleSignup(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
     setIsLoading(true);
     const form = e.currentTarget;
     const formData = new FormData(form);
-    const username = formData.get('username') as string | null;
     const email = formData.get('email') as string | null;
     const password = formData.get('password') as string | null;
     const confirmPassword = formData.get('confirmPassword') as string | null;
 
-    if (!username || !email || !password || !confirmPassword) {
+    if (!email || !password || !confirmPassword) {
       toast.error('Please fill in all fields');
       setIsLoading(false);
       return;
@@ -32,28 +32,15 @@ export function SignupForm() {
       return;
     }
 
-    const signupData = { username, email, password };
-
     try {
-      const response = await fetch('/api/auth/register', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(signupData),
-      });
-
-      const data = await response.json();
-
-      if (response.ok) {
-        toast.success('Account created successfully! Redirecting to dashboard...');
-        // Small delay before redirecting to see the success message
-        setTimeout(() => {
-          window.location.href = '/';
-        }, 1500);
-      } else {
-        showErrorToast(data.error || 'Failed to create account. Please try again.', toast);
-      }
+      // Derive username from email (part before @)
+      const username = email.split('@')[0];
+      await register(username, email, password);
+      toast.success('Account created successfully! Redirecting to dashboard...');
+      // Small delay before redirecting to see the success message
+      setTimeout(() => {
+        window.location.href = '/';
+      }, 1500);
     } catch (error) {
       showErrorToast(error, toast);
     } finally {
@@ -66,7 +53,16 @@ export function SignupForm() {
       <Card className="w-full max-w-md">
         <CardHeader className="text-center">
           <div className="flex justify-center mb-4">
-            <GitMerge className="h-10 w-10" />
+            <img
+              src="/logo-light.svg"
+              alt="Gitea Mirror Logo"
+              className="h-10 w-10 dark:hidden"
+            />
+            <img
+              src="/logo-dark.svg"
+              alt="Gitea Mirror Logo"
+              className="h-10 w-10 hidden dark:block"
+            />
           </div>
           <CardTitle className="text-2xl">Create Admin Account</CardTitle>
           <CardDescription>
@@ -76,20 +72,6 @@ export function SignupForm() {
         <CardContent>
           <form id="signup-form" onSubmit={handleSignup}>
             <div className="space-y-4">
-              <div>
-                <label htmlFor="username" className="block text-sm font-medium mb-1">
-                  Username
-                </label>
-                <input
-                  id="username"
-                  name="username"
-                  type="text"
-                  required
-                  className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-                  placeholder="Enter your username"
-                  disabled={isLoading}
-                />
-              </div>
               <div>
                 <label htmlFor="email" className="block text-sm font-medium mb-1">
                   Email
@@ -102,6 +84,7 @@ export function SignupForm() {
                   className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
                   placeholder="Enter your email"
                   disabled={isLoading}
+                  autoFocus
                 />
               </div>
               <div>

src/components/auth/SignupPage.tsx

@@ -0,0 +1,10 @@
+import { SignupForm } from './SignupForm';
+import Providers from '@/components/layout/Providers';
+
+export function SignupPage() {
+  return (
+    <Providers>
+      <SignupForm />
+    </Providers>
+  );
+}

src/components/config/AdvancedOptionsForm.tsx

@@ -0,0 +1,90 @@
+import React from "react";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Checkbox } from "../ui/checkbox";
+import type { AdvancedOptions } from "@/types/config";
+import { RefreshCw } from "lucide-react";
+
+interface AdvancedOptionsFormProps {
+  config: AdvancedOptions;
+  setConfig: React.Dispatch<React.SetStateAction<AdvancedOptions>>;
+  onAutoSave?: (config: AdvancedOptions) => Promise<void>;
+  isAutoSaving?: boolean;
+}
+
+export function AdvancedOptionsForm({
+  config,
+  setConfig,
+  onAutoSave,
+  isAutoSaving = false,
+}: AdvancedOptionsFormProps) {
+  const handleChange = (name: string, checked: boolean) => {
+    const newConfig = {
+      ...config,
+      [name]: checked,
+    };
+
+    setConfig(newConfig);
+
+    // Auto-save
+    if (onAutoSave) {
+      onAutoSave(newConfig);
+    }
+  };
+
+  return (
+    <Card className="self-start">
+      <CardHeader>
+        <CardTitle className="text-lg font-semibold flex items-center justify-between">
+          Advanced Options
+          {isAutoSaving && (
+            <div className="flex items-center text-sm text-muted-foreground">
+              <RefreshCw className="h-3 w-3 animate-spin mr-1" />
+              <span className="text-xs">Auto-saving...</span>
+            </div>
+          )}
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="space-y-4">
+        <div className="space-y-3">
+          <div className="flex items-center">
+            <Checkbox
+              id="skip-forks"
+              checked={config.skipForks}
+              onCheckedChange={(checked) =>
+                handleChange("skipForks", Boolean(checked))
+              }
+            />
+            <label
+              htmlFor="skip-forks"
+              className="ml-2 text-sm select-none"
+            >
+              Skip forks
+            </label>
+          </div>
+          <p className="text-xs text-muted-foreground ml-6">
+            Don't mirror repositories that are forks of other repositories
+          </p>
+
+          <div className="flex items-center">
+            <Checkbox
+              id="skip-starred-issues"
+              checked={config.skipStarredIssues}
+              onCheckedChange={(checked) =>
+                handleChange("skipStarredIssues", Boolean(checked))
+              }
+            />
+            <label
+              htmlFor="skip-starred-issues"
+              className="ml-2 text-sm select-none"
+            >
+              Don't fetch issues for starred repos
+            </label>
+          </div>
+          <p className="text-xs text-muted-foreground ml-6">
+            Skip mirroring issues and pull requests for starred repositories
+          </p>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

src/components/config/AutomationSettings.tsx

@@ -0,0 +1,336 @@
+import { useEffect } from "react";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Label } from "@/components/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import {
+  Clock,
+  Database,
+  RefreshCw,
+  Calendar,
+  Activity,
+  Zap,
+  Info
+} from "lucide-react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import type { ScheduleConfig, DatabaseCleanupConfig } from "@/types/config";
+import { formatDate } from "@/lib/utils";
+
+interface AutomationSettingsProps {
+  scheduleConfig: ScheduleConfig;
+  cleanupConfig: DatabaseCleanupConfig;
+  onScheduleChange: (config: ScheduleConfig) => void;
+  onCleanupChange: (config: DatabaseCleanupConfig) => void;
+  isAutoSavingSchedule?: boolean;
+  isAutoSavingCleanup?: boolean;
+}
+
+const scheduleIntervals = [
+  { label: "Every hour", value: 3600 },
+  { label: "Every 2 hours", value: 7200 },
+  { label: "Every 4 hours", value: 14400 },
+  { label: "Every 8 hours", value: 28800 },
+  { label: "Every 12 hours", value: 43200 },
+  { label: "Daily", value: 86400 },
+  { label: "Every 2 days", value: 172800 },
+  { label: "Weekly", value: 604800 },
+];
+
+const retentionPeriods = [
+  { label: "1 day", value: 86400 },
+  { label: "3 days", value: 259200 },
+  { label: "1 week", value: 604800 },
+  { label: "2 weeks", value: 1209600 },
+  { label: "1 month", value: 2592000 },
+  { label: "2 months", value: 5184000 },
+  { label: "3 months", value: 7776000 },
+];
+
+function getCleanupInterval(retentionSeconds: number): number {
+  const days = retentionSeconds / 86400;
+  if (days <= 1) return 21600; // 6 hours
+  if (days <= 3) return 43200; // 12 hours
+  if (days <= 7) return 86400; // 24 hours
+  if (days <= 30) return 172800; // 48 hours
+  return 604800; // 1 week
+}
+
+function getCleanupFrequencyText(retentionSeconds: number): string {
+  const days = retentionSeconds / 86400;
+  if (days <= 1) return "every 6 hours";
+  if (days <= 3) return "every 12 hours";
+  if (days <= 7) return "daily";
+  if (days <= 30) return "every 2 days";
+  return "weekly";
+}
+
+export function AutomationSettings({
+  scheduleConfig,
+  cleanupConfig,
+  onScheduleChange,
+  onCleanupChange,
+  isAutoSavingSchedule,
+  isAutoSavingCleanup,
+}: AutomationSettingsProps) {
+  // Update nextRun for cleanup when settings change
+  useEffect(() => {
+    if (cleanupConfig.enabled && !cleanupConfig.nextRun) {
+      const cleanupInterval = getCleanupInterval(cleanupConfig.retentionDays);
+      const nextRun = new Date(Date.now() + cleanupInterval * 1000);
+      onCleanupChange({ ...cleanupConfig, nextRun });
+    }
+  }, [cleanupConfig.enabled, cleanupConfig.retentionDays]);
+
+  return (
+    <Card className="w-full">
+      <CardHeader>
+        <CardTitle className="text-lg font-semibold flex items-center gap-2">
+          <Zap className="h-5 w-5" />
+          Automation & Maintenance
+          <TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <button className="ml-1 inline-flex items-center justify-center rounded-full w-4 h-4 bg-muted hover:bg-muted/80 transition-colors">
+                  <Info className="h-3 w-3" />
+                  <span className="sr-only">Background operations info</span>
+                </button>
+              </TooltipTrigger>
+              <TooltipContent side="right" className="max-w-xs">
+                <div className="space-y-2">
+                  <p className="font-medium">Background Operations</p>
+                  <p className="text-xs">
+                    These automated tasks run in the background to keep your mirrors up-to-date and maintain optimal database performance. 
+                    Choose intervals that match your workflow and repository update frequency.
+                  </p>
+                </div>
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        </CardTitle>
+      </CardHeader>
+      
+      <CardContent className="space-y-6">
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          {/* Automatic Mirroring Section */}
+          <div className="space-y-4 p-4 border border-border rounded-lg bg-card/50">
+            <div className="flex items-center justify-between">
+              <h3 className="text-sm font-medium flex items-center gap-2">
+                <RefreshCw className="h-4 w-4 text-primary" />
+                Automatic Mirroring
+              </h3>
+              {isAutoSavingSchedule && (
+                <Activity className="h-4 w-4 animate-spin text-muted-foreground" />
+              )}
+            </div>
+
+            <div className="space-y-4">
+              <div className="flex items-start space-x-3">
+                <Checkbox
+                  id="enable-auto-mirror"
+                  checked={scheduleConfig.enabled}
+                  onCheckedChange={(checked) =>
+                    onScheduleChange({ ...scheduleConfig, enabled: !!checked })
+                  }
+                />
+                <div className="space-y-0.5 flex-1">
+                  <Label
+                    htmlFor="enable-auto-mirror"
+                    className="text-sm font-normal cursor-pointer"
+                  >
+                    Enable automatic repository syncing
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    Periodically check GitHub for changes and mirror them to Gitea
+                  </p>
+                </div>
+              </div>
+
+              {scheduleConfig.enabled && (
+                <div className="ml-6 space-y-3">
+                  <div>
+                    <Label htmlFor="mirror-interval" className="text-sm">
+                      Sync frequency
+                    </Label>
+                    <Select
+                      value={scheduleConfig.interval.toString()}
+                      onValueChange={(value) =>
+                        onScheduleChange({
+                          ...scheduleConfig,
+                          interval: parseInt(value, 10),
+                        })
+                      }
+                    >
+                      <SelectTrigger id="mirror-interval" className="mt-1.5">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {scheduleIntervals.map((option) => (
+                          <SelectItem
+                            key={option.value}
+                            value={option.value.toString()}
+                          >
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </div>
+                </div>
+              )}
+
+              <div className="space-y-2 p-3 bg-muted/30 dark:bg-muted/10 rounded-md border border-border/50">
+                <div className="flex items-center justify-between text-xs">
+                  <span className="flex items-center gap-1.5">
+                    <Clock className="h-3.5 w-3.5" />
+                    Last sync
+                  </span>
+                  <span className="font-medium">
+                    {scheduleConfig.lastRun
+                      ? formatDate(scheduleConfig.lastRun)
+                      : "Never"}
+                  </span>
+                </div>
+                {scheduleConfig.enabled && scheduleConfig.nextRun && (
+                  <div className="flex items-center justify-between text-xs">
+                    <span className="flex items-center gap-1.5">
+                      <Calendar className="h-3.5 w-3.5" />
+                      Next sync
+                    </span>
+                    <span className="font-medium">
+                      {formatDate(scheduleConfig.nextRun)}
+                    </span>
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+
+          {/* Database Cleanup Section */}
+          <div className="space-y-4 p-4 border border-border rounded-lg bg-card/50">
+            <div className="flex items-center justify-between">
+              <h3 className="text-sm font-medium flex items-center gap-2">
+                <Database className="h-4 w-4 text-primary" />
+                Database Maintenance
+              </h3>
+              {isAutoSavingCleanup && (
+                <Activity className="h-4 w-4 animate-spin text-muted-foreground" />
+              )}
+            </div>
+
+            <div className="space-y-4">
+              <div className="flex items-start space-x-3">
+                <Checkbox
+                  id="enable-auto-cleanup"
+                  checked={cleanupConfig.enabled}
+                  onCheckedChange={(checked) =>
+                    onCleanupChange({ ...cleanupConfig, enabled: !!checked })
+                  }
+                />
+                <div className="space-y-0.5 flex-1">
+                  <Label
+                    htmlFor="enable-auto-cleanup"
+                    className="text-sm font-normal cursor-pointer"
+                  >
+                    Enable automatic database cleanup
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    Remove old activity logs and events to optimize storage
+                  </p>
+                </div>
+              </div>
+
+              {cleanupConfig.enabled && (
+                <div className="ml-6 space-y-3">
+                  <div>
+                    <Label htmlFor="retention-period" className="text-sm flex items-center gap-2">
+                      Data retention period
+                      <TooltipProvider>
+                        <Tooltip>
+                          <TooltipTrigger>
+                            <Info className="h-3 w-3 text-muted-foreground" />
+                          </TooltipTrigger>
+                          <TooltipContent side="top" className="max-w-xs">
+                            <p className="text-xs">
+                              Activity logs and events older than this will be removed. 
+                              Cleanup frequency is automatically optimized based on your retention period.
+                            </p>
+                          </TooltipContent>
+                        </Tooltip>
+                      </TooltipProvider>
+                    </Label>
+                    <Select
+                      value={cleanupConfig.retentionDays.toString()}
+                      onValueChange={(value) =>
+                        onCleanupChange({
+                          ...cleanupConfig,
+                          retentionDays: parseInt(value, 10),
+                        })
+                      }
+                    >
+                      <SelectTrigger id="retention-period" className="mt-1.5">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {retentionPeriods.map((option) => (
+                          <SelectItem
+                            key={option.value}
+                            value={option.value.toString()}
+                          >
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                    {cleanupConfig.enabled && (
+                      <p className="text-xs text-muted-foreground mt-1">
+                        Cleanup runs {getCleanupFrequencyText(cleanupConfig.retentionDays)}
+                      </p>
+                    )}
+                  </div>
+                </div>
+              )}
+
+              <div className="space-y-2 p-3 bg-muted/30 dark:bg-muted/10 rounded-md border border-border/50">
+                <div className="flex items-center justify-between text-xs">
+                  <span className="flex items-center gap-1.5">
+                    <Clock className="h-3.5 w-3.5" />
+                    Last cleanup
+                  </span>
+                  <span className="font-medium">
+                    {cleanupConfig.lastRun
+                      ? formatDate(cleanupConfig.lastRun)
+                      : "Never"}
+                  </span>
+                </div>
+                {cleanupConfig.enabled && cleanupConfig.nextRun && (
+                  <div className="flex items-center justify-between text-xs">
+                    <span className="flex items-center gap-1.5">
+                      <Calendar className="h-3.5 w-3.5" />
+                      Next cleanup
+                    </span>
+                    <span className="font-medium">
+                      {cleanupConfig.nextRun
+                        ? formatDate(cleanupConfig.nextRun)
+                        : "Calculating..."}
+                    </span>
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

src/components/config/ConfigTabs.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState, useCallback, useRef } from 'react';
 import { GitHubConfigForm } from './GitHubConfigForm';
 import { GiteaConfigForm } from './GiteaConfigForm';
-import { ScheduleConfigForm } from './ScheduleConfigForm';
-import { DatabaseCleanupConfigForm } from './DatabaseCleanupConfigForm';
+import { AutomationSettings } from './AutomationSettings';
+import { SSOSettings } from './SSOSettings';
 import type {
   ConfigApiResponse,
   GiteaConfig,
@@ -11,6 +11,8 @@ import type {
   SaveConfigApiResponse,
   ScheduleConfig,
   DatabaseCleanupConfig,
+  MirrorOptions,
+  AdvancedOptions,
 } from '@/types/config';
 import { Button } from '../ui/button';
 import { useAuth } from '@/hooks/useAuth';
@@ -19,12 +21,15 @@ import { RefreshCw } from 'lucide-react';
 import { toast } from 'sonner';
 import { Skeleton } from '@/components/ui/skeleton';
 import { invalidateConfigCache } from '@/hooks/useConfigStatus';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 
 type ConfigState = {
   githubConfig: GitHubConfig;
   giteaConfig: GiteaConfig;
   scheduleConfig: ScheduleConfig;
   cleanupConfig: DatabaseCleanupConfig;
+  mirrorOptions: MirrorOptions;
+  advancedOptions: AdvancedOptions;
 };
 
 export function ConfigTabs() {
@@ -32,12 +37,8 @@ export function ConfigTabs() {
     githubConfig: {
       username: '',
       token: '',
-      skipForks: false,
       privateRepositories: false,
-      mirrorIssues: false,
       mirrorStarred: false,
-      preserveOrgStructure: false,
-      skipStarredIssues: false,
     },
     giteaConfig: {
       url: '',
@@ -45,7 +46,8 @@ export function ConfigTabs() {
       token: '',
       organization: 'github-mirrors',
       visibility: 'public',
-      starredReposOrg: 'github',
+      starredReposOrg: 'starred',
+      preserveOrgStructure: false,
     },
     scheduleConfig: {
       enabled: false,
@@ -55,15 +57,34 @@ export function ConfigTabs() {
       enabled: false,
       retentionDays: 604800, // 7 days in seconds
     },
+    mirrorOptions: {
+      mirrorReleases: false,
+      mirrorMetadata: false,
+      metadataComponents: {
+        issues: false,
+        pullRequests: false,
+        labels: false,
+        milestones: false,
+        wiki: false,
+      },
+    },
+    advancedOptions: {
+      skipForks: false,
+      skipStarredIssues: false,
+    },
   });
-  const { user, refreshUser } = useAuth();
+  const { user } = useAuth();
   const [isLoading, setIsLoading] = useState(true);
   const [isSyncing, setIsSyncing] = useState<boolean>(false);
-  const [isConfigSaved, setIsConfigSaved] = useState<boolean>(false);
+
   const [isAutoSavingSchedule, setIsAutoSavingSchedule] = useState<boolean>(false);
   const [isAutoSavingCleanup, setIsAutoSavingCleanup] = useState<boolean>(false);
+  const [isAutoSavingGitHub, setIsAutoSavingGitHub] = useState<boolean>(false);
+  const [isAutoSavingGitea, setIsAutoSavingGitea] = useState<boolean>(false);
   const autoSaveScheduleTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const autoSaveCleanupTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const autoSaveGitHubTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const autoSaveGiteaTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
   const isConfigFormValid = (): boolean => {
     const { githubConfig, giteaConfig } = config;
@@ -78,6 +99,11 @@ export function ConfigTabs() {
     return isGitHubValid && isGiteaValid;
   };
 
+  const isGitHubConfigValid = (): boolean => {
+    const { githubConfig } = config;
+    return !!(githubConfig.username.trim() && githubConfig.token.trim());
+  };
+
   // Removed the problematic useEffect that was causing circular dependencies
   // The lastRun and nextRun should be managed by the backend and fetched via API
 
@@ -109,44 +135,9 @@ export function ConfigTabs() {
     }
   };
 
-  const handleSaveConfig = async () => {
-    if (!user?.id) return;
-    const reqPayload: SaveConfigApiRequest = {
-      userId: user.id,
-      githubConfig: config.githubConfig,
-      giteaConfig: config.giteaConfig,
-      scheduleConfig: config.scheduleConfig,
-      cleanupConfig: config.cleanupConfig,
-    };
-    try {
-      const response = await fetch('/api/config', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(reqPayload),
-      });
-      const result: SaveConfigApiResponse = await response.json();
-      if (result.success) {
-        await refreshUser();
-        setIsConfigSaved(true);
-        // Invalidate config cache so other components get fresh data
-        invalidateConfigCache();
-        toast.success(
-          'Configuration saved successfully! Now import your GitHub data to begin.',
-        );
-      } else {
-        showErrorToast(
-          `Failed to save configuration: ${result.message || 'Unknown error'}`,
-          toast
-        );
-      }
-    } catch (error) {
-      showErrorToast(error, toast);
-    }
-  };
-
   // Auto-save function specifically for schedule config changes
   const autoSaveScheduleConfig = useCallback(async (scheduleConfig: ScheduleConfig) => {
-    if (!user?.id || !isConfigSaved) return; // Only auto-save if config was previously saved
+    if (!user?.id) return;
 
     // Clear any existing timeout
     if (autoSaveScheduleTimeoutRef.current) {
@@ -163,6 +154,8 @@ export function ConfigTabs() {
         giteaConfig: config.giteaConfig,
         scheduleConfig: scheduleConfig,
         cleanupConfig: config.cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
       };
 
       try {
@@ -206,11 +199,11 @@ export function ConfigTabs() {
         setIsAutoSavingSchedule(false);
       }
     }, 500); // 500ms debounce
-  }, [user?.id, isConfigSaved, config.githubConfig, config.giteaConfig, config.cleanupConfig]);
+  }, [user?.id, config.githubConfig, config.giteaConfig, config.cleanupConfig]);
 
   // Auto-save function specifically for cleanup config changes
   const autoSaveCleanupConfig = useCallback(async (cleanupConfig: DatabaseCleanupConfig) => {
-    if (!user?.id || !isConfigSaved) return; // Only auto-save if config was previously saved
+    if (!user?.id) return;
 
     // Clear any existing timeout
     if (autoSaveCleanupTimeoutRef.current) {
@@ -227,6 +220,8 @@ export function ConfigTabs() {
         giteaConfig: config.giteaConfig,
         scheduleConfig: config.scheduleConfig,
         cleanupConfig: cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
       };
 
       try {
@@ -269,7 +264,175 @@ export function ConfigTabs() {
         setIsAutoSavingCleanup(false);
       }
     }, 500); // 500ms debounce
-  }, [user?.id, isConfigSaved, config.githubConfig, config.giteaConfig, config.scheduleConfig]);
+  }, [user?.id, config.githubConfig, config.giteaConfig, config.scheduleConfig]);
+
+  // Auto-save function specifically for GitHub config changes
+  const autoSaveGitHubConfig = useCallback(async (githubConfig: GitHubConfig) => {
+    if (!user?.id) return;
+
+    // Clear any existing timeout
+    if (autoSaveGitHubTimeoutRef.current) {
+      clearTimeout(autoSaveGitHubTimeoutRef.current);
+    }
+
+    // Debounce the auto-save to prevent excessive API calls
+    autoSaveGitHubTimeoutRef.current = setTimeout(async () => {
+      setIsAutoSavingGitHub(true);
+
+      const reqPayload: SaveConfigApiRequest = {
+        userId: user.id!,
+        githubConfig: githubConfig,
+        giteaConfig: config.giteaConfig,
+        scheduleConfig: config.scheduleConfig,
+        cleanupConfig: config.cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
+      };
+
+      try {
+        const response = await fetch('/api/config', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(reqPayload),
+        });
+        const result: SaveConfigApiResponse = await response.json();
+
+        if (result.success) {
+          // Silent success - no toast for auto-save
+          // Invalidate config cache so other components get fresh data
+          invalidateConfigCache();
+        } else {
+          showErrorToast(
+            `Auto-save failed: ${result.message || 'Unknown error'}`,
+            toast
+          );
+        }
+      } catch (error) {
+        showErrorToast(error, toast);
+      } finally {
+        setIsAutoSavingGitHub(false);
+      }
+    }, 500); // 500ms debounce
+  }, [user?.id, config.giteaConfig, config.scheduleConfig, config.cleanupConfig]);
+
+  // Auto-save function specifically for Gitea config changes
+  const autoSaveGiteaConfig = useCallback(async (giteaConfig: GiteaConfig) => {
+    if (!user?.id) return;
+
+    // Clear any existing timeout
+    if (autoSaveGiteaTimeoutRef.current) {
+      clearTimeout(autoSaveGiteaTimeoutRef.current);
+    }
+
+    // Debounce the auto-save to prevent excessive API calls
+    autoSaveGiteaTimeoutRef.current = setTimeout(async () => {
+      setIsAutoSavingGitea(true);
+
+      const reqPayload: SaveConfigApiRequest = {
+        userId: user.id!,
+        githubConfig: config.githubConfig,
+        giteaConfig: giteaConfig,
+        scheduleConfig: config.scheduleConfig,
+        cleanupConfig: config.cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
+      };
+
+      try {
+        const response = await fetch('/api/config', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(reqPayload),
+        });
+        const result: SaveConfigApiResponse = await response.json();
+
+        if (result.success) {
+          // Silent success - no toast for auto-save
+          // Invalidate config cache so other components get fresh data
+          invalidateConfigCache();
+        } else {
+          showErrorToast(
+            `Auto-save failed: ${result.message || 'Unknown error'}`,
+            toast
+          );
+        }
+      } catch (error) {
+        showErrorToast(error, toast);
+      } finally {
+        setIsAutoSavingGitea(false);
+      }
+    }, 500); // 500ms debounce
+  }, [user?.id, config.githubConfig, config.scheduleConfig, config.cleanupConfig]);
+
+  // Auto-save function for mirror options (handled within GitHub config)
+  const autoSaveMirrorOptions = useCallback(async (mirrorOptions: MirrorOptions) => {
+    if (!user?.id) return;
+
+    const reqPayload: SaveConfigApiRequest = {
+      userId: user.id!,
+      githubConfig: config.githubConfig,
+      giteaConfig: config.giteaConfig,
+      scheduleConfig: config.scheduleConfig,
+      cleanupConfig: config.cleanupConfig,
+      mirrorOptions: mirrorOptions,
+      advancedOptions: config.advancedOptions,
+    };
+
+    try {
+      const response = await fetch('/api/config', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(reqPayload),
+      });
+      const result: SaveConfigApiResponse = await response.json();
+
+      if (result.success) {
+        invalidateConfigCache();
+      } else {
+        showErrorToast(
+          `Auto-save failed: ${result.message || 'Unknown error'}`,
+          toast
+        );
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    }
+  }, [user?.id, config.githubConfig, config.giteaConfig, config.scheduleConfig, config.cleanupConfig, config.advancedOptions]);
+
+  // Auto-save function for advanced options (handled within GitHub config)
+  const autoSaveAdvancedOptions = useCallback(async (advancedOptions: AdvancedOptions) => {
+    if (!user?.id) return;
+
+    const reqPayload: SaveConfigApiRequest = {
+      userId: user.id!,
+      githubConfig: config.githubConfig,
+      giteaConfig: config.giteaConfig,
+      scheduleConfig: config.scheduleConfig,
+      cleanupConfig: config.cleanupConfig,
+      mirrorOptions: config.mirrorOptions,
+      advancedOptions: advancedOptions,
+    };
+
+    try {
+      const response = await fetch('/api/config', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(reqPayload),
+      });
+      const result: SaveConfigApiResponse = await response.json();
+
+      if (result.success) {
+        invalidateConfigCache();
+      } else {
+        showErrorToast(
+          `Auto-save failed: ${result.message || 'Unknown error'}`,
+          toast
+        );
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    }
+  }, [user?.id, config.githubConfig, config.giteaConfig, config.scheduleConfig, config.cleanupConfig, config.mirrorOptions]);
 
   // Cleanup timeouts on unmount
   useEffect(() => {
@@ -280,6 +443,12 @@ export function ConfigTabs() {
       if (autoSaveCleanupTimeoutRef.current) {
         clearTimeout(autoSaveCleanupTimeoutRef.current);
       }
+      if (autoSaveGitHubTimeoutRef.current) {
+        clearTimeout(autoSaveGitHubTimeoutRef.current);
+      }
+      if (autoSaveGiteaTimeoutRef.current) {
+        clearTimeout(autoSaveGiteaTimeoutRef.current);
+      }
     };
   }, []);
 
@@ -303,8 +472,12 @@ export function ConfigTabs() {
               response.scheduleConfig || config.scheduleConfig,
             cleanupConfig:
               response.cleanupConfig || config.cleanupConfig,
+            mirrorOptions:
+              response.mirrorOptions || config.mirrorOptions,
+            advancedOptions:
+              response.advancedOptions || config.advancedOptions,
           });
-          if (response.id) setIsConfigSaved(true);
+
         }
       } catch (error) {
         console.warn(
@@ -329,14 +502,14 @@ export function ConfigTabs() {
           </div>
           <div className="flex gap-x-4">
             <Skeleton className="h-10 w-36" />
-            <Skeleton className="h-10 w-36" />
           </div>
         </div>
 
-        {/* Content section */}
-        <div className="flex flex-col gap-y-4">
-          <div className="flex gap-x-4">
-            <div className="w-1/2 border rounded-lg p-4">
+        {/* Content section - Grid layout */}
+        <div className="space-y-4">
+          {/* GitHub & Gitea connections - Side by side */}
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div className="border rounded-lg p-4">
               <div className="flex justify-between items-center mb-4">
                 <Skeleton className="h-6 w-40" />
                 <Skeleton className="h-9 w-32" />
@@ -344,10 +517,13 @@ export function ConfigTabs() {
               <div className="space-y-4">
                 <Skeleton className="h-20 w-full" />
                 <Skeleton className="h-20 w-full" />
+                <Skeleton className="h-1 w-full" />
+                <Skeleton className="h-32 w-full" />
+                <Skeleton className="h-48 w-full" />
                 <Skeleton className="h-32 w-full" />
               </div>
             </div>
-            <div className="w-1/2 border rounded-lg p-4">
+            <div className="border rounded-lg p-4">
               <div className="flex justify-between items-center mb-4">
                 <Skeleton className="h-6 w-40" />
                 <Skeleton className="h-9 w-32" />
@@ -356,23 +532,24 @@ export function ConfigTabs() {
                 <Skeleton className="h-20 w-full" />
                 <Skeleton className="h-20 w-full" />
                 <Skeleton className="h-20 w-full" />
-                <Skeleton className="h-20 w-full" />
+                <Skeleton className="h-64 w-full" />
               </div>
             </div>
           </div>
-          <div className="flex gap-x-4">
-            <div className="w-1/2 border rounded-lg p-4">
+
+          {/* Automation & Maintenance - Full width */}
+          <div className="border rounded-lg p-4">
+            <Skeleton className="h-8 w-48 mb-4" />
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
               <div className="space-y-4">
-                <Skeleton className="h-8 w-48" />
+                <Skeleton className="h-6 w-40" />
                 <Skeleton className="h-16 w-full" />
-                <Skeleton className="h-8 w-32" />
+                <Skeleton className="h-24 w-full" />
               </div>
-            </div>
-            <div className="w-1/2 border rounded-lg p-4">
               <div className="space-y-4">
-                <Skeleton className="h-8 w-48" />
+                <Skeleton className="h-6 w-40" />
                 <Skeleton className="h-16 w-full" />
-                <Skeleton className="h-8 w-32" />
+                <Skeleton className="h-24 w-full" />
               </div>
             </div>
           </div>
@@ -388,27 +565,28 @@ export function ConfigTabs() {
   ) : (
     <div className="space-y-6">
       {/* Header section */}
-      <div className="flex flex-row justify-between items-start">
+      <div className="flex flex-col md:flex-row justify-between gap-y-4 items-start">
         <div className="flex flex-col gap-y-1.5">
           <h1 className="text-2xl font-semibold leading-none tracking-tight">
-            Configuration Settings
+            Configuration
           </h1>
           <p className="text-sm text-muted-foreground">
             Configure your GitHub and Gitea connections, and set up automatic
             mirroring.
           </p>
         </div>
-        <div className="flex gap-x-4">
+        <div className="flex gap-x-4 w-full md:w-auto">
           <Button
             onClick={handleImportGitHubData}
-            disabled={isSyncing || !isConfigSaved}
+            disabled={isSyncing || !isGitHubConfigValid()}
             title={
-              !isConfigSaved
-                ? 'Save configuration first'
+              !isGitHubConfigValid()
+                ? 'Please fill GitHub username and token fields'
                 : isSyncing
                 ? 'Import in progress'
                 : 'Import GitHub Data'
             }
+            className="w-full md:w-auto"
           >
             {isSyncing ? (
               <>
@@ -422,83 +600,94 @@ export function ConfigTabs() {
               </>
             )}
           </Button>
-          <Button
-            onClick={handleSaveConfig}
-            disabled={!isConfigFormValid()}
-            title={
-              !isConfigFormValid()
-                ? 'Please fill all required fields'
-                : 'Save Configuration'
-            }
-          >
-            Save Configuration
-          </Button>
         </div>
       </div>
 
-      {/* Content section */}
-      <div className="flex flex-col gap-y-4">
-        <div className="flex gap-x-4">
-          <GitHubConfigForm
-            config={config.githubConfig}
-            setConfig={update =>
-              setConfig(prev => ({
-                ...prev,
-                githubConfig:
-                  typeof update === 'function'
-                    ? update(prev.githubConfig)
-                    : update,
-              }))
-            }
-          />
-          <GiteaConfigForm
-            config={config.giteaConfig}
-            setConfig={update =>
-              setConfig(prev => ({
-                ...prev,
-                giteaConfig:
-                  typeof update === 'function'
-                    ? update(prev.giteaConfig)
-                    : update,
-              }))
-            }
-          />
-        </div>
-        <div className="flex gap-x-4">
-          <div className="w-1/2">
-            <ScheduleConfigForm
-              config={config.scheduleConfig}
+      {/* Content section - Tabs layout */}
+      <Tabs defaultValue="connections" className="space-y-4">
+        <TabsList className="grid w-full grid-cols-3">
+          <TabsTrigger value="connections">Connections</TabsTrigger>
+          <TabsTrigger value="automation">Automation</TabsTrigger>
+          <TabsTrigger value="sso">Authentication</TabsTrigger>
+        </TabsList>
+
+        <TabsContent value="connections" className="space-y-4">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4 md:items-stretch">
+            <GitHubConfigForm
+              config={config.githubConfig}
               setConfig={update =>
                 setConfig(prev => ({
                   ...prev,
-                  scheduleConfig:
+                  githubConfig:
                     typeof update === 'function'
-                      ? update(prev.scheduleConfig)
+                      ? update(prev.githubConfig)
                       : update,
                 }))
               }
-              onAutoSave={autoSaveScheduleConfig}
-              isAutoSaving={isAutoSavingSchedule}
+              mirrorOptions={config.mirrorOptions}
+              setMirrorOptions={update =>
+                setConfig(prev => ({
+                  ...prev,
+                  mirrorOptions:
+                    typeof update === 'function'
+                      ? update(prev.mirrorOptions)
+                      : update,
+                }))
+              }
+              advancedOptions={config.advancedOptions}
+              setAdvancedOptions={update =>
+                setConfig(prev => ({
+                  ...prev,
+                  advancedOptions:
+                    typeof update === 'function'
+                      ? update(prev.advancedOptions)
+                      : update,
+                }))
+              }
+              onAutoSave={autoSaveGitHubConfig}
+              onMirrorOptionsAutoSave={autoSaveMirrorOptions}
+              onAdvancedOptionsAutoSave={autoSaveAdvancedOptions}
+              isAutoSaving={isAutoSavingGitHub}
             />
-          </div>
-          <div className="w-1/2">
-            <DatabaseCleanupConfigForm
-              config={config.cleanupConfig}
+            <GiteaConfigForm
+              config={config.giteaConfig}
               setConfig={update =>
                 setConfig(prev => ({
                   ...prev,
-                  cleanupConfig:
+                  giteaConfig:
                     typeof update === 'function'
-                      ? update(prev.cleanupConfig)
+                      ? update(prev.giteaConfig)
                       : update,
                 }))
               }
-              onAutoSave={autoSaveCleanupConfig}
-              isAutoSaving={isAutoSavingCleanup}
+              onAutoSave={autoSaveGiteaConfig}
+              isAutoSaving={isAutoSavingGitea}
+              githubUsername={config.githubConfig.username}
             />
           </div>
-        </div>
-      </div>
+        </TabsContent>
+
+        <TabsContent value="automation" className="space-y-4">
+          <AutomationSettings
+            scheduleConfig={config.scheduleConfig}
+            cleanupConfig={config.cleanupConfig}
+            onScheduleChange={(newConfig) => {
+              setConfig(prev => ({ ...prev, scheduleConfig: newConfig }));
+              autoSaveScheduleConfig(newConfig);
+            }}
+            onCleanupChange={(newConfig) => {
+              setConfig(prev => ({ ...prev, cleanupConfig: newConfig }));
+              autoSaveCleanupConfig(newConfig);
+            }}
+            isAutoSavingSchedule={isAutoSavingSchedule}
+            isAutoSavingCleanup={isAutoSavingCleanup}
+          />
+        </TabsContent>
+
+        <TabsContent value="sso" className="space-y-4">
+          <SSOSettings />
+        </TabsContent>
+      </Tabs>
     </div>
   );
 }

src/components/config/DatabaseCleanupConfigForm.tsx

@@ -94,7 +94,7 @@ export function DatabaseCleanupConfigForm({
   ];
 
   return (
-    <Card>
+    <Card className="self-start">
       <CardContent className="pt-6 relative">
         {isAutoSaving && (
           <div className="absolute top-4 right-4 flex items-center text-sm text-muted-foreground">

src/components/config/GitHubConfigForm.tsx

@@ -1,52 +1,65 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Card,
   CardContent,
-  CardFooter,
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
 import { githubApi } from "@/lib/api";
-import type { GitHubConfig } from "@/types/config";
+import type { GitHubConfig, MirrorOptions, AdvancedOptions } from "@/types/config";
 import { Input } from "../ui/input";
-import { Checkbox } from "../ui/checkbox";
 import { toast } from "sonner";
-import { AlertTriangle } from "lucide-react";
-import { Alert, AlertDescription } from "../ui/alert";
 import { Info } from "lucide-react";
-import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
+import { GitHubMirrorSettings } from "./GitHubMirrorSettings";
+import { Separator } from "../ui/separator";
+import {
+  HoverCard,
+  HoverCardContent,
+  HoverCardTrigger,
+} from "@/components/ui/hover-card";
 
 interface GitHubConfigFormProps {
   config: GitHubConfig;
   setConfig: React.Dispatch<React.SetStateAction<GitHubConfig>>;
+  mirrorOptions: MirrorOptions;
+  setMirrorOptions: React.Dispatch<React.SetStateAction<MirrorOptions>>;
+  advancedOptions: AdvancedOptions;
+  setAdvancedOptions: React.Dispatch<React.SetStateAction<AdvancedOptions>>;
+  onAutoSave?: (githubConfig: GitHubConfig) => Promise<void>;
+  onMirrorOptionsAutoSave?: (mirrorOptions: MirrorOptions) => Promise<void>;
+  onAdvancedOptionsAutoSave?: (advancedOptions: AdvancedOptions) => Promise<void>;
+  isAutoSaving?: boolean;
 }
 
-export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
+export function GitHubConfigForm({ 
+  config, 
+  setConfig, 
+  mirrorOptions,
+  setMirrorOptions,
+  advancedOptions,
+  setAdvancedOptions,
+  onAutoSave, 
+  onMirrorOptionsAutoSave,
+  onAdvancedOptionsAutoSave,
+  isAutoSaving 
+}: GitHubConfigFormProps) {
   const [isLoading, setIsLoading] = useState(false);
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const { name, value, type, checked } = e.target;
 
-    // Special handling for preserveOrgStructure changes
-    if (
-      name === "preserveOrgStructure" &&
-      config.preserveOrgStructure !== checked
-    ) {
-      toast.info(
-        "Changing this setting may affect how repositories are accessed in Gitea. " +
-          "Existing mirrored repositories will still be accessible during sync operations.",
-        {
-          duration: 6000,
-          position: "top-center",
-        }
-      );
-    }
-
-    setConfig({
+    const newConfig = {
       ...config,
       [name]: type === "checkbox" ? checked : value,
-    });
+    };
+
+    setConfig(newConfig);
+
+    // Auto-save for all field changes
+    if (onAutoSave) {
+      onAutoSave(newConfig);
+    }
   };
 
   const testConnection = async () => {
@@ -74,22 +87,24 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
   };
 
   return (
-    <Card className="w-full">
-      <CardHeader className="flex flex-row items-center justify-between gap-4">
+    <Card className="w-full h-full flex flex-col">
+      <CardHeader className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
         <CardTitle className="text-lg font-semibold">
           GitHub Configuration
         </CardTitle>
+        {/* Desktop: Show button in header */}
         <Button
           type="button"
-          variant="outline"
+          variant="default"
           onClick={testConnection}
           disabled={isLoading || !config.token}
+          className="hidden sm:inline-flex"
         >
           {isLoading ? "Testing..." : "Test Connection"}
         </Button>
       </CardHeader>
 
-      <CardContent className="flex flex-col gap-y-6">
+      <CardContent className="flex flex-col gap-y-6 flex-1">
         <div>
           <label
             htmlFor="github-username"
@@ -110,12 +125,49 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
         </div>
 
         <div>
-          <label
-            htmlFor="github-token"
-            className="block text-sm font-medium mb-1.5"
-          >
-            GitHub Token
-          </label>
+          <div className="flex items-center gap-2 mb-1.5">
+            <label
+              htmlFor="github-token"
+              className="block text-sm font-medium"
+            >
+              GitHub Token
+            </label>
+            <HoverCard openDelay={200}>
+              <HoverCardTrigger asChild>
+                <span className="inline-flex p-0.5 hover:bg-muted rounded-sm transition-colors cursor-help">
+                  <Info className="h-3.5 w-3.5 text-muted-foreground" />
+                </span>
+              </HoverCardTrigger>
+              <HoverCardContent side="right" align="start" className="w-80">
+                <div className="space-y-2">
+                  <h4 className="font-medium text-sm">GitHub Token Requirements</h4>
+                  <div className="text-sm space-y-2">
+                    <p>
+                      You need to create a <span className="font-medium">Classic GitHub PAT Token</span> with the following scopes:
+                    </p>
+                    <ul className="ml-4 space-y-1 list-disc">
+                      <li><code className="text-xs bg-muted px-1 py-0.5 rounded">repo</code></li>
+                      <li><code className="text-xs bg-muted px-1 py-0.5 rounded">admin:org</code></li>
+                    </ul>
+                    <p className="text-muted-foreground">
+                      The organization access is required for mirroring organization repositories.
+                    </p>
+                    <p>
+                      Generate tokens at{" "}
+                      <a
+                        href="https://github.com/settings/tokens"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-primary hover:underline font-medium"
+                      >
+                        github.com/settings/tokens
+                      </a>
+                    </p>
+                  </div>
+                </div>
+              </HoverCardContent>
+            </HoverCard>
+          </div>
           <Input
             id="github-token"
             name="token"
@@ -123,7 +175,7 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
             value={config.token}
             onChange={handleChange}
             className="bg-background"
-            placeholder="Your GitHub personal access token"
+            placeholder="Your GitHub token (classic) with repo and admin:org scopes"
           />
           <p className="text-xs text-muted-foreground mt-1">
             Required for private repositories, organizations, and starred
@@ -131,210 +183,38 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
           </p>
         </div>
 
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <div className="space-y-3">
-            <div className="flex items-center">
-              <Checkbox
-                id="skip-forks"
-                name="skipForks"
-                checked={config.skipForks}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "skipForks",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="skip-forks"
-                className="ml-2 block text-sm select-none"
-              >
-                Skip Forks
-              </label>
-            </div>
+        <Separator />
 
-            <div className="flex items-center">
-              <Checkbox
-                id="private-repositories"
-                name="privateRepositories"
-                checked={config.privateRepositories}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "privateRepositories",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="private-repositories"
-                className="ml-2 block text-sm select-none"
-              >
-                Mirror Private Repos
-              </label>
-            </div>
+        <GitHubMirrorSettings
+          githubConfig={config}
+          mirrorOptions={mirrorOptions}
+          advancedOptions={advancedOptions}
+          onGitHubConfigChange={(newConfig) => {
+            setConfig(newConfig);
+            if (onAutoSave) onAutoSave(newConfig);
+          }}
+          onMirrorOptionsChange={(newOptions) => {
+            setMirrorOptions(newOptions);
+            if (onMirrorOptionsAutoSave) onMirrorOptionsAutoSave(newOptions);
+          }}
+          onAdvancedOptionsChange={(newOptions) => {
+            setAdvancedOptions(newOptions);
+            if (onAdvancedOptionsAutoSave) onAdvancedOptionsAutoSave(newOptions);
+          }}
+        />
+        
+        {/* Mobile: Show button at bottom */}
+        <Button
+          type="button"
+          variant="default"
+          onClick={testConnection}
+          disabled={isLoading || !config.token}
+          className="sm:hidden w-full"
+        >
+          {isLoading ? "Testing..." : "Test Connection"}
+        </Button>
+    </CardContent>
 
-            <div className="flex items-center">
-              <Checkbox
-                id="mirror-starred"
-                name="mirrorStarred"
-                checked={config.mirrorStarred}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "mirrorStarred",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="mirror-starred"
-                className="ml-2 block text-sm select-none"
-              >
-                Mirror Starred Repos
-              </label>
-            </div>
-          </div>
-
-          <div className="space-y-3">
-            <div className="flex items-center">
-              <Checkbox
-                id="mirror-issues"
-                name="mirrorIssues"
-                checked={config.mirrorIssues}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "mirrorIssues",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="mirror-issues"
-                className="ml-2 block text-sm select-none"
-              >
-                Mirror Issues
-              </label>
-            </div>
-
-            <div className="flex items-center">
-              <Checkbox
-                id="preserve-org-structure"
-                name="preserveOrgStructure"
-                checked={config.preserveOrgStructure}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "preserveOrgStructure",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="preserve-org-structure"
-                className="ml-2 text-sm select-none flex items-center"
-              >
-                Preserve Org Structure
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <span
-                      className="ml-1 cursor-pointer align-middle text-muted-foreground"
-                      role="button"
-                      tabIndex={0}
-                    >
-                      <Info size={16} />
-                    </span>
-                  </TooltipTrigger>
-                  <TooltipContent side="right" className="max-w-xs text-xs">
-                    When enabled, organization repositories will be mirrored to
-                    the same organization structure in Gitea. When disabled, all
-                    repositories will be mirrored under your Gitea username.
-                  </TooltipContent>
-                </Tooltip>
-              </label>
-            </div>
-
-            <div className="flex items-center">
-              <Checkbox
-                id="skip-starred-issues"
-                name="skipStarredIssues"
-                checked={config.skipStarredIssues}
-                onCheckedChange={(checked) =>
-                  handleChange({
-                    target: {
-                      name: "skipStarredIssues",
-                      type: "checkbox",
-                      checked: Boolean(checked),
-                      value: "",
-                    },
-                  } as React.ChangeEvent<HTMLInputElement>)
-                }
-              />
-              <label
-                htmlFor="skip-starred-issues"
-                className="ml-2 block text-sm select-none"
-              >
-                Skip Issues for Starred Repos
-              </label>
-            </div>
-          </div>
-        </div>
-      </CardContent>
-
-      <CardFooter className="flex-col items-start">
-        <Alert variant="note" className="w-full">
-          <AlertTriangle className="h-4 w-4 text-blue-600 dark:text-blue-400 mr-2" />
-          <AlertDescription className="text-sm">
-            <div className="font-semibold mb-1">Note:</div>
-            <div className="mb-1">
-              You need to create a{" "}
-              <span className="font-semibold">Classic GitHub PAT Token</span>{" "}
-              with following scopes:
-            </div>
-            <ul className="ml-4 mb-1 list-disc">
-              <li>
-                <code>repo</code>
-              </li>
-              <li>
-                <code>admin:org</code>
-              </li>
-            </ul>
-            <div className="mb-1">
-              The organization access is required for mirroring organization
-              repositories.
-            </div>
-            <div>
-              You can generate tokens at{" "}
-              <a
-                href="https://github.com/settings/tokens"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="underline font-medium hover:text-blue-900 dark:hover:text-blue-200"
-              >
-                github.com/settings/tokens
-              </a>
-              .
-            </div>
-          </AlertDescription>
-        </Alert>
-      </CardFooter>
     </Card>
   );
 }

src/components/config/GitHubMirrorSettings.tsx

@@ -0,0 +1,527 @@
+import React from "react";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Label } from "@/components/ui/label";
+import { Separator } from "@/components/ui/separator";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { 
+  Info, 
+  GitBranch, 
+  Star, 
+  Lock, 
+  Archive,
+  GitPullRequest,
+  Tag,
+  FileText,
+  MessageSquare,
+  Target,
+  BookOpen,
+  GitFork,
+  ChevronDown,
+  Funnel
+} from "lucide-react";
+import type { GitHubConfig, MirrorOptions, AdvancedOptions } from "@/types/config";
+import { cn } from "@/lib/utils";
+
+interface GitHubMirrorSettingsProps {
+  githubConfig: GitHubConfig;
+  mirrorOptions: MirrorOptions;
+  advancedOptions: AdvancedOptions;
+  onGitHubConfigChange: (config: GitHubConfig) => void;
+  onMirrorOptionsChange: (options: MirrorOptions) => void;
+  onAdvancedOptionsChange: (options: AdvancedOptions) => void;
+}
+
+export function GitHubMirrorSettings({
+  githubConfig,
+  mirrorOptions,
+  advancedOptions,
+  onGitHubConfigChange,
+  onMirrorOptionsChange,
+  onAdvancedOptionsChange,
+}: GitHubMirrorSettingsProps) {
+  
+  const handleGitHubChange = (field: keyof GitHubConfig, value: boolean) => {
+    onGitHubConfigChange({ ...githubConfig, [field]: value });
+  };
+
+  const handleMirrorChange = (field: keyof MirrorOptions, value: boolean) => {
+    onMirrorOptionsChange({ ...mirrorOptions, [field]: value });
+  };
+
+  const handleMetadataComponentChange = (component: keyof MirrorOptions['metadataComponents'], value: boolean) => {
+    onMirrorOptionsChange({
+      ...mirrorOptions,
+      metadataComponents: {
+        ...mirrorOptions.metadataComponents,
+        [component]: value,
+      },
+    });
+  };
+
+  const handleAdvancedChange = (field: keyof AdvancedOptions, value: boolean) => {
+    onAdvancedOptionsChange({ ...advancedOptions, [field]: value });
+  };
+
+  // When metadata is disabled, all components should be disabled
+  const isMetadataEnabled = mirrorOptions.mirrorMetadata;
+  
+  // Calculate what content is included for starred repos
+  const starredRepoContent = {
+    code: true, // Always included
+    releases: !advancedOptions.skipStarredIssues && mirrorOptions.mirrorReleases,
+    issues: !advancedOptions.skipStarredIssues && mirrorOptions.mirrorMetadata && mirrorOptions.metadataComponents.issues,
+    pullRequests: !advancedOptions.skipStarredIssues && mirrorOptions.mirrorMetadata && mirrorOptions.metadataComponents.pullRequests,
+    wiki: !advancedOptions.skipStarredIssues && mirrorOptions.mirrorMetadata && mirrorOptions.metadataComponents.wiki,
+  };
+  
+  const starredContentCount = Object.entries(starredRepoContent).filter(([key, value]) => key !== 'code' && value).length;
+  const totalStarredOptions = 4; // releases, issues, PRs, wiki
+
+  return (
+    <div className="space-y-6">
+      {/* Repository Selection Section */}
+      <div className="space-y-4">
+        <div>
+          <h4 className="text-sm font-medium mb-3 flex items-center gap-2">
+            <GitBranch className="h-4 w-4" />
+            Repository Selection
+          </h4>
+          <p className="text-xs text-muted-foreground mb-4">
+            Choose which repositories to include in mirroring
+          </p>
+        </div>
+
+        <div className="space-y-3">
+          <div className="flex items-start space-x-3">
+            <Checkbox
+              id="private-repos"
+              checked={githubConfig.privateRepositories}
+              onCheckedChange={(checked) => handleGitHubChange('privateRepositories', !!checked)}
+            />
+            <div className="space-y-0.5 flex-1">
+              <Label
+                htmlFor="private-repos"
+                className="text-sm font-normal cursor-pointer flex items-center gap-2"
+              >
+                <Lock className="h-3.5 w-3.5" />
+                Include private repositories
+              </Label>
+              <p className="text-xs text-muted-foreground">
+                Mirror your private repositories
+              </p>
+            </div>
+          </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div className="flex items-start space-x-3">
+              <Checkbox
+                id="starred-repos"
+                checked={githubConfig.mirrorStarred}
+                onCheckedChange={(checked) => handleGitHubChange('mirrorStarred', !!checked)}
+              />
+              <div className="space-y-0.5 flex-1">
+                <Label
+                  htmlFor="starred-repos"
+                  className="text-sm font-normal cursor-pointer flex items-center gap-2"
+                >
+                  <Star className="h-3.5 w-3.5" />
+                  Mirror starred repositories
+                </Label>
+                <p className="text-xs text-muted-foreground">
+                  Include repositories you've starred on GitHub
+                </p>
+              </div>
+            </div>
+
+            {/* Starred repos content selection - responsive layout */}
+            <div className={cn(
+              "flex items-center justify-end transition-opacity duration-200 mt-3 md:mt-0",
+              githubConfig.mirrorStarred ? "opacity-100" : "opacity-0 hidden pointer-events-none"
+            )}>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={!githubConfig.mirrorStarred}
+                    className="h-8 text-xs font-normal min-w-[140px] md:min-w-[140px] justify-between"
+                  >
+                    <span>
+                      {advancedOptions.skipStarredIssues ? (
+                        "Code only"
+                      ) : starredContentCount === 0 ? (
+                        "Code only"
+                      ) : starredContentCount === totalStarredOptions ? (
+                        "Full content"
+                      ) : (
+                        `${starredContentCount + 1} of ${totalStarredOptions + 1} selected`
+                      )}
+                    </span>
+                    <ChevronDown className="ml-2 h-3 w-3 opacity-50" />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent align="end" className="w-72">
+                  <div className="space-y-3">
+                    <div className="flex items-center justify-between">
+                      <div className="text-sm font-medium">Starred repos content</div>
+                      <TooltipProvider>
+                        <Tooltip>
+                          <TooltipTrigger>
+                            <Info className="h-3.5 w-3.5 text-muted-foreground" />
+                          </TooltipTrigger>
+                          <TooltipContent side="left" className="max-w-xs">
+                            <p className="text-xs">
+                              Choose what content to mirror from starred repositories. 
+                              Selecting "Lightweight mode" will only mirror code for better performance.
+                            </p>
+                          </TooltipContent>
+                        </Tooltip>
+                      </TooltipProvider>
+                    </div>
+                    
+                    <Separator className="my-2" />
+                    
+                    <div className="space-y-3">
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="starred-lightweight"
+                          checked={advancedOptions.skipStarredIssues}
+                          onCheckedChange={(checked) => handleAdvancedChange('skipStarredIssues', !!checked)}
+                        />
+                        <Label
+                          htmlFor="starred-lightweight"
+                          className="text-sm font-normal cursor-pointer flex-1"
+                        >
+                          <div className="space-y-0.5">
+                            <div className="font-medium">Lightweight mode</div>
+                            <div className="text-xs text-muted-foreground">
+                              Only mirror code, skip all metadata
+                            </div>
+                          </div>
+                        </Label>
+                      </div>
+                      
+                      {!advancedOptions.skipStarredIssues && (
+                        <>
+                          <Separator className="my-2" />
+                          <div className="space-y-2">
+                            <p className="text-xs font-medium text-muted-foreground">
+                              Content included for starred repos:
+                            </p>
+                            
+                            <div className="space-y-1.5">
+                              <div className="flex items-center gap-2 text-xs pl-2">
+                                <GitBranch className="h-3 w-3 text-muted-foreground" />
+                                <span>Source code</span>
+                                <Badge variant="secondary" className="ml-auto text-[10px] px-2 h-4">Always</Badge>
+                              </div>
+                              
+                              <div className={cn(
+                                "flex items-center gap-2 text-xs pl-2",
+                                starredRepoContent.releases ? "" : "opacity-50"
+                              )}>
+                                <Tag className="h-3 w-3 text-muted-foreground" />
+                                <span>Releases & Tags</span>
+                                {starredRepoContent.releases && <Badge variant="outline" className="ml-auto text-[10px] px-2 h-4">Included</Badge>}
+                              </div>
+                              
+                              <div className={cn(
+                                "flex items-center gap-2 text-xs pl-2",
+                                starredRepoContent.issues ? "" : "opacity-50"
+                              )}>
+                                <MessageSquare className="h-3 w-3 text-muted-foreground" />
+                                <span>Issues</span>
+                                {starredRepoContent.issues && <Badge variant="outline" className="ml-auto text-[10px] px-2 h-4">Included</Badge>}
+                              </div>
+                              
+                              <div className={cn(
+                                "flex items-center gap-2 text-xs pl-2",
+                                starredRepoContent.pullRequests ? "" : "opacity-50"
+                              )}>
+                                <GitPullRequest className="h-3 w-3 text-muted-foreground" />
+                                <span>Pull Requests</span>
+                                {starredRepoContent.pullRequests && <Badge variant="outline" className="ml-auto text-[10px] px-2 h-4">Included</Badge>}
+                              </div>
+                              
+                              <div className={cn(
+                                "flex items-center gap-2 text-xs pl-2",
+                                starredRepoContent.wiki ? "" : "opacity-50"
+                              )}>
+                                <BookOpen className="h-3 w-3 text-muted-foreground" />
+                                <span>Wiki</span>
+                                {starredRepoContent.wiki && <Badge variant="outline" className="ml-auto text-[10px] px-2 h-4">Included</Badge>}
+                              </div>
+                            </div>
+                            
+                            <p className="text-[10px] text-muted-foreground mt-2">
+                              To include more content, enable them in the Content & Data section below
+                            </p>
+                          </div>
+                        </>
+                      )}
+                    </div>
+                  </div>
+                </PopoverContent>
+              </Popover>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <Separator />
+
+      {/* Content & Data Section */}
+      <div className="space-y-4">
+        <div>
+          <h4 className="text-sm font-medium mb-3 flex items-center gap-2">
+            <Archive className="h-4 w-4" />
+            Content & Data
+          </h4>
+          <p className="text-xs text-muted-foreground mb-4">
+            Select what content to mirror from each repository
+          </p>
+        </div>
+
+        <div className="space-y-3">
+          {/* Code is always mirrored - shown as info */}
+          <div className="flex items-center gap-3 p-3 bg-muted/50 dark:bg-muted/20 rounded-md">
+            <GitBranch className="h-4 w-4 text-muted-foreground" />
+            <div className="flex-1">
+              <p className="text-sm">Source code & branches</p>
+              <p className="text-xs text-muted-foreground">Always included</p>
+            </div>
+            <Badge variant="secondary" className="text-xs">Default</Badge>
+          </div>
+
+          <div className="flex items-start space-x-3">
+            <Checkbox
+              id="mirror-releases"
+              checked={mirrorOptions.mirrorReleases}
+              onCheckedChange={(checked) => handleMirrorChange('mirrorReleases', !!checked)}
+            />
+            <div className="space-y-0.5 flex-1">
+              <Label
+                htmlFor="mirror-releases"
+                className="text-sm font-normal cursor-pointer flex items-center gap-2"
+              >
+                <Tag className="h-3.5 w-3.5" />
+                Releases & Tags
+              </Label>
+              <p className="text-xs text-muted-foreground">
+                Include GitHub releases, tags, and associated assets
+              </p>
+            </div>
+          </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div className="flex items-start space-x-3">
+              <Checkbox
+                id="mirror-metadata"
+                checked={mirrorOptions.mirrorMetadata}
+                onCheckedChange={(checked) => handleMirrorChange('mirrorMetadata', !!checked)}
+              />
+              <div className="space-y-0.5 flex-1">
+                <Label
+                  htmlFor="mirror-metadata"
+                  className="text-sm font-normal cursor-pointer flex items-center gap-2"
+                >
+                  <FileText className="h-3.5 w-3.5" />
+                  Repository Metadata
+                </Label>
+                <p className="text-xs text-muted-foreground">
+                  Mirror issues, pull requests, and other repository data
+                </p>
+              </div>
+            </div>
+
+            {/* Metadata multi-select - responsive layout */}
+            <div className={cn(
+              "flex items-center justify-end transition-opacity duration-200 mt-3 md:mt-0",
+              mirrorOptions.mirrorMetadata ? "opacity-100" : "opacity-0 hidden pointer-events-none"
+            )}>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={!mirrorOptions.mirrorMetadata}
+                    className="h-8 text-xs font-normal min-w-[140px] md:min-w-[140px] justify-between"
+                  >
+                    <span>
+                      {(() => {
+                        const selectedCount = Object.values(mirrorOptions.metadataComponents).filter(Boolean).length;
+                        const totalCount = Object.keys(mirrorOptions.metadataComponents).length;
+                        if (selectedCount === 0) return "No items selected";
+                        if (selectedCount === totalCount) return "All items selected";
+                        return `${selectedCount} of ${totalCount} selected`;
+                      })()}
+                    </span>
+                    <ChevronDown className="ml-2 h-3 w-3 opacity-50" />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent align="end" className="w-64">
+                  <div className="space-y-3">
+                    <div className="flex items-center justify-between">
+                      <div className="text-sm font-medium">Metadata to mirror</div>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-auto px-2 py-1 text-xs font-normal text-primary hover:text-primary/80"
+                        onClick={() => {
+                          const allSelected = Object.values(mirrorOptions.metadataComponents).every(Boolean);
+                          const newValue = !allSelected;
+                          
+                          // Update all metadata components at once
+                          onMirrorOptionsChange({
+                            ...mirrorOptions,
+                            metadataComponents: {
+                              issues: newValue,
+                              pullRequests: newValue,
+                              labels: newValue,
+                              milestones: newValue,
+                              wiki: newValue,
+                            },
+                          });
+                        }}
+                      >
+                        {Object.values(mirrorOptions.metadataComponents).every(Boolean) ? 'Deselect all' : 'Select all'}
+                      </Button>
+                    </div>
+                    
+                    <Separator className="my-2" />
+                    
+                    <div className="space-y-2">
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="metadata-issues-popup"
+                          checked={mirrorOptions.metadataComponents.issues}
+                          onCheckedChange={(checked) => handleMetadataComponentChange('issues', !!checked)}
+                        />
+                        <Label
+                          htmlFor="metadata-issues-popup"
+                          className="text-sm font-normal cursor-pointer flex items-center gap-2 flex-1"
+                        >
+                          <MessageSquare className="h-3.5 w-3.5 text-muted-foreground" />
+                          Issues
+                        </Label>
+                      </div>
+
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="metadata-prs-popup"
+                          checked={mirrorOptions.metadataComponents.pullRequests}
+                          onCheckedChange={(checked) => handleMetadataComponentChange('pullRequests', !!checked)}
+                        />
+                        <Label
+                          htmlFor="metadata-prs-popup"
+                          className="text-sm font-normal cursor-pointer flex items-center gap-2 flex-1"
+                        >
+                          <GitPullRequest className="h-3.5 w-3.5 text-muted-foreground" />
+                          Pull Requests
+                        </Label>
+                      </div>
+
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="metadata-labels-popup"
+                          checked={mirrorOptions.metadataComponents.labels}
+                          onCheckedChange={(checked) => handleMetadataComponentChange('labels', !!checked)}
+                        />
+                        <Label
+                          htmlFor="metadata-labels-popup"
+                          className="text-sm font-normal cursor-pointer flex items-center gap-2 flex-1"
+                        >
+                          <Tag className="h-3.5 w-3.5 text-muted-foreground" />
+                          Labels
+                        </Label>
+                      </div>
+
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="metadata-milestones-popup"
+                          checked={mirrorOptions.metadataComponents.milestones}
+                          onCheckedChange={(checked) => handleMetadataComponentChange('milestones', !!checked)}
+                        />
+                        <Label
+                          htmlFor="metadata-milestones-popup"
+                          className="text-sm font-normal cursor-pointer flex items-center gap-2 flex-1"
+                        >
+                          <Target className="h-3.5 w-3.5 text-muted-foreground" />
+                          Milestones
+                        </Label>
+                      </div>
+
+                      <div className="flex items-center space-x-3 py-1 px-1 rounded hover:bg-accent">
+                        <Checkbox
+                          id="metadata-wiki-popup"
+                          checked={mirrorOptions.metadataComponents.wiki}
+                          onCheckedChange={(checked) => handleMetadataComponentChange('wiki', !!checked)}
+                        />
+                        <Label
+                          htmlFor="metadata-wiki-popup"
+                          className="text-sm font-normal cursor-pointer flex items-center gap-2 flex-1"
+                        >
+                          <BookOpen className="h-3.5 w-3.5 text-muted-foreground" />
+                          Wiki
+                        </Label>
+                      </div>
+                    </div>
+                  </div>
+                </PopoverContent>
+              </Popover>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <Separator />
+
+      {/* Filtering & Behavior Section */}
+      <div className="space-y-4">
+        <div>
+          <h4 className="text-sm font-medium mb-3 flex items-center gap-2">
+            <Funnel className="h-4 w-4" />
+            Filtering & Behavior
+          </h4>
+          <p className="text-xs text-muted-foreground mb-4">
+            Fine-tune what gets excluded from mirroring
+          </p>
+        </div>
+
+        <div className="space-y-3">
+          <div className="flex items-start space-x-3">
+            <Checkbox
+              id="skip-forks"
+              checked={advancedOptions.skipForks}
+              onCheckedChange={(checked) => handleAdvancedChange('skipForks', !!checked)}
+            />
+            <div className="space-y-0.5 flex-1">
+              <Label
+                htmlFor="skip-forks"
+                className="text-sm font-normal cursor-pointer flex items-center gap-2"
+              >
+                <GitFork className="h-3.5 w-3.5" />
+                Skip forked repositories
+              </Label>
+              <p className="text-xs text-muted-foreground">
+                Exclude repositories that are forks of other projects
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/components/config/GiteaConfigForm.tsx

@@ -1,39 +1,115 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Card,
   CardContent,
-  CardFooter,
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "../ui/select";
 import { giteaApi } from "@/lib/api";
-import type { GiteaConfig, GiteaOrgVisibility } from "@/types/config";
+import type { GiteaConfig, MirrorStrategy } from "@/types/config";
 import { toast } from "sonner";
+import { OrganizationStrategy } from "./OrganizationStrategy";
+import { OrganizationConfiguration } from "./OrganizationConfiguration";
+import { Separator } from "../ui/separator";
 
 interface GiteaConfigFormProps {
   config: GiteaConfig;
   setConfig: React.Dispatch<React.SetStateAction<GiteaConfig>>;
+  onAutoSave?: (giteaConfig: GiteaConfig) => Promise<void>;
+  isAutoSaving?: boolean;
+  githubUsername?: string;
 }
 
-export function GiteaConfigForm({ config, setConfig }: GiteaConfigFormProps) {
+export function GiteaConfigForm({ config, setConfig, onAutoSave, isAutoSaving, githubUsername }: GiteaConfigFormProps) {
   const [isLoading, setIsLoading] = useState(false);
+  
+  // Derive the mirror strategy from existing config for backward compatibility
+  const getMirrorStrategy = (): MirrorStrategy => {
+    if (config.mirrorStrategy) return config.mirrorStrategy;
+    // Check for mixed mode: when we have both organization and personalReposOrg defined
+    if (config.organization && config.personalReposOrg && !config.preserveOrgStructure) return "mixed";
+    if (config.preserveOrgStructure) return "preserve";
+    if (config.organization && config.organization !== config.username) return "single-org";
+    return "flat-user";
+  };
+  
+  const [mirrorStrategy, setMirrorStrategy] = useState<MirrorStrategy>(getMirrorStrategy());
+  
+  // Update config when strategy changes
+  useEffect(() => {
+    const newConfig = { ...config };
+    
+    switch (mirrorStrategy) {
+      case "preserve":
+        newConfig.preserveOrgStructure = true;
+        newConfig.mirrorStrategy = "preserve";
+        newConfig.personalReposOrg = undefined; // Clear personal repos org in preserve mode
+        break;
+      case "single-org":
+        newConfig.preserveOrgStructure = false;
+        newConfig.mirrorStrategy = "single-org";
+        // Reset to default if coming from mixed mode where it was personal repos org
+        if (config.mirrorStrategy === "mixed" || !newConfig.organization || newConfig.organization === "github-personal") {
+          newConfig.organization = "github-mirrors";
+        }
+        break;
+      case "flat-user":
+        newConfig.preserveOrgStructure = false;
+        newConfig.mirrorStrategy = "flat-user";
+        newConfig.organization = "";
+        break;
+      case "mixed":
+        newConfig.preserveOrgStructure = false;
+        newConfig.mirrorStrategy = "mixed";
+        // In mixed mode, organization field represents personal repos org
+        // Reset it to default if coming from single-org mode
+        if (config.mirrorStrategy === "single-org" || !newConfig.organization || newConfig.organization === "github-mirrors") {
+          newConfig.organization = "github-personal";
+        }
+        if (!newConfig.personalReposOrg) {
+          newConfig.personalReposOrg = "github-personal";
+        }
+        break;
+    }
+    
+    setConfig(newConfig);
+    if (onAutoSave) {
+      onAutoSave(newConfig);
+    }
+  }, [mirrorStrategy]);
 
   const handleChange = (
     e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
-    const { name, value } = e.target;
-    setConfig({
+    const { name, value, type } = e.target;
+    const checked = type === "checkbox" ? (e.target as HTMLInputElement).checked : undefined;
+
+    // Special handling for preserveOrgStructure changes
+    if (
+      name === "preserveOrgStructure" &&
+      config.preserveOrgStructure !== checked
+    ) {
+      toast.info(
+        "Changing this setting may affect how repositories are accessed in Gitea. " +
+          "Existing mirrored repositories will still be accessible during sync operations.",
+        {
+          duration: 6000,
+          position: "top-center",
+        }
+      );
+    }
+
+    const newConfig = {
       ...config,
-      [name]: value,
-    });
+      [name]: type === "checkbox" ? checked : value,
+    };
+    setConfig(newConfig);
+
+    // Auto-save for all field changes
+    if (onAutoSave) {
+      onAutoSave(newConfig);
+    }
   };
 
   const testConnection = async () => {
@@ -63,22 +139,24 @@ export function GiteaConfigForm({ config, setConfig }: GiteaConfigFormProps) {
   };
 
   return (
-    <Card className="w-full">
-      <CardHeader className="flex flex-row items-center justify-between gap-4">
+    <Card className="w-full h-full flex flex-col">
+      <CardHeader className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
         <CardTitle className="text-lg font-semibold">
           Gitea Configuration
         </CardTitle>
+        {/* Desktop: Show button in header */}
         <Button
           type="button"
-          variant="outline"
+          variant="default"
           onClick={testConnection}
           disabled={isLoading || !config.url || !config.token}
+          className="hidden sm:inline-flex"
         >
           {isLoading ? "Testing..." : "Test Connection"}
         </Button>
       </CardHeader>
 
-      <CardContent className="flex flex-col gap-y-6">
+      <CardContent className="flex flex-col gap-y-6 flex-1">
         <div>
           <label
             htmlFor="gitea-username"
@@ -140,89 +218,58 @@ export function GiteaConfigForm({ config, setConfig }: GiteaConfigFormProps) {
           </p>
         </div>
 
-        <div>
-          <label
-            htmlFor="organization"
-            className="block text-sm font-medium mb-1.5"
-          >
-            Default Organization (Optional)
-          </label>
-          <input
-            id="organization"
-            name="organization"
-            type="text"
-            value={config.organization}
-            onChange={handleChange}
-            className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-            placeholder="Organization name"
-          />
-          <p className="text-xs text-muted-foreground mt-1">
-            If specified, repositories will be mirrored to this organization.
-          </p>
-        </div>
-
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <div>
-            <label
-              htmlFor="visibility"
-              className="block text-sm font-medium mb-1.5"
-            >
-              Organization Visibility
-            </label>
-            <Select
-              name="visibility"
-              value={config.visibility}
-              onValueChange={(value) =>
-                handleChange({
-                  target: { name: "visibility", value },
-                } as React.ChangeEvent<HTMLInputElement>)
-              }
-            >
-              <SelectTrigger className="w-full border border-input dark:bg-background dark:hover:bg-background">
-                <SelectValue placeholder="Select visibility" />
-              </SelectTrigger>
-              <SelectContent className="bg-background text-foreground border border-input shadow-sm">
-                {(["public", "private", "limited"] as GiteaOrgVisibility[]).map(
-                  (option) => (
-                    <SelectItem
-                      key={option}
-                      value={option}
-                      className="cursor-pointer text-sm px-3 py-2 hover:bg-accent focus:bg-accent focus:text-accent-foreground"
-                    >
-                      {option.charAt(0).toUpperCase() + option.slice(1)}
-                    </SelectItem>
-                  )
-                )}
-              </SelectContent>
-            </Select>
-          </div>
-
-          <div>
-            <label
-              htmlFor="starred-repos-org"
-              className="block text-sm font-medium mb-1.5"
-            >
-              Starred Repositories Organization
-            </label>
-            <input
-              id="starred-repos-org"
-              name="starredReposOrg"
-              type="text"
-              value={config.starredReposOrg}
-              onChange={handleChange}
-              className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-              placeholder="github"
-            />
-            <p className="text-xs text-muted-foreground mt-1">
-              Organization for starred repositories (default: github)
-            </p>
-          </div>
-        </div>
+        <Separator />
+        
+        <OrganizationStrategy
+          strategy={mirrorStrategy}
+          destinationOrg={config.organization}
+          starredReposOrg={config.starredReposOrg}
+          onStrategyChange={setMirrorStrategy}
+          githubUsername={githubUsername}
+          giteaUsername={config.username}
+        />
+        
+        <Separator />
+        
+        <OrganizationConfiguration
+          strategy={mirrorStrategy}
+          destinationOrg={config.organization}
+          starredReposOrg={config.starredReposOrg}
+          personalReposOrg={config.personalReposOrg}
+          visibility={config.visibility}
+          onDestinationOrgChange={(org) => {
+            const newConfig = { ...config, organization: org };
+            setConfig(newConfig);
+            if (onAutoSave) onAutoSave(newConfig);
+          }}
+          onStarredReposOrgChange={(org) => {
+            const newConfig = { ...config, starredReposOrg: org };
+            setConfig(newConfig);
+            if (onAutoSave) onAutoSave(newConfig);
+          }}
+          onPersonalReposOrgChange={(org) => {
+            const newConfig = { ...config, personalReposOrg: org };
+            setConfig(newConfig);
+            if (onAutoSave) onAutoSave(newConfig);
+          }}
+          onVisibilityChange={(visibility) => {
+            const newConfig = { ...config, visibility };
+            setConfig(newConfig);
+            if (onAutoSave) onAutoSave(newConfig);
+          }}
+        />
+        
+        {/* Mobile: Show button at bottom */}
+        <Button
+          type="button"
+          variant="default"
+          onClick={testConnection}
+          disabled={isLoading || !config.url || !config.token}
+          className="sm:hidden w-full"
+        >
+          {isLoading ? "Testing..." : "Test Connection"}
+        </Button>
       </CardContent>
-
-      <CardFooter className="">
-        {/* Footer content can be added here if needed */}
-      </CardFooter>
     </Card>
   );
 }

src/components/config/MirrorOptionsForm.tsx

@@ -0,0 +1,226 @@
+import React from "react";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Checkbox } from "../ui/checkbox";
+import type { MirrorOptions } from "@/types/config";
+import { RefreshCw, Info } from "lucide-react";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
+
+interface MirrorOptionsFormProps {
+  config: MirrorOptions;
+  setConfig: React.Dispatch<React.SetStateAction<MirrorOptions>>;
+  onAutoSave?: (config: MirrorOptions) => Promise<void>;
+  isAutoSaving?: boolean;
+}
+
+export function MirrorOptionsForm({
+  config,
+  setConfig,
+  onAutoSave,
+  isAutoSaving = false,
+}: MirrorOptionsFormProps) {
+  const handleChange = (name: string, checked: boolean) => {
+    let newConfig = { ...config };
+
+    if (name === "mirrorMetadata") {
+      newConfig.mirrorMetadata = checked;
+      // If disabling metadata, also disable all components
+      if (!checked) {
+        newConfig.metadataComponents = {
+          issues: false,
+          pullRequests: false,
+          labels: false,
+          milestones: false,
+          wiki: false,
+        };
+      }
+    } else if (name.startsWith("metadataComponents.")) {
+      const componentName = name.split(".")[1] as keyof typeof config.metadataComponents;
+      newConfig.metadataComponents = {
+        ...config.metadataComponents,
+        [componentName]: checked,
+      };
+    } else {
+      newConfig = {
+        ...config,
+        [name]: checked,
+      };
+    }
+
+    setConfig(newConfig);
+
+    // Auto-save
+    if (onAutoSave) {
+      onAutoSave(newConfig);
+    }
+  };
+
+  return (
+    <Card className="self-start">
+      <CardHeader>
+        <CardTitle className="text-lg font-semibold flex items-center justify-between">
+          Mirror Options
+          {isAutoSaving && (
+            <div className="flex items-center text-sm text-muted-foreground">
+              <RefreshCw className="h-3 w-3 animate-spin mr-1" />
+              <span className="text-xs">Auto-saving...</span>
+            </div>
+          )}
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="space-y-6">
+        {/* Repository Content */}
+        <div className="space-y-4">
+          <h4 className="text-sm font-medium text-foreground">Repository Content</h4>
+          
+          <div className="flex items-center">
+            <Checkbox
+              id="mirror-releases"
+              checked={config.mirrorReleases}
+              onCheckedChange={(checked) =>
+                handleChange("mirrorReleases", Boolean(checked))
+              }
+            />
+            <label
+              htmlFor="mirror-releases"
+              className="ml-2 text-sm select-none flex items-center"
+            >
+              Mirror releases
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <span className="ml-1 cursor-pointer text-muted-foreground">
+                    <Info size={14} />
+                  </span>
+                </TooltipTrigger>
+                <TooltipContent side="right" className="max-w-xs text-xs">
+                  Include GitHub releases and tags in the mirror
+                </TooltipContent>
+              </Tooltip>
+            </label>
+          </div>
+
+          <div className="flex items-center">
+            <Checkbox
+              id="mirror-metadata"
+              checked={config.mirrorMetadata}
+              onCheckedChange={(checked) =>
+                handleChange("mirrorMetadata", Boolean(checked))
+              }
+            />
+            <label
+              htmlFor="mirror-metadata"
+              className="ml-2 text-sm select-none flex items-center"
+            >
+              Mirror metadata
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <span className="ml-1 cursor-pointer text-muted-foreground">
+                    <Info size={14} />
+                  </span>
+                </TooltipTrigger>
+                <TooltipContent side="right" className="max-w-xs text-xs">
+                  Include issues, pull requests, labels, milestones, and wiki
+                </TooltipContent>
+              </Tooltip>
+            </label>
+          </div>
+
+          {/* Metadata Components */}
+          {config.mirrorMetadata && (
+            <div className="ml-6 space-y-3 border-l-2 border-muted pl-4">
+              <h5 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+                Metadata Components
+              </h5>
+              
+              <div className="grid grid-cols-1 gap-2">
+                <div className="flex items-center">
+                  <Checkbox
+                    id="metadata-issues"
+                    checked={config.metadataComponents.issues}
+                    onCheckedChange={(checked) =>
+                      handleChange("metadataComponents.issues", Boolean(checked))
+                    }
+                    disabled={!config.mirrorMetadata}
+                  />
+                  <label
+                    htmlFor="metadata-issues"
+                    className="ml-2 text-sm select-none"
+                  >
+                    Issues
+                  </label>
+                </div>
+
+                <div className="flex items-center">
+                  <Checkbox
+                    id="metadata-pullRequests"
+                    checked={config.metadataComponents.pullRequests}
+                    onCheckedChange={(checked) =>
+                      handleChange("metadataComponents.pullRequests", Boolean(checked))
+                    }
+                    disabled={!config.mirrorMetadata}
+                  />
+                  <label
+                    htmlFor="metadata-pullRequests"
+                    className="ml-2 text-sm select-none"
+                  >
+                    Pull requests
+                  </label>
+                </div>
+
+                <div className="flex items-center">
+                  <Checkbox
+                    id="metadata-labels"
+                    checked={config.metadataComponents.labels}
+                    onCheckedChange={(checked) =>
+                      handleChange("metadataComponents.labels", Boolean(checked))
+                    }
+                    disabled={!config.mirrorMetadata}
+                  />
+                  <label
+                    htmlFor="metadata-labels"
+                    className="ml-2 text-sm select-none"
+                  >
+                    Labels
+                  </label>
+                </div>
+
+                <div className="flex items-center">
+                  <Checkbox
+                    id="metadata-milestones"
+                    checked={config.metadataComponents.milestones}
+                    onCheckedChange={(checked) =>
+                      handleChange("metadataComponents.milestones", Boolean(checked))
+                    }
+                    disabled={!config.mirrorMetadata}
+                  />
+                  <label
+                    htmlFor="metadata-milestones"
+                    className="ml-2 text-sm select-none"
+                  >
+                    Milestones
+                  </label>
+                </div>
+
+                <div className="flex items-center">
+                  <Checkbox
+                    id="metadata-wiki"
+                    checked={config.metadataComponents.wiki}
+                    onCheckedChange={(checked) =>
+                      handleChange("metadataComponents.wiki", Boolean(checked))
+                    }
+                    disabled={!config.mirrorMetadata}
+                  />
+                  <label
+                    htmlFor="metadata-wiki"
+                    className="ml-2 text-sm select-none"
+                  >
+                    Wiki
+                  </label>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

src/components/config/OrganizationConfiguration.tsx

@@ -0,0 +1,175 @@
+import React from "react";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Star, Globe, Lock, Shield, Info, MonitorCog } from "lucide-react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
+import type { MirrorStrategy, GiteaOrgVisibility } from "@/types/config";
+
+interface OrganizationConfigurationProps {
+  strategy: MirrorStrategy;
+  destinationOrg?: string;
+  starredReposOrg?: string;
+  personalReposOrg?: string;
+  visibility: GiteaOrgVisibility;
+  onDestinationOrgChange: (org: string) => void;
+  onStarredReposOrgChange: (org: string) => void;
+  onPersonalReposOrgChange: (org: string) => void;
+  onVisibilityChange: (visibility: GiteaOrgVisibility) => void;
+}
+
+const visibilityOptions = [
+  { value: "public" as GiteaOrgVisibility, label: "Public", icon: Globe, description: "Visible to everyone" },
+  { value: "private" as GiteaOrgVisibility, label: "Private", icon: Lock, description: "Visible to members only" },
+  { value: "limited" as GiteaOrgVisibility, label: "Limited", icon: Shield, description: "Visible to logged-in users" },
+];
+
+export const OrganizationConfiguration: React.FC<OrganizationConfigurationProps> = ({
+  strategy,
+  destinationOrg,
+  starredReposOrg,
+  personalReposOrg,
+  visibility,
+  onDestinationOrgChange,
+  onStarredReposOrgChange,
+  onPersonalReposOrgChange,
+  onVisibilityChange,
+}) => {
+  return (
+    <div className="space-y-4">
+      <div>
+        <h4 className="text-sm font-medium mb-3 flex items-center gap-2">
+          <MonitorCog className="h-4 w-4" />
+          Organization Configuration
+        </h4>
+      </div>
+
+      {/* First row - Organization inputs with consistent layout */}
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+        {/* Left column - always shows starred repos org */}
+        <div className="space-y-1">
+          <Label htmlFor="starredReposOrg" className="text-sm font-normal flex items-center gap-2">
+            <Star className="h-3.5 w-3.5" />
+            Starred Repos Organization
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger>
+                  <Info className="h-3.5 w-3.5 text-muted-foreground" />
+                </TooltipTrigger>
+                <TooltipContent>
+                  <p>Starred repositories will be organized separately in this organization</p>
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          </Label>
+          <Input
+            id="starredReposOrg"
+            value={starredReposOrg || ""}
+            onChange={(e) => onStarredReposOrgChange(e.target.value)}
+            placeholder="starred"
+            className=""
+          />
+          <p className="text-xs text-muted-foreground mt-1">
+            Keep starred repos organized separately
+          </p>
+        </div>
+
+        {/* Right column - shows destination org for single-org/mixed, personal repos org for preserve, empty div for others */}
+        {strategy === "single-org" || strategy === "mixed" ? (
+          <div className="space-y-1">
+            <Label htmlFor="destinationOrg" className="text-sm font-normal flex items-center gap-2">
+              {strategy === "mixed" ? "Personal Repos Organization" : "Destination Organization"}
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <Info className="h-3.5 w-3.5 text-muted-foreground" />
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p>
+                      {strategy === "mixed"
+                        ? "Personal repositories will be mirrored to this organization, while organization repos preserve their structure"
+                        : "All repositories will be mirrored to this organization"
+                      }
+                    </p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </Label>
+            <Input
+              id="destinationOrg"
+              value={destinationOrg || ""}
+              onChange={(e) => onDestinationOrgChange(e.target.value)}
+              placeholder={strategy === "mixed" ? "github-personal" : "github-mirrors"}
+              className=""
+            />
+            <p className="text-xs text-muted-foreground mt-1">
+              {strategy === "mixed"
+                ? "All personal repos will go to this organization"
+                : "Organization for consolidated repositories"
+              }
+            </p>
+          </div>
+        ) : (
+          <div className="hidden md:block" />
+        )}
+      </div>
+
+      {/* Second row - Organization Visibility (always shown) */}
+      <div className="space-y-2">
+        <Label className="text-sm font-normal flex items-center gap-2">
+          Organization Visibility
+          <TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger>
+                <Info className="h-3.5 w-3.5 text-muted-foreground" />
+              </TooltipTrigger>
+              <TooltipContent>
+                <p>Default visibility for newly created organizations</p>
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        </Label>
+        <div className="grid grid-cols-3 gap-2">
+          {visibilityOptions.map((option) => {
+            const Icon = option.icon;
+            const isSelected = visibility === option.value;
+            return (
+              <TooltipProvider key={option.value}>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      onClick={() => onVisibilityChange(option.value)}
+                      className={cn(
+                        "flex items-center justify-between px-3 py-2 rounded-md text-sm transition-all",
+                        "border group",
+                        isSelected
+                          ? "bg-accent border-accent-foreground/20"
+                          : "bg-background hover:bg-accent/50 border-input"
+                      )}
+                    >
+                      <div className="flex items-center gap-2">
+                        <Icon className="h-3.5 w-3.5" />
+                        <span>{option.label}</span>
+                      </div>
+                      <Info className="h-3 w-3 text-muted-foreground opacity-50 group-hover:opacity-100 transition-opacity hidden sm:inline-block" />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p className="text-xs">{option.description}</p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+};
+

src/components/config/OrganizationStrategy.tsx

@@ -0,0 +1,437 @@
+import React from "react";
+import { Card } from "@/components/ui/card";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { Info, GitBranch, FolderTree, Star, Building2, User, Building } from "lucide-react";
+import {
+  HoverCard,
+  HoverCardContent,
+  HoverCardTrigger,
+} from "@/components/ui/hover-card";
+import { cn } from "@/lib/utils";
+
+export type MirrorStrategy = "preserve" | "single-org" | "flat-user" | "mixed";
+
+interface OrganizationStrategyProps {
+  strategy: MirrorStrategy;
+  destinationOrg?: string;
+  starredReposOrg?: string;
+  onStrategyChange: (strategy: MirrorStrategy) => void;
+  githubUsername?: string;
+  giteaUsername?: string;
+}
+
+const strategyConfig = {
+  preserve: {
+    title: "Preserve Structure",
+    icon: FolderTree,
+    description: "Keep the exact same org structure as GitHub",
+    color: "text-blue-600 dark:text-blue-400",
+    bgColor: "bg-blue-50 dark:bg-blue-950/20",
+    borderColor: "border-blue-200 dark:border-blue-900",
+    repoColors: {
+      bg: "bg-blue-50 dark:bg-blue-950/30",
+      icon: "text-blue-600 dark:text-blue-400"
+    }
+  },
+  "single-org": {
+    title: "Single Organization",
+    icon: Building2,
+    description: "Consolidate all repositories into one Gitea organization",
+    color: "text-purple-600 dark:text-purple-400",
+    bgColor: "bg-purple-50 dark:bg-purple-950/20",
+    borderColor: "border-purple-200 dark:border-purple-900",
+    repoColors: {
+      bg: "bg-purple-50 dark:bg-purple-950/30",
+      icon: "text-purple-600 dark:text-purple-400"
+    }
+  },
+  "flat-user": {
+    title: "User Repositories",
+    icon: User,
+    description: "Place all repositories directly under your user account",
+    color: "text-green-600 dark:text-green-400",
+    bgColor: "bg-green-50 dark:bg-green-950/20",
+    borderColor: "border-green-200 dark:border-green-900",
+    repoColors: {
+      bg: "bg-green-50 dark:bg-green-950/30",
+      icon: "text-green-600 dark:text-green-400"
+    }
+  },
+  "mixed": {
+    title: "Mixed Mode",
+    icon: GitBranch,
+    description: "Personal repos in single org, org repos preserve structure",
+    color: "text-orange-600 dark:text-orange-400",
+    bgColor: "bg-orange-50 dark:bg-orange-950/20",
+    borderColor: "border-orange-200 dark:border-orange-900",
+    repoColors: {
+      bg: "bg-orange-50 dark:bg-orange-950/30",
+      icon: "text-orange-600 dark:text-orange-400"
+    }
+  }
+};
+
+const MappingPreview: React.FC<{ 
+  strategy: MirrorStrategy;
+  config: typeof strategyConfig.preserve;
+  destinationOrg?: string;
+  starredReposOrg?: string;
+  githubUsername?: string;
+  giteaUsername?: string;
+}> = ({ strategy, config, destinationOrg, starredReposOrg, githubUsername, giteaUsername }) => {
+  const displayGithubUsername = githubUsername || "<username>";
+  const displayGiteaUsername = giteaUsername || "<username>";
+  const isGithubPlaceholder = !githubUsername;
+  const isGiteaPlaceholder = !giteaUsername;
+  
+  if (strategy === "preserve") {
+    return (
+      <div className="flex items-center justify-between gap-6">
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">GitHub</div>
+          <div className="space-y-1.5">
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <User className="h-3 w-3" />
+              <span className={cn(isGithubPlaceholder && "text-muted-foreground italic")}>{displayGithubUsername}/my-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Building2 className="h-3 w-3" />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Star className="h-3 w-3" />
+              <span>awesome/starred-repo</span>
+            </div>
+          </div>
+        </div>
+        
+        <div className="flex items-center">
+          <GitBranch className="h-4 w-4 text-muted-foreground" />
+        </div>
+        
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">Gitea</div>
+          <div className="space-y-1.5">
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <User className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span className={cn(isGiteaPlaceholder && "text-muted-foreground italic")}>{displayGiteaUsername}/my-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{starredReposOrg || "starred"}/starred-repo</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (strategy === "single-org") {
+    return (
+      <div className="flex items-center justify-between gap-6">
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">GitHub</div>
+          <div className="space-y-1.5">
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <User className="h-3 w-3" />
+              <span className={cn(isGithubPlaceholder && "text-muted-foreground italic")}>{displayGithubUsername}/my-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Building2 className="h-3 w-3" />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Star className="h-3 w-3" />
+              <span>awesome/starred-repo</span>
+            </div>
+          </div>
+        </div>
+        
+        <div className="flex items-center">
+          <GitBranch className="h-4 w-4 text-muted-foreground" />
+        </div>
+        
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">Gitea</div>
+          <div className="space-y-1.5">
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{destinationOrg || "github-mirrors"}/my-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{destinationOrg || "github-mirrors"}/team-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{starredReposOrg || "starred"}/starred-repo</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (strategy === "flat-user") {
+    return (
+      <div className="flex items-center justify-between gap-6">
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">GitHub</div>
+          <div className="space-y-1.5">
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <User className="h-3 w-3" />
+              <span className={cn(isGithubPlaceholder && "text-muted-foreground italic")}>{displayGithubUsername}/my-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Building2 className="h-3 w-3" />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Star className="h-3 w-3" />
+              <span>awesome/starred-repo</span>
+            </div>
+          </div>
+        </div>
+        
+        <div className="flex items-center">
+          <GitBranch className="h-4 w-4 text-muted-foreground" />
+        </div>
+        
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">Gitea</div>
+          <div className="space-y-1.5">
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <User className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span className={cn(isGiteaPlaceholder && "text-muted-foreground italic")}>{displayGiteaUsername}/my-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <User className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span className={cn(isGiteaPlaceholder && "text-muted-foreground italic")}>{displayGiteaUsername}/team-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{starredReposOrg || "starred"}/starred-repo</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (strategy === "mixed") {
+    return (
+      <div className="flex items-center justify-between gap-6">
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">GitHub</div>
+          <div className="space-y-1.5">
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <User className="h-3 w-3" />
+              <span className={cn(isGithubPlaceholder && "text-muted-foreground italic")}>{displayGithubUsername}/my-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Building2 className="h-3 w-3" />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className="flex items-center gap-2 p-1.5 bg-gray-50 dark:bg-gray-800 rounded text-xs">
+              <Star className="h-3 w-3" />
+              <span>awesome/starred-repo</span>
+            </div>
+          </div>
+        </div>
+        
+        <div className="flex items-center">
+          <GitBranch className="h-4 w-4 text-muted-foreground" />
+        </div>
+        
+        <div className="flex-1">
+          <div className="text-xs font-medium text-muted-foreground mb-2">Gitea</div>
+          <div className="space-y-1.5">
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{destinationOrg || "github-mirrors"}/my-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>my-org/team-repo</span>
+            </div>
+            <div className={cn("flex items-center gap-2 p-1.5 rounded text-xs", config.repoColors.bg)}>
+              <Building2 className={cn("h-3 w-3", config.repoColors.icon)} />
+              <span>{starredReposOrg || "starred"}/starred-repo</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+  
+  return null;
+};
+
+export const OrganizationStrategy: React.FC<OrganizationStrategyProps> = ({
+  strategy,
+  destinationOrg,
+  starredReposOrg,
+  onStrategyChange,
+  githubUsername,
+  giteaUsername,
+}) => {
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
+        <div className="flex-1">
+          <h4 className="text-sm font-medium mb-3 flex items-center gap-2">
+            <Building className="h-4 w-4" />
+            Organization Strategy
+          </h4>
+          <p className="text-xs text-muted-foreground">
+            Choose how your repositories will be organized in Gitea
+          </p>
+        </div>
+        
+        <div className="flex-shrink-0">
+          <HoverCard openDelay={200}>
+            <HoverCardTrigger asChild>
+              <button 
+                className="inline-flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground hover:bg-muted rounded-md transition-colors"
+                type="button"
+              >
+                <Info className="h-3.5 w-3.5" />
+                <span>Override Options</span>
+              </button>
+            </HoverCardTrigger>
+            <HoverCardContent side="bottom" align="start" className="w-[380px]">
+              <div className="space-y-3">
+                <div>
+                  <h4 className="font-medium text-sm mb-1.5">Fine-tune Your Mirror Destinations</h4>
+                  <p className="text-xs text-muted-foreground">
+                    After selecting a strategy, you can customize destinations for specific organizations and repositories.
+                  </p>
+                </div>
+                
+                <div className="space-y-2.5 pt-2 border-t">
+                  <div className="space-y-1">
+                    <div className="flex items-center gap-2">
+                      <Building2 className="h-3.5 w-3.5 text-primary" />
+                      <span className="text-xs font-medium">Organization Overrides</span>
+                    </div>
+                    <p className="text-xs text-muted-foreground pl-5">
+                      Click the edit button on any organization card to redirect all its repositories to a different Gitea organization.
+                    </p>
+                  </div>
+                  
+                  <div className="space-y-1">
+                    <div className="flex items-center gap-2">
+                      <GitBranch className="h-3.5 w-3.5 text-primary" />
+                      <span className="text-xs font-medium">Repository Overrides</span>
+                    </div>
+                    <p className="text-xs text-muted-foreground pl-5">
+                      Use the inline editor in the repository table's "Destination" column to set custom destinations for individual repositories.
+                    </p>
+                  </div>
+                  
+                  <div className="space-y-1">
+                    <div className="flex items-center gap-2">
+                      <Star className="h-3.5 w-3.5 text-yellow-500" />
+                      <span className="text-xs font-medium">Starred Repositories</span>
+                    </div>
+                    <p className="text-xs text-muted-foreground pl-5">
+                      Always go to the configured starred repos organization and cannot be overridden.
+                    </p>
+                  </div>
+                </div>
+                
+                <div className="pt-2 border-t">
+                  <p className="text-xs text-muted-foreground">
+                    <span className="font-medium">Priority:</span> Repository override → Organization override → Strategy default
+                  </p>
+                </div>
+              </div>
+            </HoverCardContent>
+          </HoverCard>
+        </div>
+      </div>
+
+      <RadioGroup value={strategy} onValueChange={onStrategyChange}>
+        <div className="grid grid-cols-1 2xl:grid-cols-2 gap-4">
+          {(Object.entries(strategyConfig) as [MirrorStrategy, typeof strategyConfig.preserve][]).map(([key, config]) => {
+            const isSelected = strategy === key;
+            const Icon = config.icon;
+
+            return (
+              <div key={key}>
+                <label htmlFor={key} className="cursor-pointer">
+                  <Card 
+                    className={cn(
+                      "relative",
+                      isSelected && `${config.borderColor} border-2`,
+                      !isSelected && "border-muted"
+                    )}
+                  >
+                    <div className="p-3 sm:p-4">
+                      <div className="flex items-start gap-3">
+                        <RadioGroupItem 
+                          value={key} 
+                          id={key} 
+                          className="mt-1"
+                        />
+                        
+                        <div className={cn(
+                          "rounded-lg p-2 flex-shrink-0",
+                          isSelected ? config.bgColor : "bg-muted dark:bg-muted/50"
+                        )}>
+                          <Icon className={cn(
+                            "h-4 w-4",
+                            isSelected ? config.color : "text-muted-foreground dark:text-muted-foreground/70"
+                          )} />
+                        </div>
+                        
+                        <div className="flex-1 min-w-0">
+                          <div className="flex items-start justify-between gap-2">
+                            <div className="flex-1">
+                              <h4 className="font-medium text-sm">{config.title}</h4>
+                              <p className="text-xs text-muted-foreground mt-1 leading-relaxed">
+                                {config.description}
+                              </p>
+                            </div>
+                            
+                            <HoverCard openDelay={200}>
+                              <HoverCardTrigger asChild>
+                                <span 
+                                  className="inline-flex p-1 sm:p-1.5 hover:bg-muted rounded-md transition-colors cursor-help flex-shrink-0 ml-2"
+                                  onClick={(e) => e.stopPropagation()}
+                                >
+                                  <Info className="h-3.5 w-3.5 sm:h-4 sm:w-4 text-muted-foreground" />
+                                </span>
+                              </HoverCardTrigger>
+                              <HoverCardContent side="left" align="center" className="w-[500px]">
+                                <div className="space-y-3">
+                                  <h4 className="font-medium text-sm">Repository Mapping Preview</h4>
+                                  <MappingPreview 
+                                    strategy={key}
+                                    config={config}
+                                    destinationOrg={destinationOrg}
+                                    starredReposOrg={starredReposOrg}
+                                    githubUsername={githubUsername}
+                                    giteaUsername={giteaUsername}
+                                  />
+                                </div>
+                              </HoverCardContent>
+                            </HoverCard>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </Card>
+                </label>
+              </div>
+            );
+          })}
+        </div>
+      </RadioGroup>
+    </div>
+  );
+};

src/components/config/SSOSettings.tsx

@@ -0,0 +1,585 @@
+import { useState, useEffect } from 'react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Switch } from '@/components/ui/switch';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { apiRequest, showErrorToast } from '@/lib/utils';
+import { toast } from 'sonner';
+import { Plus, Trash2, ExternalLink, Loader2, AlertCircle, Shield, Info } from 'lucide-react';
+import { Separator } from '@/components/ui/separator';
+import { Skeleton } from '../ui/skeleton';
+import { Badge } from '../ui/badge';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { Textarea } from '@/components/ui/textarea';
+
+interface SSOProvider {
+  id: string;
+  issuer: string;
+  domain: string;
+  providerId: string;
+  organizationId?: string;
+  oidcConfig?: {
+    clientId: string;
+    clientSecret: string;
+    authorizationEndpoint: string;
+    tokenEndpoint: string;
+    jwksEndpoint?: string;
+    userInfoEndpoint?: string;
+    discoveryEndpoint?: string;
+    scopes?: string[];
+    pkce?: boolean;
+  };
+  samlConfig?: {
+    entryPoint: string;
+    cert: string;
+    callbackUrl?: string;
+    audience?: string;
+    wantAssertionsSigned?: boolean;
+    signatureAlgorithm?: string;
+    digestAlgorithm?: string;
+    identifierFormat?: string;
+  };
+  mapping?: {
+    id: string;
+    email: string;
+    emailVerified?: string;
+    name?: string;
+    image?: string;
+    firstName?: string;
+    lastName?: string;
+  };
+  createdAt: string;
+  updatedAt: string;
+}
+
+export function SSOSettings() {
+  const [providers, setProviders] = useState<SSOProvider[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [showProviderDialog, setShowProviderDialog] = useState(false);
+  const [isDiscovering, setIsDiscovering] = useState(false);
+  const [headerAuthEnabled, setHeaderAuthEnabled] = useState(false);
+
+  // Form states for new provider
+  const [providerType, setProviderType] = useState<'oidc' | 'saml'>('oidc');
+  const [providerForm, setProviderForm] = useState({
+    // Common fields
+    issuer: '',
+    domain: '',
+    providerId: '',
+    organizationId: '',
+    // OIDC fields
+    clientId: '',
+    clientSecret: '',
+    authorizationEndpoint: '',
+    tokenEndpoint: '',
+    jwksEndpoint: '',
+    userInfoEndpoint: '',
+    discoveryEndpoint: '',
+    scopes: ['openid', 'email', 'profile'],
+    pkce: true,
+    // SAML fields
+    entryPoint: '',
+    cert: '',
+    callbackUrl: '',
+    audience: '',
+    wantAssertionsSigned: true,
+    signatureAlgorithm: 'sha256',
+    digestAlgorithm: 'sha256',
+    identifierFormat: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
+  });
+
+
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  const loadData = async () => {
+    setIsLoading(true);
+    try {
+      const [providersRes, headerAuthStatus] = await Promise.all([
+        apiRequest<SSOProvider[]>('/auth/sso/register'),
+        apiRequest<{ enabled: boolean }>('/auth/header-status').catch(() => ({ enabled: false }))
+      ]);
+      
+      setProviders(providersRes);
+      setHeaderAuthEnabled(headerAuthStatus.enabled);
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const discoverOIDC = async () => {
+    if (!providerForm.issuer) {
+      toast.error('Please enter an issuer URL');
+      return;
+    }
+
+    setIsDiscovering(true);
+    try {
+      const discovered = await apiRequest<any>('/sso/discover', {
+        method: 'POST',
+        data: { issuer: providerForm.issuer },
+      });
+
+      setProviderForm(prev => ({
+        ...prev,
+        authorizationEndpoint: discovered.authorizationEndpoint || '',
+        tokenEndpoint: discovered.tokenEndpoint || '',
+        jwksEndpoint: discovered.jwksEndpoint || '',
+        userInfoEndpoint: discovered.userInfoEndpoint || '',
+        discoveryEndpoint: discovered.discoveryEndpoint || `${providerForm.issuer}/.well-known/openid-configuration`,
+        domain: discovered.suggestedDomain || prev.domain,
+      }));
+
+      toast.success('OIDC configuration discovered successfully');
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setIsDiscovering(false);
+    }
+  };
+
+  const createProvider = async () => {
+    try {
+      const requestData: any = {
+        providerId: providerForm.providerId,
+        issuer: providerForm.issuer,
+        domain: providerForm.domain,
+        organizationId: providerForm.organizationId || undefined,
+        providerType,
+      };
+
+      if (providerType === 'oidc') {
+        requestData.clientId = providerForm.clientId;
+        requestData.clientSecret = providerForm.clientSecret;
+        requestData.authorizationEndpoint = providerForm.authorizationEndpoint;
+        requestData.tokenEndpoint = providerForm.tokenEndpoint;
+        requestData.jwksEndpoint = providerForm.jwksEndpoint;
+        requestData.userInfoEndpoint = providerForm.userInfoEndpoint;
+        requestData.discoveryEndpoint = providerForm.discoveryEndpoint;
+        requestData.scopes = providerForm.scopes;
+        requestData.pkce = providerForm.pkce;
+      } else {
+        requestData.entryPoint = providerForm.entryPoint;
+        requestData.cert = providerForm.cert;
+        requestData.callbackUrl = providerForm.callbackUrl || `${window.location.origin}/api/auth/sso/saml2/callback/${providerForm.providerId}`;
+        requestData.audience = providerForm.audience || window.location.origin;
+        requestData.wantAssertionsSigned = providerForm.wantAssertionsSigned;
+        requestData.signatureAlgorithm = providerForm.signatureAlgorithm;
+        requestData.digestAlgorithm = providerForm.digestAlgorithm;
+        requestData.identifierFormat = providerForm.identifierFormat;
+      }
+
+      const newProvider = await apiRequest<SSOProvider>('/auth/sso/register', {
+        method: 'POST',
+        data: requestData,
+      });
+
+      setProviders([...providers, newProvider]);
+      setShowProviderDialog(false);
+      setProviderForm({
+        issuer: '',
+        domain: '',
+        providerId: '',
+        organizationId: '',
+        clientId: '',
+        clientSecret: '',
+        authorizationEndpoint: '',
+        tokenEndpoint: '',
+        jwksEndpoint: '',
+        userInfoEndpoint: '',
+        discoveryEndpoint: '',
+        scopes: ['openid', 'email', 'profile'],
+        pkce: true,
+        entryPoint: '',
+        cert: '',
+        callbackUrl: '',
+        audience: '',
+        wantAssertionsSigned: true,
+        signatureAlgorithm: 'sha256',
+        digestAlgorithm: 'sha256',
+        identifierFormat: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
+      });
+      toast.success('SSO provider created successfully');
+    } catch (error) {
+      showErrorToast(error, toast);
+    }
+  };
+
+  const deleteProvider = async (id: string) => {
+    try {
+      await apiRequest(`/sso/providers?id=${id}`, { method: 'DELETE' });
+      setProviders(providers.filter(p => p.id !== id));
+      toast.success('Provider deleted successfully');
+    } catch (error) {
+      showErrorToast(error, toast);
+    }
+  };
+
+
+  const copyToClipboard = (text: string) => {
+    navigator.clipboard.writeText(text);
+    toast.success('Copied to clipboard');
+  };
+
+  if (isLoading) {
+    return (
+      <div className="space-y-4">
+        <Skeleton className="h-10 w-full" />
+        <Skeleton className="h-64 w-full" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Header with status indicators */}
+      <div className="flex items-center justify-between">
+        <div>
+          <h3 className="text-lg font-semibold">Authentication & SSO</h3>
+          <p className="text-sm text-muted-foreground">
+            Configure how users authenticate with your application
+          </p>
+        </div>
+        <div className="flex items-center gap-2">
+          <div className={`h-2 w-2 rounded-full ${providers.length > 0 ? 'bg-green-500' : 'bg-muted'}`} />
+          <span className="text-sm text-muted-foreground">
+            {providers.length} Provider{providers.length !== 1 ? 's' : ''} configured
+          </span>
+        </div>
+      </div>
+
+      {/* Authentication Methods Overview */}
+      <Card className="mb-6">
+        <CardHeader>
+          <CardTitle className="text-base">Active Authentication Methods</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <div className="space-y-3">
+            {/* Email & Password - Always enabled */}
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <div className="h-2 w-2 rounded-full bg-green-500" />
+                <span className="text-sm font-medium">Email & Password</span>
+                <Badge variant="secondary" className="text-xs">Default</Badge>
+              </div>
+              <span className="text-xs text-muted-foreground">Always enabled</span>
+            </div>
+            
+            {/* Header Authentication Status */}
+            {headerAuthEnabled && (
+              <div className="flex items-center justify-between">
+                <div className="flex items-center gap-2">
+                  <div className="h-2 w-2 rounded-full bg-green-500" />
+                  <span className="text-sm font-medium">Header Authentication</span>
+                  <Badge variant="secondary" className="text-xs">Auto-login</Badge>
+                </div>
+                <span className="text-xs text-muted-foreground">Via reverse proxy</span>
+              </div>
+            )}
+            
+            {/* SSO Providers Status */}
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <div className={`h-2 w-2 rounded-full ${providers.length > 0 ? 'bg-green-500' : 'bg-muted'}`} />
+                <span className="text-sm font-medium">SSO/OIDC Providers</span>
+              </div>
+              <span className="text-xs text-muted-foreground">
+                {providers.length > 0 ? `${providers.length} provider${providers.length !== 1 ? 's' : ''} configured` : 'Not configured'}
+              </span>
+            </div>
+          </div>
+          
+          {/* Header Auth Info */}
+          {headerAuthEnabled && (
+            <Alert className="mt-4">
+              <Shield className="h-4 w-4" />
+              <AlertDescription className="text-xs">
+                Header authentication is enabled. Users authenticated by your reverse proxy will be automatically logged in.
+              </AlertDescription>
+            </Alert>
+          )}
+        </CardContent>
+      </Card>
+
+      {/* SSO Providers */}
+      <Card>
+            <CardHeader>
+              <div className="flex items-center justify-between">
+                <div>
+                  <CardTitle>External Identity Providers</CardTitle>
+                  <CardDescription>
+                    Connect external OIDC/OAuth providers (Google, Azure AD, etc.) to allow users to sign in with their existing accounts
+                  </CardDescription>
+                </div>
+                <Dialog open={showProviderDialog} onOpenChange={setShowProviderDialog}>
+                  <DialogTrigger asChild>
+                    <Button>
+                      <Plus className="h-4 w-4 mr-2" />
+                      Add Provider
+                    </Button>
+                  </DialogTrigger>
+                  <DialogContent className="max-w-2xl">
+                    <DialogHeader>
+                      <DialogTitle>Add SSO Provider</DialogTitle>
+                      <DialogDescription>
+                        Configure an external identity provider for user authentication
+                      </DialogDescription>
+                    </DialogHeader>
+                    <Tabs value={providerType} onValueChange={(value) => setProviderType(value as 'oidc' | 'saml')}>
+                      <TabsList className="grid w-full grid-cols-2">
+                        <TabsTrigger value="oidc">OIDC / OAuth2</TabsTrigger>
+                        <TabsTrigger value="saml">SAML 2.0</TabsTrigger>
+                      </TabsList>
+                      
+                      {/* Common Fields */}
+                      <div className="space-y-4 mt-4">
+                        <div className="grid grid-cols-2 gap-4">
+                          <div className="space-y-2">
+                            <Label htmlFor="providerId">Provider ID</Label>
+                            <Input
+                              id="providerId"
+                              value={providerForm.providerId}
+                              onChange={e => setProviderForm(prev => ({ ...prev, providerId: e.target.value }))}
+                              placeholder="google-sso"
+                            />
+                          </div>
+                          <div className="space-y-2">
+                            <Label htmlFor="domain">Email Domain</Label>
+                            <Input
+                              id="domain"
+                              value={providerForm.domain}
+                              onChange={e => setProviderForm(prev => ({ ...prev, domain: e.target.value }))}
+                              placeholder="example.com"
+                            />
+                          </div>
+                        </div>
+
+                        <div className="space-y-2">
+                          <Label htmlFor="issuer">Issuer URL</Label>
+                          <div className="flex gap-2">
+                            <Input
+                              id="issuer"
+                              value={providerForm.issuer}
+                              onChange={e => setProviderForm(prev => ({ ...prev, issuer: e.target.value }))}
+                              placeholder={providerType === 'oidc' ? "https://accounts.google.com" : "https://idp.example.com"}
+                            />
+                            {providerType === 'oidc' && (
+                              <Button
+                                variant="outline"
+                                onClick={discoverOIDC}
+                                disabled={isDiscovering}
+                              >
+                                {isDiscovering ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Discover'}
+                              </Button>
+                            )}
+                          </div>
+                        </div>
+
+                        <div className="space-y-2">
+                          <Label htmlFor="organizationId">Organization ID (Optional)</Label>
+                          <Input
+                            id="organizationId"
+                            value={providerForm.organizationId}
+                            onChange={e => setProviderForm(prev => ({ ...prev, organizationId: e.target.value }))}
+                            placeholder="org_123"
+                          />
+                          <p className="text-xs text-muted-foreground">Link this provider to an organization for automatic user provisioning</p>
+                        </div>
+                      </div>
+
+                      <TabsContent value="oidc" className="space-y-4">
+                        <div className="grid grid-cols-2 gap-4">
+                          <div className="space-y-2">
+                            <Label htmlFor="clientId">Client ID</Label>
+                            <Input
+                              id="clientId"
+                              value={providerForm.clientId}
+                              onChange={e => setProviderForm(prev => ({ ...prev, clientId: e.target.value }))}
+                            />
+                          </div>
+                          <div className="space-y-2">
+                            <Label htmlFor="clientSecret">Client Secret</Label>
+                            <Input
+                              id="clientSecret"
+                              type="password"
+                              value={providerForm.clientSecret}
+                              onChange={e => setProviderForm(prev => ({ ...prev, clientSecret: e.target.value }))}
+                            />
+                          </div>
+                        </div>
+
+                        <div className="space-y-2">
+                          <Label htmlFor="authEndpoint">Authorization Endpoint</Label>
+                          <Input
+                            id="authEndpoint"
+                            value={providerForm.authorizationEndpoint}
+                            onChange={e => setProviderForm(prev => ({ ...prev, authorizationEndpoint: e.target.value }))}
+                            placeholder="https://accounts.google.com/o/oauth2/auth"
+                          />
+                        </div>
+
+                        <div className="space-y-2">
+                          <Label htmlFor="tokenEndpoint">Token Endpoint</Label>
+                          <Input
+                            id="tokenEndpoint"
+                            value={providerForm.tokenEndpoint}
+                            onChange={e => setProviderForm(prev => ({ ...prev, tokenEndpoint: e.target.value }))}
+                            placeholder="https://oauth2.googleapis.com/token"
+                          />
+                        </div>
+
+                        <div className="flex items-center space-x-2">
+                          <Switch
+                            id="pkce"
+                            checked={providerForm.pkce}
+                            onCheckedChange={(checked) => setProviderForm(prev => ({ ...prev, pkce: checked }))}
+                          />
+                          <Label htmlFor="pkce">Enable PKCE</Label>
+                        </div>
+
+                        <Alert>
+                          <AlertCircle className="h-4 w-4" />
+                          <AlertDescription>
+                            Redirect URL: {window.location.origin}/api/auth/sso/callback/{providerForm.providerId || '{provider-id}'}
+                          </AlertDescription>
+                        </Alert>
+                      </TabsContent>
+
+                      <TabsContent value="saml" className="space-y-4">
+                        <div className="space-y-2">
+                          <Label htmlFor="entryPoint">SAML Entry Point</Label>
+                          <Input
+                            id="entryPoint"
+                            value={providerForm.entryPoint}
+                            onChange={e => setProviderForm(prev => ({ ...prev, entryPoint: e.target.value }))}
+                            placeholder="https://idp.example.com/sso"
+                          />
+                        </div>
+
+                        <div className="space-y-2">
+                          <Label htmlFor="cert">X.509 Certificate</Label>
+                          <Textarea
+                            id="cert"
+                            value={providerForm.cert}
+                            onChange={e => setProviderForm(prev => ({ ...prev, cert: e.target.value }))}
+                            placeholder="-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----"
+                            rows={6}
+                          />
+                        </div>
+
+                        <div className="flex items-center space-x-2">
+                          <Switch
+                            id="wantAssertionsSigned"
+                            checked={providerForm.wantAssertionsSigned}
+                            onCheckedChange={(checked) => setProviderForm(prev => ({ ...prev, wantAssertionsSigned: checked }))}
+                          />
+                          <Label htmlFor="wantAssertionsSigned">Require Signed Assertions</Label>
+                        </div>
+
+                        <Alert>
+                          <AlertCircle className="h-4 w-4" />
+                          <AlertDescription>
+                            <div className="space-y-1">
+                              <p>Callback URL: {window.location.origin}/api/auth/sso/saml2/callback/{providerForm.providerId || '{provider-id}'}</p>
+                              <p>SP Metadata: {window.location.origin}/api/auth/sso/saml2/sp/metadata?providerId={providerForm.providerId || '{provider-id}'}</p>
+                            </div>
+                          </AlertDescription>
+                        </Alert>
+                      </TabsContent>
+                    </Tabs>
+                    <DialogFooter>
+                      <Button variant="outline" onClick={() => setShowProviderDialog(false)}>
+                        Cancel
+                      </Button>
+                      <Button onClick={createProvider}>Create Provider</Button>
+                    </DialogFooter>
+                  </DialogContent>
+                </Dialog>
+              </div>
+            </CardHeader>
+            <CardContent>
+              {providers.length === 0 ? (
+                <div className="text-center py-12">
+                  <div className="mx-auto h-12 w-12 text-muted-foreground/50">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor">
+                      <path strokeLinecap="round" strokeLinejoin="round" d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z" />
+                    </svg>
+                  </div>
+                  <h3 className="mt-4 text-lg font-medium">No SSO providers configured</h3>
+                  <p className="mt-2 text-sm text-muted-foreground max-w-sm mx-auto">
+                    Enable Single Sign-On by adding an external identity provider like Google, Azure AD, or any OIDC-compliant service.
+                  </p>
+                  <div className="mt-6">
+                    <Button onClick={() => setShowProviderDialog(true)}>
+                      <Plus className="h-4 w-4 mr-2" />
+                      Add Your First Provider
+                    </Button>
+                  </div>
+                </div>
+              ) : (
+                <div className="space-y-4">
+                  {providers.map(provider => (
+                    <Card key={provider.id}>
+                      <CardHeader>
+                        <div className="flex items-center justify-between">
+                          <div>
+                            <div className="flex items-center gap-2">
+                              <h4 className="font-semibold">{provider.providerId}</h4>
+                              <Badge variant="outline" className="text-xs">
+                                {provider.samlConfig ? 'SAML' : 'OIDC'}
+                              </Badge>
+                            </div>
+                            <p className="text-sm text-muted-foreground">{provider.domain}</p>
+                          </div>
+                          <Button
+                            variant="destructive"
+                            size="sm"
+                            onClick={() => deleteProvider(provider.id)}
+                          >
+                            <Trash2 className="h-4 w-4" />
+                          </Button>
+                        </div>
+                      </CardHeader>
+                      <CardContent>
+                        <div className="grid grid-cols-2 gap-4 text-sm">
+                          <div>
+                            <p className="font-medium">Issuer</p>
+                            <p className="text-muted-foreground break-all">{provider.issuer}</p>
+                          </div>
+                          {provider.oidcConfig && (
+                            <div>
+                              <p className="font-medium">Client ID</p>
+                              <p className="text-muted-foreground font-mono break-all">{provider.oidcConfig.clientId}</p>
+                            </div>
+                          )}
+                          {provider.samlConfig && (
+                            <div>
+                              <p className="font-medium">Entry Point</p>
+                              <p className="text-muted-foreground break-all">{provider.samlConfig.entryPoint}</p>
+                            </div>
+                          )}
+                          {provider.organizationId && (
+                            <div className="col-span-2">
+                              <p className="font-medium">Organization</p>
+                              <p className="text-muted-foreground">{provider.organizationId}</p>
+                            </div>
+                          )}
+                        </div>
+                      </CardContent>
+                    </Card>
+                  ))}
+                </div>
+              )}
+            </CardContent>
+      </Card>
+    </div>
+  );
+}

src/components/config/ScheduleAndCleanupForm.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { ScheduleConfigForm } from './ScheduleConfigForm';
+import { DatabaseCleanupConfigForm } from './DatabaseCleanupConfigForm';
+import { Separator } from '../ui/separator';
+import type { ScheduleConfig, DatabaseCleanupConfig } from '@/types/config';
+
+interface ScheduleAndCleanupFormProps {
+  scheduleConfig: ScheduleConfig;
+  cleanupConfig: DatabaseCleanupConfig;
+  setScheduleConfig: (update: ScheduleConfig | ((prev: ScheduleConfig) => ScheduleConfig)) => void;
+  setCleanupConfig: (update: DatabaseCleanupConfig | ((prev: DatabaseCleanupConfig) => DatabaseCleanupConfig)) => void;
+  onAutoSaveSchedule?: (config: ScheduleConfig) => Promise<void>;
+  onAutoSaveCleanup?: (config: DatabaseCleanupConfig) => Promise<void>;
+  isAutoSavingSchedule?: boolean;
+  isAutoSavingCleanup?: boolean;
+}
+
+export function ScheduleAndCleanupForm({
+  scheduleConfig,
+  cleanupConfig,
+  setScheduleConfig,
+  setCleanupConfig,
+  onAutoSaveSchedule,
+  onAutoSaveCleanup,
+  isAutoSavingSchedule,
+  isAutoSavingCleanup,
+}: ScheduleAndCleanupFormProps) {
+  return (
+    <div className="space-y-6">
+      <ScheduleConfigForm
+        config={scheduleConfig}
+        setConfig={setScheduleConfig}
+        onAutoSave={onAutoSaveSchedule}
+        isAutoSaving={isAutoSavingSchedule}
+      />
+      
+      <Separator />
+      
+      <DatabaseCleanupConfigForm
+        config={cleanupConfig}
+        setConfig={setCleanupConfig}
+        onAutoSave={onAutoSaveCleanup}
+        isAutoSaving={isAutoSavingCleanup}
+      />
+    </div>
+  );
+}

src/components/config/ScheduleConfigForm.tsx

@@ -54,7 +54,7 @@ export function ScheduleConfigForm({
   ];
 
   return (
-    <Card>
+    <Card className="self-start">
       <CardContent className="pt-6 relative">
         {isAutoSaving && (
           <div className="absolute top-4 right-4 flex items-center text-sm text-muted-foreground">

src/components/dashboard/Dashboard.tsx

@@ -57,8 +57,6 @@ export function Dashboard() {
     }
 
     setActivities((prevActivities) => [data, ...prevActivities]);
-
-    console.log("Received new log:", data);
   }, []);
 
   // Use the SSE hook
@@ -179,16 +177,16 @@ export function Dashboard() {
 
   return isLoading || !connected ? (
     <div className="flex flex-col gap-y-6">
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+      <div className="grid grid-cols-2 lg:grid-cols-4 gap-3 sm:gap-4 md:gap-6">
         <StatusCardSkeleton />
         <StatusCardSkeleton />
         <StatusCardSkeleton />
         <StatusCardSkeleton />
       </div>
 
-      <div className="flex gap-x-6 items-start">
+      <div className="flex flex-col lg:flex-row gap-6 items-start">
         {/* Repository List Skeleton */}
-        <div className="w-1/2 border rounded-lg p-4">
+        <div className="w-full lg:w-1/2 border rounded-lg p-4">
           <div className="flex justify-between items-center mb-4">
             <Skeleton className="h-6 w-32" />
             <Skeleton className="h-9 w-24" />
@@ -201,7 +199,7 @@ export function Dashboard() {
         </div>
 
         {/* Recent Activity Skeleton */}
-        <div className="w-1/2 border rounded-lg p-4">
+        <div className="w-full lg:w-1/2 border rounded-lg p-4">
           <div className="flex justify-between items-center mb-4">
             <Skeleton className="h-6 w-32" />
             <Skeleton className="h-9 w-24" />
@@ -217,24 +215,24 @@ export function Dashboard() {
   ) : (
     <div className="flex flex-col gap-y-6">
 
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+      <div className="grid grid-cols-2 lg:grid-cols-4 gap-3 sm:gap-4 md:gap-6">
         <StatusCard
-          title="Total Repositories"
+          title="Repositories"
           value={repoCount}
           icon={<GitFork className="h-4 w-4" />}
-          description="Repositories being mirrored"
+          description="Total in mirror queue"
         />
         <StatusCard
           title="Mirrored"
           value={mirroredCount}
           icon={<FlipHorizontal className="h-4 w-4" />}
-          description="Successfully mirrored"
+          description="Synced to Gitea"
         />
         <StatusCard
           title="Organizations"
           value={orgCount}
           icon={<Building2 className="h-4 w-4" />}
-          description="GitHub organizations"
+          description="From GitHub"
         />
         <StatusCard
           title="Last Sync"
@@ -254,11 +252,15 @@ export function Dashboard() {
         />
       </div>
 
-      <div className="flex gap-x-6 items-start">
-        <RepositoryList repositories={repositories} />
+      <div className="flex flex-col lg:flex-row gap-6 items-start">
+        <div className="w-full lg:w-1/2">
+          <RepositoryList repositories={repositories} />
+        </div>
 
-        {/* the api already sends 10 activities only but slicing in case of realtime updates */}
-        <RecentActivity activities={activities.slice(0, 10)} />
+        <div className="w-full lg:w-1/2">
+          {/* the api already sends 10 activities only but slicing in case of realtime updates */}
+          <RecentActivity activities={activities.slice(0, 10)} />
+        </div>
       </div>
     </div>
   );

src/components/dashboard/RecentActivity.tsx

@@ -16,7 +16,7 @@ export function RecentActivity({ activities }: RecentActivityProps) {
           <a href="/activity">View All</a>
         </Button>
       </CardHeader>
-      <CardContent className="max-h-[calc(100dvh-22.5rem)] overflow-y-auto">
+      <CardContent className="max-h-[300px] sm:max-h-[400px] lg:max-h-[calc(100dvh-22.5rem)] overflow-y-auto">
         <div className="flex flex-col divide-y divide-border">
           {activities.length === 0 ? (
             <p className="text-sm text-muted-foreground">No recent activity</p>
@@ -31,7 +31,7 @@ export function RecentActivity({ activities }: RecentActivityProps) {
                   />
                 </div>
                 <div className="flex-1 space-y-1">
-                  <p className="text-sm font-medium leading-none">
+                  <p className="text-sm font-medium leading-none break-words">
                     {activity.message}
                   </p>
                   <p className="text-xs text-muted-foreground">

src/components/dashboard/RepositoryList.tsx

@@ -54,7 +54,7 @@ export function RepositoryList({ repositories }: RepositoryListProps) {
           <a href="/repositories">View All</a>
         </Button>
       </CardHeader>
-      <CardContent className="max-h-[calc(100dvh-22.5rem)] overflow-y-auto">
+      <CardContent className="max-h-[300px] sm:max-h-[400px] lg:max-h-[calc(100dvh-22.5rem)] overflow-y-auto">
         {repositories.length === 0 ? (
           <div className="flex flex-col items-center justify-center py-6 text-center">
             <GitFork className="h-10 w-10 text-muted-foreground mb-4" />
@@ -71,16 +71,21 @@ export function RepositoryList({ repositories }: RepositoryListProps) {
             {repositories.map((repo, index) => (
               <div
                 key={index}
-                className="flex items-center justify-between gap-x-4 py-4"
+                className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2 sm:gap-x-4 py-4"
               >
                 <div className="flex-1">
-                  <div className="flex items-center gap-2">
-                    <h4 className="text-sm font-medium">{repo.name}</h4>
+                  <div className="flex items-center flex-wrap gap-2">
+                    <h4 className="text-sm font-medium break-all">{repo.name}</h4>
                     {repo.isPrivate && (
                       <span className="rounded-full bg-muted px-2 py-0.5 text-xs">
                         Private
                       </span>
                     )}
+                    {repo.isForked && (
+                      <span className="rounded-full bg-muted px-2 py-0.5 text-xs">
+                        Fork
+                      </span>
+                    )}
                   </div>
                   <div className="flex items-center gap-2 mt-1">
                     <span className="text-xs text-muted-foreground">
@@ -94,13 +99,13 @@ export function RepositoryList({ repositories }: RepositoryListProps) {
                   </div>
                 </div>
 
-                <div className="flex items-center gap-2">
+                <div className="flex items-center gap-2 sm:ml-auto">
                   <div
                     className={`h-2 w-2 rounded-full ${getStatusColor(
                       repo.status
                     )}`}
                   />
-                  <span className="text-xs capitalize w-[3rem]">
+                  <span className="text-xs capitalize w-[3rem] sm:w-auto">
                     {/* setting the minimum width to 3rem corresponding to the largest status (mirrored) so that all are left alligned */}
                     {repo.status}
                   </span>

src/components/layout/Header.tsx

@@ -1,19 +1,27 @@
 import { useAuth } from "@/hooks/useAuth";
 import { Button } from "@/components/ui/button";
-import { SiGitea } from "react-icons/si";
+
 import { ModeToggle } from "@/components/theme/ModeToggle";
 import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
 import { toast } from "sonner";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useLiveRefresh } from "@/hooks/useLiveRefresh";
 import { useConfigStatus } from "@/hooks/useConfigStatus";
+import { Menu, LogOut } from "lucide-react";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 
 interface HeaderProps {
   currentPage?: "dashboard" | "repositories" | "organizations" | "configuration" | "activity-log";
   onNavigate?: (page: string) => void;
+  onMenuClick: () => void;
 }
 
-export function Header({ currentPage, onNavigate }: HeaderProps) {
+export function Header({ currentPage, onNavigate, onMenuClick }: HeaderProps) {
   const { user, logout, isLoading } = useAuth();
   const { isLiveEnabled, toggleLive } = useLiveRefresh();
   const { isFullyConfigured, isLoading: configLoading } = useConfigStatus();
@@ -54,30 +62,52 @@ export function Header({ currentPage, onNavigate }: HeaderProps) {
 
   return (
     <header className="border-b bg-background">
-      <div className="flex h-[4.5rem] items-center justify-between px-6">
-        <button
-          onClick={() => {
-            if (currentPage !== 'dashboard') {
-              window.history.pushState({}, '', '/');
-              onNavigate?.('dashboard');
-            }
-          }}
-          className="flex items-center gap-2 py-1 hover:opacity-80 transition-opacity"
-        >
-          <SiGitea className="h-6 w-6" />
-          <span className="text-xl font-bold">Gitea Mirror</span>
-        </button>
+      <div className="flex h-[4.5rem] items-center justify-between px-4 sm:px-6">
+        <div className="flex items-center gap-2">
+          {/* Hamburger Menu Button - Mobile Only */}
+          <Button
+            variant="outline"
+            size="lg"
+            className="lg:hidden"
+            onClick={onMenuClick}
+          >
+            <Menu className="h-5 w-5" />
+            <span className="sr-only">Toggle menu</span>
+          </Button>
+          
+          <button
+            onClick={() => {
+              if (currentPage !== 'dashboard') {
+                window.history.pushState({}, '', '/');
+                onNavigate?.('dashboard');
+              }
+            }}
+            className="flex items-center gap-2 py-1 hover:opacity-80 transition-opacity"
+          >
+            <img
+              src="/logo-light.svg"
+              alt="Gitea Mirror Logo"
+              className="h-6 w-6 dark:hidden"
+            />
+            <img
+              src="/logo-dark.svg"
+              alt="Gitea Mirror Logo"
+              className="h-6 w-6 hidden dark:block"
+            />
+            <span className="text-xl font-bold hidden sm:inline">Gitea Mirror</span>
+          </button>
+        </div>
 
-        <div className="flex items-center gap-4">
+        <div className="flex items-center gap-2 sm:gap-4">
           {showLiveButton && (
             <Button
               variant="outline"
               size="lg"
-              className="flex items-center gap-2"
+              className="flex items-center gap-1.5 px-3 sm:px-4"
               onClick={toggleLive}
               title={getTooltip()}
             >
-              <div className={`w-3 h-3 rounded-full ${
+              <div className={`size-4 sm:size-3 rounded-full ${
                 configLoading
                   ? 'bg-yellow-400 animate-pulse'
                   : isLiveActive
@@ -86,7 +116,7 @@ export function Header({ currentPage, onNavigate }: HeaderProps) {
                       ? 'bg-orange-400'
                       : 'bg-gray-500'
               }`} />
-              <span>LIVE</span>
+              <span className="text-sm font-medium hidden sm:inline">LIVE</span>
             </Button>
           )}
 
@@ -95,19 +125,26 @@ export function Header({ currentPage, onNavigate }: HeaderProps) {
           {isLoading ? (
             <AuthButtonsSkeleton />
           ) : user ? (
-            <>
-              <Avatar>
-                <AvatarImage src="" alt="@shadcn" />
-                <AvatarFallback>
-                  {user.username.charAt(0).toUpperCase()}
-                </AvatarFallback>
-              </Avatar>
-              <Button variant="outline" size="lg" onClick={handleLogout}>
-                Logout
-              </Button>
-            </>
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button variant="outline" size="lg" className="relative h-10 w-10 rounded-full p-0">
+                  <Avatar className="h-full w-full">
+                    <AvatarImage src={user.image || ""} alt={user.name || user.email} />
+                    <AvatarFallback>
+                      {(user.name || user.email || "U").charAt(0).toUpperCase()}
+                    </AvatarFallback>
+                  </Avatar>
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end" className="w-48">
+                <DropdownMenuItem onClick={handleLogout} className="cursor-pointer">
+                  <LogOut className="h-4 w-4 mr-2" />
+                  Logout
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
           ) : (
-            <Button variant="outline" size="lg" asChild>
+            <Button variant="outline" size="sm" asChild>
               <a href="/login">Login</a>
             </Button>
           )}

src/components/layout/MainLayout.tsx

@@ -44,6 +44,7 @@ function AppWithProviders({ page: initialPage }: AppProps) {
   const { isLoading: configLoading } = useConfigStatus();
   const [currentPage, setCurrentPage] = useState<AppProps['page']>(initialPage);
   const [navigationKey, setNavigationKey] = useState(0);
+  const [sidebarOpen, setSidebarOpen] = useState(false);
 
   useRepoSync({
     userId: user?.id,
@@ -99,10 +100,18 @@ function AppWithProviders({ page: initialPage }: AppProps) {
   return (
     <NavigationContext.Provider value={{ navigationKey }}>
       <main className="flex min-h-screen flex-col">
-        <Header currentPage={currentPage} onNavigate={handleNavigation} />
-        <div className="flex flex-1">
-          <Sidebar onNavigate={handleNavigation} />
-          <section className="flex-1 p-6 overflow-y-auto h-[calc(100dvh-4.55rem)]">
+        <Header 
+          currentPage={currentPage} 
+          onNavigate={handleNavigation} 
+          onMenuClick={() => setSidebarOpen(!sidebarOpen)}
+        />
+        <div className="flex flex-1 relative">
+          <Sidebar 
+            onNavigate={handleNavigation} 
+            isOpen={sidebarOpen}
+            onClose={() => setSidebarOpen(false)}
+          />
+          <section className="flex-1 p-4 sm:p-6 overflow-y-auto h-[calc(100dvh-4.55rem)] w-full lg:w-[calc(100%-16rem)]">
             {currentPage === "dashboard" && <Dashboard />}
             {currentPage === "repositories" && <Repository />}
             {currentPage === "organizations" && <Organization />}

src/components/layout/Sidebar.tsx

@@ -7,16 +7,17 @@ import { VersionInfo } from "./VersionInfo";
 interface SidebarProps {
   className?: string;
   onNavigate?: (page: string) => void;
+  isOpen: boolean;
+  onClose: () => void;
 }
 
-export function Sidebar({ className, onNavigate }: SidebarProps) {
+export function Sidebar({ className, onNavigate, isOpen, onClose }: SidebarProps) {
   const [currentPath, setCurrentPath] = useState<string>("");
 
   useEffect(() => {
     // Hydration happens here
     const path = window.location.pathname;
     setCurrentPath(path);
-    console.log("Hydrated path:", path); // Should log now
   }, []);
 
   // Listen for URL changes (browser back/forward)
@@ -50,53 +51,77 @@ export function Sidebar({ className, onNavigate }: SidebarProps) {
 
     const pageName = pageMap[href] || 'dashboard';
     onNavigate?.(pageName);
+    
+    // Close sidebar on mobile after navigation
+    if (window.innerWidth < 1024) {
+      onClose();
+    }
   };
 
   return (
-    <aside className={cn("w-64 border-r bg-background", className)}>
-      <div className="flex flex-col h-full pt-4">
-        <nav className="flex flex-col gap-y-1 pl-2 pr-3">
-          {links.map((link, index) => {
-            const isActive = currentPath === link.href;
-            const Icon = link.icon;
+    <>
+      {/* Mobile Backdrop */}
+      {isOpen && (
+        <div
+          className="fixed inset-0 backdrop-blur-sm z-40 lg:hidden"
+          onClick={onClose}
+        />
+      )}
+      
+      {/* Sidebar */}
+      <aside 
+        className={cn(
+          "fixed lg:static inset-y-0 left-0 z-50 w-64 bg-background border-r flex flex-col h-full lg:h-[calc(100vh-4.5rem)] transition-transform duration-200 ease-in-out lg:translate-x-0",
+          isOpen ? "translate-x-0" : "-translate-x-full",
+          className
+        )}
+      >
+        <div className="flex flex-col h-full">
+          <nav className="flex flex-col gap-y-1 lg:gap-y-1 pl-2 pr-3 pt-4 flex-shrink-0">
+            {links.map((link, index) => {
+              const isActive = currentPath === link.href;
+              const Icon = link.icon;
 
-            return (
-              <button
-                key={index}
-                onClick={(e) => handleNavigation(link.href, e)}
-                className={cn(
-                  "flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors w-full text-left",
-                  isActive
-                    ? "bg-primary text-primary-foreground"
-                    : "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-                )}
+              return (
+                <button
+                  key={index}
+                  onClick={(e) => handleNavigation(link.href, e)}
+                  className={cn(
+                    "flex items-center gap-3 rounded-md px-3 py-3 lg:py-2 text-sm lg:text-sm font-medium transition-colors w-full text-left",
+                    isActive
+                      ? "bg-primary text-primary-foreground"
+                      : "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+                  )}
+                >
+                  <Icon className="h-5 w-5 lg:h-4 lg:w-4" />
+                  {link.label}
+                </button>
+              );
+            })}
+          </nav>
+
+          <div className="flex-1 min-h-0" />
+
+          <div className="px-4 py-4 flex-shrink-0">
+            <div className="rounded-md bg-muted p-3 lg:p-3">
+              <h4 className="text-sm font-medium mb-2">Need Help?</h4>
+              <p className="text-xs text-muted-foreground mb-3 lg:mb-2">
+                Check out the documentation for help with setup and configuration.
+              </p>
+              <a
+                href="/docs"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="inline-flex items-center gap-1.5 text-xs lg:text-xs text-primary hover:underline py-2 lg:py-0"
               >
-                <Icon className="h-4 w-4" />
-                {link.label}
-              </button>
-            );
-          })}
-        </nav>
-
-        <div className="mt-auto px-4 py-4">
-          <div className="rounded-md bg-muted p-3">
-            <h4 className="text-sm font-medium mb-2">Need Help?</h4>
-            <p className="text-xs text-muted-foreground mb-2">
-              Check out the documentation for help with setup and configuration.
-            </p>
-            <a
-              href="/docs"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="flex items-center gap-1 text-xs text-primary hover:underline"
-            >
-              Documentation
-              <ExternalLink className="h-3 w-3" />
-            </a>
+                Documentation
+                <ExternalLink className="h-3.5 w-3.5 lg:h-3 lg:w-3" />
+              </a>
+            </div>
+            <VersionInfo />
           </div>
-          <VersionInfo />
         </div>
-      </div>
-    </aside>
+      </aside>
+    </>
   );
 }

src/components/layout/SponsorCard.tsx

@@ -0,0 +1,72 @@
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
+import { Heart, Coffee, Sparkles } from "lucide-react";
+import { isSelfHostedMode } from "@/lib/deployment-mode";
+
+export function SponsorCard() {
+  // Only show in self-hosted mode
+  if (!isSelfHostedMode()) {
+    return null;
+  }
+
+  return (
+    <div className="mt-auto p-4 border-t">
+      <Card className="bg-gradient-to-r from-purple-500/10 to-pink-500/10 border-purple-500/20">
+        <CardHeader className="pb-3">
+          <CardTitle className="text-sm font-medium flex items-center gap-2">
+            <Heart className="w-4 h-4 text-pink-500" />
+            Support Development
+          </CardTitle>
+          <CardDescription className="text-xs">
+            Help us improve Gitea Mirror
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-3">
+          <p className="text-xs text-muted-foreground">
+            Gitea Mirror is open source and free. Your sponsorship helps us maintain and improve it.
+          </p>
+          
+          <div className="space-y-2">
+            <Button 
+              className="w-full h-8 text-xs" 
+              size="sm"
+              asChild
+            >
+              <a 
+                href="https://github.com/sponsors/RayLabsHQ" 
+                target="_blank" 
+                rel="noopener noreferrer"
+              >
+                <Heart className="w-3 h-3 mr-2" />
+                Sponsor on GitHub
+              </a>
+            </Button>
+            
+            <Button 
+              className="w-full h-8 text-xs" 
+              size="sm" 
+              variant="outline"
+              asChild
+            >
+              <a 
+                href="https://buymeacoffee.com/raylabs" 
+                target="_blank" 
+                rel="noopener noreferrer"
+              >
+                <Coffee className="w-3 h-3 mr-2" />
+                Buy us a coffee
+              </a>
+            </Button>
+          </div>
+
+          <div className="pt-2 border-t">
+            <p className="text-xs text-muted-foreground flex items-center gap-1">
+              <Sparkles className="w-3 h-3" />
+              Pro features available in hosted version
+            </p>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

src/components/layout/VersionInfo.tsx

@@ -37,7 +37,7 @@ export function VersionInfo() {
   return (
     <div className="text-xs text-muted-foreground text-center pt-2 pb-3 border-t border-border mt-2">
       {versionInfo.updateAvailable ? (
-        <div className="flex flex-col">
+        <div className="flex flex-col gap-1">
           <span>v{versionInfo.current}</span>
           <span className="text-primary">v{versionInfo.latest} available</span>
         </div>

src/components/oauth/ConsentPage.tsx

@@ -0,0 +1,307 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Label } from '@/components/ui/label';
+import { Separator } from '@/components/ui/separator';
+import { authClient } from '@/lib/auth-client';
+import { apiRequest, showErrorToast } from '@/lib/utils';
+import { toast, Toaster } from 'sonner';
+import { Shield, User, Mail, ChevronRight, AlertTriangle, Loader2 } from 'lucide-react';
+import { isValidRedirectUri, parseRedirectUris } from '@/lib/utils/oauth-validation';
+
+interface OAuthApplication {
+  id: string;
+  clientId: string;
+  name: string;
+  redirectURLs: string;
+  type: string;
+}
+
+interface ConsentRequest {
+  clientId: string;
+  scope: string;
+  state?: string;
+  redirectUri?: string;
+}
+
+export default function ConsentPage() {
+  const [isLoading, setIsLoading] = useState(true);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [application, setApplication] = useState<OAuthApplication | null>(null);
+  const [scopes, setScopes] = useState<string[]>([]);
+  const [selectedScopes, setSelectedScopes] = useState<Set<string>>(new Set());
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    loadConsentDetails();
+  }, []);
+
+  const loadConsentDetails = async () => {
+    try {
+      const params = new URLSearchParams(window.location.search);
+      const clientId = params.get('client_id');
+      const scope = params.get('scope');
+      const redirectUri = params.get('redirect_uri');
+
+      if (!clientId) {
+        setError('Invalid authorization request: missing client ID');
+        return;
+      }
+
+      // Fetch application details
+      const apps = await apiRequest<OAuthApplication[]>('/sso/applications');
+      const app = apps.find(a => a.clientId === clientId);
+
+      if (!app) {
+        setError('Invalid authorization request: unknown application');
+        return;
+      }
+
+      // Validate redirect URI if provided
+      if (redirectUri) {
+        const authorizedUris = parseRedirectUris(app.redirectURLs);
+        
+        if (!isValidRedirectUri(redirectUri, authorizedUris)) {
+          setError('Invalid authorization request: unauthorized redirect URI');
+          return;
+        }
+      }
+
+      setApplication(app);
+
+      // Parse requested scopes
+      const requestedScopes = scope ? scope.split(' ').filter(s => s) : ['openid'];
+      setScopes(requestedScopes);
+      
+      // By default, select all requested scopes
+      setSelectedScopes(new Set(requestedScopes));
+    } catch (error) {
+      console.error('Failed to load consent details:', error);
+      setError('Failed to load authorization details');
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleConsent = async (accept: boolean) => {
+    setIsSubmitting(true);
+    try {
+      const result = await authClient.oauth2.consent({
+        accept,
+      });
+
+      if (result.error) {
+        throw new Error(result.error.message || 'Consent failed');
+      }
+
+      // The consent method should handle the redirect
+      if (!accept) {
+        // If denied, redirect back to the application with error
+        const params = new URLSearchParams(window.location.search);
+        const redirectUri = params.get('redirect_uri');
+        
+        if (redirectUri && application) {
+          // Validate redirect URI against authorized URIs
+          const authorizedUris = parseRedirectUris(application.redirectURLs);
+          
+          if (isValidRedirectUri(redirectUri, authorizedUris)) {
+            try {
+              // Parse and reconstruct the URL to ensure it's safe
+              const url = new URL(redirectUri);
+              url.searchParams.set('error', 'access_denied');
+              
+              // Safe to redirect - URI has been validated and sanitized
+              window.location.href = url.toString();
+            } catch (e) {
+              console.error('Failed to parse redirect URI:', e);
+              setError('Invalid redirect URI');
+            }
+          } else {
+            console.error('Unauthorized redirect URI:', redirectUri);
+            setError('Invalid redirect URI');
+          }
+        }
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const toggleScope = (scope: string) => {
+    // openid scope is always required
+    if (scope === 'openid') return;
+
+    const newSelected = new Set(selectedScopes);
+    if (newSelected.has(scope)) {
+      newSelected.delete(scope);
+    } else {
+      newSelected.add(scope);
+    }
+    setSelectedScopes(newSelected);
+  };
+
+  const getScopeDescription = (scope: string): { name: string; description: string; icon: any } => {
+    const scopeDescriptions: Record<string, { name: string; description: string; icon: any }> = {
+      openid: {
+        name: 'Basic Information',
+        description: 'Your user ID (required)',
+        icon: User,
+      },
+      profile: {
+        name: 'Profile Information',
+        description: 'Your name, username, and profile picture',
+        icon: User,
+      },
+      email: {
+        name: 'Email Address',
+        description: 'Your email address and verification status',
+        icon: Mail,
+      },
+    };
+
+    return scopeDescriptions[scope] || {
+      name: scope,
+      description: `Access to ${scope} information`,
+      icon: Shield,
+    };
+  };
+
+  if (isLoading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  if (error) {
+    return (
+      <div className="min-h-screen flex items-center justify-center p-4">
+        <Card className="w-full max-w-md">
+          <CardHeader className="text-center">
+            <div className="mx-auto w-12 h-12 rounded-full bg-destructive/10 flex items-center justify-center mb-4">
+              <AlertTriangle className="h-6 w-6 text-destructive" />
+            </div>
+            <CardTitle className="text-2xl">Authorization Error</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <Alert variant="destructive">
+              <AlertDescription>{error}</AlertDescription>
+            </Alert>
+          </CardContent>
+          <CardFooter>
+            <Button 
+              variant="outline" 
+              className="w-full"
+              onClick={() => window.history.back()}
+            >
+              Go Back
+            </Button>
+          </CardFooter>
+        </Card>
+      </div>
+    );
+  }
+
+  return (
+    <>
+      <div className="min-h-screen flex items-center justify-center p-4">
+        <Card className="w-full max-w-md">
+          <CardHeader className="text-center">
+            <div className="mx-auto w-12 h-12 rounded-full bg-primary/10 flex items-center justify-center mb-4">
+              <Shield className="h-6 w-6 text-primary" />
+            </div>
+            <CardTitle className="text-2xl">Authorize {application?.name}</CardTitle>
+            <CardDescription>
+              This application is requesting access to your account
+            </CardDescription>
+          </CardHeader>
+          
+          <CardContent className="space-y-4">
+            <div className="bg-muted p-4 rounded-lg">
+              <p className="text-sm font-medium mb-2">Requested permissions:</p>
+              <div className="space-y-3">
+                {scopes.map(scope => {
+                  const scopeInfo = getScopeDescription(scope);
+                  const Icon = scopeInfo.icon;
+                  const isRequired = scope === 'openid';
+                  
+                  return (
+                    <div key={scope} className="flex items-start space-x-3">
+                      <Checkbox
+                        id={scope}
+                        checked={selectedScopes.has(scope)}
+                        onCheckedChange={() => toggleScope(scope)}
+                        disabled={isRequired || isSubmitting}
+                      />
+                      <div className="flex-1">
+                        <Label
+                          htmlFor={scope}
+                          className="flex items-center gap-2 font-medium cursor-pointer"
+                        >
+                          <Icon className="h-4 w-4" />
+                          {scopeInfo.name}
+                          {isRequired && (
+                            <span className="text-xs text-muted-foreground">(required)</span>
+                          )}
+                        </Label>
+                        <p className="text-xs text-muted-foreground mt-1">
+                          {scopeInfo.description}
+                        </p>
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+
+            <Separator />
+
+            <div className="text-sm text-muted-foreground">
+              <p className="flex items-center gap-1">
+                <ChevronRight className="h-3 w-3" />
+                You'll be redirected to {application?.type === 'web' ? 'the website' : 'the application'}
+              </p>
+              <p className="flex items-center gap-1 mt-1">
+                <ChevronRight className="h-3 w-3" />
+                You can revoke access at any time in your account settings
+              </p>
+            </div>
+          </CardContent>
+
+          <CardFooter className="flex gap-2">
+            <Button
+              variant="outline"
+              className="flex-1"
+              onClick={() => handleConsent(false)}
+              disabled={isSubmitting}
+            >
+              Deny
+            </Button>
+            <Button
+              className="flex-1"
+              onClick={() => handleConsent(true)}
+              disabled={isSubmitting || selectedScopes.size === 0}
+            >
+              {isSubmitting ? (
+                <>
+                  <Loader2 className="h-4 w-4 mr-2 animate-spin" />
+                  Authorizing...
+                </>
+              ) : (
+                'Authorize'
+              )}
+            </Button>
+          </CardFooter>
+        </Card>
+      </div>
+      <Toaster />
+    </>
+  );
+}

src/components/organizations/AddOrganizationDialog.tsx

@@ -63,12 +63,12 @@ export default function AddOrganizationDialog({
   return (
     <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
       <DialogTrigger asChild>
-        <Button className="fixed bottom-6 right-6 rounded-full h-12 w-12 shadow-lg p-0">
+        <Button className="fixed bottom-4 right-4 sm:bottom-6 sm:right-6 rounded-full h-12 w-12 shadow-lg p-0 z-10">
           <Plus className="h-6 w-6" />
         </Button>
       </DialogTrigger>
 
-      <DialogContent className="sm:max-w-[425px] gap-0 gap-y-6">
+      <DialogContent className="w-[calc(100%-2rem)] sm:max-w-[425px] gap-0 gap-y-6 mx-4 sm:mx-0">
         <DialogHeader>
           <DialogTitle>Add Organization</DialogTitle>
           <DialogDescription>

src/components/organizations/MirrorDestinationEditor.tsx

@@ -0,0 +1,193 @@
+import { useState } from "react";
+import { ArrowRight, Edit3, RotateCcw, CheckCircle2, Building2 } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Badge } from "@/components/ui/badge";
+import { toast } from "sonner";
+import { cn } from "@/lib/utils";
+
+interface MirrorDestinationEditorProps {
+  organizationId: string;
+  organizationName: string;
+  currentDestination?: string;
+  onUpdate: (newDestination: string | null) => Promise<void>;
+  isUpdating?: boolean;
+  className?: string;
+}
+
+export function MirrorDestinationEditor({
+  organizationId,
+  organizationName,
+  currentDestination,
+  onUpdate,
+  isUpdating = false,
+  className,
+}: MirrorDestinationEditorProps) {
+  const [isOpen, setIsOpen] = useState(false);
+  const [editValue, setEditValue] = useState(currentDestination || "");
+  const [isLoading, setIsLoading] = useState(false);
+
+  const hasOverride = currentDestination && currentDestination !== organizationName;
+  const effectiveDestination = currentDestination || organizationName;
+
+  const handleSave = async () => {
+    const trimmedValue = editValue.trim();
+    const newDestination = trimmedValue === "" || trimmedValue === organizationName 
+      ? null 
+      : trimmedValue;
+
+    setIsLoading(true);
+    try {
+      await onUpdate(newDestination);
+      setIsOpen(false);
+      toast.success(
+        newDestination 
+          ? `Destination updated to: ${newDestination}`
+          : "Destination reset to default"
+      );
+    } catch (error) {
+      toast.error("Failed to update destination");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleReset = async () => {
+    setEditValue("");
+    await handleSave();
+  };
+
+  const handleCancel = () => {
+    setEditValue(currentDestination || "");
+    setIsOpen(false);
+  };
+
+  return (
+    <div className={cn("flex items-center gap-2 w-full", className)}>
+      <div className="flex items-center gap-1.5 text-xs text-muted-foreground min-w-0 flex-1">
+        <Building2 className="h-3 w-3 flex-shrink-0" />
+        <span className="font-medium truncate">{organizationName}</span>
+        <ArrowRight className="h-3 w-3 flex-shrink-0" />
+        <span className={cn(
+          "font-medium truncate",
+          hasOverride && "text-orange-600 dark:text-orange-400"
+        )}>
+          {effectiveDestination}
+        </span>
+        {hasOverride && (
+          <Badge variant="outline" className="h-4 px-1 text-[10px] border-orange-600 text-orange-600 dark:border-orange-400 dark:text-orange-400 flex-shrink-0">
+            custom
+          </Badge>
+        )}
+      </div>
+
+      <Popover open={isOpen} onOpenChange={setIsOpen}>
+        <PopoverTrigger asChild>
+          <Button
+            size="sm"
+            variant="ghost"
+            className="h-10 w-10 sm:h-6 sm:w-6 p-0 opacity-60 hover:opacity-100"
+            title="Edit mirror destination"
+            disabled={isUpdating || isLoading}
+          >
+            <Edit3 className="h-5 w-5 sm:h-3 sm:w-3" />
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent className="w-80" align="end">
+          <div className="space-y-4">
+            <div>
+              <h4 className="font-medium text-sm mb-1">Mirror Destination</h4>
+              <p className="text-xs text-muted-foreground">
+                Customize where this organization's repositories are mirrored to in Gitea.
+              </p>
+            </div>
+
+            <div className="space-y-3">
+              {/* Visual Preview */}
+              <div className="rounded-md bg-muted/50 p-3 space-y-2">
+                <div className="text-xs font-medium text-muted-foreground">Preview</div>
+                <div className="flex items-center gap-2 text-sm">
+                  <div className="flex items-center gap-1.5">
+                    <Building2 className="h-4 w-4 text-muted-foreground" />
+                    <span>{organizationName}</span>
+                  </div>
+                  <ArrowRight className="h-4 w-4 text-muted-foreground" />
+                  <div className="flex items-center gap-1.5">
+                    <Building2 className="h-4 w-4 text-primary" />
+                    <span className="font-medium text-primary">
+                      {editValue.trim() || organizationName}
+                    </span>
+                  </div>
+                </div>
+              </div>
+
+              {/* Input Field */}
+              <div className="space-y-2">
+                <Label htmlFor="destination" className="text-xs">
+                  Destination Organization
+                </Label>
+                <Input
+                  id="destination"
+                  value={editValue}
+                  onChange={(e) => setEditValue(e.target.value)}
+                  placeholder={organizationName}
+                  className="h-8"
+                  disabled={isLoading}
+                />
+                <p className="text-xs text-muted-foreground">
+                  Leave empty to use the default GitHub organization name
+                </p>
+              </div>
+
+              {/* Quick Actions */}
+              {hasOverride && (
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={handleReset}
+                  disabled={isLoading}
+                  className="w-full h-8 text-xs"
+                >
+                  <RotateCcw className="h-3 w-3 mr-2" />
+                  Reset to Default ({organizationName})
+                </Button>
+              )}
+            </div>
+
+            {/* Action Buttons */}
+            <div className="flex gap-2 justify-end">
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={handleCancel}
+                disabled={isLoading}
+              >
+                Cancel
+              </Button>
+              <Button
+                size="sm"
+                onClick={handleSave}
+                disabled={isLoading || (editValue.trim() === (currentDestination || ""))}
+              >
+                {isLoading ? (
+                  <>
+                    <CheckCircle2 className="h-3 w-3 mr-2 animate-spin" />
+                    Saving...
+                  </>
+                ) : (
+                  "Save"
+                )}
+              </Button>
+            </div>
+          </div>
+        </PopoverContent>
+      </Popover>
+    </div>
+  );
+}

src/components/organizations/Organization.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 import { Button } from "@/components/ui/button";
-import { Search, RefreshCw, FlipHorizontal, Plus } from "lucide-react";
+import { Search, RefreshCw, FlipHorizontal, Filter } from "lucide-react";
 import type { MirrorJob, Organization } from "@/lib/db/schema";
 import { OrganizationList } from "./OrganizationsList";
 import AddOrganizationDialog from "./AddOrganizationDialog";
@@ -26,6 +26,17 @@ import { useFilterParams } from "@/hooks/useFilterParams";
 import { toast } from "sonner";
 import { useConfigStatus } from "@/hooks/useConfigStatus";
 import { useNavigation } from "@/components/layout/MainLayout";
+import { useLiveRefresh } from "@/hooks/useLiveRefresh";
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from "@/components/ui/drawer";
 
 export function Organization() {
   const [organizations, setOrganizations] = useState<Organization[]>([]);
@@ -34,6 +45,7 @@ export function Organization() {
   const { user } = useAuth();
   const { isGitHubConfigured } = useConfigStatus();
   const { navigationKey } = useNavigation();
+  const { registerRefreshCallback } = useLiveRefresh();
   const { filter, setFilter } = useFilterParams({
     searchTerm: "",
     membershipRole: "",
@@ -52,8 +64,6 @@ export function Organization() {
         )
       );
     }
-
-    console.log("Received new log:", data);
   }, []);
 
   // Use the SSE hook
@@ -62,19 +72,23 @@ export function Organization() {
     onMessage: handleNewMessage,
   });
 
-  const fetchOrganizations = useCallback(async () => {
+  const fetchOrganizations = useCallback(async (isLiveRefresh = false) => {
     if (!user?.id) {
       return false;
     }
 
     // Don't fetch organizations if GitHub is not configured
     if (!isGitHubConfigured) {
-      setIsLoading(false);
+      if (!isLiveRefresh) {
+        setIsLoading(false);
+      }
       return false;
     }
 
     try {
-      setIsLoading(true);
+      if (!isLiveRefresh) {
+        setIsLoading(true);
+      }
 
       const response = await apiRequest<OrganizationsApiResponse>(
         `/github/organizations?userId=${user.id}`,
@@ -87,27 +101,47 @@ export function Organization() {
         setOrganizations(response.organizations);
         return true;
       } else {
-        toast.error(response.error || "Error fetching organizations");
+        if (!isLiveRefresh) {
+          toast.error(response.error || "Error fetching organizations");
+        }
         return false;
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error fetching organizations"
-      );
+      if (!isLiveRefresh) {
+        toast.error(
+          error instanceof Error ? error.message : "Error fetching organizations"
+        );
+      }
       return false;
     } finally {
-      setIsLoading(false);
+      if (!isLiveRefresh) {
+        setIsLoading(false);
+      }
     }
   }, [user?.id, isGitHubConfigured]); // Only depend on user.id, not entire user object
 
   useEffect(() => {
     // Reset loading state when component becomes active
     setIsLoading(true);
-    fetchOrganizations();
+    fetchOrganizations(false); // Manual refresh, not live
   }, [fetchOrganizations, navigationKey]); // Include navigationKey to trigger on navigation
 
+  // Register with global live refresh system
+  useEffect(() => {
+    // Only register for live refresh if GitHub is configured
+    if (!isGitHubConfigured) {
+      return;
+    }
+
+    const unregister = registerRefreshCallback(() => {
+      fetchOrganizations(true); // Live refresh
+    });
+
+    return unregister;
+  }, [registerRefreshCallback, fetchOrganizations, isGitHubConfigured]);
+
   const handleRefresh = async () => {
-    const success = await fetchOrganizations();
+    const success = await fetchOrganizations(false);
     if (success) {
       toast.success("Organizations refreshed successfully.");
     }
@@ -140,6 +174,12 @@ export function Organization() {
             return updated ? updated : org;
           })
         );
+
+        // Refresh organization data to get updated repository breakdown
+        // Use a small delay to allow the backend to process the mirroring request
+        setTimeout(() => {
+          fetchOrganizations(true);
+        }, 1000);
       } else {
         toast.error(response.error || "Error starting mirror job");
       }
@@ -258,115 +298,351 @@ export function Organization() {
     }
   };
 
-  // Get unique organization names for combobox (since Organization has no owner field)
-  const ownerOptions = Array.from(
-    new Set(
-      organizations.map((org) => org.name).filter((v): v is string => !!v)
-    )
-  ).sort();
+  // Check if any filters are active
+  const hasActiveFilters = !!(filter.membershipRole || filter.status);
+  const activeFilterCount = [filter.membershipRole, filter.status].filter(Boolean).length;
+
+  // Clear all filters
+  const clearFilters = () => {
+    setFilter({
+      searchTerm: filter.searchTerm,
+      membershipRole: "",
+      status: "",
+    });
+  };
 
   return (
-    <div className="flex flex-col gap-y-8">
-      {/* Combine search and actions into a single flex row */}
-      <div className="flex flex-row items-center gap-4 w-full flex-wrap">
-        <div className="relative flex-grow">
-          <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-          <input
-            type="text"
-            placeholder="Search Organizations..."
-            className="pl-8 h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-            value={filter.searchTerm}
-            onChange={(e) =>
-              setFilter((prev) => ({ ...prev, searchTerm: e.target.value }))
-            }
-          />
+    <div className="flex flex-col gap-y-4 sm:gap-y-8">
+      {/* Search and filters */}
+      <div className="flex flex-col sm:flex-row items-start sm:items-center gap-2 sm:gap-4 w-full">
+        {/* Mobile: Search bar with filter button */}
+        <div className="flex items-center gap-2 w-full sm:hidden">
+          <div className="relative flex-grow">
+            <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+            <input
+              type="text"
+              placeholder="Search organizations..."
+              className="pl-10 pr-3 h-10 w-full rounded-md border border-input bg-background text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              value={filter.searchTerm}
+              onChange={(e) =>
+                setFilter((prev) => ({ ...prev, searchTerm: e.target.value }))
+              }
+            />
+          </div>
+          
+          {/* Mobile Filter Drawer */}
+          <Drawer>
+            <DrawerTrigger asChild>
+              <Button 
+                variant="outline" 
+                size="icon" 
+                className="relative h-10 w-10 shrink-0"
+              >
+                <Filter className="h-4 w-4" />
+                {activeFilterCount > 0 && (
+                  <span className="absolute -top-1 -right-1 flex h-5 w-5 items-center justify-center rounded-full bg-primary text-[10px] font-medium text-primary-foreground">
+                    {activeFilterCount}
+                  </span>
+                )}
+              </Button>
+            </DrawerTrigger>
+            <DrawerContent className="max-h-[85vh]">
+              <DrawerHeader className="text-left">
+                <DrawerTitle className="text-lg font-semibold">Filter Organizations</DrawerTitle>
+                <DrawerDescription className="text-sm text-muted-foreground">
+                  Narrow down your organization list
+                </DrawerDescription>
+              </DrawerHeader>
+              
+              <div className="px-4 py-6 space-y-6 overflow-y-auto">
+                {/* Active filters summary */}
+                {hasActiveFilters && (
+                  <div className="flex items-center justify-between p-3 bg-muted/50 rounded-lg">
+                    <span className="text-sm font-medium">
+                      {activeFilterCount} filter{activeFilterCount > 1 ? 's' : ''} active
+                    </span>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={clearFilters}
+                      className="h-7 px-2 text-xs"
+                    >
+                      Clear all
+                    </Button>
+                  </div>
+                )}
+
+                {/* Role Filter */}
+                <div className="space-y-2">
+                  <label className="text-sm font-medium flex items-center gap-2">
+                    <span className="text-muted-foreground">By</span> Role
+                    {filter.membershipRole && (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        {filter.membershipRole
+                          .replace(/_/g, " ")
+                          .replace(/\b\w/g, (c) => c.toUpperCase())}
+                      </span>
+                    )}
+                  </label>
+                  <Select
+                    value={filter.membershipRole || "all"}
+                    onValueChange={(value) =>
+                      setFilter((prev) => ({
+                        ...prev,
+                        membershipRole: value === "all" ? "" : (value as MembershipRole),
+                      }))
+                    }
+                  >
+                    <SelectTrigger className="w-full h-10">
+                      <SelectValue placeholder="All roles" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {["all", ...membershipRoleEnum.options].map((role) => (
+                        <SelectItem key={role} value={role}>
+                          <span className="flex items-center gap-2">
+                            {role !== "all" && (
+                              <span className={`h-2 w-2 rounded-full ${
+                                role === "admin" ? "bg-purple-500" : "bg-blue-500"
+                              }`} />
+                            )}
+                            {role === "all"
+                              ? "All roles"
+                              : role
+                                  .replace(/_/g, " ")
+                                  .replace(/\b\w/g, (c) => c.toUpperCase())}
+                          </span>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                {/* Status Filter */}
+                <div className="space-y-2">
+                  <label className="text-sm font-medium flex items-center gap-2">
+                    <span className="text-muted-foreground">By</span> Status
+                    {filter.status && (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        {filter.status.charAt(0).toUpperCase() + filter.status.slice(1)}
+                      </span>
+                    )}
+                  </label>
+                  <Select
+                    value={filter.status || "all"}
+                    onValueChange={(value) =>
+                      setFilter((prev) => ({
+                        ...prev,
+                        status:
+                          value === "all"
+                            ? ""
+                            : (value as
+                                | ""
+                                | "imported"
+                                | "mirroring"
+                                | "mirrored"
+                                | "failed"
+                                | "syncing"
+                                | "synced"),
+                      }))
+                    }
+                  >
+                    <SelectTrigger className="w-full h-10">
+                      <SelectValue placeholder="All statuses" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {[
+                        "all",
+                        "imported",
+                        "mirroring",
+                        "mirrored",
+                        "failed",
+                        "syncing",
+                        "synced",
+                      ].map((status) => (
+                        <SelectItem key={status} value={status}>
+                          <span className="flex items-center gap-2">
+                            {status !== "all" && (
+                              <span className={`h-2 w-2 rounded-full ${
+                                status === "synced" || status === "mirrored" ? "bg-green-500" :
+                                status === "failed" ? "bg-red-500" :
+                                status === "syncing" || status === "mirroring" ? "bg-blue-500" :
+                                "bg-yellow-500"
+                              }`} />
+                            )}
+                            {status === "all"
+                              ? "All statuses"
+                              : status.charAt(0).toUpperCase() + status.slice(1)}
+                          </span>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+              
+              <DrawerFooter className="gap-2 px-4 pt-2 pb-4 border-t">
+                <DrawerClose asChild>
+                  <Button className="w-full" size="sm">
+                    Apply Filters
+                  </Button>
+                </DrawerClose>
+                <DrawerClose asChild>
+                  <Button variant="outline" className="w-full" size="sm">
+                    Cancel
+                  </Button>
+                </DrawerClose>
+              </DrawerFooter>
+            </DrawerContent>
+          </Drawer>
+          
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={handleRefresh}
+            title="Refresh organizations"
+            className="h-10 w-10 shrink-0"
+          >
+            <RefreshCw className="h-4 w-4" />
+          </Button>
+          
+          <Button
+            variant="default"
+            size="icon"
+            onClick={handleMirrorAllOrgs}
+            disabled={isLoading || loadingOrgIds.size > 0}
+            title="Mirror all organizations"
+            className="h-10 w-10 shrink-0"
+          >
+            <FlipHorizontal className="h-4 w-4" />
+          </Button>
         </div>
 
-        {/* Membership Role Filter */}
-        <Select
-          value={filter.membershipRole || "all"}
-          onValueChange={(value) =>
-            setFilter((prev) => ({
-              ...prev,
-              membershipRole: value === "all" ? "" : (value as MembershipRole),
-            }))
-          }
-        >
-          <SelectTrigger className="w-[140px] h-9 max-h-9">
-            <SelectValue placeholder="All Roles" />
-          </SelectTrigger>
-          <SelectContent>
-            {["all", ...membershipRoleEnum.options].map((role) => (
-              <SelectItem key={role} value={role}>
-                {role === "all"
-                  ? "All Roles"
-                  : role
-                      .replace(/_/g, " ")
-                      .replace(/\b\w/g, (c) => c.toUpperCase())}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
+        {/* Desktop: Original layout */}
+        <div className="hidden sm:flex sm:flex-row sm:items-center sm:gap-4 sm:w-full">
+          <div className="relative flex-grow">
+            <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+            <input
+              type="text"
+              placeholder="Search organizations..."
+              className="pl-10 pr-3 h-10 w-full rounded-md border border-input bg-background text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              value={filter.searchTerm}
+              onChange={(e) =>
+                setFilter((prev) => ({ ...prev, searchTerm: e.target.value }))
+              }
+            />
+          </div>
 
-        {/* Status Filter */}
-        <Select
-          value={filter.status || "all"}
-          onValueChange={(value) =>
-            setFilter((prev) => ({
-              ...prev,
-              status:
-                value === "all"
-                  ? ""
-                  : (value as
-                      | ""
-                      | "imported"
-                      | "mirroring"
-                      | "mirrored"
-                      | "failed"
-                      | "syncing"
-                      | "synced"),
-            }))
-          }
-        >
-          <SelectTrigger className="w-[140px] h-9 max-h-9">
-            <SelectValue placeholder="All Statuses" />
-          </SelectTrigger>
-          <SelectContent>
-            {[
-              "all",
-              "imported",
-              "mirroring",
-              "mirrored",
-              "failed",
-              "syncing",
-              "synced",
-            ].map((status) => (
-              <SelectItem key={status} value={status}>
-                {status === "all"
-                  ? "All Statuses"
-                  : status.charAt(0).toUpperCase() + status.slice(1)}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
+          {/* Filter controls */}
+          <div className="flex items-center gap-2">
+            {/* Membership Role Filter */}
+            <Select
+              value={filter.membershipRole || "all"}
+              onValueChange={(value) =>
+                setFilter((prev) => ({
+                  ...prev,
+                  membershipRole: value === "all" ? "" : (value as MembershipRole),
+                }))
+              }
+            >
+              <SelectTrigger className="w-[140px] h-10">
+                <SelectValue placeholder="All roles" />
+              </SelectTrigger>
+              <SelectContent>
+                {["all", ...membershipRoleEnum.options].map((role) => (
+                  <SelectItem key={role} value={role}>
+                    <span className="flex items-center gap-2">
+                      {role !== "all" && (
+                        <span className={`h-2 w-2 rounded-full ${
+                          role === "admin" ? "bg-purple-500" : "bg-blue-500"
+                        }`} />
+                      )}
+                      {role === "all"
+                        ? "All roles"
+                        : role
+                            .replace(/_/g, " ")
+                            .replace(/\b\w/g, (c) => c.toUpperCase())}
+                    </span>
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
 
-        <Button
-          variant="outline"
-          size="icon"
-          onClick={handleRefresh}
-          title="Refresh organizations"
-        >
-          <RefreshCw className="h-4 w-4" />
-        </Button>
+            {/* Status Filter */}
+            <Select
+              value={filter.status || "all"}
+              onValueChange={(value) =>
+                setFilter((prev) => ({
+                  ...prev,
+                  status:
+                    value === "all"
+                      ? ""
+                      : (value as
+                          | ""
+                          | "imported"
+                          | "mirroring"
+                          | "mirrored"
+                          | "failed"
+                          | "syncing"
+                          | "synced"),
+                }))
+              }
+            >
+              <SelectTrigger className="w-[140px] h-10">
+                <SelectValue placeholder="All statuses" />
+              </SelectTrigger>
+              <SelectContent>
+                {[
+                  "all",
+                  "imported",
+                  "mirroring",
+                  "mirrored",
+                  "failed",
+                  "syncing",
+                  "synced",
+                ].map((status) => (
+                  <SelectItem key={status} value={status}>
+                    <span className="flex items-center gap-2">
+                      {status !== "all" && (
+                        <span className={`h-2 w-2 rounded-full ${
+                          status === "synced" || status === "mirrored" ? "bg-green-500" :
+                          status === "failed" ? "bg-red-500" :
+                          status === "syncing" || status === "mirroring" ? "bg-blue-500" :
+                          "bg-yellow-500"
+                        }`} />
+                      )}
+                      {status === "all"
+                        ? "All statuses"
+                        : status.charAt(0).toUpperCase() + status.slice(1)}
+                    </span>
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
 
-        <Button
-          variant="default"
-          onClick={handleMirrorAllOrgs}
-          disabled={isLoading || loadingOrgIds.size > 0}
-        >
-          <FlipHorizontal className="h-4 w-4 mr-2" />
-          Mirror All
-        </Button>
+          {/* Action buttons */}
+          <div className="flex items-center gap-2 ml-auto">
+            <Button
+              variant="outline"
+              size="icon"
+              onClick={handleRefresh}
+              title="Refresh organizations"
+              className="h-10 w-10"
+            >
+              <RefreshCw className="h-4 w-4" />
+            </Button>
+
+            <Button
+              variant="default"
+              onClick={handleMirrorAllOrgs}
+              disabled={isLoading || loadingOrgIds.size > 0}
+              className="h-10 px-4"
+            >
+              <FlipHorizontal className="h-4 w-4 mr-2" />
+              Mirror All
+            </Button>
+          </div>
+        </div>
       </div>
 
       <OrganizationList
@@ -377,6 +653,9 @@ export function Organization() {
         loadingOrgIds={loadingOrgIds}
         onMirror={handleMirrorOrg}
         onAddOrganization={() => setIsDialogOpen(true)}
+        onRefresh={async () => {
+          await fetchOrganizations(false);
+        }}
       />
 
       <AddOrganizationDialog