chore: bump version to v2.20.0

Major repository migration from arunavo4 to RayLabsHQ organization.
This release includes updated Docker image locations and all repository
references throughout the codebase.

.claude/commands/new_release.md

@@ -0,0 +1,4 @@
+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.

.env.example

@@ -19,6 +19,7 @@ JWT_SECRET=change-this-to-a-secure-random-string-in-production
 # SKIP_FORKS=false
 # PRIVATE_REPOSITORIES=false
 # MIRROR_ISSUES=false
+# MIRROR_WIKI=false
 # MIRROR_STARRED=false
 # MIRROR_ORGANIZATIONS=false
 # PRESERVE_ORG_STRUCTURE=false

.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'

CHANGELOG.md

@@ -5,6 +5,208 @@ 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]
+
+## [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,128 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## 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**: JWT tokens with bcryptjs password hashing
+
+### 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 Flow**: 
+   - First user signup creates admin account
+   - JWT tokens stored in cookies
+   - Protected routes check auth via `getUserFromCookie()`
+
+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**: Three ways to organize repositories in Gitea:
+   - **preserve**: Maintains GitHub structure (default)
+   - **single-org**: All repos go to one organization
+   - **flat-user**: All repos go under user account
+   - Starred repos always go to separate organization (starredReposOrg)
+   - 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`)
+- JWT_SECRET auto-generated if not provided
+- Database auto-initializes on first run
+- Use `bun run dev:clean` for fresh database start
+- Tailwind CSS v4 configured with Vite plugin
+
+### 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/`
+
+

Dockerfile

@@ -1,6 +1,6 @@
 # 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
 

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,15 +1,25 @@
 <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 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]
+> **Repository Migration Notice**: Starting from version 2.20, this project has moved from `arunavo4/gitea-mirror` to `RayLabsHQ/gitea-mirror`. Please update your Docker images and Git remotes to use the new location:
+> ```bash
+> # Docker
+> docker pull ghcr.io/raylabshq/gitea-mirror:latest
+> 
+> # Git remote
+> git remote set-url origin https://github.com/RayLabsHQ/gitea-mirror.git
+> ```
+
 ## 🚀 Quick Start
 
 ```bash
@@ -21,7 +31,7 @@ bun run setup && bun run dev
 
 # 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
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/gitea-mirror.sh)"
 
 # For local testing (offline-friendly)
 sudo LOCAL_REPO_DIR=~/Development/gitea-mirror ./scripts/gitea-mirror-lxc-local.sh
@@ -30,15 +40,16 @@ sudo LOCAL_REPO_DIR=~/Development/gitea-mirror ./scripts/gitea-mirror-lxc-local.
 See the [LXC Container Deployment Guide](scripts/README-lxc.md).
 
 <p align="center">
-  <img src=".github/assets/dashboard.png" alt="Dashboard" width="80%"/>
+  <img src=".github/assets/dashboard.png" alt="Dashboard" width="full"/>
 </p>
 
 ## ✨ Features
 
 - 🔁 Sync public, private, or starred GitHub repos to Gitea
-- 🏢 Mirror entire organizations with structure preservation
+- 🏢 Mirror entire organizations with flexible organization strategies
+- 🎯 Custom destination control for both organizations and individual repositories
 - 🐞 Optional mirroring of issues and labels
-- 🌟 Mirror your starred repositories
+- 🌟 Mirror your starred repositories to a dedicated organization
 - 🕹️ Modern user interface with toast notifications and smooth experience
 - 🧠 Smart filtering and job queue with detailed logs
 - 🛠️ Works with personal access tokens (GitHub + Gitea)
@@ -50,12 +61,12 @@ See the [LXC Container Deployment Guide](scripts/README-lxc.md).
 ## 📸 Screenshots
 
 <p align="center">
-  <img src=".github/assets/repositories.png" width="45%"/>
-  <img src=".github/assets/organisations.png" width="45%"/>
+  <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="45%"/>
-  <img src=".github/assets/activity.png" width="45%"/>
+  <img src=".github/assets/configuration.png" width="49%"/>
+  <img src=".github/assets/activity.png" width="49%"/>
 </p>
 
 ### Dashboard
@@ -69,7 +80,7 @@ Easily configure your GitHub and Gitea connections, set up automatic mirroring s
 
 ## Getting Started
 
-See the [Quick Start Guide](docs/quickstart.md) for detailed instructions on getting up and running quickly.
+See the [Quick Start Guide](src/content/docs/quickstart.md) for detailed instructions on getting up and running quickly.
 
 ### Prerequisites
 
@@ -136,12 +147,12 @@ 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
+docker pull ghcr.io/RayLabsHQ/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
+  ghcr.io/RayLabsHQ/gitea-mirror:latest
 ```
 
 ##### Building Docker Images Manually
@@ -167,36 +178,27 @@ docker compose up -d
 
 See [Docker build documentation](./scripts/README-docker.md) for more details.
 
-##### Using LXC Containers
+##### Using LXC Containers (Proxmox VE)
 
-Gitea Mirror offers two deployment options for LXC containers:
-
-**1. Proxmox VE (online, recommended for production)**
+For Proxmox VE users, Gitea Mirror can be deployed using the community-maintained script:
 
 ```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
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/gitea-mirror.sh)"
 ```
 
-**2. Local testing (offline-friendly, works on developer laptops)**
+This community script:
+- Creates a privileged Alpine Linux LXC container
+- Installs Bun runtime environment
+- Clones and builds Gitea Mirror
+- Configures a systemd service for automatic startup
+- Sets up the application to run on port 4321
 
-```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
+> [!NOTE]
+> The script is maintained by the [Community Scripts for Proxmox VE](https://community-scripts.github.io/ProxmoxVE/) project.
+> For more information, visit the [Gitea Mirror script documentation](https://community-scripts.github.io/ProxmoxVE/scripts?id=gitea-mirror).
 
-# 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
+After installation, access Gitea Mirror at `http://<container-ip>:4321`
 
 The application includes a health check endpoint at `/api/health` for monitoring.
 
@@ -242,7 +244,7 @@ The Docker container can be configured with the following environment variables:
 
 ```bash
 # Clone the repository
-git clone https://github.com/arunavo4/gitea-mirror.git
+git clone https://github.com/RayLabsHQ/gitea-mirror.git
 cd gitea-mirror
 
 # Quick setup (installs dependencies and initializes the database)
@@ -282,9 +284,39 @@ bun run reset-users
 bun run check-db
 ```
 
+##### Database Permissions for Direct Installation
+
+> [!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.
+
+**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](docs/configuration.md) for more details.
+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:
 
@@ -296,6 +328,57 @@ Key configuration options include:
 > [!IMPORTANT]
 > **SQLite is the only database required for Gitea Mirror**, handling both data storage and real-time event notifications.
 
+### Mirror Strategies & Destination Customization
+
+Gitea Mirror offers three flexible strategies for organizing your repositories in Gitea, with fine-grained control over destinations:
+
+#### 1. **Preserve GitHub Structure** (Default)
+- Personal repositories → Your Gitea username (or custom organization)
+- Organization repositories → Same organization name in Gitea (with individual overrides)
+- Maintains the exact structure from GitHub with optional customization
+
+#### 2. **Single Organization**
+- All repositories → One designated organization
+- Simplifies management by consolidating everything
+- Requires specifying a destination organization name
+
+#### 3. **Flat User Structure**
+- All repositories → Your Gitea user account
+- No organizations needed
+- Simplest approach for personal use
+
+#### Destination Customization
+
+**Organization-Level Overrides:**
+- Click the edit button on any organization card to set a custom destination
+- All repositories from that GitHub organization will be mirrored to your specified Gitea organization
+- Visual indicators show when custom destinations are active
+
+**Repository-Level Overrides:**
+- Fine-tune individual repository destinations in the repository table
+- Click the edit button in the "Destination" column to customize where a specific repo is mirrored
+- Overrides organization-level settings for maximum flexibility
+- Starred repositories display a ⭐ icon and always go to the configured starred repos organization
+
+**Priority Hierarchy:**
+1. Starred repositories → Always go to `starredReposOrg` (not editable)
+2. Repository-level custom destination (highest priority for non-starred)
+3. Organization-level custom destination
+4. Personal repos override (for non-organization repos)
+5. Default strategy rules (lowest priority)
+
+> [!NOTE]
+> **Starred Repositories**: Repositories you've starred on GitHub are automatically organized into a separate organization (default: "starred") and cannot have custom destinations. They're marked with a ⭐ icon for easy identification.
+
+> [!TIP]
+> **Example Use Cases**: 
+> - Mirror personal repos to `personal-archive` organization
+> - Redirect `work-org` repos to `company-mirror` in Gitea
+> - Override a single important repo to go to a special organization
+> - Keep `company-org` repos in their own `company-org` organization
+> - Override `community-scripts` to go to `community-mirrors` organization
+> - This gives you complete control while maintaining GitHub's structure as the default
+
 ## 🚀 Development
 
 ### Local Development Setup
@@ -333,13 +416,13 @@ docker run -d \
   -e USER_UID=1000 \
   -e USER_GID=1000 \
   -e GITEA__database__DB_TYPE=sqlite3 \
-  -e GITEA__database__PATH=/data/gitea.db \
+  -e GITEA__database__PATH=/data/gitea/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__security__INSTALL_LOCK=false \
   -e GITEA__service__DISABLE_REGISTRATION=false \
   gitea/gitea:latest
 ```
@@ -366,7 +449,7 @@ docker run -d \
   -e GITEA_URL=http://gitea:3000 \
   -e GITEA_TOKEN=your-local-gitea-token \
   -e GITEA_USERNAME=your-local-gitea-username \
-  arunavo4/gitea-mirror:latest
+  RayLabsHQ/gitea-mirror:latest
 ```
 
 > [!NOTE]
@@ -467,14 +550,14 @@ Try the following steps:
 > # 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
+>   ghcr.io/RayLabsHQ/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
+> git clone https://github.com/RayLabsHQ/gitea-mirror.git
 > cd gitea-mirror
 >
 > # Start the application with Docker Compose
@@ -483,6 +566,36 @@ Try the following steps:
 >
 > This setup provides a complete containerized deployment for the Gitea Mirror application.
 
+#### Docker Volume Types and Permissions
+
+> [!IMPORTANT]
+> **Named Volumes vs Bind Mounts**: If you encounter SQLite permission errors even when using Docker, check your volume configuration:
+
+**✅ Named Volumes (Recommended):**
+```yaml
+volumes:
+  - gitea-mirror-data:/app/data  # Docker manages permissions automatically
+```
+
+**⚠️ Bind Mounts (Requires Manual Permission Setup):**
+```yaml
+volumes:
+  - /host/path/to/data:/app/data  # Host filesystem permissions apply
+```
+
+**If using bind mounts**, ensure the host directory is owned by UID 1001 (the `gitea-mirror` user):
+```bash
+# Set correct ownership for bind mount
+sudo chown -R 1001:1001 /host/path/to/data
+sudo chmod -R 755 /host/path/to/data
+```
+
+**Why named volumes work better:**
+- Docker automatically handles permissions
+- Better portability across different hosts
+- No manual permission setup required
+- Used by our official docker-compose.yml
+
 
 #### Database Maintenance
 
@@ -531,3 +644,4 @@ Try the following steps:
 - [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
+- [Community Scripts](https://community-scripts.github.io/ProxmoxVE/) - For the Proxmox VE installation script maintained by [CrazyWolf13](https://github.com/CrazyWolf13)

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:
@@ -63,6 +68,7 @@ services:
       - 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}

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,7 +11,7 @@ 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:
@@ -30,6 +30,7 @@ services:
       - 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}

docker-entrypoint.sh

@@ -232,6 +232,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..."

package.json

@@ -1,23 +1,21 @@
 {
   "name": "gitea-mirror",
   "type": "module",
-  "version": "2.9.0",
+  "version": "2.20.0",
   "engines": {
     "bun": ">=1.2.9"
   },
   "scripts": {
-    "setup": "bun install && bun run manage-db init && bun run update-db",
+    "setup": "bun install && bun run manage-db init",
     "dev": "bunx --bun astro dev",
-    "dev:clean": "bun run cleanup-db && bun run manage-db init && bun run update-db && bunx --bun astro dev",
+    "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",
     "manage-db": "bun scripts/manage-db.ts",
     "init-db": "bun scripts/manage-db.ts init",
-    "update-db": "bun scripts/update-mirror-jobs-table.ts",
     "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",
-
     "startup-recovery": "bun scripts/startup-recovery.ts",
     "startup-recovery-force": "bun scripts/startup-recovery.ts --force",
     "test-recovery": "bun scripts/test-recovery.ts",
@@ -26,68 +24,72 @@
     "test-shutdown-cleanup": "bun scripts/test-graceful-shutdown.ts --cleanup",
     "preview": "bunx --bun astro preview",
     "start": "bun dist/server/entry.mjs",
-    "start:fresh": "bun run cleanup-db && bun run manage-db init && bun run update-db && bun dist/server/entry.mjs",
+    "start:fresh": "bun run cleanup-db && bun run manage-db init && bun dist/server/entry.mjs",
     "test": "bun test",
     "test:watch": "bun test --watch",
     "test:coverage": "bun test --coverage",
     "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.2.2",
+    "@astrojs/react": "^4.3.0",
+    "@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.10",
+    "@tanstack/react-virtual": "^3.13.10",
     "@types/canvas-confetti": "^1.9.0",
-    "@types/react": "^19.1.4",
-    "@types/react-dom": "^19.1.5",
-    "astro": "^5.7.13",
-    "axios": "^1.9.0",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "astro": "^5.9.3",
     "bcryptjs": "^3.0.2",
     "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.2",
     "fuse.js": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
-    "lucide-react": "^0.511.0",
+    "lucide-react": "^0.515.0",
     "next-themes": "^0.4.6",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-icons": "^5.5.0",
-    "sonner": "^2.0.3",
-    "superagent": "^10.2.1",
-    "tailwind-merge": "^3.3.0",
-    "tailwindcss": "^4.1.7",
-    "tw-animate-css": "^1.3.0",
+    "sonner": "^2.0.5",
+    "tailwind-merge": "^3.3.1",
+    "tailwindcss": "^4.1.10",
+    "tw-animate-css": "^1.3.4",
+    "typescript": "^5.8.3",
     "uuid": "^11.1.0",
-    "zod": "^3.25.7"
+    "zod": "^3.25.64"
   },
   "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/superagent": "^8.1.9",
     "@types/uuid": "^10.0.0",
-    "@vitejs/plugin-react": "^4.4.1",
+    "@vitejs/plugin-react": "^4.5.2",
     "jsdom": "^26.1.0",
-    "tsx": "^4.19.4",
-    "vitest": "^3.1.4"
+    "tsx": "^4.20.3",
+    "vitest": "^3.2.3"
   },
-  "packageManager": "bun@1.2.9"
+  "packageManager": "bun@1.2.16"
 }

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/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/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 Username: ${userConfig.githubConfig?.username || "Not set"}`);
+      console.log(`   Gitea URL: ${userConfig.giteaConfig?.url || "Not set"}`);
+      console.log(`   Gitea Username: ${userConfig.giteaConfig?.username || "Not set"}`);
+      console.log(`   Preserve Org Structure: ${userConfig.githubConfig?.preserveOrgStructure || false}`);
+      console.log(`   Mirror Issues: ${userConfig.githubConfig?.mirrorIssues || 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?.username;
+
+        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/repair-mirrored-repos.ts

@@ -0,0 +1,277 @@
+#!/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
+    let query = db
+      .select()
+      .from(repositories)
+      .where(
+        or(
+          eq(repositories.status, "imported"),
+          eq(repositories.status, "failed")
+        )
+      );
+
+    if (specificRepo) {
+      query = query.where(eq(repositories.name, specificRepo));
+    }
+
+    const repos = await query;
+
+    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?.username;
+
+        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);
+});

src/components/NotFound.tsx

@@ -0,0 +1,81 @@
+import React from "react";
+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/ActivityLog.tsx

@@ -16,7 +16,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '../ui/dialog';
-import { apiRequest, formatDate } from '@/lib/utils';
+import { apiRequest, formatDate, showErrorToast } from '@/lib/utils';
 import { useAuth } from '@/hooks/useAuth';
 import type { MirrorJob } from '@/lib/db/schema';
 import type { ActivityApiResponse } from '@/types/activities';
@@ -155,7 +155,7 @@ export function ActivityLog() {
       if (!res.success) {
         // Only show error toast for manual refreshes to avoid spam during live updates
         if (!isLiveRefresh) {
-          toast.error(res.message ?? 'Failed to fetch activities.');
+          showErrorToast(res.message ?? 'Failed to fetch activities.', toast);
         }
         return false;
       }
@@ -184,9 +184,7 @@ export function ActivityLog() {
       if (isMountedRef.current) {
         // Only show error toast for manual refreshes to avoid spam during live updates
         if (!isLiveRefresh) {
-          toast.error(
-            err instanceof Error ? err.message : 'Failed to fetch activities.',
-          );
+          showErrorToast(err, toast);
         }
       }
       return false;
@@ -313,7 +311,6 @@ export function ActivityLog() {
       setIsInitialLoading(true);
       setShowCleanupDialog(false);
 
-      // Use fetch directly to avoid potential axios issues
       const response = await fetch('/api/activities/cleanup', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -332,11 +329,11 @@ export function ActivityLog() {
         setActivities([]);
         toast.success(`All activities cleaned up successfully. Deleted ${res.result.mirrorJobsDeleted} mirror jobs and ${res.result.eventsDeleted} events.`);
       } else {
-        toast.error(res.error || 'Failed to cleanup activities.');
+        showErrorToast(res.error || 'Failed to cleanup activities.', toast);
       }
     } catch (error) {
       console.error('Error cleaning up activities:', error);
-      toast.error(error instanceof Error ? error.message : 'Failed to cleanup activities.');
+      showErrorToast(error, toast);
     } finally {
       setIsInitialLoading(false);
     }

src/components/auth/LoginForm.tsx

@@ -1,12 +1,13 @@
 '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 { toast, Toaster } from 'sonner';
-import { FlipHorizontal } from 'lucide-react';
+import { showErrorToast } from '@/lib/utils';
+
 
 export function LoginForm() {
   const [isLoading, setIsLoading] = useState(false);
@@ -45,10 +46,10 @@ export function LoginForm() {
           window.location.href = '/';
         }, 1000);
       } else {
-        toast.error(data.error || 'Login failed. Please try again.');
+        showErrorToast(data.error || 'Login failed. Please try again.', toast);
       }
     } catch (error) {
-      toast.error('An error occurred while logging in. Please try again.');
+      showErrorToast(error, toast);
     } finally {
       setIsLoading(false);
     }
@@ -59,7 +60,16 @@ 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>

src/components/auth/SignupForm.tsx

@@ -3,8 +3,8 @@
 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';
 
 export function SignupForm() {
   const [isLoading, setIsLoading] = useState(false);
@@ -51,10 +51,10 @@ export function SignupForm() {
           window.location.href = '/';
         }, 1500);
       } else {
-        toast.error(data.error || 'Failed to create account. Please try again.');
+        showErrorToast(data.error || 'Failed to create account. Please try again.', toast);
       }
     } catch (error) {
-      toast.error('An error occurred while creating your account. Please try again.');
+      showErrorToast(error, toast);
     } finally {
       setIsLoading(false);
     }
@@ -65,7 +65,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>

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,332 @@
+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
+        </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>
+
+        <div className="mt-6 p-4 bg-blue-50/50 dark:bg-blue-950/20 rounded-lg border border-blue-200 dark:border-blue-900">
+          <div className="flex gap-3">
+            <Info className="h-4 w-4 text-blue-600 dark:text-blue-400 flex-shrink-0 mt-0.5" />
+            <div className="space-y-1">
+              <p className="text-sm font-medium text-blue-900 dark:text-blue-100">
+                Background Operations
+              </p>
+              <p className="text-xs text-blue-800 dark:text-blue-200/80">
+                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>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

src/components/config/ConfigTabs.tsx

