feat(safari): let users delete iCloud backups

Author: Nagi-ovo

Voyager/Extension/ICloudSyncService.swift

@@ -4,8 +4,13 @@ import Foundation
 final class ICloudSyncService {
   static let shared = ICloudSyncService()
 
+  private static let temporaryFilePrefix = "voyager-icloud-"
   private let container = CKContainer(identifier: "iCloud.com.yourCompany.Gemini-Voyager")
 
+  private init() {
+    removeOrphanedTemporaryFiles()
+  }
+
   private var database: CKDatabase {
     container.privateCloudDatabase
   }
@@ -24,7 +29,7 @@ final class ICloudSyncService {
 
   func write(fileName: String, json: String, completion: @escaping (Result<Void, Error>) -> Void) {
     let temporaryURL = FileManager.default.temporaryDirectory
-      .appendingPathComponent("voyager-\(UUID().uuidString).json")
+      .appendingPathComponent("\(Self.temporaryFilePrefix)\(UUID().uuidString).json")
 
     do {
       try Data(json.utf8).write(to: temporaryURL, options: .atomic)
@@ -97,6 +102,68 @@ final class ICloudSyncService {
     }
   }
 
+  func deleteBackup(completion: @escaping (Result<Int, Error>) -> Void) {
+    collectRecordIDs(cursor: nil, collected: [], completion: completion)
+  }
+
+  private func collectRecordIDs(
+    cursor: CKQueryOperation.Cursor?,
+    collected: [CKRecord.ID],
+    completion: @escaping (Result<Int, Error>) -> Void
+  ) {
+    let operation: CKQueryOperation
+    if let cursor {
+      operation = CKQueryOperation(cursor: cursor)
+    } else {
+      operation = CKQueryOperation(
+        query: CKQuery(recordType: "VoyagerSyncFile", predicate: NSPredicate(value: true))
+      )
+    }
+
+    var recordIDs = collected
+    operation.desiredKeys = []
+    operation.recordFetchedBlock = { record in
+      recordIDs.append(record.recordID)
+    }
+    operation.queryCompletionBlock = { nextCursor, error in
+      if let error {
+        completion(.failure(VoyagerICloudFailureMapper.map(error: error)))
+        return
+      }
+      if let nextCursor {
+        self.collectRecordIDs(
+          cursor: nextCursor,
+          collected: recordIDs,
+          completion: completion
+        )
+        return
+      }
+      self.delete(recordIDs: recordIDs, completion: completion)
+    }
+    database.add(operation)
+  }
+
+  private func delete(
+    recordIDs: [CKRecord.ID],
+    completion: @escaping (Result<Int, Error>) -> Void
+  ) {
+    guard !recordIDs.isEmpty else {
+      completion(.success(0))
+      return
+    }
+
+    let operation = CKModifyRecordsOperation(recordIDsToDelete: recordIDs)
+    operation.isAtomic = true
+    operation.modifyRecordsCompletionBlock = { _, deletedRecordIDs, error in
+      if let error {
+        completion(.failure(VoyagerICloudFailureMapper.map(error: error)))
+      } else {
+        completion(.success(deletedRecordIDs?.count ?? recordIDs.count))
+      }
+    }
+    database.add(operation)
+  }
+
   private func save(
     record: CKRecord,
     fileName: String,
@@ -125,4 +192,18 @@ final class ICloudSyncService {
     CKRecord.ID(recordName: VoyagerICloudRecordIdentity.recordName(for: fileName))
   }
 
+  private func removeOrphanedTemporaryFiles() {
+    let fileManager = FileManager.default
+    let directory = fileManager.temporaryDirectory
+    guard
+      let files = try? fileManager.contentsOfDirectory(
+        at: directory,
+        includingPropertiesForKeys: nil
+      )
+    else { return }
+
+    for file in files where file.lastPathComponent.hasPrefix(Self.temporaryFilePrefix) {
+      try? fileManager.removeItem(at: file)
+    }
+  }
 }

Voyager/Extension/SafariWebExtensionHandler.swift

@@ -51,6 +51,8 @@ final class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
       writeICloudFile(request: request, context: context)
     case .iCloudReadFile(let fileName):
       readICloudFile(fileName: fileName, context: context)
+    case .iCloudDeleteBackup:
+      deleteICloudBackup(context: context)
     case .copyImageToPasteboard(let request):
       copyImageToPasteboard(request: request, context: context)
     }
@@ -121,6 +123,20 @@ final class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
     }
   }
 
