cleanup: improve orphaned repo handling

src/lib/db/schema.ts

@@ -94,7 +94,7 @@ export const cleanupConfigSchema = z.object({
   deleteFromGitea: z.boolean().default(false),
   deleteIfNotInGitHub: z.boolean().default(true),
   protectedRepos: z.array(z.string()).default([]),
-  dryRun: z.boolean().default(true),
+  dryRun: z.boolean().default(false),
   orphanedRepoAction: z
     .enum(["skip", "archive", "delete"])
     .default("archive"),

src/lib/env-config-loader.ts

@@ -169,7 +169,7 @@ function parseEnvConfig(): EnvConfig {
       deleteFromGitea: process.env.CLEANUP_DELETE_FROM_GITEA === 'true',
       deleteIfNotInGitHub: process.env.CLEANUP_DELETE_IF_NOT_IN_GITHUB === 'true',
       protectedRepos,
-      dryRun: process.env.CLEANUP_DRY_RUN === 'true',
+      dryRun: process.env.CLEANUP_DRY_RUN === 'true' ? true : process.env.CLEANUP_DRY_RUN === 'false' ? false : false,
       orphanedRepoAction: process.env.CLEANUP_ORPHANED_REPO_ACTION as 'skip' | 'archive' | 'delete',
       batchSize: process.env.CLEANUP_BATCH_SIZE ? parseInt(process.env.CLEANUP_BATCH_SIZE, 10) : undefined,
       pauseBetweenDeletes: process.env.CLEANUP_PAUSE_BETWEEN_DELETES ? parseInt(process.env.CLEANUP_PAUSE_BETWEEN_DELETES, 10) : undefined,

src/lib/gitea.ts

@@ -2436,7 +2436,11 @@ export async function archiveGiteaRepo(
       const currentName = repoResponse.data.name;
       
       // Skip if already marked as archived
-      if (currentName.startsWith('[ARCHIVED]')) {
+      const normalizedName = currentName.toLowerCase();
+      if (
+        currentName.startsWith('[ARCHIVED]') ||
+        normalizedName.startsWith('archived-')
+      ) {
         console.log(`[Archive] Repository ${owner}/${repo} already marked as archived. Skipping.`);
         return;
       }
@@ -2495,17 +2499,17 @@ export async function archiveGiteaRepo(
         await httpPatch(
           `${client.url}/api/v1/repos/${owner}/${archivedName}`,
           {
-            mirror_interval: "8760h", // 1 year - minimizes sync attempts
+            mirror_interval: "0h", // Disable automatic syncing; manual sync is still available
           },
           {
             Authorization: `token ${client.token}`,
             'Content-Type': 'application/json',
           }
         );
-        console.log(`[Archive] Reduced sync frequency for ${owner}/${archivedName} to yearly`);
+        console.log(`[Archive] Disabled automatic syncs for ${owner}/${archivedName}; manual sync only`);
       } catch (intervalError) {
         // Non-critical - repo is still preserved even if we can't change interval
-        console.debug(`[Archive] Could not update mirror interval (non-critical):`, intervalError);
+        console.debug(`[Archive] Could not disable mirror interval (non-critical):`, intervalError);
       }
     } else {
       // For non-mirror repositories, use Gitea's native archive feature

src/lib/repository-cleanup-service.ts

@@ -69,7 +69,20 @@ async function identifyOrphanedRepositories(config: any): Promise<any[]> {
     
     // Only identify repositories as orphaned if we successfully accessed GitHub
     // This prevents false positives when GitHub is down or account is inaccessible
-    const orphanedRepos = dbRepos.filter(repo => !githubRepoFullNames.has(repo.fullName));
+    const orphanedRepos = dbRepos.filter(repo => {
+      const isOrphaned = !githubRepoFullNames.has(repo.fullName);
+      if (!isOrphaned) {
+        return false;
+      }
+
+      // Skip repositories we've already archived/preserved
+      if (repo.status === 'archived' || repo.isArchived) {
+        console.log(`[Repository Cleanup] Skipping ${repo.fullName} - already archived`);
+        return false;
+      }
+
+      return true;
+    });
     
     if (orphanedRepos.length > 0) {
       console.log(`[Repository Cleanup] Found ${orphanedRepos.length} orphaned repositories for user ${userId}`);
@@ -98,7 +111,12 @@ async function handleOrphanedRepository(
     console.log(`[Repository Cleanup] Skipping orphaned repository ${repoFullName}`);
     return;
   }
-  
+
+  if (repo.status === 'archived' || repo.isArchived) {
+    console.log(`[Repository Cleanup] Repository ${repoFullName} already archived; skipping additional actions`);
+    return;
+  }
+
   if (dryRun) {
     console.log(`[Repository Cleanup] DRY RUN: Would ${action} orphaned repository ${repoFullName}`);
     return;
@@ -260,7 +278,7 @@ async function runRepositoryCleanup(config: any): Promise<{
     
     // Process orphaned repositories
     const action = cleanupConfig.orphanedRepoAction || 'archive';
-    const dryRun = cleanupConfig.dryRun ?? true;
+    const dryRun = cleanupConfig.dryRun ?? false;
     const batchSize = cleanupConfig.batchSize || 10;
     const pauseBetweenDeletes = cleanupConfig.pauseBetweenDeletes || 2000;
     

src/lib/utils/config-defaults.ts

@@ -100,6 +100,13 @@ export async function createDefaultConfig({ userId, envOverrides = {} }: Default
     cleanupConfig: {
       enabled: cleanupEnabled,
       retentionDays: cleanupRetentionDays,
+      deleteFromGitea: false,
+      deleteIfNotInGitHub: true,
+      protectedRepos: [],
+      dryRun: false,
+      orphanedRepoAction: "archive",
+      batchSize: 10,
+      pauseBetweenDeletes: 2000,
       lastRun: null,
       nextRun: cleanupEnabled ? new Date(Date.now() + getCleanupInterval(cleanupRetentionDays) * 1000) : null,
     },
@@ -123,4 +130,4 @@ function getCleanupInterval(retentionSeconds: number): number {
   if (days <= 7) return 86400; // 24 hours
   if (days <= 30) return 172800; // 48 hours
   return 604800; // 1 week
-}
+}

src/lib/utils/config-mapper.ts

@@ -225,16 +225,26 @@ export function mapDbScheduleToUi(dbSchedule: DbScheduleConfig): any {
  * Maps UI cleanup config to database schema
  */
 export function mapUiCleanupToDb(uiCleanup: any): DbCleanupConfig {
+  const parsedRetention =
+    typeof uiCleanup.retentionDays === "string"
+      ? parseInt(uiCleanup.retentionDays, 10)
+      : uiCleanup.retentionDays;
+  const retentionSeconds = Number.isFinite(parsedRetention)
+    ? parsedRetention
+    : 604800;
+
   return {
-    enabled: uiCleanup.enabled || false,
-    retentionDays: uiCleanup.retentionDays || 604800, // Default to 7 days
-    deleteFromGitea: false,
-    deleteIfNotInGitHub: true,
-    protectedRepos: [],
-    dryRun: true,
-    orphanedRepoAction: "archive",
-    batchSize: 10,
-    pauseBetweenDeletes: 2000,
+    enabled: Boolean(uiCleanup.enabled),
+    retentionDays: retentionSeconds,
+    deleteFromGitea: uiCleanup.deleteFromGitea ?? false,
+    deleteIfNotInGitHub: uiCleanup.deleteIfNotInGitHub ?? true,
+    protectedRepos: uiCleanup.protectedRepos ?? [],
+    dryRun: uiCleanup.dryRun ?? false,
+    orphanedRepoAction: (uiCleanup.orphanedRepoAction as DbCleanupConfig["orphanedRepoAction"]) || "archive",
+    batchSize: uiCleanup.batchSize ?? 10,
+    pauseBetweenDeletes: uiCleanup.pauseBetweenDeletes ?? 2000,
+    lastRun: uiCleanup.lastRun ?? null,
+    nextRun: uiCleanup.nextRun ?? null,
   };
 }
 
@@ -253,9 +263,16 @@ export function mapDbCleanupToUi(dbCleanup: DbCleanupConfig): any {
   }
 
   return {
-    enabled: dbCleanup.enabled || false,
-    retentionDays: dbCleanup.retentionDays || 604800, // Use actual value from DB or default to 7 days
-    lastRun: dbCleanup.lastRun || null,
-    nextRun: dbCleanup.nextRun || null,
+    enabled: dbCleanup.enabled ?? false,
+    retentionDays: dbCleanup.retentionDays ?? 604800,
+    deleteFromGitea: dbCleanup.deleteFromGitea ?? false,
+    deleteIfNotInGitHub: dbCleanup.deleteIfNotInGitHub ?? true,
+    protectedRepos: dbCleanup.protectedRepos ?? [],
+    dryRun: dbCleanup.dryRun ?? false,
+    orphanedRepoAction: dbCleanup.orphanedRepoAction ?? "archive",
+    batchSize: dbCleanup.batchSize ?? 10,
+    pauseBetweenDeletes: dbCleanup.pauseBetweenDeletes ?? 2000,
+    lastRun: dbCleanup.lastRun ?? null,
+    nextRun: dbCleanup.nextRun ?? null,
   };
 }