fix(sync): finish cloud audio deletion and playback guards

Author: eulicesl

app/lib/pages/conversations/private_cloud_sync_page.dart

@@ -27,6 +27,8 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
   bool _isDeleting = false;
   bool _isAudioLoading = false;
   List<CloudAudioConversation> _conversations = [];
+  bool? _lastPrivateCloudSyncEnabled;
+  int _playbackGeneration = 0;
 
   final AudioPlayer _audioPlayer = AudioPlayer();
   StreamSubscription<PlayerState>? _playerStateSubscription;
@@ -50,9 +52,40 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
         setState(() {});
       }
     });
-    if (context.read<UserProvider>().privateCloudSyncEnabled) {
-      _loadCloudAudioConversations();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+
+    final isEnabled = context.watch<UserProvider>().privateCloudSyncEnabled;
+    if (_lastPrivateCloudSyncEnabled == isEnabled) return;
+    _lastPrivateCloudSyncEnabled = isEnabled;
+
+    if (isEnabled) {
+      unawaited(_loadCloudAudioConversations());
+      return;
     }
+
+    _cancelPendingPlayback(clearConversations: true);
+  }
+
+  void _cancelPendingPlayback({bool clearConversations = false}) {
+    _playbackGeneration++;
+    unawaited(_audioPlayer.stop());
+    _currentPlayingConversationId = null;
+    _isAudioLoading = false;
+    if (clearConversations) {
+      _conversations = [];
+    }
+  }
+
+  bool _shouldAbortPlaybackStart(String conversationId, int playbackGeneration) {
+    return !mounted ||
+        _isDeleting ||
+        !context.read<UserProvider>().privateCloudSyncEnabled ||
+        _currentPlayingConversationId != conversationId ||
+        _playbackGeneration != playbackGeneration;
   }
 
   @override
@@ -98,9 +131,6 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
           backgroundColor: Colors.green,
         ),
       );
-      if (value) {
-        await _loadCloudAudioConversations();
-      }
     } catch (e) {
       Logger.debug('Error toggling cloud storage: $e');
       if (!mounted) return;
@@ -127,6 +157,7 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
     }
 
     await _audioPlayer.stop();