+  private func deleteICloudBackup(context: NSExtensionContext) {
+    ICloudSyncService.shared.deleteBackup { result in
+      switch result {
+      case .success(let deleted):
+        self.respondWithSuccess(
+          context: context,
+          data: VoyagerICloudDeleteResponse(deleted: deleted)
+        )
+      case .failure(let error):
+        self.respondWithICloudError(context: context, error: error)
+      }
+    }
+  }
+
   private func respondWithICloudError(context: NSExtensionContext, error: Error) {
     guard let failure = error as? VoyagerICloudFailure else {
       respondWithError(context: context, message: error.localizedDescription)

Voyager/Shared/NativeMessaging.swift

@@ -13,6 +13,7 @@ enum VoyagerNativeRequest: Codable, Equatable {
   case iCloudAccountStatus
   case iCloudWriteFile(VoyagerICloudWriteRequest)
   case iCloudReadFile(fileName: String)
+  case iCloudDeleteBackup
   case copyImageToPasteboard(VoyagerClipboardImageRequest)
 
   var actionName: String {
@@ -29,6 +30,7 @@ enum VoyagerNativeRequest: Codable, Equatable {
     case .iCloudAccountStatus: return Action.iCloudAccountStatus.rawValue
     case .iCloudWriteFile: return Action.iCloudWriteFile.rawValue
     case .iCloudReadFile: return Action.iCloudReadFile.rawValue
+    case .iCloudDeleteBackup: return Action.iCloudDeleteBackup.rawValue
     case .copyImageToPasteboard: return Action.copyImageToPasteboard.rawValue
     }
   }
@@ -46,6 +48,7 @@ enum VoyagerNativeRequest: Codable, Equatable {
     case iCloudAccountStatus
     case iCloudWriteFile
     case iCloudReadFile
+    case iCloudDeleteBackup
     case copyImageToPasteboard
   }
 
@@ -122,6 +125,8 @@ enum VoyagerNativeRequest: Codable, Equatable {
       self = .iCloudReadFile(
         fileName: try container.decode(String.self, forKey: .fileName)
       )
+    case .iCloudDeleteBackup:
+      self = .iCloudDeleteBackup
     case .copyImageToPasteboard:
       self = .copyImageToPasteboard(
         VoyagerClipboardImageRequest(
@@ -173,6 +178,8 @@ enum VoyagerNativeRequest: Codable, Equatable {
     case .iCloudReadFile(let fileName):
       try container.encode(Action.iCloudReadFile, forKey: .action)
       try container.encode(fileName, forKey: .fileName)
+    case .iCloudDeleteBackup:
+      try container.encode(Action.iCloudDeleteBackup, forKey: .action)
     case .copyImageToPasteboard(let request):
       try container.encode(Action.copyImageToPasteboard, forKey: .action)
       try container.encode(request.pngBase64, forKey: .pngBase64)
@@ -341,4 +348,8 @@ struct VoyagerICloudReadResponse: Codable {
   let found: Bool
 }
 
+struct VoyagerICloudDeleteResponse: Codable {
+  let deleted: Int
+}
+
 struct VoyagerEmptyResponse: Codable {}

Voyager/Tests/NativeSupportTests.swift

@@ -274,6 +274,7 @@ final class NativeSupportTests: XCTestCase {
         ["action": "iCloudReadFile", "fileName": "prompts.json"],
         .iCloudReadFile(fileName: "prompts.json")
       ),
+      (["action": "iCloudDeleteBackup"], .iCloudDeleteBackup),
       (
         ["action": "copyImageToPasteboard", "pngBase64": "aGVsbG8="],
         .copyImageToPasteboard(VoyagerClipboardImageRequest(pngBase64: "aGVsbG8="))

src/core/utils/__tests__/safariICloudSync.test.ts

@@ -3,6 +3,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import {
   SafariICloudSyncError,
   checkSafariICloudAccount,
+  deleteSafariICloudBackup,
   getSafariICloudRetryDelay,
   isSafariICloudConflictError,
   readSafariICloudFile,
@@ -55,6 +56,15 @@ describe('Safari iCloud sync bridge', () => {
     await expect(readSafariICloudFile('prompts.json')).resolves.toBeNull();
   });
 
+  it('deletes every native iCloud backup record', async () => {
+    sendNativeMessage.mockResolvedValue({ success: true, data: { deleted: 4 } });
+
+    await expect(deleteSafariICloudBackup()).resolves.toBe(4);
+    expect(sendNativeMessage).toHaveBeenCalledWith('com.yourCompany.Gemini-Voyager', {
+      action: 'iCloudDeleteBackup',
+    });
+  });
+
   it('surfaces native CloudKit errors', async () => {
     sendNativeMessage.mockResolvedValue({ success: false, error: 'iCloud is unavailable' });
 

src/core/utils/safariICloudSync.ts

@@ -8,6 +8,7 @@ type NativeICloudResponse = {
     available?: unknown;
     found?: unknown;
     json?: unknown;
+    deleted?: unknown;
   };
   code?: unknown;
   error?: unknown;
@@ -80,3 +81,11 @@ export async function readSafariICloudFile<T>(fileName: string): Promise<T | nul
   }
   return JSON.parse(response.data.json) as T;
 }
+
+export async function deleteSafariICloudBackup(): Promise<number> {
+  const response = await sendICloudMessage({ action: 'iCloudDeleteBackup' });
+  if (response.success !== true || typeof response.data?.deleted !== 'number') {
+    throw responseError(response, 'iCloud backup deletion failed');
+  }
+  return response.data.deleted;
+}

src/locales/ar/messages.json

@@ -1239,6 +1239,15 @@
     "message": "هل تريد استبدال البيانات المحلية بنسخة السحابة؟ ستُفقد التغييرات المحلية التي لم يتم رفعها.",
     "description": "Confirmation before overwriting local sync data"
   },
+  "syncDeleteICloudBackup": { "message": "حذف نسخة iCloud الاحتياطية" },
+  "syncDeleteICloudConfirm": {
+    "message": "هل تريد حذف جميع نسخ Voyager الاحتياطية من iCloud؟ ستبقى البيانات المحلية على هذا الـ Mac. لا يمكن التراجع عن هذا الإجراء."
+  },
+  "syncDeletingICloudBackup": { "message": "جارٍ حذف نسخة iCloud الاحتياطية…" },
+  "syncDeleteICloudSuccess": {
+    "message": "✓ تم حذف {count} من ملفات iCloud الاحتياطية؛ لم تتغير البيانات المحلية"
+  },
+  "syncDeleteICloudFailed": { "message": "✗ تعذر حذف نسخة iCloud الاحتياطية: {error}" },
   "syncMode": {
     "message": "وضع المزامنة",
     "description": "Sync mode label"

src/locales/en/messages.json

@@ -1239,6 +1239,15 @@
     "message": "Overwrite local data with the cloud copy? Local changes that have not been uploaded will be lost.",
     "description": "Confirmation before overwriting local sync data"
   },
+  "syncDeleteICloudBackup": { "message": "Delete iCloud backup" },
+  "syncDeleteICloudConfirm": {
+    "message": "Delete every Voyager backup from iCloud? Local data will stay on this Mac. This cannot be undone."
+  },
+  "syncDeletingICloudBackup": { "message": "Deleting iCloud backup…" },
+  "syncDeleteICloudSuccess": {
+    "message": "✓ Deleted {count} iCloud backup files; local data is unchanged"
+  },
+  "syncDeleteICloudFailed": { "message": "✗ Could not delete iCloud backup: {error}" },
   "syncMode": {
     "message": "Sync Mode",
     "description": "Sync mode label"

src/locales/es/messages.json

@@ -1239,6 +1239,15 @@
     "message": "¿Sobrescribir los datos locales con la copia de la nube? Se perderán los cambios locales que no se hayan subido.",
     "description": "Confirmation before overwriting local sync data"
   },
+  "syncDeleteICloudBackup": { "message": "Eliminar copia de iCloud" },
+  "syncDeleteICloudConfirm": {
+    "message": "¿Eliminar todas las copias de Voyager de iCloud? Los datos locales seguirán en este Mac. Esta acción no se puede deshacer."
+  },
+  "syncDeletingICloudBackup": { "message": "Eliminando copia de iCloud…" },
+  "syncDeleteICloudSuccess": {
+    "message": "✓ Se eliminaron {count} archivos de iCloud; los datos locales no cambiaron"
+  },
+  "syncDeleteICloudFailed": { "message": "✗ No se pudo eliminar la copia de iCloud: {error}" },
   "syncMode": {
     "message": "Modo sinc.",
     "description": "Sync mode label"

src/locales/fr/messages.json

@@ -1239,6 +1239,17 @@
     "message": "Remplacer les données locales par la copie du cloud ? Les modifications locales non téléversées seront perdues.",
     "description": "Confirmation before overwriting local sync data"
   },
+  "syncDeleteICloudBackup": { "message": "Supprimer la sauvegarde iCloud" },
+  "syncDeleteICloudConfirm": {
+    "message": "Supprimer toutes les sauvegardes Voyager d’iCloud ? Les données locales resteront sur ce Mac. Cette action est irréversible."
+  },
+  "syncDeletingICloudBackup": { "message": "Suppression de la sauvegarde iCloud…" },
+  "syncDeleteICloudSuccess": {
+    "message": "✓ {count} fichiers de sauvegarde iCloud supprimés ; les données locales sont inchangées"
+  },
+  "syncDeleteICloudFailed": {
+    "message": "✗ Impossible de supprimer la sauvegarde iCloud : {error}"
+  },
   "syncMode": {
     "message": "Mode",
     "description": "Sync mode label"