@@ -1,8 +1,7 @@
 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 type {
   ConfigApiResponse,
   GiteaConfig,
@@ -11,10 +10,12 @@ import type {
   SaveConfigApiResponse,
   ScheduleConfig,
   DatabaseCleanupConfig,
+  MirrorOptions,
+  AdvancedOptions,
 } from '@/types/config';
 import { Button } from '../ui/button';
 import { useAuth } from '@/hooks/useAuth';
-import { apiRequest } from '@/lib/utils';
+import { apiRequest, showErrorToast } from '@/lib/utils';
 import { RefreshCw } from 'lucide-react';
 import { toast } from 'sonner';
 import { Skeleton } from '@/components/ui/skeleton';
@@ -25,6 +26,8 @@ type ConfigState = {
   giteaConfig: GiteaConfig;
   scheduleConfig: ScheduleConfig;
   cleanupConfig: DatabaseCleanupConfig;
+  mirrorOptions: MirrorOptions;
+  advancedOptions: AdvancedOptions;
 };
 
 export function ConfigTabs() {
@@ -32,12 +35,8 @@ export function ConfigTabs() {
     githubConfig: {
       username: '',
       token: '',
-      skipForks: false,
       privateRepositories: false,
-      mirrorIssues: false,
       mirrorStarred: false,
-      preserveOrgStructure: false,
-      skipStarredIssues: false,
     },
     giteaConfig: {
       url: '',
@@ -46,6 +45,7 @@ export function ConfigTabs() {
       organization: 'github-mirrors',
       visibility: 'public',
       starredReposOrg: 'github',
+      preserveOrgStructure: false,
     },
     scheduleConfig: {
       enabled: false,
@@ -55,15 +55,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 +97,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,47 +133,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 {
-        toast.error(
-          `Failed to save configuration: ${result.message || 'Unknown error'}`,
-        );
-      }
-    } catch (error) {
-      toast.error(
-        `An error occurred while saving the configuration: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      );
-    }
-  };
-
   // 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) {
@@ -166,6 +152,8 @@ export function ConfigTabs() {
         giteaConfig: config.giteaConfig,
         scheduleConfig: scheduleConfig,
         cleanupConfig: config.cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
       };
 
       try {
@@ -198,27 +186,22 @@ export function ConfigTabs() {
             console.warn('Failed to fetch updated config after auto-save:', fetchError);
           }
         } else {
-          toast.error(
+          showErrorToast(
             `Auto-save failed: ${result.message || 'Unknown error'}`,
-            { duration: 3000 }
+            toast
           );
         }
       } catch (error) {
-        toast.error(
-          `Auto-save error: ${
-            error instanceof Error ? error.message : String(error)
-          }`,
-          { duration: 3000 }
-        );
+        showErrorToast(error, toast);
       } finally {
         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) {
@@ -235,6 +218,8 @@ export function ConfigTabs() {
         giteaConfig: config.giteaConfig,
         scheduleConfig: config.scheduleConfig,
         cleanupConfig: cleanupConfig,
+        mirrorOptions: config.mirrorOptions,
+        advancedOptions: config.advancedOptions,
       };
 
       try {
@@ -266,23 +251,186 @@ export function ConfigTabs() {
             console.warn('Failed to fetch updated config after auto-save:', fetchError);
           }
         } else {
-          toast.error(
+          showErrorToast(
             `Auto-save failed: ${result.message || 'Unknown error'}`,
-            { duration: 3000 }
+            toast
           );
         }
       } catch (error) {
-        toast.error(
-          `Auto-save error: ${
-            error instanceof Error ? error.message : String(error)
-          }`,
-          { duration: 3000 }
-        );
+        showErrorToast(error, toast);
       } finally {
         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(() => {
@@ -293,6 +441,12 @@ export function ConfigTabs() {
       if (autoSaveCleanupTimeoutRef.current) {
         clearTimeout(autoSaveCleanupTimeoutRef.current);
       }
+      if (autoSaveGitHubTimeoutRef.current) {
+        clearTimeout(autoSaveGitHubTimeoutRef.current);
+      }
+      if (autoSaveGiteaTimeoutRef.current) {
+        clearTimeout(autoSaveGiteaTimeoutRef.current);
+      }
     };
   }, []);
 
@@ -316,8 +470,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(
@@ -342,14 +500,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" />
@@ -357,10 +515,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" />
@@ -369,23 +530,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>
@@ -414,10 +576,10 @@ export function ConfigTabs() {
         <div className="flex gap-x-4">
           <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'
@@ -435,23 +597,13 @@ 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">
+      {/* Content section - Grid layout */}
+      <div className="space-y-6">
+        {/* GitHub & Gitea connections - Side by side */}
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4 md:items-stretch">
           <GitHubConfigForm
             config={config.githubConfig}
             setConfig={update =>
@@ -463,6 +615,30 @@ export function ConfigTabs() {
                     : update,
               }))
             }
+            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}
           />
           <GiteaConfigForm
             config={config.giteaConfig}
@@ -475,41 +651,28 @@ export function ConfigTabs() {
                     : update,
               }))
             }
+            onAutoSave={autoSaveGiteaConfig}
+            isAutoSaving={isAutoSavingGitea}
+            githubUsername={config.githubConfig.username}
           />
         </div>
-        <div className="flex gap-x-4">
-          <div className="w-1/2">
-            <ScheduleConfigForm
-              config={config.scheduleConfig}
-              setConfig={update =>
-                setConfig(prev => ({
-                  ...prev,
-                  scheduleConfig:
-                    typeof update === 'function'
-                      ? update(prev.scheduleConfig)
-                      : update,
-                }))
-              }
-              onAutoSave={autoSaveScheduleConfig}
-              isAutoSaving={isAutoSavingSchedule}
-            />
-          </div>
-          <div className="w-1/2">
-            <DatabaseCleanupConfigForm
-              config={config.cleanupConfig}
-              setConfig={update =>
-                setConfig(prev => ({
-                  ...prev,
-                  cleanupConfig:
-                    typeof update === 'function'
-                      ? update(prev.cleanupConfig)
-                      : update,
-                }))
-              }
-              onAutoSave={autoSaveCleanupConfig}
-              isAutoSaving={isAutoSavingCleanup}
-            />
-          </div>
+
+        {/* Automation & Maintenance - Full width */}
+        <div>
+          <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}
+          />
         </div>
       </div>
     </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,7 +87,7 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
   };
 
   return (
-    <Card className="w-full">
+    <Card className="w-full h-full flex flex-col">
       <CardHeader className="flex flex-row items-center justify-between gap-4">
         <CardTitle className="text-lg font-semibold">
           GitHub Configuration
@@ -89,7 +102,7 @@ export function GitHubConfigForm({ config, setConfig }: GitHubConfigFormProps) {
         </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 +123,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 +173,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 +181,27 @@ 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);
+          }}
+        />
+    </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="flex items-start justify-between 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 - inline to prevent layout shift */}
+            <div className={cn(
+              "flex items-center justify-end transition-opacity duration-200",
+              githubConfig.mirrorStarred ? "opacity-100" : "opacity-0 pointer-events-none"
+            )}>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={!githubConfig.mirrorStarred}
+                    className="h-8 text-xs font-normal 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 lg: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 - inline to prevent layout shift */}
+            <div className={cn(
+              "flex items-center justify-end transition-opacity duration-200",
+              mirrorOptions.mirrorMetadata ? "opacity-100" : "opacity-0 pointer-events-none"
+            )}>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={!mirrorOptions.mirrorMetadata}
+                    className="h-8 text-xs font-normal 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,99 @@
-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;
+    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";
+        break;
+      case "single-org":
+        newConfig.preserveOrgStructure = false;
+        newConfig.mirrorStrategy = "single-org";
+        if (!newConfig.organization) {
+          newConfig.organization = "github-mirrors";
+        }
+        break;
+      case "flat-user":
+        newConfig.preserveOrgStructure = false;
+        newConfig.mirrorStrategy = "flat-user";
+        newConfig.organization = "";
+        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,7 +123,7 @@ export function GiteaConfigForm({ config, setConfig }: GiteaConfigFormProps) {
   };
 
   return (
-    <Card className="w-full">
+    <Card className="w-full h-full flex flex-col">
       <CardHeader className="flex flex-row items-center justify-between gap-4">
         <CardTitle className="text-lg font-semibold">
           Gitea Configuration
@@ -78,7 +138,7 @@ export function GiteaConfigForm({ config, setConfig }: GiteaConfigFormProps) {
         </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 +200,47 @@ 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);
+          }}
+        />
       </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,201 @@
+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="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>
+        ) : strategy === "preserve" ? (
+          <div className="space-y-1">
+            <Label htmlFor="personalReposOrg" className="text-sm font-normal flex items-center gap-2">
+              Personal Repos Organization
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <Info className="h-3.5 w-3.5 text-muted-foreground" />
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p>Override where your personal repositories are mirrored (leave empty to use your username)</p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </Label>
+            <Input
+              id="personalReposOrg"
+              value={personalReposOrg || ""}
+              onChange={(e) => onPersonalReposOrgChange(e.target.value)}
+              placeholder="my-personal-mirrors"
+              className=""
+            />
+            <p className="text-xs text-muted-foreground mt-1">
+              Override destination for your personal repos
+            </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" />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p className="text-xs">{option.description}</p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+};
+

src/components/config/OrganizationStrategy.tsx

@@ -0,0 +1,434 @@
+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 organization 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: "user 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 items-start 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="left" 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">
+                      <div className="flex items-center gap-3">
+                        <RadioGroupItem 
+                          value={key} 
+                          id={key} 
+                        />
+                        
+                        <div className={cn(
+                          "rounded-lg p-2",
+                          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">
+                          <div className="flex items-center gap-2">
+                            <h4 className="font-medium text-sm">{config.title}</h4>
+                          </div>
+                          <p className="text-xs text-muted-foreground mt-0.5">
+                            {config.description}
+                          </p>
+                        </div>
+                        
+                        <HoverCard openDelay={200}>
+                          <HoverCardTrigger asChild>
+                            <span 
+                              className="inline-flex p-1.5 hover:bg-muted rounded-md transition-colors cursor-help"
+                              onClick={(e) => e.stopPropagation()}
+                            >
+                              <Info className="h-4 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>
+                  </Card>
+                </label>
+              </div>
+            );
+          })}
+        </div>
+      </RadioGroup>
+    </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

@@ -5,7 +5,7 @@ import { GitFork, Clock, FlipHorizontal, Building2 } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import type { MirrorJob, Organization, Repository } from "@/lib/db/schema";
 import { useAuth } from "@/hooks/useAuth";
-import { apiRequest } from "@/lib/utils";
+import { apiRequest, showErrorToast } from "@/lib/utils";
 import type { DashboardApiResponse } from "@/types/dashboard";
 import { useSSE } from "@/hooks/useSEE";
 import { toast } from "sonner";
@@ -103,15 +103,11 @@ export function Dashboard() {
         }
         return true;
       } else {
-        toast.error(response.error || "Error fetching dashboard data");
+        showErrorToast(response.error || "Error fetching dashboard data", toast);
         return false;
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error
-          ? error.message
-          : "Error fetching dashboard data"
-      );
+      showErrorToast(error, toast);
       return false;
     } finally {
       setIsLoading(false);

src/components/dashboard/RepositoryList.tsx

@@ -81,6 +81,11 @@ export function RepositoryList({ repositories }: RepositoryListProps) {
                         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">

src/components/layout/Header.tsx

@@ -1,6 +1,6 @@
 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";
@@ -64,7 +64,16 @@ export function Header({ currentPage, onNavigate }: HeaderProps) {
           }}
           className="flex items-center gap-2 py-1 hover:opacity-80 transition-opacity"
         >
-          <SiGitea className="h-6 w-6" />
+          <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">Gitea Mirror</span>
         </button>
 

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/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", className)}>
+      <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
+        <Building2 className="h-3 w-3" />
+        <span className="font-medium">{organizationName}</span>
+        <ArrowRight className="h-3 w-3" />
+        <span className={cn(
+          "font-medium",
+          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">
+            custom
+          </Badge>
+        )}
+      </div>
+
+      <Popover open={isOpen} onOpenChange={setIsOpen}>
+        <PopoverTrigger asChild>
+          <Button
+            size="sm"
+            variant="ghost"
+            className="h-6 w-6 p-0 opacity-60 hover:opacity-100"
+            title="Edit mirror destination"
+            disabled={isUpdating || isLoading}
+          >
+            <Edit3 className="h-3 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,11 +1,11 @@
 import { useCallback, useEffect, useState } from "react";
 import { Button } from "@/components/ui/button";
-import { Search, RefreshCw, FlipHorizontal, Plus } from "lucide-react";
+import { Search, RefreshCw, FlipHorizontal } from "lucide-react";
 import type { MirrorJob, Organization } from "@/lib/db/schema";
 import { OrganizationList } from "./OrganizationsList";
 import AddOrganizationDialog from "./AddOrganizationDialog";
 import { useAuth } from "@/hooks/useAuth";
-import { apiRequest } from "@/lib/utils";
+import { apiRequest, showErrorToast } from "@/lib/utils";
 import {
   membershipRoleEnum,
   type AddOrganizationApiRequest,
@@ -26,6 +26,7 @@ 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";
 
 export function Organization() {
   const [organizations, setOrganizations] = useState<Organization[]>([]);
@@ -34,6 +35,7 @@ export function Organization() {
   const { user } = useAuth();
   const { isGitHubConfigured } = useConfigStatus();
   const { navigationKey } = useNavigation();
+  const { registerRefreshCallback } = useLiveRefresh();
   const { filter, setFilter } = useFilterParams({
     searchTerm: "",
     membershipRole: "",
@@ -62,19 +64,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 +93,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 +166,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");
       }
@@ -193,12 +225,10 @@ export function Organization() {
           searchTerm: org,
         }));
       } else {
-        toast.error(response.error || "Error adding organization");
+        showErrorToast(response.error || "Error adding organization", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error adding organization"
-      );
+      showErrorToast(error, toast);
     } finally {
       setIsLoading(false);
     }
@@ -250,24 +280,17 @@ export function Organization() {
           })
         );
       } else {
-        toast.error(response.error || "Error starting mirror jobs");
+        showErrorToast(response.error || "Error starting mirror jobs", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error starting mirror jobs"
-      );
+      showErrorToast(error, toast);
     } finally {
       // Reset loading states - we'll let the SSE updates handle status changes
       setLoadingOrgIds(new Set());
     }
   };
 
-  // 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();
+
 
   return (
     <div className="flex flex-col gap-y-8">
@@ -381,6 +404,7 @@ export function Organization() {
         loadingOrgIds={loadingOrgIds}
         onMirror={handleMirrorOrg}
         onAddOrganization={() => setIsDialogOpen(true)}
+        onRefresh={() => fetchOrganizations(false)}
       />
 
       <AddOrganizationDialog

src/components/organizations/OrganizationsList.tsx

@@ -1,14 +1,16 @@
 import { useMemo } from "react";
 import { Card } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
-import { Plus, RefreshCw, Building2 } from "lucide-react";
-import { SiGithub } from "react-icons/si";
+import { Badge } from "@/components/ui/badge";
+import { Plus, RefreshCw, Building2, Check, AlertCircle, Clock } from "lucide-react";
+import { SiGithub, SiGitea } from "react-icons/si";
 import type { Organization } from "@/lib/db/schema";
 import type { FilterParams } from "@/types/filter";
 import Fuse from "fuse.js";
 import { Skeleton } from "@/components/ui/skeleton";
-import { Checkbox } from "@/components/ui/checkbox";
-import { getStatusColor } from "@/lib/utils";
+import { cn } from "@/lib/utils";
+import { MirrorDestinationEditor } from "./MirrorDestinationEditor";
+import { useGiteaConfig } from "@/hooks/useGiteaConfig";
 
 interface OrganizationListProps {
   organizations: Organization[];
@@ -18,8 +20,25 @@ interface OrganizationListProps {
   onMirror: ({ orgId }: { orgId: string }) => Promise<void>;
   loadingOrgIds: Set<string>;
   onAddOrganization?: () => void;
+  onRefresh?: () => Promise<void>;
 }
 
+// Helper function to get status badge variant and icon
+const getStatusBadge = (status: string | null) => {
+  switch (status) {
+    case "imported":
+      return { variant: "secondary" as const, label: "Not Mirrored", icon: null };
+    case "mirroring":
+      return { variant: "outline" as const, label: "Mirroring", icon: Clock };
+    case "mirrored":
+      return { variant: "default" as const, label: "Mirrored", icon: Check };
+    case "failed":
+      return { variant: "destructive" as const, label: "Failed", icon: AlertCircle };
+    default:
+      return { variant: "secondary" as const, label: "Unknown", icon: null };
+  }
+};
+
 export function OrganizationList({
   organizations,
   isLoading,
@@ -28,7 +47,59 @@ export function OrganizationList({
   onMirror,
   loadingOrgIds,
   onAddOrganization,
+  onRefresh,
 }: OrganizationListProps) {
+  const { giteaConfig } = useGiteaConfig();
+
+  // Helper function to construct Gitea organization URL
+  const getGiteaOrgUrl = (organization: Organization): string | null => {
+    if (!giteaConfig?.url) {
+      return null;
+    }
+
+    // Only provide Gitea links for organizations that have been mirrored
+    const validStatuses = ['mirroring', 'mirrored'];
+    if (!validStatuses.includes(organization.status || '')) {
+      return null;
+    }
+
+    // Use destinationOrg if available, otherwise use the organization name
+    const orgName = organization.destinationOrg || organization.name;
+    if (!orgName) {
+      return null;
+    }
+
+    // Ensure the base URL doesn't have a trailing slash
+    const baseUrl = giteaConfig.url.endsWith('/')
+      ? giteaConfig.url.slice(0, -1)
+      : giteaConfig.url;
+
+    return `${baseUrl}/${orgName}`;
+  };
+
+  const handleUpdateDestination = async (orgId: string, newDestination: string | null) => {
+    // Call API to update organization destination
+    const response = await fetch(`/api/organizations/${orgId}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        destinationOrg: newDestination,
+      }),
+    });
+
+    if (!response.ok) {
+      const errorData = await response.json();
+      throw new Error(errorData.error || "Failed to update organization");
+    }
+
+    // Refresh organizations data
+    if (onRefresh) {
+      await onRefresh();
+    }
+  };
+
   const hasAnyFilter = Object.values(filter).some(
     (val) => val?.toString().trim() !== ""
   );
@@ -93,82 +164,206 @@ export function OrganizationList({
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
       {filteredOrganizations.map((org, index) => {
         const isLoading = loadingOrgIds.has(org.id ?? "");
+        const statusBadge = getStatusBadge(org.status);
+        const StatusIcon = statusBadge.icon;
 
         return (
-          <Card key={index} className="overflow-hidden p-4">
-            <div className="flex items-center justify-between mb-2">
-              <div className="flex items-center gap-2">
-                <Building2 className="h-5 w-5 text-muted-foreground" />
-                <a 
-                  href={`/repositories?organization=${encodeURIComponent(org.name || '')}`}
-                  className="font-medium hover:underline cursor-pointer"
-                >
-                  {org.name}
-                </a>
+          <Card 
+            key={index} 
+            className={cn(
+              "overflow-hidden p-4 transition-all hover:shadow-md min-h-[160px]",
+              isLoading && "opacity-75"
+            )}
+          >
+            <div className="flex items-start justify-between mb-3">
+              <div className="flex-1">
+                <div className="flex items-center gap-2 mb-1">
+                  <Building2 className="h-5 w-5 text-muted-foreground" />
+                  <a 
+                    href={`/repositories?organization=${encodeURIComponent(org.name || '')}`}
+                    className="font-medium hover:underline cursor-pointer"
+                  >
+                    {org.name}
+                  </a>
+                  <span
+                    className={`text-xs px-2 py-0.5 rounded-full capitalize ${
+                      org.membershipRole === "member"
+                        ? "bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200"
+                        : "bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-200"
+                    }`}
+                  >
+                    {org.membershipRole}
+                  </span>
+                </div>
+
+                {/* Destination override section */}
+                <div className="mt-2">
+                  <MirrorDestinationEditor
+                    organizationId={org.id!}
+                    organizationName={org.name!}
+                    currentDestination={org.destinationOrg}
+                    onUpdate={(newDestination) => handleUpdateDestination(org.id!, newDestination)}
+                    isUpdating={isLoading}
+                  />
+                </div>
               </div>
-              <span
-                className={`text-xs px-2 py-1 rounded-full capitalize ${
-                  org.membershipRole === "member"
-                    ? "bg-blue-100 text-blue-800"
-                    : "bg-purple-100 text-purple-800"
-                }`}
-              >
-                {org.membershipRole}
-                {/* needs to be updated  */}
-              </span>
+              <Badge variant={statusBadge.variant} className="ml-2">
+                {StatusIcon && <StatusIcon className={cn(
+                  "h-3 w-3",
+                  org.status === "mirroring" && "animate-pulse"
+                )} />}
+                {statusBadge.label}
+              </Badge>
             </div>
 
-            <p className="text-sm text-muted-foreground mb-4">
-              {org.repositoryCount}{" "}
-              {org.repositoryCount === 1 ? "repository" : "repositories"}
-            </p>
+            <div className="text-sm text-muted-foreground mb-4">
+              <div className="flex items-center justify-between">
+                <span className="font-medium">
+                  {org.repositoryCount}{" "}
+                  {org.repositoryCount === 1 ? "repository" : "repositories"}
+                </span>
+              </div>
+              {/* Always render this section to prevent layout shift */}
+              <div className="flex gap-4 mt-2 text-xs min-h-[20px]">
+                {isLoading || (org.status === "mirroring" && org.publicRepositoryCount === undefined) ? (
+                  <>
+                    <Skeleton className="h-3 w-16" />
+                    <Skeleton className="h-3 w-16" />
+                  </>
+                ) : (
+                  <>
+                    {org.publicRepositoryCount !== undefined ? (
+                      <span className="flex items-center gap-1">
+                        <div className="h-2 w-2 rounded-full bg-green-500" />
+                        {org.publicRepositoryCount} public
+                      </span>
+                    ) : null}
+                    {org.privateRepositoryCount !== undefined && org.privateRepositoryCount > 0 ? (
+                      <span className="flex items-center gap-1">
+                        <div className="h-2 w-2 rounded-full bg-orange-500" />
+                        {org.privateRepositoryCount} private
+                      </span>
+                    ) : null}
+                    {org.forkRepositoryCount !== undefined && org.forkRepositoryCount > 0 ? (
+                      <span className="flex items-center gap-1">
+                        <div className="h-2 w-2 rounded-full bg-blue-500" />
+                        {org.forkRepositoryCount} fork{org.forkRepositoryCount !== 1 ? 's' : ''}
+                      </span>
+                    ) : null}
+                    {/* Show a placeholder if no counts are available to maintain height */}
+                    {org.publicRepositoryCount === undefined && 
+                     org.privateRepositoryCount === undefined && 
+                     org.forkRepositoryCount === undefined && (
+                      <span className="invisible">Loading counts...</span>
+                    )}
+                  </>
+                )}
+              </div>
+            </div>
 
             <div className="flex items-center justify-between">
-              <div className="flex items-center">
-                <Checkbox
-                  id={`include-${org.id}`}
-                  name={`include-${org.id}`}
-                  checked={org.status === "mirrored"}
-                  disabled={
-                    loadingOrgIds.has(org.id ?? "") ||
-                    org.status === "mirrored" ||
-                    org.status === "mirroring"
-                  }
-                  onCheckedChange={async (checked) => {
-                    if (checked && !org.isIncluded && org.id) {
-                      onMirror({ orgId: org.id });
-                    }
-                  }}
-                />
-                <label
-                  htmlFor={`include-${org.id}`}
-                  className="ml-2 text-sm select-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                >
-                  Include in mirroring
-                </label>
-
-                {isLoading && (
-                  <RefreshCw className="opacity-50 h-4 w-4 animate-spin ml-4" />
+              <div className="flex items-center gap-2">
+                {org.status === "imported" && (
+                  <Button
+                    size="sm"
+                    onClick={() => org.id && onMirror({ orgId: org.id })}
+                    disabled={isLoading}
+                  >
+                    {isLoading ? (
+                      <>
+                        <RefreshCw className="h-3 w-3 animate-spin mr-2" />
+                        Starting...
+                      </>
+                    ) : (
+                      "Mirror"
+                    )}
+                  </Button>
+                )}
+                
+                {org.status === "mirroring" && (
+                  <Button size="sm" disabled variant="outline">
+                    <RefreshCw className="h-3 w-3 animate-spin mr-2" />
+                    Mirroring...
+                  </Button>
+                )}
+                
+                {org.status === "mirrored" && (
+                  <Button size="sm" disabled variant="secondary">
+                    <Check className="h-3 w-3 mr-2" />
+                    Mirrored
+                  </Button>
+                )}
+                
+                {org.status === "failed" && (
+                  <Button
+                    size="sm"
+                    variant="destructive"
+                    onClick={() => org.id && onMirror({ orgId: org.id })}
+                    disabled={isLoading}
+                  >
+                    {isLoading ? (
+                      <>
+                        <RefreshCw className="h-3 w-3 animate-spin mr-2" />
+                        Retrying...
+                      </>
+                    ) : (
+                      <>
+                        <AlertCircle className="h-3 w-3 mr-2" />
+                        Retry
+                      </>
+                    )}
+                  </Button>
                 )}
               </div>
 
-              <Button variant="ghost" size="icon" asChild>
-                <a
-                  href={`https://github.com/${org.name}`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                   <SiGithub className="h-4 w-4" />
-                </a>
-              </Button>
-            </div>
+              <div className="flex items-center gap-1">
+                {(() => {
+                  const giteaUrl = getGiteaOrgUrl(org);
 
-            {/* dont know if this looks good. maybe revised  */}
-            <div className="flex items-center gap-2 justify-end mt-4">
-              <div
-                className={`h-2 w-2 rounded-full ${getStatusColor(org.status)}`}
-              />
-              <span className="text-sm capitalize">{org.status}</span>
+                  // Determine tooltip based on status and configuration
+                  let tooltip: string;
+                  if (!giteaConfig?.url) {
+                    tooltip = "Gitea not configured";
+                  } else if (org.status === 'imported') {
+                    tooltip = "Organization not yet mirrored to Gitea";
+                  } else if (org.status === 'failed') {
+                    tooltip = "Organization mirroring failed";
+                  } else if (org.status === 'mirroring') {
+                    tooltip = "Organization is being mirrored to Gitea";
+                  } else if (giteaUrl) {
+                    tooltip = "View on Gitea";
+                  } else {
+                    tooltip = "Gitea organization not available";
+                  }
+
+                  return giteaUrl ? (
+                    <Button variant="ghost" size="icon" asChild>
+                      <a
+                        href={giteaUrl}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        title={tooltip}
+                      >
+                        <SiGitea className="h-4 w-4" />
+                      </a>
+                    </Button>
+                  ) : (
+                    <Button variant="ghost" size="icon" disabled title={tooltip}>
+                      <SiGitea className="h-4 w-4" />
+                    </Button>
+                  );
+                })()}
+                <Button variant="ghost" size="icon" asChild>
+                  <a
+                    href={`https://github.com/${org.name}`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    title="View on GitHub"
+                  >
+                     <SiGithub className="h-4 w-4" />
+                  </a>
+                </Button>
+              </div>
             </div>
           </Card>
         );

src/components/repositories/InlineDestinationEditor.tsx

@@ -0,0 +1,187 @@
+import { useState, useRef, useEffect } from "react";
+import { Edit3, Check, X } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Badge } from "@/components/ui/badge";
+import { cn } from "@/lib/utils";
+import type { Repository } from "@/lib/db/schema";
+
+interface InlineDestinationEditorProps {
+  repository: Repository;
+  giteaConfig: any;
+  onUpdate: (repoId: string, newDestination: string | null) => Promise<void>;
+  isUpdating?: boolean;
+  className?: string;
+}
+
+export function InlineDestinationEditor({
+  repository,
+  giteaConfig,
+  onUpdate,
+  isUpdating = false,
+  className,
+}: InlineDestinationEditorProps) {
+  const [isEditing, setIsEditing] = useState(false);
+  const [editValue, setEditValue] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  // Determine the default destination based on repository properties and config
+  const getDefaultDestination = () => {
+    // Starred repos always go to the configured starredReposOrg
+    if (repository.isStarred && giteaConfig?.starredReposOrg) {
+      return giteaConfig.starredReposOrg;
+    }
+    
+    // Check mirror strategy
+    const strategy = giteaConfig?.mirrorStrategy || 'preserve';
+    
+    if (strategy === 'single-org' && giteaConfig?.organization) {
+      // All repos go to a single organization
+      return giteaConfig.organization;
+    } else if (strategy === 'flat-user') {
+      // All repos go under the user account
+      return giteaConfig?.username || repository.owner;
+    } else {
+      // 'preserve' strategy or default
+      // For organization repos, use the organization name
+      if (repository.organization) {
+        return repository.organization;
+      }
+      // For personal repos, check if personalReposOrg is configured
+      if (!repository.organization && giteaConfig?.personalReposOrg) {
+        return giteaConfig.personalReposOrg;
+      }
+      // Default to the gitea username or owner
+      return giteaConfig?.username || repository.owner;
+    }
+  };
+
+  const defaultDestination = getDefaultDestination();
+  const currentDestination = repository.destinationOrg || defaultDestination;
+  const hasOverride = repository.destinationOrg && repository.destinationOrg !== defaultDestination;
+  const isStarredRepo = repository.isStarred && giteaConfig?.starredReposOrg;
+
+  useEffect(() => {
+    if (isEditing && inputRef.current) {
+      inputRef.current.focus();
+      inputRef.current.select();
+    }
+  }, [isEditing]);
+
+  const handleStartEdit = () => {
+    if (isStarredRepo) return; // Don't allow editing starred repos
+    setEditValue(currentDestination);
+    setIsEditing(true);
+  };
+
+  const handleSave = async () => {
+    const trimmedValue = editValue.trim();
+    const newDestination = trimmedValue === defaultDestination ? null : trimmedValue;
+
+    if (trimmedValue === currentDestination) {
+      setIsEditing(false);
+      return;
+    }
+
+    setIsLoading(true);
+    try {
+      await onUpdate(repository.id!, newDestination);
+      setIsEditing(false);
+    } catch (error) {
+      // Revert on error
+      setEditValue(currentDestination);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setEditValue(currentDestination);
+    setIsEditing(false);
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      handleSave();
+    } else if (e.key === "Escape") {
+      e.preventDefault();
+      handleCancel();
+    }
+  };
+
+  if (isEditing) {
+    return (
+      <div className={cn("flex items-center gap-1", className)}>
+        <Input
+          ref={inputRef}
+          value={editValue}
+          onChange={(e) => setEditValue(e.target.value)}
+          onKeyDown={handleKeyDown}
+          onBlur={handleCancel}
+          className="h-6 text-sm px-2 py-0 w-24"
+          disabled={isLoading}
+        />
+        <Button
+          size="sm"
+          variant="ghost"
+          className="h-5 w-5 p-0"
+          onClick={handleSave}
+          disabled={isLoading}
+        >
+          <Check className="h-3 w-3" />
+        </Button>
+        <Button
+          size="sm"
+          variant="ghost"
+          className="h-5 w-5 p-0"
+          onClick={handleCancel}
+          disabled={isLoading}
+        >
+          <X className="h-3 w-3" />
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn("flex flex-col gap-0.5", className)}>
+      {/* Show GitHub org if exists */}
+      {repository.organization && (
+        <span className="text-xs text-muted-foreground">
+          {repository.organization}
+        </span>
+      )}
+      
+      {/* Show Gitea destination */}
+      <div className="flex items-center gap-1 group">
+        <span className="text-sm">
+          {currentDestination || "-"}
+        </span>
+        {hasOverride && (
+          <Badge variant="outline" className="h-4 px-1 text-[10px] ml-1">
+            custom
+          </Badge>
+        )}
+        {isStarredRepo && (
+          <Badge variant="secondary" className="h-4 px-1 text-[10px] ml-1">
+            starred
+          </Badge>
+        )}
+        {!isStarredRepo && (
+          <Button
+            size="sm"
+            variant="ghost"
+            className="h-4 w-4 p-0 opacity-0 group-hover:opacity-60 hover:opacity-100 ml-1"
+            onClick={handleStartEdit}
+            disabled={isUpdating || isLoading}
+            title="Edit destination"
+          >
+            <Edit3 className="h-3 w-3" />
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}

src/components/repositories/Repository.tsx

@@ -9,7 +9,7 @@ import {
   type RepositoryApiResponse,
   type RepoStatus,
 } from "@/types/Repository";
-import { apiRequest } from "@/lib/utils";
+import { apiRequest, showErrorToast } from "@/lib/utils";
 import {
   Select,
   SelectContent,
@@ -18,7 +18,7 @@ import {
   SelectValue,
 } from "../ui/select";
 import { Button } from "@/components/ui/button";
-import { Search, RefreshCw, FlipHorizontal } from "lucide-react";
+import { Search, RefreshCw, FlipHorizontal, RotateCcw, X } from "lucide-react";
 import type { MirrorRepoRequest, MirrorRepoResponse } from "@/types/mirror";
 import { useSSE } from "@/hooks/useSEE";
 import { useFilterParams } from "@/hooks/useFilterParams";
@@ -46,6 +46,7 @@ export default function Repository() {
     owner: "",
   });
   const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false);
+  const [selectedRepoIds, setSelectedRepoIds] = useState<Set<string>>(new Set());
 
   // Read organization filter from URL when component mounts
   useEffect(() => {
@@ -108,16 +109,14 @@ export default function Repository() {
       } else {
         // Only show error toast for manual refreshes to avoid spam during live updates
         if (!isLiveRefresh) {
-          toast.error(response.error || "Error fetching repositories");
+          showErrorToast(response.error || "Error fetching repositories", toast);
         }
         return false;
       }
     } catch (error) {
       // Only show error toast for manual refreshes to avoid spam during live updates
       if (!isLiveRefresh) {
-        toast.error(
-          error instanceof Error ? error.message : "Error fetching repositories"
-        );
+        showErrorToast(error, toast);
       }
       return false;
     } finally {
@@ -184,12 +183,10 @@ export default function Repository() {
           })
         );
       } else {
-        toast.error(response.error || "Error starting mirror job");
+        showErrorToast(response.error || "Error starting mirror job", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error starting mirror job"
-      );
+      showErrorToast(error, toast);
     } finally {
       setLoadingRepoIds((prev) => {
         const newSet = new Set(prev);
@@ -248,18 +245,153 @@ export default function Repository() {
           })
         );
       } else {
-        toast.error(response.error || "Error starting mirror jobs");
+        showErrorToast(response.error || "Error starting mirror jobs", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error starting mirror jobs"
-      );
+      showErrorToast(error, toast);
     } finally {
       // Reset loading states - we'll let the SSE updates handle status changes
       setLoadingRepoIds(new Set());
     }
   };
 
+  // Bulk action handlers
+  const handleBulkMirror = async () => {
+    if (selectedRepoIds.size === 0) return;
+    
+    const selectedRepos = repositories.filter(repo => repo.id && selectedRepoIds.has(repo.id));
+    const eligibleRepos = selectedRepos.filter(
+      repo => repo.status === "imported" || repo.status === "failed"
+    );
+
+    if (eligibleRepos.length === 0) {
+      toast.info("No eligible repositories to mirror in selection");
+      return;
+    }
+
+    const repoIds = eligibleRepos.map(repo => repo.id as string);
+    
+    setLoadingRepoIds(prev => {
+      const newSet = new Set(prev);
+      repoIds.forEach(id => newSet.add(id));
+      return newSet;
+    });
+
+    try {
+      const response = await apiRequest<MirrorRepoResponse>("/job/mirror-repo", {
+        method: "POST",
+        data: { userId: user?.id, repositoryIds: repoIds }
+      });
+
+      if (response.success) {
+        toast.success(`Mirroring started for ${repoIds.length} repositories`);
+        setRepositories(prevRepos =>
+          prevRepos.map(repo => {
+            const updated = response.repositories.find(r => r.id === repo.id);
+            return updated ? updated : repo;
+          })
+        );
+        setSelectedRepoIds(new Set());
+      } else {
+        showErrorToast(response.error || "Error starting mirror jobs", toast);
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setLoadingRepoIds(new Set());
+    }
+  };
+
+  const handleBulkSync = async () => {
+    if (selectedRepoIds.size === 0) return;
+    
+    const selectedRepos = repositories.filter(repo => repo.id && selectedRepoIds.has(repo.id));
+    const eligibleRepos = selectedRepos.filter(
+      repo => repo.status === "mirrored" || repo.status === "synced"
+    );
+
+    if (eligibleRepos.length === 0) {
+      toast.info("No eligible repositories to sync in selection");
+      return;
+    }
+
+    const repoIds = eligibleRepos.map(repo => repo.id as string);
+    
+    setLoadingRepoIds(prev => {
+      const newSet = new Set(prev);
+      repoIds.forEach(id => newSet.add(id));
+      return newSet;
+    });
+
+    try {
+      const response = await apiRequest<SyncRepoResponse>("/job/sync-repo", {
+        method: "POST",
+        data: { userId: user?.id, repositoryIds: repoIds }
+      });
+
+      if (response.success) {
+        toast.success(`Syncing started for ${repoIds.length} repositories`);
+        setRepositories(prevRepos =>
+          prevRepos.map(repo => {
+            const updated = response.repositories.find(r => r.id === repo.id);
+            return updated ? updated : repo;
+          })
+        );
+        setSelectedRepoIds(new Set());
+      } else {
+        showErrorToast(response.error || "Error starting sync jobs", toast);
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setLoadingRepoIds(new Set());
+    }
+  };
+
+  const handleBulkRetry = async () => {
+    if (selectedRepoIds.size === 0) return;
+    
+    const selectedRepos = repositories.filter(repo => repo.id && selectedRepoIds.has(repo.id));
+    const eligibleRepos = selectedRepos.filter(repo => repo.status === "failed");
+
+    if (eligibleRepos.length === 0) {
+      toast.info("No failed repositories in selection to retry");
+      return;
+    }
+
+    const repoIds = eligibleRepos.map(repo => repo.id as string);
+    
+    setLoadingRepoIds(prev => {
+      const newSet = new Set(prev);
+      repoIds.forEach(id => newSet.add(id));
+      return newSet;
+    });
+
+    try {
+      const response = await apiRequest<RetryRepoResponse>("/job/retry-repo", {
+        method: "POST",
+        data: { userId: user?.id, repositoryIds: repoIds }
+      });
+
+      if (response.success) {
+        toast.success(`Retrying ${repoIds.length} repositories`);
+        setRepositories(prevRepos =>
+          prevRepos.map(repo => {
+            const updated = response.repositories.find(r => r.id === repo.id);
+            return updated ? updated : repo;
+          })
+        );
+        setSelectedRepoIds(new Set());
+      } else {
+        showErrorToast(response.error || "Error retrying jobs", toast);
+      }
+    } catch (error) {
+      showErrorToast(error, toast);
+    } finally {
+      setLoadingRepoIds(new Set());
+    }
+  };
+
   const handleSyncRepo = async ({ repoId }: { repoId: string }) => {
     try {
       if (!user || !user.id) {
@@ -287,12 +419,10 @@ export default function Repository() {
           })
         );
       } else {
-        toast.error(response.error || "Error starting sync job");
+        showErrorToast(response.error || "Error starting sync job", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error starting sync job"
-      );
+      showErrorToast(error, toast);
     } finally {
       setLoadingRepoIds((prev) => {
         const newSet = new Set(prev);
@@ -329,12 +459,10 @@ export default function Repository() {
           })
         );
       } else {
-        toast.error(response.error || "Error retrying job");
+        showErrorToast(response.error || "Error retrying job", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error retrying job"
-      );
+      showErrorToast(error, toast);
     } finally {
       setLoadingRepoIds((prev) => {
         const newSet = new Set(prev);
@@ -381,12 +509,10 @@ export default function Repository() {
           searchTerm: repo,
         }));
       } else {
-        toast.error(response.error || "Error adding repository");
+        showErrorToast(response.error || "Error adding repository", toast);
       }
     } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : "Error adding repository"
-      );
+      showErrorToast(error, toast);
     }
   };
 
@@ -404,6 +530,35 @@ export default function Repository() {
     )
   ).sort();
 
+  // Determine what actions are available for selected repositories
+  const getAvailableActions = () => {
+    if (selectedRepoIds.size === 0) return [];
+    
+    const selectedRepos = repositories.filter(repo => repo.id && selectedRepoIds.has(repo.id));
+    const statuses = new Set(selectedRepos.map(repo => repo.status));
+    
+    const actions = [];
+    
+    // Check if any selected repos can be mirrored
+    if (selectedRepos.some(repo => repo.status === "imported" || repo.status === "failed")) {
+      actions.push('mirror');
+    }
+    
+    // Check if any selected repos can be synced
+    if (selectedRepos.some(repo => repo.status === "mirrored" || repo.status === "synced")) {
+      actions.push('sync');
+    }
+    
+    // Check if any selected repos are failed
+    if (selectedRepos.some(repo => repo.status === "failed")) {
+      actions.push('retry');
+    }
+    
+    return actions;
+  };
+  
+  const availableActions = getAvailableActions();
+
   return (
     <div className="flex flex-col gap-y-8">
       {/* Combine search and actions into a single flex row */}
@@ -471,14 +626,69 @@ export default function Repository() {
           <RefreshCw className="h-4 w-4" />
         </Button>
 
-        <Button
-          variant="default"
-          onClick={handleMirrorAllRepos}
-          disabled={isInitialLoading || loadingRepoIds.size > 0}
-        >
-          <FlipHorizontal className="h-4 w-4 mr-2" />
-          Mirror All
-        </Button>
+        {/* Context-aware action buttons */}
+        {selectedRepoIds.size === 0 ? (
+          <Button
+            variant="default"
+            onClick={handleMirrorAllRepos}
+            disabled={isInitialLoading || loadingRepoIds.size > 0}
+          >
+            <FlipHorizontal className="h-4 w-4 mr-2" />
+            Mirror All
+          </Button>
+        ) : (
+          <div className="flex items-center gap-2">
+            <div className="flex items-center gap-2 px-3 py-1 bg-muted/50 rounded-md">
+              <span className="text-sm font-medium">
+                {selectedRepoIds.size} selected
+              </span>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="h-6 w-6"
+                onClick={() => setSelectedRepoIds(new Set())}
+              >
+                <X className="h-4 w-4" />
+              </Button>
+            </div>
+            
+            {availableActions.includes('mirror') && (
+              <Button
+                variant="default"
+                size="sm"
+                onClick={handleBulkMirror}
+                disabled={loadingRepoIds.size > 0}
+              >
+                <FlipHorizontal className="h-4 w-4 mr-2" />
+                Mirror ({selectedRepoIds.size})
+              </Button>
+            )}
+            
+            {availableActions.includes('sync') && (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={handleBulkSync}
+                disabled={loadingRepoIds.size > 0}
+              >
+                <RefreshCw className="h-4 w-4 mr-2" />
+                Sync ({selectedRepoIds.size})
+              </Button>
+            )}
+            
+            {availableActions.includes('retry') && (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={handleBulkRetry}
+                disabled={loadingRepoIds.size > 0}
+              >
+                <RotateCcw className="h-4 w-4 mr-2" />
+                Retry
+              </Button>
+            )}
+          </div>
+        )}
       </div>
 
       {!isGitHubConfigured ? (
@@ -509,6 +719,9 @@ export default function Repository() {
           onSync={handleSyncRepo}
           onRetry={handleRetryRepoAction}
           loadingRepoIds={loadingRepoIds}
+          selectedRepoIds={selectedRepoIds}
+          onSelectionChange={setSelectedRepoIds}
+          onRefresh={() => fetchRepositories(false)}
         />
       )}
 

src/components/repositories/RepositoryTable.tsx

@@ -1,7 +1,7 @@
 import { useMemo, useRef } from "react";
 import Fuse from "fuse.js";
 import { useVirtualizer } from "@tanstack/react-virtual";
-import { FlipHorizontal, GitFork, RefreshCw, RotateCcw } from "lucide-react";
+import { FlipHorizontal, GitFork, RefreshCw, RotateCcw, Star } from "lucide-react";
 import { SiGithub, SiGitea } from "react-icons/si";
 import type { Repository } from "@/lib/db/schema";
 import { Button } from "@/components/ui/button";
@@ -9,6 +9,14 @@ import { formatDate, getStatusColor } from "@/lib/utils";
 import type { FilterParams } from "@/types/filter";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useGiteaConfig } from "@/hooks/useGiteaConfig";
+import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { InlineDestinationEditor } from "./InlineDestinationEditor";
 
 interface RepositoryTableProps {
   repositories: Repository[];
@@ -20,6 +28,9 @@ interface RepositoryTableProps {
   onSync: ({ repoId }: { repoId: string }) => Promise<void>;
   onRetry: ({ repoId }: { repoId: string }) => Promise<void>;
   loadingRepoIds: Set<string>;
+  selectedRepoIds: Set<string>;
+  onSelectionChange: (selectedIds: Set<string>) => void;
+  onRefresh?: () => Promise<void>;
 }
 
 export default function RepositoryTable({
@@ -32,10 +43,36 @@ export default function RepositoryTable({
   onSync,
   onRetry,
   loadingRepoIds,
+  selectedRepoIds,
+  onSelectionChange,
+  onRefresh,
 }: RepositoryTableProps) {
   const tableParentRef = useRef<HTMLDivElement>(null);
   const { giteaConfig } = useGiteaConfig();
 
+  const handleUpdateDestination = async (repoId: string, newDestination: string | null) => {
+    // Call API to update repository destination
+    const response = await fetch(`/api/repositories/${repoId}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        destinationOrg: newDestination,
+      }),
+    });
+
+    if (!response.ok) {
+      const errorData = await response.json();
+      throw new Error(errorData.error || "Failed to update repository");
+    }
+
+    // Refresh repositories data
+    if (onRefresh) {
+      await onRefresh();
+    }
+  };
+
   // Helper function to construct Gitea repository URL
   const getGiteaRepoUrl = (repository: Repository): string | null => {
     if (!giteaConfig?.url) {
@@ -105,9 +142,36 @@ export default function RepositoryTable({
     overscan: 5,
   });
 
+  // Selection handlers
+  const handleSelectAll = (checked: boolean) => {
+    if (checked) {
+      const allIds = new Set(filteredRepositories.map(repo => repo.id).filter((id): id is string => !!id));
+      onSelectionChange(allIds);
+    } else {
+      onSelectionChange(new Set());
+    }
+  };
+
+  const handleSelectRepo = (repoId: string, checked: boolean) => {
+    const newSelection = new Set(selectedRepoIds);
+    if (checked) {
+      newSelection.add(repoId);
+    } else {
+      newSelection.delete(repoId);
+    }
+    onSelectionChange(newSelection);
+  };
+
+  const isAllSelected = filteredRepositories.length > 0 && 
+    filteredRepositories.every(repo => repo.id && selectedRepoIds.has(repo.id));
+  const isPartiallySelected = selectedRepoIds.size > 0 && !isAllSelected;
+
   return isLoading ? (
     <div className="border rounded-md">
       <div className="h-[45px] flex items-center justify-between border-b bg-muted/50">
+        <div className="h-full p-3 flex items-center justify-center flex-[0.3]">
+          <Skeleton className="h-4 w-4" />
+        </div>
         <div className="h-full p-3 text-sm font-medium flex-[2.5]">
           Repository
         </div>
@@ -132,6 +196,9 @@ export default function RepositoryTable({
           key={i}
           className="h-[65px] flex items-center justify-between border-b bg-transparent"
         >
+          <div className="h-full p-3 flex items-center justify-center flex-[0.3]">
+            <Skeleton className="h-4 w-4" />
+          </div>
           <div className="h-full p-3 text-sm font-medium flex-[2.5]">
             <Skeleton className="h-full w-full" />
           </div>
@@ -187,6 +254,14 @@ export default function RepositoryTable({
     <div className="flex flex-col border rounded-md">
       {/* table header */}
       <div className="h-[45px] flex items-center justify-between border-b bg-muted/50">
+        <div className="h-full p-3 flex items-center justify-center flex-[0.3]">
+          <Checkbox 
+            checked={isAllSelected}
+            indeterminate={isPartiallySelected}
+            onCheckedChange={handleSelectAll}
+            aria-label="Select all repositories"
+          />
+        </div>
         <div className="h-full p-3 text-sm font-medium flex-[2.5]">
           Repository
         </div>
@@ -235,11 +310,25 @@ export default function RepositoryTable({
                 data-index={virtualRow.index}
                 className="h-[65px] flex items-center justify-between bg-transparent border-b hover:bg-muted/50" //the height is set according to the row content. right now the highest row is in the repo column which is arround 64.99px
               >
+                {/* Checkbox */}
+                <div className="h-full p-3 flex items-center justify-center flex-[0.3]">
+                  <Checkbox 
+                    checked={repo.id ? selectedRepoIds.has(repo.id) : false}
+                    onCheckedChange={(checked) => repo.id && handleSelectRepo(repo.id, !!checked)}
+                    aria-label={`Select ${repo.name}`}
+                  />
+                </div>
+
                 {/* Repository  */}
                 <div className="h-full p-3 flex items-center gap-2 flex-[2.5]">
                   <GitFork className="h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div className="font-medium">{repo.name}</div>
+                  <div className="flex-1">
+                    <div className="font-medium flex items-center gap-1">
+                      {repo.name}
+                      {repo.isStarred && (
+                        <Star className="h-3 w-3 fill-yellow-500 text-yellow-500" />
+                      )}
+                    </div>
                     <div className="text-xs text-muted-foreground">
                       {repo.fullName}
                     </div>
@@ -249,6 +338,11 @@ export default function RepositoryTable({
                       Private
                     </span>
                   )}
+                  {repo.isForked && (
+                    <span className="ml-2 rounded-full bg-muted px-2 py-0.5 text-xs">
+                      Fork
+                    </span>
+                  )}
                 </div>
 
                 {/* Owner  */}
@@ -258,7 +352,12 @@ export default function RepositoryTable({
 
                 {/* Organization  */}
                 <div className="h-full p-3 flex items-center flex-[1]">
-                  <p className="text-sm"> {repo.organization || "-"}</p>
+                  <InlineDestinationEditor
+                    repository={repo}
+                    giteaConfig={giteaConfig}
+                    onUpdate={handleUpdateDestination}
+                    isUpdating={loadingRepoIds.has(repo.id ?? "")}
+                  />
                 </div>
 
                 {/* Last Mirrored  */}
@@ -272,12 +371,26 @@ export default function RepositoryTable({
 
                 {/* Status  */}
                 <div className="h-full p-3 flex items-center gap-x-2 flex-[1]">
-                  <div
-                    className={`h-2 w-2 rounded-full ${getStatusColor(
-                      repo.status
-                    )}`}
-                  />
-                  <span className="text-sm capitalize">{repo.status}</span>
+                  {repo.status === "failed" && repo.errorMessage ? (
+                    <TooltipProvider>
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <div className="flex items-center gap-x-2 cursor-help">
+                            <div className={`h-2 w-2 rounded-full ${getStatusColor(repo.status)}`} />
+                            <span className="text-sm capitalize underline decoration-dotted">{repo.status}</span>
+                          </div>
+                        </TooltipTrigger>
+                        <TooltipContent className="max-w-xs">
+                          <p className="text-sm">{repo.errorMessage}</p>
+                        </TooltipContent>
+                      </Tooltip>
+                    </TooltipProvider>
+                  ) : (
+                    <>
+                      <div className={`h-2 w-2 rounded-full ${getStatusColor(repo.status)}`} />
+                      <span className="text-sm capitalize">{repo.status}</span>
+                    </>
+                  )}
                 </div>
 
                 {/* Actions  */}

src/components/ui/accordion.tsx

@@ -0,0 +1,64 @@
+import * as React from "react"
+import * as AccordionPrimitive from "@radix-ui/react-accordion"
+import { ChevronDownIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+function Accordion({
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Root>) {
+  return <AccordionPrimitive.Root data-slot="accordion" {...props} />
+}
+
+function AccordionItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Item>) {
+  return (
+    <AccordionPrimitive.Item
+      data-slot="accordion-item"
+      className={cn("border-b last:border-b-0", className)}
+      {...props}
+    />
+  )
+}
+
+function AccordionTrigger({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Trigger>) {
+  return (
+    <AccordionPrimitive.Header className="flex">
+      <AccordionPrimitive.Trigger
+        data-slot="accordion-trigger"
+        className={cn(
+          "focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180",
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon className="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200" />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  )
+}
+
+function AccordionContent({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Content>) {
+  return (
+    <AccordionPrimitive.Content
+      data-slot="accordion-content"
+      className="data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm"
+      {...props}
+    >
+      <div className={cn("pt-0 pb-4", className)}>{children}</div>
+    </AccordionPrimitive.Content>
+  )
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }

src/components/ui/badge.tsx

@@ -0,0 +1,46 @@
+import * as React from "react"
+import { Slot } from "@radix-ui/react-slot"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const badgeVariants = cva(
+  "inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",
+  {
+    variants: {
+      variant: {
+        default:
+          "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
+        secondary:
+          "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
+        destructive:
+          "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+        outline:
+          "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  }
+)
+
+function Badge({
+  className,
+  variant,
+  asChild = false,
+  ...props
+}: React.ComponentProps<"span"> &
+  VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : "span"
+
+  return (
+    <Comp
+      data-slot="badge"
+      className={cn(badgeVariants({ variant }), className)}
+      {...props}
+    />
+  )
+}
+
+export { Badge, badgeVariants }

src/components/ui/collapsible.tsx

@@ -0,0 +1,31 @@
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
+
+function Collapsible({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
+  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />
+}
+
+function CollapsibleTrigger({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
+  return (
+    <CollapsiblePrimitive.CollapsibleTrigger
+      data-slot="collapsible-trigger"
+      {...props}
+    />
+  )
+}
+
+function CollapsibleContent({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
+  return (
+    <CollapsiblePrimitive.CollapsibleContent
+      data-slot="collapsible-content"
+      {...props}
+    />
+  )
+}
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent }

src/components/ui/hover-card.tsx

@@ -0,0 +1,42 @@
+import * as React from "react"
+import * as HoverCardPrimitive from "@radix-ui/react-hover-card"
+
+import { cn } from "@/lib/utils"
+
+function HoverCard({
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Root>) {
+  return <HoverCardPrimitive.Root data-slot="hover-card" {...props} />
+}
+
+function HoverCardTrigger({
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Trigger>) {
+  return (
+    <HoverCardPrimitive.Trigger data-slot="hover-card-trigger" {...props} />
+  )
+}
+
+function HoverCardContent({
+  className,
+  align = "center",
+  sideOffset = 4,
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Content>) {
+  return (
+    <HoverCardPrimitive.Portal data-slot="hover-card-portal">
+      <HoverCardPrimitive.Content
+        data-slot="hover-card-content"
+        align={align}
+        sideOffset={sideOffset}
+        className={cn(
+          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-64 origin-(--radix-hover-card-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",
+          className
+        )}
+        {...props}
+      />
+    </HoverCardPrimitive.Portal>
+  )
+}
+
+export { HoverCard, HoverCardTrigger, HoverCardContent }

src/components/ui/radio-group.tsx

@@ -0,0 +1,43 @@
+import * as React from "react"
+import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"
+import { CircleIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+function RadioGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof RadioGroupPrimitive.Root>) {
+  return (
+    <RadioGroupPrimitive.Root
+      data-slot="radio-group"
+      className={cn("grid gap-3", className)}
+      {...props}
+    />
+  )
+}
+
+function RadioGroupItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof RadioGroupPrimitive.Item>) {
+  return (
+    <RadioGroupPrimitive.Item
+      data-slot="radio-group-item"
+      className={cn(
+        "border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+        className
+      )}
+      {...props}
+    >
+      <RadioGroupPrimitive.Indicator
+        data-slot="radio-group-indicator"
+        className="relative flex items-center justify-center"
+      >
+        <CircleIcon className="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2" />
+      </RadioGroupPrimitive.Indicator>
+    </RadioGroupPrimitive.Item>
+  )
+}
+
+export { RadioGroup, RadioGroupItem }

src/components/ui/scroll-area.tsx

@@ -0,0 +1,56 @@
+import * as React from "react"
+import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
+
+import { cn } from "@/lib/utils"
+
+function ScrollArea({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof ScrollAreaPrimitive.Root>) {
+  return (
+    <ScrollAreaPrimitive.Root
+      data-slot="scroll-area"
+      className={cn("relative", className)}
+      {...props}
+    >
+      <ScrollAreaPrimitive.Viewport
+        data-slot="scroll-area-viewport"
+        className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1"
+      >
+        {children}
+      </ScrollAreaPrimitive.Viewport>
+      <ScrollBar />
+      <ScrollAreaPrimitive.Corner />
+    </ScrollAreaPrimitive.Root>
+  )
+}
+
+function ScrollBar({
+  className,
+  orientation = "vertical",
+  ...props
+}: React.ComponentProps<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>) {
+  return (
+    <ScrollAreaPrimitive.ScrollAreaScrollbar
+      data-slot="scroll-area-scrollbar"
+      orientation={orientation}
+      className={cn(
+        "flex touch-none p-px transition-colors select-none",
+        orientation === "vertical" &&
+          "h-full w-2.5 border-l border-l-transparent",
+        orientation === "horizontal" &&
+          "h-2.5 flex-col border-t border-t-transparent",
+        className
+      )}
+      {...props}
+    >
+      <ScrollAreaPrimitive.ScrollAreaThumb
+        data-slot="scroll-area-thumb"
+        className="bg-border relative flex-1 rounded-full"
+      />
+    </ScrollAreaPrimitive.ScrollAreaScrollbar>
+  )
+}
+
+export { ScrollArea, ScrollBar }

src/components/ui/separator.tsx

@@ -0,0 +1,26 @@
+import * as React from "react"
+import * as SeparatorPrimitive from "@radix-ui/react-separator"
+
+import { cn } from "@/lib/utils"
+
+function Separator({
+  className,
+  orientation = "horizontal",
+  decorative = true,
+  ...props
+}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
+  return (
+    <SeparatorPrimitive.Root
+      data-slot="separator"
+      decorative={decorative}
+      orientation={orientation}
+      className={cn(
+        "bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { Separator }

src/components/ui/tooltip.tsx

@@ -19,7 +19,11 @@ function TooltipProvider({
 function Tooltip({
   ...props
 }: React.ComponentProps<typeof TooltipPrimitive.Root>) {
-  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
+  return (
+    <TooltipProvider>
+      <TooltipPrimitive.Root data-slot="tooltip" {...props} />
+    </TooltipProvider>
+  )
 }
 
 function TooltipTrigger({
@@ -40,7 +44,7 @@ function TooltipContent({
         data-slot="tooltip-content"
         sideOffset={sideOffset}
         className={cn(
-          "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-[var(--radix-tooltip-content-transform-origin)] rounded-md px-3 py-1.5 text-xs text-balance",
+          "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
           className
         )}
         {...props}

src/content/config.ts

@@ -1,17 +1,4 @@
 import { defineCollection, z } from 'astro:content';
 
-// Define a schema for the documentation collection
-const docsCollection = defineCollection({
-  type: 'content',
-  schema: z.object({
-    title: z.string(),
-    description: z.string(),
-    order: z.number().optional(),
-    updatedDate: z.date().optional(),
-  }),
-});
-
-// Export the collections
-export const collections = {
-  'docs': docsCollection,
-};
+// Export empty collections since docs have been moved
+export const collections = {};

src/content/docs/architecture.md

@@ -1,123 +0,0 @@
----
-title: "Architecture"
-description: "Comprehensive overview of the Gitea Mirror application architecture."
-order: 1
-updatedDate: 2025-05-22
----
-
-<div class="mb-6">
-  <h1 class="text-2xl font-bold text-foreground">Gitea Mirror Architecture</h1>
-  <p class="text-muted-foreground mt-2">This document provides a comprehensive overview of the Gitea Mirror application architecture, including component diagrams, project structure, and detailed explanations of each part of the system.</p>
-</div>
-
-## System Overview
-
-<div class="mb-4">
-  <p class="text-muted-foreground">Gitea Mirror is a web application that automates the mirroring of GitHub repositories to Gitea instances. It provides a user-friendly interface for configuring, monitoring, and managing mirroring operations without requiring users to edit configuration files or run Docker commands.</p>
-</div>
-
-The application is built using:
-
-- <span class="font-semibold text-foreground">Astro</span>: Web framework for the frontend
-- <span class="font-semibold text-foreground">React</span>: Component library for interactive UI elements
-- <span class="font-semibold text-foreground">Shadcn UI</span>: UI component library built on Tailwind CSS
-- <span class="font-semibold text-foreground">SQLite</span>: Database for storing configuration, state, and events
-- <span class="font-semibold text-foreground">Bun</span>: Runtime environment for the backend
-- <span class="font-semibold text-foreground">Drizzle ORM</span>: Type-safe ORM for database interactions
-
-## Architecture Diagram
-
-```mermaid
-graph TD
-    subgraph "Gitea Mirror"
-        Frontend["Frontend<br/>(Astro + React)"]
-        Backend["Backend<br/>(Bun)"]
-        Database["Database<br/>(SQLite + Drizzle)"]
-
-        Frontend <--> Backend
-        Backend <--> Database
-    end
-
-    subgraph "External APIs"
-        GitHub["GitHub API"]
-        Gitea["Gitea API"]
-    end
-
-    Backend --> GitHub
-    Backend --> Gitea
-```
-
-## Component Breakdown
-
-### Frontend (Astro + React)
-
-The frontend is built with Astro, a modern web framework that allows for server-side rendering and partial hydration. React components are used for interactive elements, providing a responsive and dynamic user interface.
-
-Key frontend components:
-
-- **Dashboard**: Overview of mirroring status and recent activity
-- **Repository Management**: Interface for managing repositories to mirror
-- **Organization Management**: Interface for managing GitHub organizations
-- **Configuration**: Settings for GitHub and Gitea connections
-- **Activity Log**: Detailed log of mirroring operations
-
-### Backend (Bun)
-
-The backend is built with Bun and provides API endpoints for the frontend to interact with. It handles:
-
-- Authentication and user management
-- GitHub API integration
-- Gitea API integration
-- Mirroring operations
-- Database interactions
-
-### Database (SQLite + Drizzle ORM)
-
-SQLite with Bun's native SQLite driver is used for data persistence, with Drizzle ORM providing type-safe database interactions. The database stores:
-
-- User accounts and authentication data
-- GitHub and Gitea configuration
-- Repository and organization information
-- Mirroring job history and status
-- Event notifications and their read status
-
-## Data Flow
-
-1. **User Authentication**: Users authenticate through the frontend, which communicates with the backend to validate credentials.
-2. **Configuration**: Users configure GitHub and Gitea settings through the UI, which are stored in the SQLite database.
-3. **Repository Discovery**: The backend queries the GitHub API to discover repositories based on user configuration.
-4. **Mirroring Process**: When triggered, the backend fetches repository data from GitHub and pushes it to Gitea.
-5. **Status Tracking**: All operations are logged in the database and displayed in the Activity Log.
-
-## Project Structure
-
-```
-gitea-mirror/
-├── src/                  # Source code
-│   ├── components/       # React components
-│   ├── content/          # Documentation and content
-│   ├── layouts/          # Astro layout components
-│   ├── lib/              # Utility functions and database
-│   ├── pages/            # Astro pages and API routes
-│   └── styles/           # CSS and Tailwind styles
-├── public/               # Static assets
-├── data/                 # Database and persistent data
-├── docker/               # Docker configuration
-└── scripts/              # Utility scripts for deployment and maintenance
-    ├── gitea-mirror-lxc-local.sh    # Local LXC deployment script
-    └── manage-db.ts                 # Database management tool
-```
-
-## Deployment Options
-
-Gitea Mirror supports multiple deployment options:
-
-1. **Docker**: Run as a containerized application using Docker and docker-compose
-2. **LXC Containers**: Deploy in Linux Containers (LXC) on Proxmox VE (using community script by [Tobias/CrazyWolf13](https://github.com/CrazyWolf13)) or local workstations
-3. **Native**: Run directly on the host system using Bun runtime
-
-Each deployment method has its own advantages:
-
-- **Docker**: Isolation, easy updates, consistent environment
-- **LXC**: Lightweight virtualization, better performance than Docker, system-level isolation
-- **Native**: Best performance, direct access to system resources

src/content/docs/configuration.md

@@ -1,176 +0,0 @@
----
-title: "Configuration"
-description: "Guide to configuring Gitea Mirror for your environment."
-order: 2
-updatedDate: 2025-05-22
----
-
-<div class="mb-6">
-  <h1 class="text-2xl font-bold text-foreground">Gitea Mirror Configuration Guide</h1>
-  <p class="text-muted-foreground mt-2">This guide provides detailed information on how to configure Gitea Mirror for your environment.</p>
-</div>
-
-## Configuration Methods
-
-Gitea Mirror can be configured using:
-
-1. <span class="font-semibold text-foreground">Environment Variables</span>: Set configuration options through environment variables
-2. <span class="font-semibold text-foreground">Web UI</span>: Configure the application through the web interface after installation
-
-## Environment Variables
-
-The following environment variables can be used to configure Gitea Mirror:
-
-| Variable | Description | Default Value | Example |
-|----------|-------------|---------------|---------|
-| `NODE_ENV` | Runtime environment (development, production, test) | `development` | `production` |
-| `DATABASE_URL` | SQLite database URL | `file:data/gitea-mirror.db` | `file:path/to/your/database.db` |
-| `JWT_SECRET` | Secret key for JWT authentication | Auto-generated secure random string | `your-secure-random-string` |
-| `HOST` | Server host | `localhost` | `0.0.0.0` |
-| `PORT` | Server port | `4321` | `8080` |
-
-### Important Security Note
-
-The application 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.
-
-While this auto-generation feature provides good security by default, you can still explicitly set your own `JWT_SECRET` for complete control over your deployment.
-
-## Web UI Configuration
-
-After installing and starting Gitea Mirror, you can configure it through the web interface:
-
-1. Navigate to `http://your-server:port/`
-2. If this is your first time, you'll be guided through creating an admin account
-3. Log in with your credentials
-4. Go to the Configuration page
-
-### GitHub Configuration
-
-The GitHub configuration section allows you to connect to GitHub and specify which repositories to mirror.
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| Username | Your GitHub username | - |
-| Token | GitHub personal access token | - |
-| Skip Forks | Skip forked repositories | `false` |
-| Private Repositories | Include private repositories | `false` |
-| Mirror Issues | Mirror issues from GitHub to Gitea | `false` |
-| Mirror Starred | Mirror starred repositories | `false` |
-| Mirror Organizations | Mirror organization repositories | `false` |
-| Only Mirror Orgs | Only mirror organization repositories | `false` |
-| Preserve Org Structure | Maintain organization structure in Gitea | `false` |
-| Skip Starred Issues | Skip mirroring issues for starred repositories | `false` |
-
-#### GitHub Token Permissions
-
-Your GitHub token needs the following permissions:
-
-- `repo` - Full control of private repositories
-- `read:org` - Read organization membership
-- `read:user` - Read user profile data
-
-To create a GitHub token:
-
-1. Go to [GitHub Settings > Developer settings > Personal access tokens](https://github.com/settings/tokens)
-2. Click "Generate new token"
-3. Select the required permissions
-4. Copy the generated token and paste it into Gitea Mirror
-
-### Gitea Configuration
-
-The Gitea configuration section allows you to connect to your Gitea instance and specify how repositories should be mirrored.
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| URL | Gitea server URL | - |
-| Token | Gitea access token | - |
-| Organization | Default organization for mirrored repositories | - |
-| Visibility | Default visibility for mirrored repositories | `public` |
-| Starred Repos Org | Organization for starred repositories | `github` |
-
-#### Gitea Token Creation
-
-To create a Gitea access token:
-
-1. Log in to your Gitea instance
-2. Go to Settings > Applications
-3. Under "Generate New Token", enter a name for your token
-4. Click "Generate Token"
-5. Copy the generated token and paste it into Gitea Mirror
-
-### Schedule Configuration
-
-You can configure automatic mirroring on a schedule:
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| Enable Scheduling | Enable automatic mirroring | `false` |
-| Interval (seconds) | Time between mirroring operations | `3600` (1 hour) |
-
-## Advanced Configuration
-
-### Repository Filtering
-
-You can include or exclude specific repositories using patterns:
-
-- Include patterns: Only repositories matching these patterns will be mirrored
-- Exclude patterns: Repositories matching these patterns will be skipped
-
-Example patterns:
-- `*` - All repositories
-- `org-name/*` - All repositories in a specific organization
-- `username/repo-name` - A specific repository
-
-### Database Management
-
-Gitea Mirror includes several database management tools that can be run from the command line:
-
-```bash
-# Initialize the database (only if it doesn't exist)
-bun run init-db
-
-# Check database status
-bun run check-db
-
-# Fix database location issues
-bun run fix-db
-
-# Reset all users (for testing signup flow)
-bun run reset-users
-
-# Remove database files completely
-bun run cleanup-db
-```
-
-### Event Management
-
-Events in Gitea Mirror (such as repository mirroring operations) are stored in the SQLite database. You can manage these events using the following scripts:
-
-```bash
-# View all events in the database
-bun scripts/check-events.ts
-
-# Mark all events as read
-bun scripts/mark-events-read.ts
-```
-
-For cleaning up old activities and events, use the cleanup button in the Activity Log page of the web interface.
-
-### Health Check Endpoint
-
-Gitea Mirror includes a built-in health check endpoint at `/api/health` that provides:
-
-- System status and uptime
-- Database connectivity check
-- Memory usage statistics
-- Environment information
-
-You can use this endpoint for monitoring your deployment:
-
-```bash
-# Basic check (returns 200 OK if healthy)
-curl -I http://your-server:port/api/health
-
-# Detailed health information (JSON)
-curl http://your-server:port/api/health
-```

src/content/docs/quickstart.md

@@ -1,182 +0,0 @@
----
-title: "Quick Start Guide"
-description: "Get started with Gitea Mirror quickly."
-order: 3
-updatedDate: 2025-05-22
----
-
-<div class="mb-6">
-  <h1 class="text-2xl font-bold text-foreground">Gitea Mirror Quick Start Guide</h1>
-  <p class="text-muted-foreground mt-2">This guide will help you get Gitea Mirror up and running quickly.</p>
-</div>
-
-## Prerequisites
-
-Before you begin, make sure you have:
-
-1. <span class="font-semibold text-foreground">A GitHub account with a personal access token</span>
-2. <span class="font-semibold text-foreground">A Gitea instance with an access token</span>
-3. <span class="font-semibold text-foreground">One of the following:</span>
-   - Docker and docker-compose (for Docker deployment)
-   - Bun 1.2.9+ (for native deployment)
-   - Proxmox VE or LXD (for LXC container deployment)
-
-## Installation Options
-
-Choose the installation method that works best for your environment.
-
-### Using Docker (Recommended for most users)
-
-Docker provides the easiest way to get started with minimal configuration.
-
-1. Clone the repository:
-   ```bash
-   git clone https://github.com/arunavo4/gitea-mirror.git
-   cd gitea-mirror
-   ```
-
-2. Start the application in production mode:
-   ```bash
-   docker compose up -d
-   ```
-
-3. Access the application at [http://localhost:4321](http://localhost:4321)
-
-### Using Bun (Native Installation)
-
-If you prefer to run the application directly on your system:
-
-1. Clone the repository:
-   ```bash
-   git clone https://github.com/arunavo4/gitea-mirror.git
-   cd gitea-mirror
-   ```
-
-2. Run the quick setup script:
-   ```bash
-   bun run setup
-   ```
-   This installs dependencies and initializes the database.
-
-3. Choose how to run the application:
-
-   **Development Mode:**
-   ```bash
-   bun run dev
-   ```
-
-   Note: For Bun-specific features, use:
-   ```bash
-   bunx --bun astro dev
-   ```
-
-   **Production Mode:**
-   ```bash
-   bun run build
-   bun run start
-   ```
-
-4. Access the application at [http://localhost:4321](http://localhost:4321)
-
-### Using LXC Containers (Recommended for server deployments)
-
-#### Proxmox VE (Online Installation)
-
-For deploying on a Proxmox VE host with internet access:
-
-```bash
-# Optional env overrides: CTID HOSTNAME STORAGE DISK_SIZE CORES MEMORY BRIDGE IP_CONF
-sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/arunavo4/gitea-mirror/main/scripts/gitea-mirror-lxc-proxmox.sh)"
-```
-
-This script:
-- Creates a privileged LXC container
-- Installs Bun and dependencies
-- Clones and builds the application
-- Sets up a systemd service
-
-#### Local LXD (Offline-friendly Installation)
-
-For testing on a local workstation or in environments without internet access:
-
-1. Clone the repository locally:
-   ```bash
-   git clone https://github.com/arunavo4/gitea-mirror.git
-   ```
-
-2. Download the Bun installer once:
-   ```bash
-   curl -L -o /tmp/bun-linux-x64.zip https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64.zip
-   ```
-
-3. Run the local LXC installer:
-   ```bash
-   sudo LOCAL_REPO_DIR=~/path/to/gitea-mirror ./gitea-mirror/scripts/gitea-mirror-lxc-local.sh
-   ```
-
-For more details on LXC deployment, see the [LXC Container Deployment Guide](https://github.com/arunavo4/gitea-mirror/blob/main/scripts/README-lxc.md).
-
-## Initial Configuration
-
-Follow these steps to configure Gitea Mirror for first use:
-
-1. **Create Admin Account**
-   - Upon first access, you'll be prompted to create an admin account
-   - Choose a secure username and password
-   - This will be your administrator account
-
-2. **Configure GitHub Connection**
-   - Navigate to the Configuration page
-   - Enter your GitHub username
-   - Enter your GitHub personal access token
-   - Select which repositories to mirror (all, starred, organizations)
-   - Configure repository filtering options
-
-3. **Configure Gitea Connection**
-   - Enter your Gitea server URL
-   - Enter your Gitea access token
-   - Configure organization and visibility settings
-
-4. **Set Up Scheduling (Optional)**
-   - Enable automatic mirroring if desired
-   - Set the mirroring interval (in seconds)
-
-5. **Save Configuration**
-   - Click the "Save" button to store your settings
-
-## Performing Your First Mirror
-
-After completing the configuration, you can start mirroring repositories:
-
-1. Click "Import GitHub Data" to fetch repositories from GitHub
-2. Go to the Repositories page to view your imported repositories
-3. Select the repositories you want to mirror
-4. Click "Mirror Selected" to start the mirroring process
-5. Monitor the progress on the Activity page
-6. You'll receive toast notifications about the success or failure of operations
-
-## Troubleshooting
-
-If you encounter any issues:
-
-- Check the Activity Log for detailed error messages
-- Verify your GitHub and Gitea tokens have the correct permissions
-- Ensure your Gitea instance is accessible from the machine running Gitea Mirror
-- Check logs based on your deployment method:
-  - Docker: `docker logs gitea-mirror`
-  - Native: Check the terminal output or system logs
-  - LXC: `systemctl status gitea-mirror` or `journalctl -u gitea-mirror -f`
-- Use the health check endpoint to verify system status: `curl http://your-server:4321/api/health`
-- For database issues, try the database management tools: `bun run check-db` or `bun run fix-db`
-
-## Next Steps
-
-After your initial setup:
-
-- Explore the dashboard for an overview of your mirroring status
-- Set up automatic mirroring schedules for hands-off operation
-- Configure organization mirroring for team repositories
-- Check out the [Configuration Guide](/configuration) for advanced settings
-- Review the [Architecture Documentation](/architecture) to understand the system
-- For server deployments, set up monitoring using the health check endpoint
-- Use the cleanup button in the Activity Log page to manage old events and activities

src/hooks/useMirror.ts

@@ -1,83 +0,0 @@
-import { useState } from 'react';
-import { mirrorApi } from '@/lib/api';
-import type { MirrorJob } from '@/lib/db/schema';
-
-export function useMirror() {
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [currentJob, setCurrentJob] = useState<MirrorJob | null>(null);
-  const [jobs, setJobs] = useState<MirrorJob[]>([]);
-
-  const startMirror = async (configId: string, repositoryIds?: string[]) => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      const job = await mirrorApi.startMirror(configId, repositoryIds);
-      setCurrentJob(job);
-      return job;
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to start mirroring');
-      throw err;
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const getMirrorJobs = async (configId: string) => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      const fetchedJobs = await mirrorApi.getMirrorJobs(configId);
-      setJobs(fetchedJobs);
-      return fetchedJobs;
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to fetch mirror jobs');
-      throw err;
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const getMirrorJob = async (jobId: string) => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      const job = await mirrorApi.getMirrorJob(jobId);
-      setCurrentJob(job);
-      return job;
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to fetch mirror job');
-      throw err;
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const cancelMirrorJob = async (jobId: string) => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      const result = await mirrorApi.cancelMirrorJob(jobId);
-      if (result.success && currentJob?.id === jobId) {
-        setCurrentJob({ ...currentJob, status: 'failed' });
-      }
-      return result;
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to cancel mirror job');
-      throw err;
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return {
-    isLoading,
-    error,
-    currentJob,
-    jobs,
-    startMirror,
-    getMirrorJobs,
-    getMirrorJob,
-    cancelMirrorJob,
-  };
-}

src/lib/db/index.ts

@@ -25,11 +25,256 @@ let sqlite: Database;
 try {
   sqlite = new Database(dbPath);
   console.log("Successfully connected to SQLite database using Bun's native driver");
+
+  // Ensure all required tables exist
+  ensureTablesExist(sqlite);
+
+  // Run migrations
+  runMigrations(sqlite);
 } catch (error) {
   console.error("Error opening database:", error);
   throw error;
 }
 
+/**
+ * Run database migrations
+ */
+function runMigrations(db: Database) {
+  try {
+    // Migration 1: Add destination_org column to organizations table
+    const orgTableInfo = db.query("PRAGMA table_info(organizations)").all() as Array<{name: string}>;
+    const hasDestinationOrg = orgTableInfo.some(col => col.name === 'destination_org');
+
+    if (!hasDestinationOrg) {
+      console.log("🔄 Running migration: Adding destination_org column to organizations table");
+      db.exec("ALTER TABLE organizations ADD COLUMN destination_org TEXT");
+      console.log("✅ Migration completed: destination_org column added");
+    }
+
+    // Migration 2: Add destination_org column to repositories table
+    const repoTableInfo = db.query("PRAGMA table_info(repositories)").all() as Array<{name: string}>;
+    const hasRepoDestinationOrg = repoTableInfo.some(col => col.name === 'destination_org');
+
+    if (!hasRepoDestinationOrg) {
+      console.log("🔄 Running migration: Adding destination_org column to repositories table");
+      db.exec("ALTER TABLE repositories ADD COLUMN destination_org TEXT");
+      console.log("✅ Migration completed: destination_org column added to repositories");
+    }
+  } catch (error) {
+    console.error("❌ Error running migrations:", error);
+    // Don't throw - migrations should be non-breaking
+  }
+}
+
+/**
+ * Ensure all required tables exist in the database
+ */
+function ensureTablesExist(db: Database) {
+  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...`);
+        createTable(db, table);
+        console.log(`✅ Table '${table}' created successfully`);
+      }
+    } catch (error) {
+      console.error(`❌ Error checking/creating table '${table}':`, error);
+      throw error;
+    }
+  }
+}
+
+/**
+ * Create a specific table with its schema
+ */
+function createTable(db: Database, tableName: string) {
+  switch (tableName) {
+    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,
+          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)
+        )
+      `);
+      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,
+          language TEXT,
+          description TEXT,
+          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)
+        )
+      `);
+
+      // Create indexes for repositories
+      db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_repositories_user_id ON repositories(user_id);
+        CREATE INDEX IF NOT EXISTS idx_repositories_config_id ON repositories(config_id);
+        CREATE INDEX IF NOT EXISTS idx_repositories_status ON repositories(status);
+        CREATE INDEX IF NOT EXISTS idx_repositories_owner ON repositories(owner);
+        CREATE INDEX IF NOT EXISTS idx_repositories_organization ON repositories(organization);
+        CREATE INDEX IF NOT EXISTS idx_repositories_is_fork ON repositories(is_fork);
+        CREATE INDEX IF NOT EXISTS idx_repositories_is_starred ON repositories(is_starred);
+      `);
+      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,
+          destination_org 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)
+        )
+      `);
+
+      // Create indexes for organizations
+      db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_organizations_user_id ON organizations(user_id);
+        CREATE INDEX IF NOT EXISTS idx_organizations_config_id ON organizations(config_id);
+        CREATE INDEX IF NOT EXISTS idx_organizations_status ON organizations(status);
+        CREATE INDEX IF NOT EXISTS idx_organizations_is_included ON organizations(is_included);
+      `);
+      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 mirror_jobs
+      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)
+        )
+      `);
+
+      // Create indexes for events
+      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);
+      `);
+      break;
+
+    default:
+      throw new Error(`Unknown table: ${tableName}`);
+  }
+}
+
 // Create drizzle instance with the SQLite client
 export const db = drizzle({ client: sqlite });
 
@@ -226,6 +471,9 @@ export const organizations = sqliteTable("organizations", {
     .notNull()
     .default(true),
 
+  // Override destination organization for this GitHub org's repos
+  destinationOrg: text("destination_org"),
+
   status: text("status").notNull().default("imported"),
   lastMirrored: integer("last_mirrored", { mode: "timestamp" }),
   errorMessage: text("error_message"),

src/lib/db/schema.ts

@@ -26,6 +26,7 @@ export const configSchema = z.object({
     skipForks: z.boolean().default(false),
     privateRepositories: z.boolean().default(false),
     mirrorIssues: z.boolean().default(false),
+    mirrorWiki: z.boolean().default(false),
     mirrorStarred: z.boolean().default(false),
     useSpecificUser: z.boolean().default(false),
     singleRepo: z.string().optional(),
@@ -33,7 +34,6 @@ export const configSchema = z.object({
     excludeOrgs: z.array(z.string()).default([]),
     mirrorPublicOrgs: z.boolean().default(false),
     publicOrgs: z.array(z.string()).default([]),
-    preserveOrgStructure: z.boolean().default(false),
     skipStarredIssues: z.boolean().default(false),
   }),
   giteaConfig: z.object({
@@ -43,6 +43,9 @@ export const configSchema = z.object({
     organization: z.string().optional(),
     visibility: z.enum(["public", "private", "limited"]).default("public"),
     starredReposOrg: z.string().default("github"),
+    preserveOrgStructure: z.boolean().default(false),
+    mirrorStrategy: z.enum(["preserve", "single-org", "flat-user", "mixed"]).optional(),
+    personalReposOrg: z.string().optional(), // Override destination for personal repos
   }),
   include: z.array(z.string()).default(["*"]),
   exclude: z.array(z.string()).default([]),
@@ -98,6 +101,7 @@ export const repositorySchema = z.object({
   errorMessage: z.string().optional(),
 
   mirroredLocation: z.string().default(""), // Store the full Gitea path where repo was mirrored
+  destinationOrg: z.string().optional(), // Custom destination organization override
 
   createdAt: z.date().default(() => new Date()),
   updatedAt: z.date().default(() => new Date()),
@@ -152,6 +156,12 @@ export const organizationSchema = z.object({
   errorMessage: z.string().optional(),
 
   repositoryCount: z.number().default(0),
+  publicRepositoryCount: z.number().optional(),
+  privateRepositoryCount: z.number().optional(),
+  forkRepositoryCount: z.number().optional(),
+
+  // Override destination organization for this GitHub org's repos
+  destinationOrg: z.string().optional(),
 
   createdAt: z.date().default(() => new Date()),
   updatedAt: z.date().default(() => new Date()),

src/lib/gitea.test.ts

@@ -1,6 +1,8 @@
 import { describe, test, expect, mock, beforeEach, afterEach } from "bun:test";
 import { Octokit } from "@octokit/rest";
 import { repoStatusEnum } from "@/types/Repository";
+import { getOrCreateGiteaOrg, getGiteaRepoOwner, getGiteaRepoOwnerAsync } from "./gitea";
+import type { Config, Repository, Organization } from "./db/schema";
 
 // Mock the isRepoPresentInGitea function
 const mockIsRepoPresentInGitea = mock(() => Promise.resolve(false));
@@ -27,23 +29,17 @@ mock.module("@/lib/helpers", () => {
   };
 });
 
-// Mock superagent
-mock.module("superagent", () => {
-  const mockPost = mock(() => ({
-    set: () => ({
-      set: () => ({
-        send: () => Promise.resolve({ body: { id: 123 } })
-      })
-    })
-  }));
-
-  const mockGet = mock(() => ({
-    set: () => Promise.resolve({ body: [] })
-  }));
-
+// Mock http-client
+mock.module("@/lib/http-client", () => {
   return {
-    post: mockPost,
-    get: mockGet
+    httpPost: mock(() => Promise.resolve({ data: { id: 123 }, status: 200, statusText: 'OK', headers: new Headers() })),
+    httpGet: mock(() => Promise.resolve({ data: [], status: 200, statusText: 'OK', headers: new Headers() })),
+    HttpError: class MockHttpError extends Error {
+      constructor(message: string, public status: number, public statusText: string, public response?: string) {
+        super(message);
+        this.name = 'HttpError';
+      }
+    }
   };
 });
 
@@ -117,4 +113,312 @@ describe("Gitea Repository Mirroring", () => {
     // Check that the function was called
     expect(mirrorGithubRepoToGitea).toHaveBeenCalled();
   });
+
+  test("getOrCreateGiteaOrg handles JSON parsing errors gracefully", async () => {
+    // Mock fetch to return invalid JSON
+    const originalFetch = global.fetch;
+    global.fetch = mock(async (url: string) => {
+      if (url.includes("/api/v1/orgs/")) {
+        // Mock response that looks successful but has invalid JSON
+        return {
+          ok: true,
+          status: 200,
+          headers: {
+            get: (name: string) => name === "content-type" ? "application/json" : null
+          },
+          json: () => Promise.reject(new Error("Unexpected token in JSON")),
+          text: () => Promise.resolve("Invalid JSON response"),
+          clone: function() {
+            return {
+              text: () => Promise.resolve("Invalid JSON response")
+            };
+          }
+        } as any;
+      }
+      return originalFetch(url);
+    });
+
+    const config = {
+      userId: "user-id",
+      giteaConfig: {
+        url: "https://gitea.example.com",
+        token: "gitea-token"
+      }
+    };
+
+    try {
+      await getOrCreateGiteaOrg({
+        orgName: "test-org",
+        config
+      });
+      // Should not reach here
+      expect(true).toBe(false);
+    } catch (error) {
+      // Should catch the JSON parsing error with a descriptive message
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toContain("Failed to parse JSON response from Gitea API");
+    } finally {
+      // Restore original fetch
+      global.fetch = originalFetch;
+    }
+  });
+
+  test("getOrCreateGiteaOrg handles non-JSON content-type gracefully", async () => {
+    // Mock fetch to return HTML instead of JSON
+    const originalFetch = global.fetch;
+    global.fetch = mock(async (url: string) => {
+      if (url.includes("/api/v1/orgs/")) {
+        return {
+          ok: true,
+          status: 200,
+          headers: {
+            get: (name: string) => name === "content-type" ? "text/html" : null
+          },
+          text: () => Promise.resolve("<html><body>Error page</body></html>")
+        } as any;
+      }
+      return originalFetch(url);
+    });
+
+    const config = {
+      userId: "user-id",
+      giteaConfig: {
+        url: "https://gitea.example.com",
+        token: "gitea-token"
+      }
+    };
+
+    try {
+      await getOrCreateGiteaOrg({
+        orgName: "test-org",
+        config
+      });
+      // Should not reach here
+      expect(true).toBe(false);
+    } catch (error) {
+      // Should catch the content-type error
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toContain("Invalid response format from Gitea API");
+      expect((error as Error).message).toContain("text/html");
+    } finally {
+      // Restore original fetch
+      global.fetch = originalFetch;
+    }
+  });
+
+  test("mirrorGitHubOrgToGitea handles empty organizations correctly", async () => {
+    // Mock the createMirrorJob function
+    const mockCreateMirrorJob = mock(() => Promise.resolve("job-id"));
+
+    // Mock the getOrCreateGiteaOrg function
+    const mockGetOrCreateGiteaOrg = mock(() => Promise.resolve("gitea-org-id"));
+
+    // Create a test version of the function with mocked dependencies
+    const testMirrorGitHubOrgToGitea = async ({
+      organization,
+      config,
+    }: {
+      organization: any;
+      config: any;
+    }) => {
+      // Simulate the function logic for empty organization
+      console.log(`Mirroring organization ${organization.name}`);
+
+      // Mock: get or create Gitea org
+      await mockGetOrCreateGiteaOrg();
+
+      // Mock: query the db with the org name and get the repos
+      const orgRepos: any[] = []; // Empty array to simulate no repositories
+
+      if (orgRepos.length === 0) {
+        console.log(`No repositories found for organization ${organization.name} - marking as successfully mirrored`);
+      } else {
+        console.log(`Mirroring ${orgRepos.length} repositories for organization ${organization.name}`);
+        // Repository processing would happen here
+      }
+
+      console.log(`Organization ${organization.name} mirrored successfully`);
+
+      // Mock: Append log for "mirrored" status
+      await mockCreateMirrorJob({
+        userId: config.userId,
+        organizationId: organization.id,
+        organizationName: organization.name,
+        message: `Successfully mirrored organization: ${organization.name}`,
+        details: orgRepos.length === 0
+          ? `Organization ${organization.name} was processed successfully (no repositories found).`
+          : `Organization ${organization.name} was mirrored to Gitea with ${orgRepos.length} repositories.`,
+        status: "mirrored",
+      });
+    };
+
+    // Create mock organization
+    const organization = {
+      id: "org-id",
+      name: "empty-org",
+      status: "imported"
+    };
+
+    // Create mock config
+    const config = {
+      id: "config-id",
+      userId: "user-id",
+      githubConfig: {
+        token: "github-token"
+      },
+      giteaConfig: {
+        url: "https://gitea.example.com",
+        token: "gitea-token"
+      }
+    };
+
+    // Call the test function
+    await testMirrorGitHubOrgToGitea({
+      organization,
+      config
+    });
+
+    // Verify that the mirror job was created with the correct details for empty org
+    expect(mockCreateMirrorJob).toHaveBeenCalledWith({
+      userId: "user-id",
+      organizationId: "org-id",
+      organizationName: "empty-org",
+      message: "Successfully mirrored organization: empty-org",
+      details: "Organization empty-org was processed successfully (no repositories found).",
+      status: "mirrored",
+    });
+
+    // Verify that getOrCreateGiteaOrg was called
+    expect(mockGetOrCreateGiteaOrg).toHaveBeenCalled();
+  });
+});
+
+describe("getGiteaRepoOwner - Organization Override Tests", () => {
+  const baseConfig: Partial<Config> = {
+    githubConfig: {
+      username: "testuser",
+      token: "token",
+      preserveOrgStructure: false,
+      skipForks: false,
+      privateRepositories: false,
+      mirrorIssues: false,
+      mirrorWiki: false,
+      mirrorStarred: false,
+      useSpecificUser: false,
+      includeOrgs: [],
+      excludeOrgs: [],
+      mirrorPublicOrgs: false,
+      publicOrgs: [],
+      skipStarredIssues: false
+    },
+    giteaConfig: {
+      username: "giteauser",
+      url: "https://gitea.example.com",
+      token: "gitea-token",
+      organization: "github-mirrors",
+      visibility: "public",
+      starredReposOrg: "starred",
+      preserveOrgStructure: false,
+      mirrorStrategy: "preserve"
+    }
+  };
+
+  const baseRepo: Repository = {
+    id: "repo-id",
+    userId: "user-id",
+    configId: "config-id",
+    name: "test-repo",
+    fullName: "testuser/test-repo",
+    url: "https://github.com/testuser/test-repo",
+    cloneUrl: "https://github.com/testuser/test-repo.git",
+    owner: "testuser",
+    isPrivate: false,
+    isForked: false,
+    hasIssues: true,
+    isStarred: false,
+    isArchived: false,
+    size: 1000,
+    hasLFS: false,
+    hasSubmodules: false,
+    defaultBranch: "main",
+    visibility: "public",
+    status: "imported",
+    mirroredLocation: "",
+    createdAt: new Date(),
+    updatedAt: new Date()
+  };
+
+  test("starred repos go to starredReposOrg", () => {
+    const repo = { ...baseRepo, isStarred: true };
+    const result = getGiteaRepoOwner({ config: baseConfig, repository: repo });
+    expect(result).toBe("starred");
+  });
+
+  test("preserve strategy: personal repos use personalReposOrg override", () => {
+    const configWithOverride = {
+      ...baseConfig,
+      giteaConfig: {
+        ...baseConfig.giteaConfig!,
+        personalReposOrg: "my-personal-mirrors"
+      }
+    };
+    const repo = { ...baseRepo, organization: undefined };
+    const result = getGiteaRepoOwner({ config: configWithOverride, repository: repo });
+    expect(result).toBe("my-personal-mirrors");
+  });
+
+  test("preserve strategy: personal repos fallback to username when no override", () => {
+    const repo = { ...baseRepo, organization: undefined };
+    const result = getGiteaRepoOwner({ config: baseConfig, repository: repo });
+    expect(result).toBe("giteauser");
+  });
+
+  test("preserve strategy: org repos go to same org name", () => {
+    const repo = { ...baseRepo, organization: "myorg" };
+    const result = getGiteaRepoOwner({ config: baseConfig, repository: repo });
+    expect(result).toBe("myorg");
+  });
+
+  test("mixed strategy: personal repos go to organization", () => {
+    const configWithMixed = {
+      ...baseConfig,
+      giteaConfig: {
+        ...baseConfig.giteaConfig!,
+        mirrorStrategy: "mixed" as const,
+        organization: "github-mirrors"
+      }
+    };
+    const repo = { ...baseRepo, organization: undefined };
+    const result = getGiteaRepoOwner({ config: configWithMixed, repository: repo });
+    expect(result).toBe("github-mirrors");
+  });
+
+  test("mixed strategy: org repos preserve their structure", () => {
+    const configWithMixed = {
+      ...baseConfig,
+      giteaConfig: {
+        ...baseConfig.giteaConfig!,
+        mirrorStrategy: "mixed" as const,
+        organization: "github-mirrors"
+      }
+    };
+    const repo = { ...baseRepo, organization: "myorg" };
+    const result = getGiteaRepoOwner({ config: configWithMixed, repository: repo });
+    expect(result).toBe("myorg");
+  });
+
+  test("mixed strategy: fallback to username if no org configs", () => {
+    const configWithMixed = {
+      ...baseConfig,
+      giteaConfig: {
+        ...baseConfig.giteaConfig!,
+        mirrorStrategy: "mixed" as const,
+        organization: undefined,
+        personalReposOrg: undefined
+      }
+    };
+    const repo = { ...baseRepo, organization: undefined };
+    const result = getGiteaRepoOwner({ config: configWithMixed, repository: repo });
+    expect(result).toBe("giteauser");
+  });
 });

src/lib/gitea.ts

@@ -6,10 +6,90 @@ import {
 import { Octokit } from "@octokit/rest";
 import type { Config } from "@/types/config";
 import type { Organization, Repository } from "./db/schema";
-import superagent from "superagent";
+import { httpPost, httpGet } from "./http-client";
 import { createMirrorJob } from "./helpers";
 import { db, organizations, repositories } from "./db";
-import { eq } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
+
+/**
+ * Helper function to get organization configuration including destination override
+ */
+export const getOrganizationConfig = async ({
+  orgName,
+  userId,
+}: {
+  orgName: string;
+  userId: string;
+}): Promise<Organization | null> => {
+  try {
+    const [orgConfig] = await db
+      .select()
+      .from(organizations)
+      .where(and(eq(organizations.name, orgName), eq(organizations.userId, userId)))
+      .limit(1);
+
+    return orgConfig || null;
+  } catch (error) {
+    console.error(`Error fetching organization config for ${orgName}:`, error);
+    return null;
+  }
+};
+
+/**
+ * Enhanced async version of getGiteaRepoOwner that supports organization overrides
+ */
+export const getGiteaRepoOwnerAsync = async ({
+  config,
+  repository,
+}: {
+  config: Partial<Config>;
+  repository: Repository;
+}): Promise<string> => {
+  if (!config.githubConfig || !config.giteaConfig) {
+    throw new Error("GitHub or Gitea config is required.");
+  }
+
+  if (!config.giteaConfig.username) {
+    throw new Error("Gitea username is required.");
+  }
+
+  if (!config.userId) {
+    throw new Error("User ID is required for organization overrides.");
+  }
+
+  // Check if repository is starred - starred repos always go to starredReposOrg (highest priority)
+  if (repository.isStarred && config.giteaConfig.starredReposOrg) {
+    return config.giteaConfig.starredReposOrg;
+  }
+
+  // Check for repository-specific override (second highest priority)
+  if (repository.destinationOrg) {
+    console.log(`Using repository override: ${repository.fullName} -> ${repository.destinationOrg}`);
+    return repository.destinationOrg;
+  }
+
+  // Check for organization-specific override
+  if (repository.organization) {
+    const orgConfig = await getOrganizationConfig({
+      orgName: repository.organization,
+      userId: config.userId,
+    });
+
+    if (orgConfig?.destinationOrg) {
+      console.log(`Using organization override: ${repository.organization} -> ${orgConfig.destinationOrg}`);
+      return orgConfig.destinationOrg;
+    }
+  }
+
+  // Check for personal repos override (when it's user's repo, not an organization)
+  if (!repository.organization && config.giteaConfig.personalReposOrg) {
+    console.log(`Using personal repos override: ${config.giteaConfig.personalReposOrg}`);
+    return config.giteaConfig.personalReposOrg;
+  }
+
+  // Fall back to existing strategy logic
+  return getGiteaRepoOwner({ config, repository });
+};
 
 export const getGiteaRepoOwner = ({
   config,
@@ -26,13 +106,53 @@ export const getGiteaRepoOwner = ({
     throw new Error("Gitea username is required.");
   }
 
-  // if the config has preserveOrgStructure set to true, then use the org name as the owner
-  if (config.githubConfig.preserveOrgStructure && repository.organization) {
-    return repository.organization;
+  // Check if repository is starred - starred repos always go to starredReposOrg
+  if (repository.isStarred && config.giteaConfig.starredReposOrg) {
+    return config.giteaConfig.starredReposOrg;
   }
 
-  // if the config has preserveOrgStructure set to false, then use the gitea username as the owner
-  return config.giteaConfig.username;
+  // Get the mirror strategy - use preserveOrgStructure for backward compatibility
+  const mirrorStrategy = config.giteaConfig.mirrorStrategy || 
+    (config.githubConfig.preserveOrgStructure ? "preserve" : "flat-user");
+
+  switch (mirrorStrategy) {
+    case "preserve":
+      // Keep GitHub structure - org repos go to same org, personal repos to user (or override)
+      if (repository.organization) {
+        return repository.organization;
+      }
+      // Use personal repos override if configured, otherwise use username
+      return config.giteaConfig.personalReposOrg || config.giteaConfig.username;
+
+    case "single-org":
+      // All non-starred repos go to the destination organization
+      if (config.giteaConfig.organization) {
+        return config.giteaConfig.organization;
+      }
+      // Fallback to username if no organization specified
+      return config.giteaConfig.username;
+
+    case "flat-user":
+      // All non-starred repos go under the user account
+      return config.giteaConfig.username;
+
+    case "mixed":
+      // Mixed mode: personal repos to single org, organization repos preserve structure
+      if (repository.organization) {
+        // Organization repos preserve their structure
+        return repository.organization;
+      }
+      // Personal repos go to configured organization (same as single-org)
+      if (config.giteaConfig.organization) {
+        return config.giteaConfig.organization;
+      }
+      // Fallback to username if no organization specified
+      return config.giteaConfig.username;
+
+    default:
+      // Default fallback
+      return config.giteaConfig.username;
+  }
 };
 
 export const isRepoPresentInGitea = async ({
@@ -80,8 +200,11 @@ export const checkRepoLocation = async ({
   expectedOwner: string;
 }): Promise<{ present: boolean; actualOwner: string }> => {
   // First check if we have a recorded mirroredLocation and if the repo exists there
-  if (repository.mirroredLocation && repository.mirroredLocation.trim() !== "") {
-    const [mirroredOwner] = repository.mirroredLocation.split('/');
+  if (
+    repository.mirroredLocation &&
+    repository.mirroredLocation.trim() !== ""
+  ) {
+    const [mirroredOwner] = repository.mirroredLocation.split("/");
     if (mirroredOwner) {
       const mirroredPresent = await isRepoPresentInGitea({
         config,
@@ -90,7 +213,9 @@ export const checkRepoLocation = async ({
       });
 
       if (mirroredPresent) {
-        console.log(`Repository found at recorded mirrored location: ${repository.mirroredLocation}`);
+        console.log(
+          `Repository found at recorded mirrored location: ${repository.mirroredLocation}`
+        );
         return { present: true, actualOwner: mirroredOwner };
       }
     }
@@ -129,15 +254,44 @@ export const mirrorGithubRepoToGitea = async ({
       throw new Error("Gitea username is required.");
     }
 
+    // Get the correct owner based on the strategy (with organization overrides)
+    const repoOwner = await getGiteaRepoOwnerAsync({ config, repository });
+
     const isExisting = await isRepoPresentInGitea({
       config,
-      owner: config.giteaConfig.username,
+      owner: repoOwner,
       repoName: repository.name,
     });
 
     if (isExisting) {
       console.log(
-        `Repository ${repository.name} already exists in Gitea. Skipping migration.`
+        `Repository ${repository.name} already exists in Gitea under ${repoOwner}. Updating database status.`
+      );
+
+      // Update database to reflect that the repository is already mirrored
+      await db
+        .update(repositories)
+        .set({
+          status: repoStatusEnum.parse("mirrored"),
+          updatedAt: new Date(),
+          lastMirrored: new Date(),
+          errorMessage: null,
+          mirroredLocation: `${repoOwner}/${repository.name}`,
+        })
+        .where(eq(repositories.id, repository.id!));
+
+      // Append log for "mirrored" status
+      await createMirrorJob({
+        userId: config.userId,
+        repositoryId: repository.id,
+        repositoryName: repository.name,
+        message: `Repository ${repository.name} already exists in Gitea`,
+        details: `Repository ${repository.name} was found to already exist in Gitea under ${repoOwner} and database status was updated.`,
+        status: "mirrored",
+      });
+
+      console.log(
+        `Repository ${repository.name} database status updated to mirrored`
       );
       return;
     }
@@ -181,22 +335,45 @@ export const mirrorGithubRepoToGitea = async ({
 
     const apiUrl = `${config.giteaConfig.url}/api/v1/repos/migrate`;
 
-    const response = await superagent
-      .post(apiUrl)
-      .set("Authorization", `token ${config.giteaConfig.token}`)
-      .set("Content-Type", "application/json")
-      .send({
+    // Handle organization creation if needed for single-org or preserve strategies
+    if (repoOwner !== config.giteaConfig.username && !repository.isStarred) {
+      // Need to create the organization if it doesn't exist
+      await getOrCreateGiteaOrg({
+        orgName: repoOwner,
+        config,
+      });
+    }
+
+    const response = await httpPost(
+      apiUrl,
+      {
         clone_addr: cloneAddress,
         repo_name: repository.name,
         mirror: true,
+        wiki: config.githubConfig.mirrorWiki || false, // will mirror wiki if it exists
         private: repository.isPrivate,
-        repo_owner: config.giteaConfig.username,
+        repo_owner: repoOwner,
         description: "",
         service: "git",
-      });
+      },
+      {
+        Authorization: `token ${config.giteaConfig.token}`,
+      }
+    );
+
+    //mirror releases
+    await mirrorGitHubReleasesToGitea({
+      config,
+      octokit,
+      repository,
+    });
 
     // clone issues
-    if (config.githubConfig.mirrorIssues) {
+    // Skip issues for starred repos if skipStarredIssues is enabled
+    const shouldMirrorIssues = config.githubConfig.mirrorIssues && 
+      !(repository.isStarred && config.githubConfig.skipStarredIssues);
+    
+    if (shouldMirrorIssues) {
       await mirrorGitRepoIssuesToGitea({
         config,
         octokit,
@@ -215,7 +392,7 @@ export const mirrorGithubRepoToGitea = async ({
         updatedAt: new Date(),
         lastMirrored: new Date(),
         errorMessage: null,
-        mirroredLocation: `${config.giteaConfig.username}/${repository.name}`,
+        mirroredLocation: `${repoOwner}/${repository.name}`,
       })
       .where(eq(repositories.id, repository.id!));
 
@@ -229,7 +406,7 @@ export const mirrorGithubRepoToGitea = async ({
       status: "mirrored",
     });
 
-    return response.body;
+    return response.data;
   } catch (error) {
     console.error(
       `Error while mirroring repository ${repository.name}: ${
@@ -283,6 +460,8 @@ export async function getOrCreateGiteaOrg({
   }
 
   try {
+    console.log(`Attempting to get or create Gitea organization: ${orgName}`);
+
     const orgRes = await fetch(
       `${config.giteaConfig.url}/api/v1/orgs/${orgName}`,
       {
@@ -293,13 +472,50 @@ export async function getOrCreateGiteaOrg({
       }
     );
 
+    console.log(
+      `Get org response status: ${orgRes.status} for org: ${orgName}`
+    );
+
     if (orgRes.ok) {
-      const org = await orgRes.json();
-      // Note: Organization events are handled by the main mirroring process
-      // to avoid duplicate events
-      return org.id;
+      // Check if response is actually JSON
+      const contentType = orgRes.headers.get("content-type");
+      if (!contentType || !contentType.includes("application/json")) {
+        console.warn(
+          `Expected JSON response but got content-type: ${contentType}`
+        );
+        const responseText = await orgRes.text();
+        console.warn(`Response body: ${responseText}`);
+        throw new Error(
+          `Invalid response format from Gitea API. Expected JSON but got: ${contentType}`
+        );
+      }
+
+      // Clone the response to handle potential JSON parsing errors
+      const orgResClone = orgRes.clone();
+
+      try {
+        const org = await orgRes.json();
+        console.log(
+          `Successfully retrieved existing org: ${orgName} with ID: ${org.id}`
+        );
+        // Note: Organization events are handled by the main mirroring process
+        // to avoid duplicate events
+        return org.id;
+      } catch (jsonError) {
+        const responseText = await orgResClone.text();
+        console.error(
+          `Failed to parse JSON response for existing org: ${responseText}`
+        );
+        throw new Error(
+          `Failed to parse JSON response from Gitea API: ${
+            jsonError instanceof Error ? jsonError.message : String(jsonError)
+          }`
+        );
+      }
     }
 
+    console.log(`Organization ${orgName} not found, attempting to create it`);
+
     const createRes = await fetch(`${config.giteaConfig.url}/api/v1/orgs`, {
       method: "POST",
       headers: {
@@ -310,25 +526,68 @@ export async function getOrCreateGiteaOrg({
         username: orgName,
         full_name: `${orgName} Org`,
         description: `Mirrored organization from GitHub ${orgName}`,
-        visibility: "public",
+        visibility: config.giteaConfig?.visibility || "public",
       }),
     });
 
+    console.log(
+      `Create org response status: ${createRes.status} for org: ${orgName}`
+    );
+
     if (!createRes.ok) {
-      throw new Error(`Failed to create Gitea org: ${await createRes.text()}`);
+      const errorText = await createRes.text();
+      console.error(
+        `Failed to create org ${orgName}. Status: ${createRes.status}, Response: ${errorText}`
+      );
+      throw new Error(`Failed to create Gitea org: ${errorText}`);
+    }
+
+    // Check if response is actually JSON
+    const createContentType = createRes.headers.get("content-type");
+    if (!createContentType || !createContentType.includes("application/json")) {
+      console.warn(
+        `Expected JSON response but got content-type: ${createContentType}`
+      );
+      const responseText = await createRes.text();
+      console.warn(`Response body: ${responseText}`);
+      throw new Error(
+        `Invalid response format from Gitea API. Expected JSON but got: ${createContentType}`
+      );
     }
 
     // Note: Organization creation events are handled by the main mirroring process
     // to avoid duplicate events
 
-    const newOrg = await createRes.json();
-    return newOrg.id;
+    // Clone the response to handle potential JSON parsing errors
+    const createResClone = createRes.clone();
+
+    try {
+      const newOrg = await createRes.json();
+      console.log(
+        `Successfully created new org: ${orgName} with ID: ${newOrg.id}`
+      );
+      return newOrg.id;
+    } catch (jsonError) {
+      const responseText = await createResClone.text();
+      console.error(
+        `Failed to parse JSON response for new org: ${responseText}`
+      );
+      throw new Error(
+        `Failed to parse JSON response from Gitea API: ${
+          jsonError instanceof Error ? jsonError.message : String(jsonError)
+        }`
+      );
+    }
   } catch (error) {
     const errorMessage =
       error instanceof Error
         ? error.message
         : "Unknown error occurred in getOrCreateGiteaOrg.";
 
+    console.error(
+      `Error in getOrCreateGiteaOrg for ${orgName}: ${errorMessage}`
+    );
+
     await createMirrorJob({
       userId: config.userId,
       organizationId: orgId,
@@ -372,7 +631,33 @@ export async function mirrorGitHubRepoToGiteaOrg({
 
     if (isExisting) {
       console.log(
-        `Repository ${repository.name} already exists in Gitea. Skipping migration.`
+        `Repository ${repository.name} already exists in Gitea organization ${orgName}. Updating database status.`
+      );
+
+      // Update database to reflect that the repository is already mirrored
+      await db
+        .update(repositories)
+        .set({
+          status: repoStatusEnum.parse("mirrored"),
+          updatedAt: new Date(),
+          lastMirrored: new Date(),
+          errorMessage: null,
+          mirroredLocation: `${orgName}/${repository.name}`,
+        })
+        .where(eq(repositories.id, repository.id!));
+
+      // Create a mirror job log entry
+      await createMirrorJob({
+        userId: config.userId,
+        repositoryId: repository.id,
+        repositoryName: repository.name,
+        message: `Repository ${repository.name} already exists in Gitea organization ${orgName}`,
+        details: `Repository ${repository.name} was found to already exist in Gitea organization ${orgName} and database status was updated.`,
+        status: "mirrored",
+      });
+
+      console.log(
+        `Repository ${repository.name} database status updated to mirrored in organization ${orgName}`
       );
       return;
     }
@@ -410,20 +695,34 @@ export async function mirrorGitHubRepoToGiteaOrg({
 
     const apiUrl = `${config.giteaConfig.url}/api/v1/repos/migrate`;
 
-    const migrateRes = await superagent
-      .post(apiUrl)
-      .set("Authorization", `token ${config.giteaConfig.token}`)
-      .set("Content-Type", "application/json")
-      .send({
+    const migrateRes = await httpPost(
+      apiUrl,
+      {
         clone_addr: cloneAddress,
         uid: giteaOrgId,
         repo_name: repository.name,
         mirror: true,
+        wiki: config.githubConfig?.mirrorWiki || false, // will mirror wiki if it exists
         private: repository.isPrivate,
-      });
+      },
+      {
+        Authorization: `token ${config.giteaConfig.token}`,
+      }
+    );
+
+    //mirror releases
+    await mirrorGitHubReleasesToGitea({
+      config,
+      octokit,
+      repository,
+    });
 
     // Clone issues
-    if (config.githubConfig?.mirrorIssues) {
+    // Skip issues for starred repos if skipStarredIssues is enabled
+    const shouldMirrorIssues = config.githubConfig?.mirrorIssues && 
+      !(repository.isStarred && config.githubConfig?.skipStarredIssues);
+    
+    if (shouldMirrorIssues) {
       await mirrorGitRepoIssuesToGitea({
         config,
         octokit,
@@ -458,7 +757,7 @@ export async function mirrorGitHubRepoToGiteaOrg({
       status: "mirrored",
     });
 
-    return migrateRes.body;
+    return migrateRes.data;
   } catch (error) {
     console.error(
       `Error while mirroring repository ${repository.name}: ${
@@ -570,11 +869,37 @@ export async function mirrorGitHubOrgToGitea({
       status: repoStatusEnum.parse("mirroring"),
     });
 
-    const giteaOrgId = await getOrCreateGiteaOrg({
-      orgId: organization.id,
-      orgName: organization.name,
-      config,
-    });
+    // Get the mirror strategy - use preserveOrgStructure for backward compatibility
+    const mirrorStrategy = config.giteaConfig?.mirrorStrategy || 
+      (config.githubConfig?.preserveOrgStructure ? "preserve" : "flat-user");
+
+    let giteaOrgId: number;
+    let targetOrgName: string;
+
+    // Determine the target organization based on strategy
+    if (mirrorStrategy === "single-org" && config.giteaConfig?.organization) {
+      // For single-org strategy, use the configured destination organization
+      targetOrgName = config.giteaConfig.organization;
+      giteaOrgId = await getOrCreateGiteaOrg({
+        orgId: organization.id,
+        orgName: targetOrgName,
+        config,
+      });
+      console.log(`Using single organization strategy: all repos will go to ${targetOrgName}`);
+    } else if (mirrorStrategy === "preserve") {
+      // For preserve strategy, create/use an org with the same name as GitHub
+      targetOrgName = organization.name;
+      giteaOrgId = await getOrCreateGiteaOrg({
+        orgId: organization.id,
+        orgName: targetOrgName,
+        config,
+      });
+    } else {
+      // For flat-user strategy, we shouldn't create organizations at all
+      // Skip organization creation and let individual repos be handled by getGiteaRepoOwner
+      console.log(`Using flat-user strategy: repos will be placed under user account`);
+      targetOrgName = config.giteaConfig?.username || "";
+    }
 
     //query the db with the org name and get the repos
     const orgRepos = await db
@@ -583,60 +908,79 @@ export async function mirrorGitHubOrgToGitea({
       .where(eq(repositories.organization, organization.name));
 
     if (orgRepos.length === 0) {
-      console.log(`No repositories found for organization ${organization.name}`);
-      return;
-    }
+      console.log(
+        `No repositories found for organization ${organization.name} - marking as successfully mirrored`
+      );
+    } else {
+      console.log(
+        `Mirroring ${orgRepos.length} repositories for organization ${organization.name}`
+      );
 
-    console.log(`Mirroring ${orgRepos.length} repositories for organization ${organization.name}`);
+      // Import the processWithRetry function
+      const { processWithRetry } = await import("@/lib/utils/concurrency");
 
-    // Import the processWithRetry function
-    const { processWithRetry } = await import("@/lib/utils/concurrency");
+      // Process repositories in parallel with concurrency control
+      await processWithRetry(
+        orgRepos,
+        async (repo) => {
+          // Prepare repository data
+          const repoData = {
+            ...repo,
+            status: repo.status as RepoStatus,
+            visibility: repo.visibility as RepositoryVisibility,
+            lastMirrored: repo.lastMirrored ?? undefined,
+            errorMessage: repo.errorMessage ?? undefined,
+            organization: repo.organization ?? undefined,
+            forkedFrom: repo.forkedFrom ?? undefined,
+            mirroredLocation: repo.mirroredLocation || "",
+          };
 
-    // Process repositories in parallel with concurrency control
-    await processWithRetry(
-      orgRepos,
-      async (repo) => {
-        // Prepare repository data
-        const repoData = {
-          ...repo,
-          status: repo.status as RepoStatus,
-          visibility: repo.visibility as RepositoryVisibility,
-          lastMirrored: repo.lastMirrored ?? undefined,
-          errorMessage: repo.errorMessage ?? undefined,
-          organization: repo.organization ?? undefined,
-          forkedFrom: repo.forkedFrom ?? undefined,
-          mirroredLocation: repo.mirroredLocation || "",
-        };
+          // Log the start of mirroring
+          console.log(
+            `Starting mirror for repository: ${repo.name} from GitHub org ${organization.name}`
+          );
 
-        // Log the start of mirroring
-        console.log(`Starting mirror for repository: ${repo.name} in organization ${organization.name}`);
-
-        // Mirror the repository
-        await mirrorGitHubRepoToGiteaOrg({
-          octokit,
-          config,
-          repository: repoData,
-          giteaOrgId,
-          orgName: organization.name,
-        });
-
-        return repo;
-      },
-      {
-        concurrencyLimit: 3, // Process 3 repositories at a time
-        maxRetries: 2,
-        retryDelay: 2000,
-        onProgress: (completed, total, result) => {
-          const percentComplete = Math.round((completed / total) * 100);
-          if (result) {
-            console.log(`Mirrored repository "${result.name}" in organization ${organization.name} (${completed}/${total}, ${percentComplete}%)`);
+          // Mirror the repository based on strategy
+          if (mirrorStrategy === "flat-user") {
+            // For flat-user strategy, mirror directly to user account
+            await mirrorGithubRepoToGitea({
+              octokit,
+              repository: repoData,
+              config,
+            });
+          } else {
+            // For preserve and single-org strategies, use organization
+            await mirrorGitHubRepoToGiteaOrg({
+              octokit,
+              config,
+              repository: repoData,
+              giteaOrgId: giteaOrgId!,
+              orgName: targetOrgName,
+            });
           }
+
+          return repo;
         },
-        onRetry: (repo, error, attempt) => {
-          console.log(`Retrying repository ${repo.name} in organization ${organization.name} (attempt ${attempt}): ${error.message}`);
+        {
+          concurrencyLimit: 3, // Process 3 repositories at a time
+          maxRetries: 2,
+          retryDelay: 2000,
+          onProgress: (completed, total, result) => {
+            const percentComplete = Math.round((completed / total) * 100);
+            if (result) {
+              console.log(
+                `Mirrored repository "${result.name}" in organization ${organization.name} (${completed}/${total}, ${percentComplete}%)`
+              );
+            }
+          },
+          onRetry: (repo, error, attempt) => {
+            console.log(
+              `Retrying repository ${repo.name} in organization ${organization.name} (attempt ${attempt}): ${error.message}`
+            );
+          },
         }
-      }
-    );
+      );
+    }
 
     console.log(`Organization ${organization.name} mirrored successfully`);
 
@@ -657,7 +1001,10 @@ export async function mirrorGitHubOrgToGitea({
       organizationId: organization.id,
       organizationName: organization.name,
       message: `Successfully mirrored organization: ${organization.name}`,
-      details: `Organization ${organization.name} was mirrored to Gitea.`,
+      details:
+        orgRepos.length === 0
+          ? `Organization ${organization.name} was processed successfully (no repositories found).`
+          : `Organization ${organization.name} was mirrored to Gitea with ${orgRepos.length} repositories.`,
       status: repoStatusEnum.parse("mirrored"),
     });
   } catch (error) {
@@ -734,26 +1081,28 @@ export const syncGiteaRepo = async ({
       status: repoStatusEnum.parse("syncing"),
     });
 
-    // Get the expected owner based on current config
-    const repoOwner = getGiteaRepoOwner({ config, repository });
+    // Get the expected owner based on current config (with organization overrides)
+    const repoOwner = await getGiteaRepoOwnerAsync({ config, repository });
 
     // Check if repo exists at the expected location or alternate location
     const { present, actualOwner } = await checkRepoLocation({
       config,
       repository,
-      expectedOwner: repoOwner
+      expectedOwner: repoOwner,
     });
 
     if (!present) {
-      throw new Error(`Repository ${repository.name} not found in Gitea at any expected location`);
+      throw new Error(
+        `Repository ${repository.name} not found in Gitea at any expected location`
+      );
     }
 
     // Use the actual owner where the repo was found
     const apiUrl = `${config.giteaConfig.url}/api/v1/repos/${actualOwner}/${repository.name}/mirror-sync`;
 
-    const response = await superagent
-      .post(apiUrl)
-      .set("Authorization", `token ${config.giteaConfig.token}`);
+    const response = await httpPost(apiUrl, undefined, {
+      Authorization: `token ${config.giteaConfig.token}`,
+    });
 
     // Mark repo as "synced" in DB
     await db
@@ -779,7 +1128,7 @@ export const syncGiteaRepo = async ({
 
     console.log(`Repository ${repository.name} synced successfully`);
 
-    return response.body;
+    return response.data;
   } catch (error) {
     console.error(
       `Error while syncing repository ${repository.name}: ${
@@ -856,9 +1205,11 @@ export const mirrorGitRepoIssuesToGitea = async ({
   );
 
   // Filter out pull requests
-  const filteredIssues = issues.filter(issue => !(issue as any).pull_request);
+  const filteredIssues = issues.filter((issue) => !(issue as any).pull_request);
 
-  console.log(`Mirroring ${filteredIssues.length} issues from ${repository.fullName}`);
+  console.log(
+    `Mirroring ${filteredIssues.length} issues from ${repository.fullName}`
+  );
 
   if (filteredIssues.length === 0) {
     console.log(`No issues to mirror for ${repository.fullName}`);
@@ -866,13 +1217,14 @@ export const mirrorGitRepoIssuesToGitea = async ({
   }
 
   // Get existing labels from Gitea
-  const giteaLabelsRes = await superagent
-    .get(
-      `${config.giteaConfig.url}/api/v1/repos/${repoOrigin}/${repository.name}/labels`
-    )
-    .set("Authorization", `token ${config.giteaConfig.token}`);
+  const giteaLabelsRes = await httpGet(
+    `${config.giteaConfig.url}/api/v1/repos/${repoOrigin}/${repository.name}/labels`,
+    {
+      Authorization: `token ${config.giteaConfig.token}`,
+    }
+  );
 
-  const giteaLabels = giteaLabelsRes.body;
+  const giteaLabels = giteaLabelsRes.data;
   const labelMap = new Map<string, number>(
     giteaLabels.map((label: any) => [label.name, label.id])
   );
@@ -897,15 +1249,18 @@ export const mirrorGitRepoIssuesToGitea = async ({
           giteaLabelIds.push(labelMap.get(name)!);
         } else {
           try {
-            const created = await superagent
-              .post(
-                `${config.giteaConfig.url}/api/v1/repos/${repoOrigin}/${repository.name}/labels`
-              )
-              .set("Authorization", `token ${config.giteaConfig.token}`)
-              .send({ name, color: "#ededed" }); // Default color
+            const created = await httpPost(
+              `${config.giteaConfig!.url}/api/v1/repos/${repoOrigin}/${
+                repository.name
+              }/labels`,
+              { name, color: "#ededed" }, // Default color
+              {
+                Authorization: `token ${config.giteaConfig!.token}`,
+              }
+            );
 
-            labelMap.set(name, created.body.id);
-            giteaLabelIds.push(created.body.id);
+            labelMap.set(name, created.data.id);
+            giteaLabelIds.push(created.data.id);
           } catch (labelErr) {
             console.error(
               `Failed to create label "${name}" in Gitea: ${labelErr}`
@@ -931,12 +1286,15 @@ export const mirrorGitRepoIssuesToGitea = async ({
       };
 
       // Create the issue in Gitea
-      const createdIssue = await superagent
-        .post(
-          `${config.giteaConfig.url}/api/v1/repos/${repoOrigin}/${repository.name}/issues`
-        )
-        .set("Authorization", `token ${config.giteaConfig.token}`)
-        .send(issuePayload);
+      const createdIssue = await httpPost(
+        `${config.giteaConfig!.url}/api/v1/repos/${repoOrigin}/${
+          repository.name
+        }/issues`,
+        issuePayload,
+        {
+          Authorization: `token ${config.giteaConfig!.token}`,
+        }
+      );
 
       // Clone comments
       const comments = await octokit.paginate(
@@ -955,23 +1313,28 @@ export const mirrorGitRepoIssuesToGitea = async ({
         await processWithRetry(
           comments,
           async (comment) => {
-            await superagent
-              .post(
-                `${config.giteaConfig.url}/api/v1/repos/${repoOrigin}/${repository.name}/issues/${createdIssue.body.number}/comments`
-              )
-              .set("Authorization", `token ${config.giteaConfig.token}`)
-              .send({
+            await httpPost(
+              `${config.giteaConfig!.url}/api/v1/repos/${repoOrigin}/${
+                repository.name
+              }/issues/${createdIssue.data.number}/comments`,
+              {
                 body: `@${comment.user?.login} commented on GitHub:\n\n${comment.body}`,
-              });
+              },
+              {
+                Authorization: `token ${config.giteaConfig!.token}`,
+              }
+            );
             return comment;
           },
           {
             concurrencyLimit: 5,
             maxRetries: 2,
             retryDelay: 1000,
-            onRetry: (comment, error, attempt) => {
-              console.log(`Retrying comment (attempt ${attempt}): ${error.message}`);
-            }
+            onRetry: (_comment, error, attempt) => {
+              console.log(
+                `Retrying comment (attempt ${attempt}): ${error.message}`
+              );
+            },
           }
         );
       }
@@ -985,14 +1348,69 @@ export const mirrorGitRepoIssuesToGitea = async ({
       onProgress: (completed, total, result) => {
         const percentComplete = Math.round((completed / total) * 100);
         if (result) {
-          console.log(`Mirrored issue "${result.title}" (${completed}/${total}, ${percentComplete}%)`);
+          console.log(
+            `Mirrored issue "${result.title}" (${completed}/${total}, ${percentComplete}%)`
+          );
         }
       },
       onRetry: (issue, error, attempt) => {
-        console.log(`Retrying issue "${issue.title}" (attempt ${attempt}): ${error.message}`);
-      }
+        console.log(
+          `Retrying issue "${issue.title}" (attempt ${attempt}): ${error.message}`
+        );
+      },
     }
   );
 
-  console.log(`Completed mirroring ${filteredIssues.length} issues for ${repository.fullName}`);
+  console.log(
+    `Completed mirroring ${filteredIssues.length} issues for ${repository.fullName}`
+  );
 };
+
+export async function mirrorGitHubReleasesToGitea({
+  octokit,
+  repository,
+  config,
+}: {
+  octokit: Octokit;
+  repository: Repository;
+  config: Partial<Config>;
+}) {
+  if (
+    !config.giteaConfig?.username ||
+    !config.giteaConfig?.token ||
+    !config.giteaConfig?.url
+  ) {
+    throw new Error("Gitea config is incomplete for mirroring releases.");
+  }
+
+  const repoOwner = await getGiteaRepoOwnerAsync({
+    config,
+    repository,
+  });
+
+  const { url, token } = config.giteaConfig;
+
+  const releases = await octokit.rest.repos.listReleases({
+    owner: repository.owner,
+    repo: repository.name,
+  });
+
+  for (const release of releases.data) {
+    await httpPost(
+      `${url}/api/v1/repos/${repoOwner}/${repository.name}/releases`,
+      {
+        tag_name: release.tag_name,
+        target: release.target_commitish,
+        title: release.name || release.tag_name,
+        note: release.body || "",
+        draft: release.draft,
+        prerelease: release.prerelease,
+      },
+      {
+        Authorization: `token ${token}`,
+      }
+    );
+  }
+
+  console.log(`✅ Mirrored ${releases.data.length} GitHub releases to Gitea`);
+}

src/lib/http-client.ts

@@ -0,0 +1,204 @@
+/**
+ * HTTP client utility functions using fetch() for consistent error handling
+ */
+
+export interface HttpResponse<T = any> {
+  data: T;
+  status: number;
+  statusText: string;
+  headers: Headers;
+}
+
+export class HttpError extends Error {
+  constructor(
+    message: string,
+    public status: number,
+    public statusText: string,
+    public response?: string
+  ) {
+    super(message);
+    this.name = 'HttpError';
+  }
+}
+
+/**
+ * Enhanced fetch with consistent error handling and JSON parsing
+ */
+export async function httpRequest<T = any>(
+  url: string,
+  options: RequestInit = {}
+): Promise<HttpResponse<T>> {
+  try {
+    const response = await fetch(url, {
+      ...options,
+      headers: {
+        'Content-Type': 'application/json',
+        ...options.headers,
+      },
+    });
+
+    // Clone response for error handling
+    const responseClone = response.clone();
+
+    if (!response.ok) {
+      let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
+      let responseText = '';
+
+      try {
+        responseText = await responseClone.text();
+        if (responseText) {
+          errorMessage += ` - ${responseText}`;
+        }
+      } catch {
+        // Ignore text parsing errors
+      }
+
+      throw new HttpError(
+        errorMessage,
+        response.status,
+        response.statusText,
+        responseText
+      );
+    }
+
+    // Check content type for JSON responses
+    const contentType = response.headers.get('content-type');
+    let data: T;
+
+    if (contentType && contentType.includes('application/json')) {
+      try {
+        data = await response.json();
+      } catch (jsonError) {
+        const responseText = await responseClone.text();
+
+        // Enhanced JSON parsing error logging
+        console.error("=== JSON PARSING ERROR ===");
+        console.error("URL:", url);
+        console.error("Status:", response.status, response.statusText);
+        console.error("Content-Type:", contentType);
+        console.error("Response length:", responseText.length);
+        console.error("Response preview (first 500 chars):", responseText.substring(0, 500));
+        console.error("JSON Error:", jsonError instanceof Error ? jsonError.message : String(jsonError));
+        console.error("========================");
+
+        throw new HttpError(
+          `Failed to parse JSON response from ${url}: ${jsonError instanceof Error ? jsonError.message : String(jsonError)}. Response: ${responseText.substring(0, 200)}${responseText.length > 200 ? '...' : ''}`,
+          response.status,
+          response.statusText,
+          responseText
+        );
+      }
+    } else {
+      // For non-JSON responses, return text as data
+      data = (await response.text()) as unknown as T;
+    }
+
+    return {
+      data,
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers,
+    };
+  } catch (error) {
+    if (error instanceof HttpError) {
+      throw error;
+    }
+
+    // Handle network errors, etc.
+    throw new HttpError(
+      `Network error: ${error instanceof Error ? error.message : String(error)}`,
+      0,
+      'Network Error'
+    );
+  }
+}
+
+/**
+ * GET request
+ */
+export async function httpGet<T = any>(
+  url: string,
+  headers?: Record<string, string>
+): Promise<HttpResponse<T>> {
+  return httpRequest<T>(url, {
+    method: 'GET',
+    headers,
+  });
+}
+
+/**
+ * POST request
+ */
+export async function httpPost<T = any>(
+  url: string,
+  body?: any,
+  headers?: Record<string, string>
+): Promise<HttpResponse<T>> {
+  return httpRequest<T>(url, {
+    method: 'POST',
+    headers,
+    body: body ? JSON.stringify(body) : undefined,
+  });
+}
+
+/**
+ * PUT request
+ */
+export async function httpPut<T = any>(
+  url: string,
+  body?: any,
+  headers?: Record<string, string>
+): Promise<HttpResponse<T>> {
+  return httpRequest<T>(url, {
+    method: 'PUT',
+    headers,
+    body: body ? JSON.stringify(body) : undefined,
+  });
+}
+
+/**
+ * DELETE request
+ */
+export async function httpDelete<T = any>(
+  url: string,
+  headers?: Record<string, string>
+): Promise<HttpResponse<T>> {
+  return httpRequest<T>(url, {
+    method: 'DELETE',
+    headers,
+  });
+}
+
+/**
+ * Gitea-specific HTTP client with authentication
+ */
+export class GiteaHttpClient {
+  constructor(
+    private baseUrl: string,
+    private token: string
+  ) {}
+
+  private getHeaders(additionalHeaders?: Record<string, string>): Record<string, string> {
+    return {
+      'Authorization': `token ${this.token}`,
+      'Content-Type': 'application/json',
+      ...additionalHeaders,
+    };
+  }
+
+  async get<T = any>(endpoint: string): Promise<HttpResponse<T>> {
+    return httpGet<T>(`${this.baseUrl}${endpoint}`, this.getHeaders());
+  }
+
+  async post<T = any>(endpoint: string, body?: any): Promise<HttpResponse<T>> {
+    return httpPost<T>(`${this.baseUrl}${endpoint}`, body, this.getHeaders());
+  }
+
+  async put<T = any>(endpoint: string, body?: any): Promise<HttpResponse<T>> {
+    return httpPut<T>(`${this.baseUrl}${endpoint}`, body, this.getHeaders());
+  }
+
+  async delete<T = any>(endpoint: string): Promise<HttpResponse<T>> {
+    return httpDelete<T>(`${this.baseUrl}${endpoint}`, this.getHeaders());
+  }
+}

src/lib/utils.test.ts

@@ -1,35 +1,35 @@
 import { describe, test, expect } from "bun:test";
-import { jsonResponse, formatDate, truncate, safeParse } from "./utils";
+import { jsonResponse, formatDate, truncate, safeParse, parseErrorMessage, showErrorToast } from "./utils";
 
 describe("jsonResponse", () => {
   test("creates a Response with JSON content", () => {
     const data = { message: "Hello, world!" };
     const response = jsonResponse({ data });
-    
+
     expect(response).toBeInstanceOf(Response);
     expect(response.status).toBe(200);
     expect(response.headers.get("Content-Type")).toBe("application/json");
   });
-  
+
   test("uses the provided status code", () => {
     const data = { error: "Not found" };
     const response = jsonResponse({ data, status: 404 });
-    
+
     expect(response.status).toBe(404);
   });
-  
+
   test("correctly serializes complex objects", async () => {
     const now = new Date();
-    const data = { 
+    const data = {
       message: "Complex object",
       date: now,
       nested: { foo: "bar" },
       array: [1, 2, 3]
     };
-    
+
     const response = jsonResponse({ data });
     const responseBody = await response.json();
-    
+
     expect(responseBody).toEqual({
       message: "Complex object",
       date: now.toISOString(),
@@ -43,22 +43,22 @@ describe("formatDate", () => {
   test("formats a date object", () => {
     const date = new Date("2023-01-15T12:30:45Z");
     const formatted = formatDate(date);
-    
+
     // The exact format might depend on the locale, so we'll check for parts
     expect(formatted).toContain("2023");
     expect(formatted).toContain("January");
     expect(formatted).toContain("15");
   });
-  
+
   test("formats a date string", () => {
     const dateStr = "2023-01-15T12:30:45Z";
     const formatted = formatDate(dateStr);
-    
+
     expect(formatted).toContain("2023");
     expect(formatted).toContain("January");
     expect(formatted).toContain("15");
   });
-  
+
   test("returns 'Never' for null or undefined", () => {
     expect(formatDate(null)).toBe("Never");
     expect(formatDate(undefined)).toBe("Never");
@@ -69,18 +69,18 @@ describe("truncate", () => {
   test("truncates a string that exceeds the length", () => {
     const str = "This is a long string that needs truncation";
     const truncated = truncate(str, 10);
-    
+
     expect(truncated).toBe("This is a ...");
     expect(truncated.length).toBe(13); // 10 chars + "..."
   });
-  
+
   test("does not truncate a string that is shorter than the length", () => {
     const str = "Short";
     const truncated = truncate(str, 10);
-    
+
     expect(truncated).toBe("Short");
   });
-  
+
   test("handles empty strings", () => {
     expect(truncate("", 10)).toBe("");
   });
@@ -90,21 +90,71 @@ describe("safeParse", () => {
   test("parses valid JSON strings", () => {
     const jsonStr = '{"name":"John","age":30}';
     const parsed = safeParse(jsonStr);
-    
+
     expect(parsed).toEqual({ name: "John", age: 30 });
   });
-  
+
   test("returns undefined for invalid JSON strings", () => {
     const invalidJson = '{"name":"John",age:30}'; // Missing quotes around age
     const parsed = safeParse(invalidJson);
-    
+
     expect(parsed).toBeUndefined();
   });
-  
+
   test("returns the original value for non-string inputs", () => {
     const obj = { name: "John", age: 30 };
     const parsed = safeParse(obj);
-    
+
     expect(parsed).toBe(obj);
   });
 });
+
+describe("parseErrorMessage", () => {
+  test("parses JSON error with error and troubleshooting fields", () => {
+    const errorMessage = JSON.stringify({
+      error: "Unexpected end of JSON input",
+      errorType: "SyntaxError",
+      timestamp: "2025-05-28T09:08:02.37Z",
+      troubleshooting: "JSON parsing error detected. Check Gitea server status and logs. Ensure Gitea is returning valid JSON responses."
+    });
+
+    const result = parseErrorMessage(errorMessage);
+
+    expect(result.title).toBe("Unexpected end of JSON input");
+    expect(result.description).toBe("JSON parsing error detected. Check Gitea server status and logs. Ensure Gitea is returning valid JSON responses.");
+    expect(result.isStructured).toBe(true);
+  });
+
+  test("parses JSON error with title and description fields", () => {
+    const errorMessage = JSON.stringify({
+      title: "Connection Failed",
+      description: "Unable to connect to the server. Please check your network connection."
+    });
+
+    const result = parseErrorMessage(errorMessage);
+
+    expect(result.title).toBe("Connection Failed");
+    expect(result.description).toBe("Unable to connect to the server. Please check your network connection.");
+    expect(result.isStructured).toBe(true);
+  });
+
+  test("handles plain string error messages", () => {
+    const errorMessage = "Simple error message";
+
+    const result = parseErrorMessage(errorMessage);
+
+    expect(result.title).toBe("Simple error message");
+    expect(result.description).toBeUndefined();
+    expect(result.isStructured).toBe(false);
+  });
+
+  test("handles Error objects", () => {
+    const error = new Error("Something went wrong");
+
+    const result = parseErrorMessage(error);
+
+    expect(result.title).toBe("Something went wrong");
+    expect(result.description).toBeUndefined();
+    expect(result.isStructured).toBe(false);
+  });
+});

src/lib/utils.ts

@@ -1,7 +1,6 @@
 import { clsx, type ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
-import axios from "axios";
-import type { AxiosError, AxiosRequestConfig } from "axios";
+import { httpRequest, HttpError } from "@/lib/http-client";
 import type { RepoStatus } from "@/types/Repository";
 
 export const API_BASE = "/api";
@@ -37,27 +36,148 @@ export function safeParse<T>(value: unknown): T | undefined {
   return value as T;
 }
 
+// Enhanced error message parsing for toast notifications
+export interface ParsedErrorMessage {
+  title: string;
+  description?: string;
+  isStructured: boolean;
+}
+
+export function parseErrorMessage(error: unknown): ParsedErrorMessage {
+  // Handle Error objects
+  if (error instanceof Error) {
+    return parseErrorMessage(error.message);
+  }
+
+  // Handle string messages
+  if (typeof error === "string") {
+    // Try to parse as JSON first
+    try {
+      const parsed = JSON.parse(error);
+
+      // Check for common structured error formats
+      if (typeof parsed === "object" && parsed !== null) {
+        // Format 1: { error: "message", errorType: "type", troubleshooting: "info" }
+        if (parsed.error) {
+          return {
+            title: parsed.error,
+            description: parsed.troubleshooting || parsed.errorType || undefined,
+            isStructured: true,
+          };
+        }
+
+        // Format 2: { title: "title", description: "desc" }
+        if (parsed.title) {
+          return {
+            title: parsed.title,
+            description: parsed.description || undefined,
+            isStructured: true,
+          };
+        }
+
+        // Format 3: { message: "msg", details: "details" }
+        if (parsed.message) {
+          return {
+            title: parsed.message,
+            description: parsed.details || undefined,
+            isStructured: true,
+          };
+        }
+      }
+    } catch {
+      // Not valid JSON, treat as plain string
+    }
+
+    // Plain string message
+    return {
+      title: error,
+      description: undefined,
+      isStructured: false,
+    };
+  }
+
+  // Handle objects directly
+  if (typeof error === "object" && error !== null) {
+    const errorObj = error as any;
+
+    if (errorObj.error) {
+      return {
+        title: errorObj.error,
+        description: errorObj.troubleshooting || errorObj.errorType || undefined,
+        isStructured: true,
+      };
+    }
+
+    if (errorObj.title) {
+      return {
+        title: errorObj.title,
+        description: errorObj.description || undefined,
+        isStructured: true,
+      };
+    }
+
+    if (errorObj.message) {
+      return {
+        title: errorObj.message,
+        description: errorObj.details || undefined,
+        isStructured: true,
+      };
+    }
+  }
+
+  // Fallback for unknown types
+  return {
+    title: String(error),
+    description: undefined,
+    isStructured: false,
+  };
+}
+
+// Enhanced toast helper that parses structured error messages
+export function showErrorToast(error: unknown, toast: any) {
+  const parsed = parseErrorMessage(error);
+
+  if (parsed.description) {
+    // Use sonner's rich toast format with title and description
+    toast.error(parsed.title, {
+      description: parsed.description,
+    });
+  } else {
+    // Simple error toast
+    toast.error(parsed.title);
+  }
+}
+
 // Helper function for API requests
 
 export async function apiRequest<T>(
   endpoint: string,
-  options: AxiosRequestConfig = {}
+  options: (RequestInit & { data?: any }) = {}
 ): Promise<T> {
   try {
-    const response = await axios<T>(`${API_BASE}${endpoint}`, {
+    // Handle the custom 'data' property by converting it to 'body'
+    const { data, ...requestOptions } = options;
+    const finalOptions: RequestInit = {
       headers: {
         "Content-Type": "application/json",
-        ...(options.headers || {}),
+        ...(requestOptions.headers || {}),
       },
-      ...options,
-    });
+      ...requestOptions,
+    };
+
+    // If data is provided, stringify it and set as body
+    if (data !== undefined) {
+      finalOptions.body = JSON.stringify(data);
+    }
+
+    const response = await httpRequest<T>(`${API_BASE}${endpoint}`, finalOptions);
 
     return response.data;
   } catch (err) {
-    const error = err as AxiosError<{ message?: string }>;
+    const error = err as HttpError;
 
     const message =
-      error.response?.data?.message ||
+      error.response ||
       error.message ||
       "An unknown error occurred";
 
@@ -96,3 +216,76 @@ export const jsonResponse = ({
     headers: { "Content-Type": "application/json" },
   });
 };
+
+/**
+ * Securely handles errors for API responses by sanitizing error messages
+ * and preventing sensitive information exposure while maintaining proper logging
+ */
+export function createSecureErrorResponse(
+  error: unknown,
+  context: string,
+  status: number = 500
+): Response {
+  // Log the full error details server-side for debugging
+  console.error(`Error in ${context}:`, error);
+
+  // Log additional error details if it's an Error object
+  if (error instanceof Error) {
+    console.error(`Error name: ${error.name}`);
+    console.error(`Error message: ${error.message}`);
+    if (error.stack) {
+      console.error(`Error stack: ${error.stack}`);
+    }
+  }
+
+  // Determine safe error message for client
+  let clientMessage = "An internal server error occurred";
+
+  // Only expose specific safe error types to clients
+  if (error instanceof Error) {
+    // Safe error patterns that can be exposed (add more as needed)
+    const safeErrorPatterns = [
+      /missing required field/i,
+      /invalid.*format/i,
+      /not found/i,
+      /unauthorized/i,
+      /forbidden/i,
+      /bad request/i,
+      /validation.*failed/i,
+      /user id is required/i,
+      /no repositories found/i,
+      /config missing/i,
+      /invalid userid/i,
+      /no users found/i,
+      /missing userid/i,
+      /github token is required/i,
+      /invalid github token/i,
+      /invalid gitea token/i,
+      /username and password are required/i,
+      /invalid username or password/i,
+      /organization already exists/i,
+      /no configuration found/i,
+      /github token is missing/i,
+      /use post method/i,
+    ];
+
+    const isSafeError = safeErrorPatterns.some(pattern =>
+      pattern.test(error.message)
+    );
+
+    if (isSafeError) {
+      clientMessage = error.message;
+    }
+  }
+
+  return new Response(
+    JSON.stringify({
+      error: clientMessage,
+      timestamp: new Date().toISOString(),
+    }),
+    {
+      status,
+      headers: { "Content-Type": "application/json" },
+    }
+  );
+}

src/lib/utils/concurrency.test.ts

@@ -5,19 +5,19 @@ describe("processInParallel", () => {
   test("processes items in parallel with concurrency control", async () => {
     // Create an array of numbers to process
     const items = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    
+
     // Create a mock function to track execution
     const processItem = mock(async (item: number) => {
       // Simulate async work
       await new Promise(resolve => setTimeout(resolve, 10));
       return item * 2;
     });
-    
+
     // Create a mock progress callback
     const onProgress = mock((completed: number, total: number, result?: number) => {
       // Progress tracking
     });
-    
+
     // Process the items with a concurrency limit of 3
     const results = await processInParallel(
       items,
@@ -25,25 +25,25 @@ describe("processInParallel", () => {
       3,
       onProgress
     );
-    
+
     // Verify results
     expect(results).toEqual([2, 4, 6, 8, 10, 12, 14, 16, 18, 20]);
-    
+
     // Verify that processItem was called for each item
     expect(processItem).toHaveBeenCalledTimes(10);
-    
+
     // Verify that onProgress was called for each item
     expect(onProgress).toHaveBeenCalledTimes(10);
-    
+
     // Verify the last call to onProgress had the correct completed/total values
     expect(onProgress.mock.calls[9][0]).toBe(10); // completed
     expect(onProgress.mock.calls[9][1]).toBe(10); // total
   });
-  
+
   test("handles errors in processing", async () => {
     // Create an array of numbers to process
     const items = [1, 2, 3, 4, 5];
-    
+
     // Create a mock function that throws an error for item 3
     const processItem = mock(async (item: number) => {
       if (item === 3) {
@@ -51,24 +51,24 @@ describe("processInParallel", () => {
       }
       return item * 2;
     });
-    
+
     // Create a spy for console.error
     const originalConsoleError = console.error;
     const consoleErrorMock = mock(() => {});
     console.error = consoleErrorMock;
-    
+
     try {
       // Process the items
       const results = await processInParallel(items, processItem);
-      
+
       // Verify results (should have 4 items, missing the one that errored)
       expect(results).toEqual([2, 4, 8, 10]);
-      
+
       // Verify that processItem was called for each item
       expect(processItem).toHaveBeenCalledTimes(5);
-      
-      // Verify that console.error was called once
-      expect(consoleErrorMock).toHaveBeenCalledTimes(1);
+
+      // Verify that console.error was called (enhanced logging calls it multiple times)
+      expect(consoleErrorMock).toHaveBeenCalled();
     } finally {
       // Restore console.error
       console.error = originalConsoleError;
@@ -80,51 +80,51 @@ describe("processWithRetry", () => {
   test("retries failed operations", async () => {
     // Create an array of numbers to process
     const items = [1, 2, 3];
-    
+
     // Create a counter to track retry attempts
     const attemptCounts: Record<number, number> = { 1: 0, 2: 0, 3: 0 };
-    
+
     // Create a mock function that fails on first attempt for item 2
     const processItem = mock(async (item: number) => {
       attemptCounts[item]++;
-      
+
       if (item === 2 && attemptCounts[item] === 1) {
         throw new Error("Temporary error");
       }
-      
+
       return item * 2;
     });
-    
+
     // Create a mock for the onRetry callback
     const onRetry = mock((item: number, error: Error, attempt: number) => {
       // Retry tracking
     });
-    
+
     // Process the items with retry
     const results = await processWithRetry(items, processItem, {
       maxRetries: 2,
       retryDelay: 10,
       onRetry,
     });
-    
+
     // Verify results
     expect(results).toEqual([2, 4, 6]);
-    
+
     // Verify that item 2 was retried once
     expect(attemptCounts[1]).toBe(1); // No retries
     expect(attemptCounts[2]).toBe(2); // One retry
     expect(attemptCounts[3]).toBe(1); // No retries
-    
+
     // Verify that onRetry was called once
     expect(onRetry).toHaveBeenCalledTimes(1);
     expect(onRetry.mock.calls[0][0]).toBe(2); // item
     expect(onRetry.mock.calls[0][2]).toBe(1); // attempt
   });
-  
+
   test("gives up after max retries", async () => {
     // Create an array of numbers to process
     const items = [1, 2];
-    
+
     // Create a mock function that always fails for item 2
     const processItem = mock(async (item: number) => {
       if (item === 2) {
@@ -132,17 +132,17 @@ describe("processWithRetry", () => {
       }
       return item * 2;
     });
-    
+
     // Create a mock for the onRetry callback
     const onRetry = mock((item: number, error: Error, attempt: number) => {
       // Retry tracking
     });
-    
+
     // Create a spy for console.error
     const originalConsoleError = console.error;
     const consoleErrorMock = mock(() => {});
     console.error = consoleErrorMock;
-    
+
     try {
       // Process the items with retry
       const results = await processWithRetry(items, processItem, {
@@ -150,15 +150,15 @@ describe("processWithRetry", () => {
         retryDelay: 10,
         onRetry,
       });
-      
+
       // Verify results (should have 1 item, missing the one that errored)
       expect(results).toEqual([2]);
-      
+
       // Verify that onRetry was called twice (for 2 retry attempts)
       expect(onRetry).toHaveBeenCalledTimes(2);
-      
-      // Verify that console.error was called once
-      expect(consoleErrorMock).toHaveBeenCalledTimes(1);
+
+      // Verify that console.error was called (enhanced logging calls it multiple times)
+      expect(consoleErrorMock).toHaveBeenCalled();
     } finally {
       // Restore console.error
       console.error = originalConsoleError;

src/lib/utils/concurrency.ts

@@ -46,11 +46,25 @@ export async function processInParallel<T, R>(
     const batchResults = await Promise.allSettled(batchPromises);
 
     // Process results and handle errors
-    for (const result of batchResults) {
+    for (let j = 0; j < batchResults.length; j++) {
+      const result = batchResults[j];
       if (result.status === 'fulfilled') {
         results.push(result.value);
       } else {
-        console.error('Error processing item:', result.reason);
+        const itemIndex = i + j;
+        console.error("=== BATCH ITEM PROCESSING ERROR ===");
+        console.error("Batch index:", Math.floor(i / concurrencyLimit));
+        console.error("Item index in batch:", j);
+        console.error("Global item index:", itemIndex);
+        console.error("Error type:", result.reason?.constructor?.name);
+        console.error("Error message:", result.reason instanceof Error ? result.reason.message : String(result.reason));
+
+        if (result.reason instanceof Error && result.reason.message.includes('JSON')) {
+          console.error("🚨 JSON parsing error in batch processing");
+          console.error("This indicates an API response issue from Gitea");
+        }
+
+        console.error("==================================");
       }
     }
   }
@@ -139,6 +153,21 @@ export async function processWithRetry<T, R>(
           const delay = retryDelay * Math.pow(2, attempt - 1);
           await new Promise(resolve => setTimeout(resolve, delay));
         } else {
+          // Enhanced error logging for final failure
+          console.error("=== ITEM PROCESSING FAILED (MAX RETRIES EXCEEDED) ===");
+          console.error("Item:", getItemId ? getItemId(item) : 'unknown');
+          console.error("Error type:", lastError.constructor.name);
+          console.error("Error message:", lastError.message);
+          console.error("Attempts made:", maxRetries + 1);
+
+          if (lastError.message.includes('JSON')) {
+            console.error("🚨 JSON-related error detected in item processing");
+            console.error("This suggests an issue with API responses from Gitea");
+          }
+
+          console.error("Stack trace:", lastError.stack);
+          console.error("================================================");
+
           throw lastError;
         }
       }

src/lib/utils/config-mapper.ts

@@ -0,0 +1,136 @@
+/**
+ * Maps between UI config structure and database schema structure
+ */
+
+import type { 
+  GitHubConfig, 
+  GiteaConfig,
+  MirrorOptions, 
+  AdvancedOptions,
+  SaveConfigApiRequest 
+} from "@/types/config";
+
+interface DbGitHubConfig {
+  username: string;
+  token?: string;
+  skipForks: boolean;
+  privateRepositories: boolean;
+  mirrorIssues: boolean;
+  mirrorWiki: boolean;
+  mirrorStarred: boolean;
+  useSpecificUser: boolean;
+  singleRepo?: string;
+  includeOrgs: string[];
+  excludeOrgs: string[];
+  mirrorPublicOrgs: boolean;
+  publicOrgs: string[];
+  skipStarredIssues: boolean;
+}
+
+interface DbGiteaConfig {
+  username: string;
+  url: string;
+  token: string;
+  organization?: string;
+  visibility: "public" | "private" | "limited";
+  starredReposOrg: string;
+  preserveOrgStructure: boolean;
+  mirrorStrategy?: "preserve" | "single-org" | "flat-user" | "mixed";
+  personalReposOrg?: string;
+}
+
+/**
+ * Maps UI config structure to database schema structure
+ */
+export function mapUiToDbConfig(
+  githubConfig: GitHubConfig,
+  giteaConfig: GiteaConfig,
+  mirrorOptions: MirrorOptions,
+  advancedOptions: AdvancedOptions
+): { githubConfig: DbGitHubConfig; giteaConfig: DbGiteaConfig } {
+  // Map GitHub config with fields from mirrorOptions and advancedOptions
+  const dbGithubConfig: DbGitHubConfig = {
+    username: githubConfig.username,
+    token: githubConfig.token,
+    privateRepositories: githubConfig.privateRepositories,
+    mirrorStarred: githubConfig.mirrorStarred,
+    
+    // From mirrorOptions
+    mirrorIssues: mirrorOptions.mirrorMetadata && mirrorOptions.metadataComponents.issues,
+    mirrorWiki: mirrorOptions.mirrorMetadata && mirrorOptions.metadataComponents.wiki,
+    
+    // From advancedOptions
+    skipForks: advancedOptions.skipForks,
+    skipStarredIssues: advancedOptions.skipStarredIssues,
+    
+    // Default values for fields not in UI
+    useSpecificUser: false,
+    includeOrgs: [],
+    excludeOrgs: [],
+    mirrorPublicOrgs: false,
+    publicOrgs: [],
+  };
+
+  // Gitea config remains mostly the same
+  const dbGiteaConfig: DbGiteaConfig = {
+    ...giteaConfig,
+  };
+
+  return {
+    githubConfig: dbGithubConfig,
+    giteaConfig: dbGiteaConfig,
+  };
+}
+
+/**
+ * Maps database schema structure to UI config structure
+ */
+export function mapDbToUiConfig(dbConfig: any): {
+  githubConfig: GitHubConfig;
+  giteaConfig: GiteaConfig;
+  mirrorOptions: MirrorOptions;
+  advancedOptions: AdvancedOptions;
+} {
+  const githubConfig: GitHubConfig = {
+    username: dbConfig.githubConfig?.username || "",
+    token: dbConfig.githubConfig?.token || "",
+    privateRepositories: dbConfig.githubConfig?.privateRepositories || false,
+    mirrorStarred: dbConfig.githubConfig?.mirrorStarred || false,
+  };
+
+  const giteaConfig: GiteaConfig = {
+    url: dbConfig.giteaConfig?.url || "",
+    username: dbConfig.giteaConfig?.username || "",
+    token: dbConfig.giteaConfig?.token || "",
+    organization: dbConfig.giteaConfig?.organization || "github-mirrors",
+    visibility: dbConfig.giteaConfig?.visibility || "public",
+    starredReposOrg: dbConfig.giteaConfig?.starredReposOrg || "github",
+    preserveOrgStructure: dbConfig.giteaConfig?.preserveOrgStructure || false,
+    mirrorStrategy: dbConfig.giteaConfig?.mirrorStrategy,
+    personalReposOrg: dbConfig.giteaConfig?.personalReposOrg,
+  };
+
+  const mirrorOptions: MirrorOptions = {
+    mirrorReleases: false, // Not stored in DB yet
+    mirrorMetadata: dbConfig.githubConfig?.mirrorIssues || dbConfig.githubConfig?.mirrorWiki || false,
+    metadataComponents: {
+      issues: dbConfig.githubConfig?.mirrorIssues || false,
+      pullRequests: false, // Not stored in DB yet
+      labels: false, // Not stored in DB yet
+      milestones: false, // Not stored in DB yet
+      wiki: dbConfig.githubConfig?.mirrorWiki || false,
+    },
+  };
+
+  const advancedOptions: AdvancedOptions = {
+    skipForks: dbConfig.githubConfig?.skipForks || false,
+    skipStarredIssues: dbConfig.githubConfig?.skipStarredIssues || false,
+  };
+
+  return {
+    githubConfig,
+    giteaConfig,
+    mirrorOptions,
+    advancedOptions,
+  };
+}

src/pages/404.astro

@@ -0,0 +1,37 @@
+---
+import '../styles/global.css';
+import ThemeScript from '@/components/theme/ThemeScript.astro';
+import { NotFound } from '@/components/NotFound';
+
+const generator = Astro.generator;
+---
+
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="generator" content={generator} />
+    <title>Page Not Found - Gitea Mirror</title>
+    <ThemeScript />
+  </head>
+  <body>
+    <NotFound client:load />
+  </body>
+</html>
+
+<style>
+  /* Floating animation for 404 text */
+  :global(.animate-float) {
+    animation: float 3s ease-in-out infinite;
+  }
+
+  @keyframes float {
+    0%, 100% {
+      transform: translateY(0);
+    }
+    50% {
+      transform: translateY(-10px);
+    }
+  }
+</style>

src/pages/api/activities/cleanup.ts

@@ -1,6 +1,7 @@
 import type { APIRoute } from "astro";
 import { db, mirrorJobs, events } from "@/lib/db";
 import { eq, count } from "drizzle-orm";
+import { createSecureErrorResponse } from "@/lib/utils";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -87,29 +88,6 @@ export const POST: APIRoute = async ({ request }) => {
       { status: 200, headers: { "Content-Type": "application/json" } }
     );
   } catch (error) {
-    console.error("Error cleaning up activities:", error);
-
-    // Provide more specific error messages
-    let errorMessage = "An unknown error occurred.";
-    if (error instanceof Error) {
-      errorMessage = error.message;
-
-      // Check for common database errors
-      if (error.message.includes("FOREIGN KEY constraint failed")) {
-        errorMessage = "Cannot delete activities due to database constraints. Some jobs may still be referenced by other records.";
-      } else if (error.message.includes("database is locked")) {
-        errorMessage = "Database is currently locked. Please try again in a moment.";
-      } else if (error.message.includes("no such table")) {
-        errorMessage = "Database tables are missing. Please check your database setup.";
-      }
-    }
-
-    return new Response(
-      JSON.stringify({
-        success: false,
-        error: errorMessage,
-      }),
-      { status: 500, headers: { "Content-Type": "application/json" } }
-    );
+    return createSecureErrorResponse(error, "activities cleanup", 500);
   }
 };

src/pages/api/activities/index.ts

@@ -1,6 +1,7 @@
 import type { APIRoute } from "astro";
 import { db, mirrorJobs, configs } from "@/lib/db";
 import { eq, sql } from "drizzle-orm";
+import { createSecureErrorResponse } from "@/lib/utils";
 import type { MirrorJob } from "@/lib/db/schema";
 import { repoStatusEnum } from "@/types/Repository";
 
@@ -45,14 +46,6 @@ export const GET: APIRoute = async ({ url }) => {
       { status: 200, headers: { "Content-Type": "application/json" } }
     );
   } catch (error) {
-    console.error("Error fetching mirror job activities:", error);
-    return new Response(
-      JSON.stringify({
-        success: false,
-        error:
-          error instanceof Error ? error.message : "An unknown error occurred.",
-      }),
-      { status: 500, headers: { "Content-Type": "application/json" } }
-    );
+    return createSecureErrorResponse(error, "activities fetch", 500);
   }
 };

src/pages/api/cleanup/auto.ts

@@ -5,6 +5,7 @@
 
 import type { APIRoute } from 'astro';
 import { runAutomaticCleanup } from '@/lib/cleanup-service';
+import { createSecureErrorResponse } from '@/lib/utils';
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -38,21 +39,7 @@ export const POST: APIRoute = async ({ request }) => {
       }
     );
   } catch (error) {
-    console.error('Error in manual cleanup trigger:', error);
-    
-    return new Response(
-      JSON.stringify({
-        success: false,
-        message: 'Failed to run automatic cleanup',
-        error: error instanceof Error ? error.message : 'Unknown error',
-      }),
-      {
-        status: 500,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      }
-    );
+    return createSecureErrorResponse(error, "cleanup trigger", 500);
   }
 };
 

src/pages/api/config/index.ts

@@ -3,18 +3,20 @@ import { db, configs, users } from "@/lib/db";
 import { v4 as uuidv4 } from "uuid";
 import { eq } from "drizzle-orm";
 import { calculateCleanupInterval } from "@/lib/cleanup-service";
+import { createSecureErrorResponse } from "@/lib/utils";
+import { mapUiToDbConfig, mapDbToUiConfig } from "@/lib/utils/config-mapper";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
     const body = await request.json();
-    const { userId, githubConfig, giteaConfig, scheduleConfig, cleanupConfig } = body;
+    const { userId, githubConfig, giteaConfig, scheduleConfig, cleanupConfig, mirrorOptions, advancedOptions } = body;
 
-    if (!userId || !githubConfig || !giteaConfig || !scheduleConfig || !cleanupConfig) {
+    if (!userId || !githubConfig || !giteaConfig || !scheduleConfig || !cleanupConfig || !mirrorOptions || !advancedOptions) {
       return new Response(
         JSON.stringify({
           success: false,
           message:
-            "userId, githubConfig, giteaConfig, scheduleConfig, and cleanupConfig are required.",
+            "userId, githubConfig, giteaConfig, scheduleConfig, cleanupConfig, mirrorOptions, and advancedOptions are required.",
         }),
         {
           status: 400,
@@ -32,6 +34,14 @@ export const POST: APIRoute = async ({ request }) => {
 
     const existingConfig = existingConfigResult[0];
 
+    // Map UI structure to database schema structure first
+    const { githubConfig: mappedGithubConfig, giteaConfig: mappedGiteaConfig } = mapUiToDbConfig(
+      githubConfig,
+      giteaConfig,
+      mirrorOptions,
+      advancedOptions
+    );
+    
     // Preserve tokens if fields are empty
     if (existingConfig) {
       try {
@@ -45,12 +55,12 @@ export const POST: APIRoute = async ({ request }) => {
             ? JSON.parse(existingConfig.giteaConfig)
             : existingConfig.giteaConfig;
 
-        if (!githubConfig.token && existingGithub.token) {
-          githubConfig.token = existingGithub.token;
+        if (!mappedGithubConfig.token && existingGithub.token) {
+          mappedGithubConfig.token = existingGithub.token;
         }
 
-        if (!giteaConfig.token && existingGitea.token) {
-          giteaConfig.token = existingGitea.token;
+        if (!mappedGiteaConfig.token && existingGitea.token) {
+          mappedGiteaConfig.token = existingGitea.token;
         }
       } catch (tokenError) {
         console.error("Failed to preserve tokens:", tokenError);
@@ -119,8 +129,8 @@ export const POST: APIRoute = async ({ request }) => {
       await db
         .update(configs)
         .set({
-          githubConfig,
-          giteaConfig,
+          githubConfig: mappedGithubConfig,
+          giteaConfig: mappedGiteaConfig,
           scheduleConfig: processedScheduleConfig,
           cleanupConfig: processedCleanupConfig,
           updatedAt: new Date(),
@@ -167,8 +177,8 @@ export const POST: APIRoute = async ({ request }) => {
       userId,
       name: "Default Configuration",
       isActive: true,
-      githubConfig,
-      giteaConfig,
+      githubConfig: mappedGithubConfig,
+      giteaConfig: mappedGiteaConfig,
       include: [],
       exclude: [],
       scheduleConfig: processedScheduleConfig,
@@ -189,19 +199,7 @@ export const POST: APIRoute = async ({ request }) => {
       }
     );
   } catch (error) {
-    console.error("Error saving configuration:", error);
-    return new Response(
-      JSON.stringify({
-        success: false,
-        message:
-          "Error saving configuration: " +
-          (error instanceof Error ? error.message : "Unknown error"),
-      }),
-      {
-        status: 500,
-        headers: { "Content-Type": "application/json" },
-      }
-    );
+    return createSecureErrorResponse(error, "config save", 500);
   }
 };
 
@@ -225,32 +223,40 @@ export const GET: APIRoute = async ({ request }) => {
       .limit(1);
 
     if (config.length === 0) {
-      // Return a default empty configuration instead of a 404 error
+      // Return a default empty configuration with UI structure
+      const defaultDbConfig = {
+        githubConfig: {
+          username: "",
+          token: "",
+          skipForks: false,
+          privateRepositories: false,
+          mirrorIssues: false,
+          mirrorWiki: false,
+          mirrorStarred: false,
+          useSpecificUser: false,
+          preserveOrgStructure: false,
+          skipStarredIssues: false,
+        },
+        giteaConfig: {
+          url: "",
+          token: "",
+          username: "",
+          organization: "github-mirrors",
+          visibility: "public",
+          starredReposOrg: "github",
+          preserveOrgStructure: false,
+        },
+      };
+      
+      const uiConfig = mapDbToUiConfig(defaultDbConfig);
+      
       return new Response(
         JSON.stringify({
           id: null,
           userId: userId,
           name: "Default Configuration",
           isActive: true,
-          githubConfig: {
-            username: "",
-            token: "",
-            skipForks: false,
-            privateRepositories: false,
-            mirrorIssues: false,
-            mirrorStarred: true,
-            useSpecificUser: false,
-            preserveOrgStructure: true,
-            skipStarredIssues: false,
-          },
-          giteaConfig: {
-            url: "",
-            token: "",
-            username: "",
-            organization: "github-mirrors",
-            visibility: "public",
-            starredReposOrg: "github",
-          },
+          ...uiConfig,
           scheduleConfig: {
             enabled: false,
             interval: 3600,
@@ -271,21 +277,18 @@ export const GET: APIRoute = async ({ request }) => {
       );
     }
 
-    return new Response(JSON.stringify(config[0]), {
+    // Map database structure to UI structure
+    const dbConfig = config[0];
+    const uiConfig = mapDbToUiConfig(dbConfig);
+    
+    return new Response(JSON.stringify({
+      ...dbConfig,
+      ...uiConfig,
+    }), {
       status: 200,
       headers: { "Content-Type": "application/json" },
     });
   } catch (error) {
-    console.error("Error fetching configuration:", error);
-
-    return new Response(
-      JSON.stringify({
-        error: error instanceof Error ? error.message : "Something went wrong",
-      }),
-      {
-        status: 500,
-        headers: { "Content-Type": "application/json" },
-      }
-    );
+    return createSecureErrorResponse(error, "config fetch", 500);
   }
 };

src/pages/api/dashboard/index.ts

@@ -1,7 +1,7 @@
 import type { APIRoute } from "astro";
 import { db, repositories, organizations, mirrorJobs, configs } from "@/lib/db";
 import { eq, count, and, sql, or } from "drizzle-orm";
-import { jsonResponse } from "@/lib/utils";
+import { jsonResponse, createSecureErrorResponse } from "@/lib/utils";
 import type { DashboardApiResponse } from "@/types/dashboard";
 import { repositoryVisibilityEnum, repoStatusEnum } from "@/types/Repository";
 import { membershipRoleEnum } from "@/types/organizations";
@@ -108,15 +108,6 @@ export const GET: APIRoute = async ({ request }) => {
 
     return jsonResponse({ data: successResponse });
   } catch (error) {
-    console.error("Error loading dashboard for user:", userId, error);
-
-    return jsonResponse({
-      data: {
-        success: false,
-        error: error instanceof Error ? error.message : "Internal server error",
-        message: "Failed to fetch dashboard data",
-      },
-      status: 500,
-    });
+    return createSecureErrorResponse(error, "dashboard data fetch", 500);
   }
 };

src/pages/api/gitea/test-connection.test.ts

@@ -1,5 +1,4 @@
 import { describe, test, expect, mock, beforeEach, afterEach } from "bun:test";
-import axios from "axios";
 
 // Mock the POST function
 const mockPOST = mock(async ({ request }) => {

src/pages/api/gitea/test-connection.ts

@@ -1,5 +1,6 @@
 import type { APIRoute } from 'astro';
-import axios from 'axios';
+import { httpGet, HttpError } from '@/lib/http-client';
+import { createSecureErrorResponse } from '@/lib/utils';
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -25,11 +26,9 @@ export const POST: APIRoute = async ({ request }) => {
     const baseUrl = url.endsWith('/') ? url.slice(0, -1) : url;
 
     // Test the connection by fetching the authenticated user
-    const response = await axios.get(`${baseUrl}/api/v1/user`, {
-      headers: {
-        'Authorization': `token ${token}`,
-        'Accept': 'application/json',
-      },
+    const response = await httpGet(`${baseUrl}/api/v1/user`, {
+      'Authorization': `token ${token}`,
+      'Accept': 'application/json',
     });
 
     const data = response.data;
@@ -72,8 +71,8 @@ export const POST: APIRoute = async ({ request }) => {
     console.error('Gitea connection test failed:', error);
 
     // Handle specific error types
-    if (axios.isAxiosError(error) && error.response) {
-      if (error.response.status === 401) {
+    if (error instanceof HttpError) {
+      if (error.status === 401) {
         return new Response(
           JSON.stringify({
             success: false,
@@ -86,7 +85,7 @@ export const POST: APIRoute = async ({ request }) => {
             },
           }
         );
-      } else if (error.response.status === 404) {
+      } else if (error.status === 404) {
         return new Response(
           JSON.stringify({
             success: false,
@@ -99,37 +98,24 @@ export const POST: APIRoute = async ({ request }) => {
             },
           }
         );
+      } else if (error.status === 0) {
+        // Network error
+        return new Response(
+          JSON.stringify({
+            success: false,
+            message: 'Could not connect to Gitea server. Please check the URL.',
+          }),
+          {
+            status: 500,
+            headers: {
+              'Content-Type': 'application/json',
+            },
+          }
+        );
       }
     }
 
-    // Handle connection errors
-    if (axios.isAxiosError(error) && (error.code === 'ECONNREFUSED' || error.code === 'ENOTFOUND')) {
-      return new Response(
-        JSON.stringify({
-          success: false,
-          message: 'Could not connect to Gitea server. Please check the URL.',
-        }),
-        {
-          status: 500,
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        }
-      );
-    }
-
     // Generic error response
-    return new Response(
-      JSON.stringify({
-        success: false,
-        message: `Gitea connection test failed: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      }),
-      {
-        status: 500,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      }
-    );
+    return createSecureErrorResponse(error, "Gitea connection test", 500);
   }
 };

src/pages/api/github/organizations.ts

@@ -1,14 +1,14 @@
 import type { APIRoute } from "astro";
 import { db } from "@/lib/db";
-import { organizations } from "@/lib/db";
-import { eq, sql } from "drizzle-orm";
+import { organizations, repositories, configs } from "@/lib/db";
+import { eq, sql, and, count } from "drizzle-orm";
 import {
   membershipRoleEnum,
   type OrganizationsApiResponse,
 } from "@/types/organizations";
 import type { Organization } from "@/lib/db/schema";
 import { repoStatusEnum } from "@/types/Repository";
-import { jsonResponse } from "@/lib/utils";
+import { jsonResponse, createSecureErrorResponse } from "@/lib/utils";
 
 export const GET: APIRoute = async ({ request }) => {
   const url = new URL(request.url);
@@ -25,36 +25,118 @@ export const GET: APIRoute = async ({ request }) => {
   }
 
   try {
+    // Fetch the user's active configuration to respect filtering settings
+    const [config] = await db
+      .select()
+      .from(configs)
+      .where(and(eq(configs.userId, userId), eq(configs.isActive, true)));
+
+    if (!config) {
+      return jsonResponse({
+        data: {
+          success: false,
+          error: "No active configuration found for this user",
+        },
+        status: 404,
+      });
+    }
+
+    const githubConfig = config.githubConfig as {
+      mirrorStarred: boolean;
+      skipForks: boolean;
+      privateRepositories: boolean;
+    };
+
     const rawOrgs = await db
       .select()
       .from(organizations)
       .where(eq(organizations.userId, userId))
       .orderBy(sql`name COLLATE NOCASE`);
 
-    const orgsWithIds: Organization[] = rawOrgs.map((org) => ({
-      ...org,
-      status: repoStatusEnum.parse(org.status),
-      membershipRole: membershipRoleEnum.parse(org.membershipRole),
-      lastMirrored: org.lastMirrored ?? undefined,
-      errorMessage: org.errorMessage ?? undefined,
-    }));
+    // Calculate repository breakdowns for each organization
+    const orgsWithBreakdown = await Promise.all(
+      rawOrgs.map(async (org) => {
+        // Build base conditions for this organization (without private/fork filters)
+        const baseConditions = [
+          eq(repositories.userId, userId),
+          eq(repositories.organization, org.name)
+        ];
+
+        if (!githubConfig.mirrorStarred) {
+          baseConditions.push(eq(repositories.isStarred, false));
+        }
+
+        // Get total count with all user config filters applied
+        const totalConditions = [...baseConditions];
+        if (githubConfig.skipForks) {
+          totalConditions.push(eq(repositories.isForked, false));
+        }
+        if (!githubConfig.privateRepositories) {
+          totalConditions.push(eq(repositories.isPrivate, false));
+        }
+
+        const [totalCount] = await db
+          .select({ count: count() })
+          .from(repositories)
+          .where(and(...totalConditions));
+
+        // Get public count
+        const publicConditions = [...baseConditions, eq(repositories.isPrivate, false)];
+        if (githubConfig.skipForks) {
+          publicConditions.push(eq(repositories.isForked, false));
+        }
+
+        const [publicCount] = await db
+          .select({ count: count() })
+          .from(repositories)
+          .where(and(...publicConditions));
+
+        // Get private count (only if private repos are enabled in config)
+        const [privateCount] = githubConfig.privateRepositories ? await db
+          .select({ count: count() })
+          .from(repositories)
+          .where(
+            and(
+              ...baseConditions,
+              eq(repositories.isPrivate, true),
+              ...(githubConfig.skipForks ? [eq(repositories.isForked, false)] : [])
+            )
+          ) : [{ count: 0 }];
+
+        // Get fork count (only if forks are enabled in config)
+        const [forkCount] = !githubConfig.skipForks ? await db
+          .select({ count: count() })
+          .from(repositories)
+          .where(
+            and(
+              ...baseConditions,
+              eq(repositories.isForked, true),
+              ...(!githubConfig.privateRepositories ? [eq(repositories.isPrivate, false)] : [])
+            )
+          ) : [{ count: 0 }];
+
+        return {
+          ...org,
+          status: repoStatusEnum.parse(org.status),
+          membershipRole: membershipRoleEnum.parse(org.membershipRole),
+          lastMirrored: org.lastMirrored ?? undefined,
+          errorMessage: org.errorMessage ?? undefined,
+          repositoryCount: totalCount.count,
+          publicRepositoryCount: publicCount.count,
+          privateRepositoryCount: privateCount.count,
+          forkRepositoryCount: forkCount.count,
+        };
+      })
+    );
 
     const resPayload: OrganizationsApiResponse = {
       success: true,
       message: "Organizations fetched successfully",
-      organizations: orgsWithIds,
+      organizations: orgsWithBreakdown,
     };
 
     return jsonResponse({ data: resPayload, status: 200 });
   } catch (error) {
-    console.error("Error fetching organizations:", error);
-
-    return jsonResponse({
-      data: {
-        success: false,
-        error: error instanceof Error ? error.message : "Something went wrong",
-      },
-      status: 500,
-    });
+    return createSecureErrorResponse(error, "organizations fetch", 500);
   }
 };

src/pages/api/github/repositories.ts

@@ -6,7 +6,7 @@ import {
   repoStatusEnum,
   type RepositoryApiResponse,
 } from "@/types/Repository";
-import { jsonResponse } from "@/lib/utils";
+import { jsonResponse, createSecureErrorResponse } from "@/lib/utils";
 
 export const GET: APIRoute = async ({ request }) => {
   const url = new URL(request.url);
@@ -82,15 +82,6 @@ export const GET: APIRoute = async ({ request }) => {
       status: 200,
     });
   } catch (error) {
-    console.error("Error fetching repositories:", error);
-
-    return jsonResponse({
-      data: {
-        success: false,
-        error: error instanceof Error ? error.message : "Something went wrong",
-        message: "An error occurred while fetching repositories.",
-      },
-      status: 500,
-    });
+    return createSecureErrorResponse(error, "repositories fetch", 500);
   }
 };

src/pages/api/github/test-connection.test.ts

@@ -111,7 +111,7 @@ describe("GitHub Test Connection API", () => {
         })
       };
     });
-    
+
     const request = new Request("http://localhost/api/github/test-connection", {
       method: "POST",
       headers: {
@@ -121,13 +121,15 @@ describe("GitHub Test Connection API", () => {
         token: "invalid-token"
       })
     });
-    
+
     const response = await POST({ request } as any);
-    
+
     expect(response.status).toBe(500);
-    
+
     const data = await response.json();
-    expect(data.success).toBe(false);
-    expect(data.message).toContain("Bad credentials");
+    // The createSecureErrorResponse function returns an error field, not success
+    // It sanitizes error messages for security, so we expect the generic message
+    expect(data.error).toBeDefined();
+    expect(data.error).toBe("An internal server error occurred");
   });
 });

src/pages/api/github/test-connection.ts

@@ -1,5 +1,6 @@
 import type { APIRoute } from "astro";
 import { Octokit } from "@octokit/rest";
+import { createSecureErrorResponse } from "@/lib/utils";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -83,19 +84,6 @@ export const POST: APIRoute = async ({ request }) => {
     }
 
     // Generic error response
-    return new Response(
-      JSON.stringify({
-        success: false,
-        message: `GitHub connection test failed: ${
-          error instanceof Error ? error.message : "Unknown error"
-        }`,
-      }),
-      {
-        status: 500,
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    );
+    return createSecureErrorResponse(error, "GitHub connection test", 500);
   }
 };

src/pages/api/health.ts

@@ -1,10 +1,10 @@
 import type { APIRoute } from "astro";
-import { jsonResponse } from "@/lib/utils";
+import { jsonResponse, createSecureErrorResponse } from "@/lib/utils";
 import { db } from "@/lib/db";
 import { ENV } from "@/lib/config";
 import { getRecoveryStatus, hasJobsNeedingRecovery } from "@/lib/recovery";
 import os from "os";
-import axios from "axios";
+import { httpGet } from "@/lib/http-client";
 
 // Track when the server started
 const serverStartTime = new Date();
@@ -58,7 +58,7 @@ export const GET: APIRoute = async () => {
       latestVersion: latestVersion,
       updateAvailable: latestVersion !== "unknown" &&
                        currentVersion !== "unknown" &&
-                       latestVersion !== currentVersion,
+                       compareVersions(currentVersion, latestVersion) < 0,
       database: dbStatus,
       recovery: recoveryStatus,
       system: systemInfo,
@@ -69,19 +69,7 @@ export const GET: APIRoute = async () => {
       status: 200,
     });
   } catch (error) {
-    console.error("Health check failed:", error);
-
-    return jsonResponse({
-      data: {
-        status: "error",
-        timestamp: new Date().toISOString(),
-        error: error instanceof Error ? error.message : "Unknown error",
-        version: process.env.npm_package_version || "unknown",
-        latestVersion: "unknown",
-        updateAvailable: false,
-      },
-      status: 503, // Service Unavailable
-    });
+    return createSecureErrorResponse(error, "health check", 503);
   }
 };
 
@@ -186,6 +174,28 @@ function formatBytes(bytes: number): string {
   return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
 }
 
+/**
+ * Compare semantic versions
+ * Returns: 
+ *  -1 if v1 < v2
+ *   0 if v1 = v2
+ *   1 if v1 > v2
+ */
+function compareVersions(v1: string, v2: string): number {
+  const parts1 = v1.split('.').map(Number);
+  const parts2 = v2.split('.').map(Number);
+  
+  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+    const part1 = parts1[i] || 0;
+    const part2 = parts2[i] || 0;
+    
+    if (part1 < part2) return -1;
+    if (part1 > part2) return 1;
+  }
+  
+  return 0;
+}
+
 /**
  * Check for the latest version from GitHub releases
  */
@@ -197,9 +207,9 @@ async function checkLatestVersion(): Promise<string> {
 
   try {
     // Fetch the latest release from GitHub
-    const response = await axios.get(
-      'https://api.github.com/repos/arunavo4/gitea-mirror/releases/latest',
-      { headers: { 'Accept': 'application/vnd.github.v3+json' } }
+    const response = await httpGet(
+      'https://api.github.com/repos/RayLabsHQ/gitea-mirror/releases/latest',
+      { 'Accept': 'application/vnd.github.v3+json' }
     );
 
     // Extract version from tag_name (remove 'v' prefix if present)

src/pages/api/job/mirror-org.ts

@@ -6,6 +6,7 @@ import { createGitHubClient } from "@/lib/github";
 import { mirrorGitHubOrgToGitea } from "@/lib/gitea";
 import { repoStatusEnum } from "@/types/Repository";
 import { type MembershipRole } from "@/types/organizations";
+import { createSecureErrorResponse } from "@/lib/utils";
 import { processWithResilience } from "@/lib/utils/concurrency";
 import { v4 as uuidv4 } from "uuid";
 
@@ -149,13 +150,6 @@ export const POST: APIRoute = async ({ request }) => {
       headers: { "Content-Type": "application/json" },
     });
   } catch (error) {
-    console.error("Error in mirroring organization:", error);
-    return new Response(
-      JSON.stringify({
-        error:
-          error instanceof Error ? error.message : "An unknown error occurred.",
-      }),
-      { status: 500, headers: { "Content-Type": "application/json" } }
-    );
+    return createSecureErrorResponse(error, "mirror organization", 500);
   }
 };

src/pages/api/job/mirror-repo.test.ts

@@ -1,35 +1,109 @@
 import { describe, test, expect, mock, beforeEach, afterEach } from "bun:test";
+import type { MirrorRepoRequest } from "@/types/mirror";
+import { POST } from "./mirror-repo";
 
-// Create a mock POST function
-const mockPOST = mock(async ({ request }) => {
-  const body = await request.json();
-
-  // Check for missing userId or repositoryIds
-  if (!body.userId || !body.repositoryIds) {
-    return new Response(
-      JSON.stringify({
-        error: "Missing userId or repositoryIds."
-      }),
-      { status: 400 }
-    );
-  }
-
-  // Success case
-  return new Response(
-    JSON.stringify({
-      success: true,
-      message: "Repository mirroring started",
-      batchId: "test-batch-id"
-    }),
-    { status: 200 }
-  );
-});
-
-// Create a mock module
-const mockModule = {
-  POST: mockPOST
+// Mock the database module
+const mockDb = {
+  select: mock(() => ({
+    from: mock((table: any) => ({
+      where: mock(() => {
+        // Return config for configs table
+        if (table === mockConfigs) {
+          return {
+            limit: mock(() => Promise.resolve([{
+              id: "config-id",
+              userId: "user-id",
+              githubConfig: {
+                token: "github-token",
+                preserveOrgStructure: false,
+                mirrorIssues: false
+              },
+              giteaConfig: {
+                url: "https://gitea.example.com",
+                token: "gitea-token",
+                username: "giteauser"
+              }
+            }]))
+          };
+        }
+        // Return repositories for repositories table
+        return Promise.resolve([
+          {
+            id: "repo-id-1",
+            name: "test-repo-1",
+            visibility: "public",
+            status: "pending",
+            organization: null,
+            lastMirrored: null,
+            errorMessage: null,
+            forkedFrom: null,
+            mirroredLocation: ""
+          },
+          {
+            id: "repo-id-2",
+            name: "test-repo-2",
+            visibility: "public",
+            status: "pending",
+            organization: null,
+            lastMirrored: null,
+            errorMessage: null,
+            forkedFrom: null,
+            mirroredLocation: ""
+          }
+        ]);
+      })
+    }))
+  }))
 };
 
+const mockConfigs = {};
+const mockRepositories = {};
+
+mock.module("@/lib/db", () => ({
+  db: mockDb,
+  configs: mockConfigs,
+  repositories: mockRepositories
+}));
+
+// Mock the gitea module
+const mockMirrorGithubRepoToGitea = mock(() => Promise.resolve());
+const mockMirrorGitHubOrgRepoToGiteaOrg = mock(() => Promise.resolve());
+
+mock.module("@/lib/gitea", () => ({
+  mirrorGithubRepoToGitea: mockMirrorGithubRepoToGitea,
+  mirrorGitHubOrgRepoToGiteaOrg: mockMirrorGitHubOrgRepoToGiteaOrg
+}));
+
+// Mock the github module
+const mockCreateGitHubClient = mock(() => ({}));
+
+mock.module("@/lib/github", () => ({
+  createGitHubClient: mockCreateGitHubClient
+}));
+
+// Mock the concurrency module
+const mockProcessWithResilience = mock(() => Promise.resolve([]));
+
+mock.module("@/lib/utils/concurrency", () => ({
+  processWithResilience: mockProcessWithResilience
+}));
+
+// Mock drizzle-orm
+mock.module("drizzle-orm", () => ({
+  eq: mock(() => ({})),
+  inArray: mock(() => ({}))
+}));
+
+// Mock the types
+mock.module("@/types/Repository", () => ({
+  repositoryVisibilityEnum: {
+    parse: mock((value: string) => value)
+  },
+  repoStatusEnum: {
+    parse: mock((value: string) => value)
+  }
+}));
+
 describe("Repository Mirroring API", () => {
   // Mock console.log and console.error to prevent test output noise
   let originalConsoleLog: typeof console.log;
@@ -58,12 +132,13 @@ describe("Repository Mirroring API", () => {
       })
     });
 
-    const response = await mockModule.POST({ request } as any);
+    const response = await POST({ request } as any);
 
     expect(response.status).toBe(400);
 
     const data = await response.json();
-    expect(data.error).toBe("Missing userId or repositoryIds.");
+    expect(data.success).toBe(false);
+    expect(data.message).toBe("userId and repositoryIds are required.");
   });
 
   test("returns 400 if repositoryIds is missing", async () => {
@@ -77,12 +152,13 @@ describe("Repository Mirroring API", () => {
       })
     });
 
-    const response = await mockModule.POST({ request } as any);
+    const response = await POST({ request } as any);
 
     expect(response.status).toBe(400);
 
     const data = await response.json();
-    expect(data.error).toBe("Missing userId or repositoryIds.");
+    expect(data.success).toBe(false);
+    expect(data.message).toBe("userId and repositoryIds are required.");
   });
 
   test("returns 200 and starts mirroring repositories", async () => {
@@ -97,13 +173,13 @@ describe("Repository Mirroring API", () => {
       })
     });
 
-    const response = await mockModule.POST({ request } as any);
+    const response = await POST({ request } as any);
 
     expect(response.status).toBe(200);
 
     const data = await response.json();
     expect(data.success).toBe(true);
-    expect(data.message).toBe("Repository mirroring started");
-    expect(data.batchId).toBe("test-batch-id");
+    expect(data.message).toBe("Mirror job started.");
+    expect(data.repositories).toBeDefined();
   });
 });

src/pages/api/job/mirror-repo.ts

@@ -6,10 +6,11 @@ import { repositoryVisibilityEnum, repoStatusEnum } from "@/types/Repository";
 import {
   mirrorGithubRepoToGitea,
   mirrorGitHubOrgRepoToGiteaOrg,
+  getGiteaRepoOwnerAsync,
 } from "@/lib/gitea";
 import { createGitHubClient } from "@/lib/github";
 import { processWithResilience } from "@/lib/utils/concurrency";
-import { v4 as uuidv4 } from "uuid";
+import { createSecureErrorResponse } from "@/lib/utils";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -77,9 +78,6 @@ export const POST: APIRoute = async ({ request }) => {
       // Define the concurrency limit - adjust based on API rate limits
       const CONCURRENCY_LIMIT = 3;
 
-      // Generate a batch ID to group related repositories
-      const batchId = uuidv4();
-
       // Process repositories in parallel with resilience to container restarts
       await processWithResilience(
         repos,
@@ -99,12 +97,29 @@ export const POST: APIRoute = async ({ request }) => {
           // Log the start of mirroring
           console.log(`Starting mirror for repository: ${repo.name}`);
 
-          // Mirror the repository based on whether it's in an organization
-          if (repo.organization && config.githubConfig.preserveOrgStructure) {
+          // Determine where the repository should be mirrored (with organization overrides)
+          const owner = await getGiteaRepoOwnerAsync({
+            config,
+            repository: repoData,
+          });
+
+          console.log(`Repository ${repo.name} will be mirrored to owner: ${owner}`);
+
+          // For single-org and starred repos strategies, or when mirroring to an org,
+          // always use the org mirroring function to ensure proper organization handling
+          const mirrorStrategy = config.giteaConfig?.mirrorStrategy || 
+            (config.githubConfig?.preserveOrgStructure ? "preserve" : "flat-user");
+          
+          const shouldUseOrgMirror = 
+            owner !== config.giteaConfig?.username || // Different owner means org
+            mirrorStrategy === "single-org" || // Single-org strategy always uses org
+            repoData.isStarred; // Starred repos always go to org
+
+          if (shouldUseOrgMirror) {
             await mirrorGitHubOrgRepoToGiteaOrg({
               config,
               octokit,
-              orgName: repo.organization,
+              orgName: owner,
               repository: repoData,
             });
           } else {
@@ -120,7 +135,6 @@ export const POST: APIRoute = async ({ request }) => {
         {
           userId: config.userId || "",
           jobType: "mirror",
-          batchId,
           getItemId: (repo) => repo.id,
           getItemName: (repo) => repo.name,
           concurrencyLimit: CONCURRENCY_LIMIT,
@@ -129,15 +143,19 @@ export const POST: APIRoute = async ({ request }) => {
           checkpointInterval: 5, // Checkpoint every 5 repositories to reduce event frequency
           onProgress: (completed, total, result) => {
             const percentComplete = Math.round((completed / total) * 100);
-            console.log(`Mirroring progress: ${percentComplete}% (${completed}/${total})`);
+            console.log(
+              `Mirroring progress: ${percentComplete}% (${completed}/${total})`
+            );
 
             if (result) {
               console.log(`Successfully mirrored repository: ${result.name}`);
             }
           },
           onRetry: (repo, error, attempt) => {
-            console.log(`Retrying repository ${repo.name} (attempt ${attempt}): ${error.message}`);
-          }
+            console.log(
+              `Retrying repository ${repo.name} (attempt ${attempt}): ${error.message}`
+            );
+          },
         }
       );
 
@@ -165,13 +183,40 @@ export const POST: APIRoute = async ({ request }) => {
       headers: { "Content-Type": "application/json" },
     });
   } catch (error) {
-    console.error("Error mirroring repositories:", error);
-    return new Response(
-      JSON.stringify({
-        error:
-          error instanceof Error ? error.message : "An unknown error occurred",
-      }),
-      { status: 500, headers: { "Content-Type": "application/json" } }
+    // Enhanced error logging for better debugging
+    console.error("=== ERROR MIRRORING REPOSITORIES ===");
+    console.error("Error type:", error?.constructor?.name);
+    console.error(
+      "Error message:",
+      error instanceof Error ? error.message : String(error)
     );
+
+    if (error instanceof Error) {
+      console.error("Error stack:", error.stack);
+    }
+
+    // Log additional context
+    console.error("Request details:");
+    console.error("- URL:", request.url);
+    console.error("- Method:", request.method);
+    console.error("- Headers:", Object.fromEntries(request.headers.entries()));
+
+    // If it's a JSON parsing error, provide more context
+    if (error instanceof SyntaxError && error.message.includes("JSON")) {
+      console.error("🚨 JSON PARSING ERROR DETECTED:");
+      console.error(
+        "This suggests the response from Gitea API is not valid JSON"
+      );
+      console.error("Common causes:");
+      console.error("- Gitea server returned HTML error page instead of JSON");
+      console.error("- Network connection interrupted");
+      console.error("- Gitea server is down or misconfigured");
+      console.error("- Authentication token is invalid");
+      console.error("Check your Gitea server logs and configuration");
+    }
+
+    console.error("=====================================");
+
+    return createSecureErrorResponse(error, "mirror-repo API", 500);
   }
-};
+};

src/pages/api/job/retry-repo.ts

@@ -1,7 +1,7 @@
 import type { APIRoute } from "astro";
 import { db, configs, repositories } from "@/lib/db";
 import { eq, inArray } from "drizzle-orm";
-import { getGiteaRepoOwner, isRepoPresentInGitea } from "@/lib/gitea";
+import { getGiteaRepoOwnerAsync, isRepoPresentInGitea } from "@/lib/gitea";
 import {
   mirrorGithubRepoToGitea,
   mirrorGitHubOrgRepoToGiteaOrg,
@@ -12,6 +12,7 @@ import { repoStatusEnum, repositoryVisibilityEnum } from "@/types/Repository";
 import type { RetryRepoRequest, RetryRepoResponse } from "@/types/retry";
 import { processWithRetry } from "@/lib/utils/concurrency";
 import { createMirrorJob } from "@/lib/helpers";
+import { createSecureErrorResponse } from "@/lib/utils";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -92,6 +93,7 @@ export const POST: APIRoute = async ({ request }) => {
             lastMirrored: repo.lastMirrored ?? undefined,
             errorMessage: repo.errorMessage ?? undefined,
             forkedFrom: repo.forkedFrom ?? undefined,
+            mirroredLocation: repo.mirroredLocation || "",
           };
 
           // Log the start of retry operation
@@ -107,8 +109,8 @@ export const POST: APIRoute = async ({ request }) => {
             status: "imported",
           });
 
-          // Determine if the repository exists in Gitea
-          let owner = getGiteaRepoOwner({
+          // Determine if the repository exists in Gitea (with organization overrides)
+          let owner = await getGiteaRepoOwnerAsync({
             config,
             repository: repoData,
           });
@@ -133,13 +135,23 @@ export const POST: APIRoute = async ({ request }) => {
               throw new Error("Octokit client is not initialized.");
             }
 
-            console.log(`Importing repo: ${repo.name} ${owner}`);
+            console.log(`Importing repo: ${repo.name} to owner: ${owner}`);
 
-            if (repo.organization && config.githubConfig.preserveOrgStructure) {
+            // For single-org and starred repos strategies, or when mirroring to an org,
+            // always use the org mirroring function to ensure proper organization handling
+            const mirrorStrategy = config.giteaConfig?.mirrorStrategy || 
+              (config.githubConfig?.preserveOrgStructure ? "preserve" : "flat-user");
+            
+            const shouldUseOrgMirror = 
+              owner !== config.giteaConfig?.username || // Different owner means org
+              mirrorStrategy === "single-org" || // Single-org strategy always uses org
+              repoData.isStarred; // Starred repos always go to org
+
+            if (shouldUseOrgMirror) {
               await mirrorGitHubOrgRepoToGiteaOrg({
                 config,
                 octokit,
-                orgName: repo.organization,
+                orgName: owner,
                 repository: {
                   ...repoData,
                   status: repoStatusEnum.parse("imported"),
@@ -199,12 +211,6 @@ export const POST: APIRoute = async ({ request }) => {
       headers: { "Content-Type": "application/json" },
     });
   } catch (err) {
-    console.error("Error retrying repo:", err);
-    return new Response(
-      JSON.stringify({
-        error: err instanceof Error ? err.message : "An unknown error occurred",
-      }),
-      { status: 500, headers: { "Content-Type": "application/json" } }
-    );
+    return createSecureErrorResponse(err, "repository retry", 500);
   }
 };

src/pages/api/job/schedule-sync-repo.ts

@@ -7,6 +7,7 @@ import type {
   ScheduleSyncRepoRequest,
   ScheduleSyncRepoResponse,
 } from "@/types/sync";
+import { createSecureErrorResponse } from "@/lib/utils";
 
 export const POST: APIRoute = async ({ request }) => {
   try {
@@ -111,6 +112,7 @@ export const POST: APIRoute = async ({ request }) => {
               organization: repo.organization ?? undefined,
               lastMirrored: repo.lastMirrored ?? undefined,
               errorMessage: repo.errorMessage ?? undefined,
+              mirroredLocation: repo.mirroredLocation || "",
               forkedFrom: repo.forkedFrom ?? undefined,
               visibility: repositoryVisibilityEnum.parse(repo.visibility),
             },
@@ -132,6 +134,7 @@ export const POST: APIRoute = async ({ request }) => {
         errorMessage: repo.errorMessage ?? undefined,
         forkedFrom: repo.forkedFrom ?? undefined,
         visibility: repositoryVisibilityEnum.parse(repo.visibility),
+        mirroredLocation: repo.mirroredLocation || "",
       })),
     };
 
@@ -140,15 +143,6 @@ export const POST: APIRoute = async ({ request }) => {
       headers: { "Content-Type": "application/json" },
     });
   } catch (error) {
-    console.error("Error in scheduling sync:", error);
-    return new Response(
-      JSON.stringify({
-        success: false,
-        error:
-          error instanceof Error ? error.message : "An unknown error occurred",
-        repositories: [],
-      } satisfies ScheduleSyncRepoResponse),
-      { status: 500, headers: { "Content-Type": "application/json" } }
-    );
+    return createSecureErrorResponse(error, "schedule sync", 500);
   }
 };