+    final playbackGeneration = ++_playbackGeneration;
     if (!mounted) return;
     setState(() {
       _currentPlayingConversationId = conversation.id;
@@ -135,17 +166,19 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
 
     try {
       final audioFileInfos = await getConversationAudioSignedUrls(conversation.id);
+      if (_shouldAbortPlaybackStart(conversation.id, playbackGeneration)) return;
       if (audioFileInfos.isEmpty) {
         throw Exception('No audio files available to play');
       }
 
       if (audioFileInfos.any((af) => !af.isCached)) {
         await precacheConversationAudio(conversation.id);
-        if (!mounted) return;
+        if (_shouldAbortPlaybackStart(conversation.id, playbackGeneration)) return;
         setState(() {
           _currentPlayingConversationId = null;
           _isAudioLoading = false;
         });
+        if (!mounted) return;
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(context.l10n.preparingCloudAudioTryAgain), backgroundColor: Colors.orange),
         );
@@ -165,9 +198,15 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
       );
 
       await _audioPlayer.setAudioSource(playlist, preload: true);
-      if (!mounted) return;
+      if (_shouldAbortPlaybackStart(conversation.id, playbackGeneration)) {
+        await _audioPlayer.stop();
+        return;
+      }
       setState(() => _isAudioLoading = false);
       await _audioPlayer.play();
+      if (_shouldAbortPlaybackStart(conversation.id, playbackGeneration)) {
+        await _audioPlayer.stop();
+      }
     } catch (e) {
       Logger.debug('Error playing conversation audio: $e');
       if (!mounted) return;
@@ -227,12 +266,7 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
     if (confirmed != true) return;
 
     setState(() => _isDeleting = true);
-    await _audioPlayer.stop();
-    if (mounted) {
-      setState(() {
-        _currentPlayingConversationId = null;
-      });
-    }
+    _cancelPendingPlayback();
 
     try {
       final success = await deleteAllCloudAudio();

app/lib/services/audio_download_service.dart

@@ -201,7 +201,8 @@ class AudioDownloadService {
         .replaceAll(RegExp(r'[^a-zA-Z0-9]+'), '_')
         .replaceAll(RegExp(r'_+'), '_')
         .replaceAll(RegExp(r'^_|_$'), '');
-    final prefix = sanitizedTitle.isEmpty ? 'omi' : sanitizedTitle.toLowerCase();
+    final boundedTitle = sanitizedTitle.length > 80 ? sanitizedTitle.substring(0, 80) : sanitizedTitle;
+    final prefix = boundedTitle.isEmpty ? 'omi' : boundedTitle.toLowerCase();
     return '${prefix}_$timestamp.wav';
   }
 

backend/database/conversations.py

@@ -288,6 +288,27 @@ def iter_all_conversations(uid: str, batch_size: int = 400, include_discarded: b
         offset += batch_size
 
 
+def iter_audio_metadata_conversations(uid: str, batch_size: int = 400, include_discarded: bool = False):
+    """Yield lightweight conversation metadata without hydrating transcript payloads."""
+    conversations_ref = db.collection('users').document(uid).collection(conversations_collection)
+    if not include_discarded:
+        conversations_ref = conversations_ref.where(filter=FieldFilter('discarded', '==', False))
+    conversations_ref = conversations_ref.select(['id', 'created_at', 'audio_files', 'structured.title', 'is_locked'])
+    conversations_ref = conversations_ref.order_by('created_at', direction=firestore.Query.DESCENDING)
+    offset = 0
+    while True:
+        batch_ref = conversations_ref.limit(batch_size).offset(offset)
+        batch = []
+        for doc in batch_ref.stream():
+            conv = doc.to_dict() or {}
+            conv.setdefault('id', doc.id)
+            batch.append(conv)
+        yield from batch
+        if len(batch) < batch_size:
+            break
+        offset += batch_size
+
+
 def update_conversation(uid: str, conversation_id: str, update_data: dict):
     doc_ref = db.collection('users').document(uid).collection(conversations_collection).document(conversation_id)
     doc_snapshot = doc_ref.get()

backend/routers/sync.py

@@ -176,7 +176,7 @@ def list_conversations_with_audio(
     Returns lightweight conversation info (id, title, date, audio file count, total duration).
     """
     result = []
-    for conv in conversations_db.iter_all_conversations(uid, include_discarded=False):
+    for conv in conversations_db.iter_audio_metadata_conversations(uid, include_discarded=False):
         audio_files = conv.get('audio_files') or []
         if not audio_files or conv.get('is_locked', False):
             continue
@@ -220,7 +220,24 @@ def delete_all_cloud_audio(
             logger.error(f"Failed to clear audio_files for conversation {conversation_id}: {e}")
             raise HTTPException(status_code=503, detail="Failed to clear conversation audio metadata.") from e
 
-    deleted_count = delete_all_user_cloud_audio(uid)
+    delete_result = delete_all_user_cloud_audio(uid)
+    deleted_count = delete_result['deleted_blobs']
+    failed_count = delete_result['failed_blobs']
+
+    if failed_count:
+        logger.error(
+            f"Failed to delete {failed_count} cloud audio blobs after clearing {cleared_conversations} "
+            f"conversations for user {uid}"
+        )
+        raise HTTPException(
+            status_code=503,
+            detail={
+                'message': 'Failed to delete one or more cloud audio blobs.',
+                'deleted_blobs': deleted_count,
+                'failed_blobs': failed_count,
+                'cleared_conversations': cleared_conversations,
+            },
+        )
 
     logger.info(
         f"Deleted {deleted_count} cloud audio blobs and cleared {cleared_conversations} conversations for user {uid}"

backend/tests/unit/test_private_cloud_sync_audio_management.py

@@ -21,7 +21,7 @@ def test_list_conversations_with_audio_iterates_all_batches(monkeypatch):
     conversations.extend(_conversation(i, audio_files=[{'duration': 1.5}, {'duration': 2.5}]) for i in range(2, 505))
 
     iter_mock = MagicMock(return_value=iter(conversations))
-    monkeypatch.setattr(sync.conversations_db, 'iter_all_conversations', iter_mock)
+    monkeypatch.setattr(sync.conversations_db, 'iter_audio_metadata_conversations', iter_mock)
 
     result = sync.list_conversations_with_audio(uid='user-1')
 
@@ -39,7 +39,9 @@ def test_list_conversations_with_audio_skips_locked_conversations(monkeypatch):
         {**_conversation(2, audio_files=[{'duration': 2.0}], discarded=False), 'is_locked': True},
     ]
 
-    monkeypatch.setattr(sync.conversations_db, 'iter_all_conversations', MagicMock(return_value=iter(conversations)))
+    monkeypatch.setattr(
+        sync.conversations_db, 'iter_audio_metadata_conversations', MagicMock(return_value=iter(conversations))
+    )
 
     result = sync.list_conversations_with_audio(uid='user-1')
 
@@ -52,7 +54,7 @@ def test_delete_all_cloud_audio_clears_every_matching_conversation(monkeypatch):
 
     iter_mock = MagicMock(return_value=iter(conversations))
     update_mock = MagicMock()
-    delete_mock = MagicMock(return_value=77)
+    delete_mock = MagicMock(return_value={'deleted_blobs': 77, 'failed_blobs': 0})
 
     monkeypatch.setattr(sync.conversations_db, 'iter_all_conversations', iter_mock)
     monkeypatch.setattr(sync.conversations_db, 'update_conversation', update_mock)
@@ -83,3 +85,26 @@ def test_delete_all_cloud_audio_stops_before_blob_delete_when_metadata_clear_fai
 
     assert exc_info.value.status_code == 503
     delete_mock.assert_not_called()
+
+
+def test_delete_all_cloud_audio_returns_error_when_blob_delete_partially_fails(monkeypatch):
+    conversations = [_conversation(1, audio_files=[{'duration': 1.0}])]
+
+    monkeypatch.setattr(sync.conversations_db, 'iter_all_conversations', MagicMock(return_value=iter(conversations)))
+    monkeypatch.setattr(sync.conversations_db, 'update_conversation', MagicMock())
+    monkeypatch.setattr(
+        sync,
+        'delete_all_user_cloud_audio',
+        MagicMock(return_value={'deleted_blobs': 4, 'failed_blobs': 1}),
+    )
+
+    with pytest.raises(sync.HTTPException) as exc_info:
+        sync.delete_all_cloud_audio(uid='user-1')
+
+    assert exc_info.value.status_code == 503
+    assert exc_info.value.detail == {
+        'message': 'Failed to delete one or more cloud audio blobs.',
+        'deleted_blobs': 4,
+        'failed_blobs': 1,
+        'cleared_conversations': 1,
+    }

backend/utils/other/storage.py

@@ -649,11 +649,11 @@ def delete_conversation_audio_files(uid: str, conversation_id: str) -> None:
         blob.delete()
 
 
-def delete_all_user_cloud_audio(uid: str) -> int:
+def delete_all_user_cloud_audio(uid: str) -> dict[str, int]:
     """Delete all cloud-synced audio blobs for a user.
 
     Removes raw chunks, per-conversation merged audio, and cached merged assets.
-    Returns the total number of deleted blobs.
+    Returns the total number of deleted and failed blobs.
     """
     bucket = storage_client.bucket(private_cloud_sync_bucket)
     deleted = 0
@@ -671,7 +671,10 @@ def delete_all_user_cloud_audio(uid: str) -> int:
     if failed:
         logger.warning(f'Failed to delete {failed} cloud audio blobs for user {uid}')
 
-    return deleted
+    return {
+        'deleted_blobs': deleted,
+        'failed_blobs': failed,
+    }
 
 
 def download_audio_chunks_and_merge(