feat(pawchive): export local favorites to Pawchive and two-way sync (v2.3.10)

- Android: expose getSupportedAbis/getPrimaryAbi via rulegel/device channel (Build.SUPPORTED_ABIS)
- AppUpdateInfo: add apkArm64Url, apkArmv7Url, apkX86_64Url fields + apkUrlForAbi() selector
- UpdateService: parse per-ABI APK assets by filename pattern, async assetUrlForCurrentPlatform
- app.dart + settings_screen.dart: await new async URL resolver
- Bump version to 2.3.8+48

android/app/src/main/kotlin/com/example/gel_rule_app/MainActivity.kt

@@ -54,6 +54,8 @@ class MainActivity : FlutterActivity() {
                             setPreferredRefreshRate(hz.toFloat())
                             result.success(null)
                         }
+                        "getSupportedAbis" -> result.success(Build.SUPPORTED_ABIS.toList())
+                        "getPrimaryAbi" -> result.success(Build.SUPPORTED_ABIS.firstOrNull() ?: "armeabi-v7a")
                         else -> result.notImplemented()
                     }
                 } catch (error: Throwable) {

lib/app/app.dart

@@ -149,7 +149,7 @@ class _AppOverlayState extends ConsumerState<_AppOverlay> {
 
   Future<void> _downloadUpdate(AppUpdateInfo info) async {
     final updateService = ref.read(updateServiceProvider);
-    final assetUrl = updateService.assetUrlForCurrentPlatform(info);
+    final assetUrl = await updateService.assetUrlForCurrentPlatform(info);
     if (assetUrl == null) {
       final url = Uri.tryParse(info.htmlUrl);
       if (url != null) {

lib/app/changelog.dart

@@ -1,4 +1,93 @@
 const lunarisChangelog = [
+  LunarisChange(
+    version: '2.3.10',
+    title: 'Выгрузка локального избранного в Pawchive и двусторонняя синхронизация',
+    bullets: [
+      'Экспорт локального избранного: добавлена возможность выгрузить всех ваших локальных авторов из приложения прямо в аккаунт Pawchive на сервере в 1 клик.',
+      'Двусторонняя синхронизация: переключатель двусторонней синхронизации объединяет коллекции — скачивает новых авторов с сервера и отправляет локальных на сервер Pawchive.',
+      'Кнопка выгрузки в карточке аккаунта: быстрая кнопка со стрелкой вверх и пункт контекстного меню «Выгрузить в Pawchive» для любого подключённого аккаунта.',
+      'Синхронизация в реальном времени с любых провайдеров: при добавлении автора в избранное в лентах Kemono, Coomer или Pawchive изменение мгновенно передаётся на сервер Pawchive.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.9',
+    title: 'Исправление входа и синхронизации аккаунтов Pawchive',
+    bullets: [
+      'Исправлены API эндпоинты Pawchive: пути запросов избранных авторов и управления подписками приведены в соответствие со спецификацией API v1 (/api/v1/account/favorites, /api/v1/favorites/creator/...).',
+      'Устранена ошибка 404: авторизация по логину и паролю, а также по session cookie теперь успешно завершается и сразу синхронизирует всех авторов.',
+      'Информативные ошибки: понятные сообщения на русском при неверном пароле или сбое сети вместо сырых исключений Dio.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.8',
+    title: 'ABI-Aware Auto-Update — правильный APK для вашего процессора',
+    bullets: [
+      'Определение архитектуры Android: приложение читает Build.SUPPORTED_ABIS (arm64-v8a, armeabi-v7a, x86_64) через нативный канал.',
+      'Точный APK из Gitea: при обновлении скачивается per-ABI APK (app-arm64-v8a-release.apk и т.д.), а не один общий файл.',
+      'Fallback: нет per-ABI APK → универсальный APK → страница релиза в браузере.',
+      'Кеш ABI: архитектура определяется один раз за сеанс.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.7',
+    title: 'Lazy Media Dimensions for Pawchive & Unknown-Size Providers',
+    bullets: [
+      'Auto-Resolve Image Dimensions: when a provider (such as Pawchive) does not supply width/height metadata, the app now lazily resolves the real pixel dimensions by decoding the image in the background and displays them as soon as they are ready.',
+      'No More "0 × 0": the resolution badge now shows "… × …" while dimensions are being fetched, and the correct resolution (e.g. 1920 × 1080) once decoded. The badge is hidden entirely for video/link posts where dimensions cannot be resolved.',
+      'Session Cache: resolved image dimensions are cached in memory for the lifetime of the app so repeated visits to the same post do not trigger re-downloads.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.6',
+    title: 'Pawchive Accounts Integration & Favorites Synchronization',
+    bullets: [
+      'Pawchive Account Support: users can now log into Pawchive with their username and password or paste a direct session cookie.',
+      'Multi-Account Synchronization: add and manage multiple Pawchive accounts; synchronize favorite artists from all connected accounts into a consolidated local favorites list with 1 tap.',
+      'Real-Time Remote Favorites Sync: favoriting or unfavoriting any Pawchive artist in the app automatically pushes the change to the active Pawchive account in real time.',
+      'Artist Posts Direct Favorite: added a star toggle directly in the artist posts screen top bar to add or remove creators from favorites without leaving their gallery.',
+      'Dedicated UI & Quick Access: manage connected accounts, view sync stats, and trigger synchronization from the Artists screen, Favorites modal, and Settings screen.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.5',
+    title: 'Fullscreen Video Auto-Rotation & Orientation Controls',
+    bullets: [
+      'Smart Fullscreen Auto-Rotation: entering fullscreen mode on horizontal/landscape videos automatically snaps the device into landscape orientation for maximum viewing area, while vertical/portrait videos stay in portrait mode.',
+      'Manual Orientation Toggle: added a quick-access rotation button (Icons.screen_lock_portrait / landscape) directly in the fullscreen top bar next to the close button, allowing 1-tap switching between landscape and portrait.',
+      'Clean Orientation Recovery: exiting fullscreen seamlessly restores system navigation bars (Edge-to-Edge) and restores unrestricted device sensor orientations.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.4',
+    title: 'OverlayPortal Architecture & Search UI Unblocking',
+    bullets: [
+      'OverlayPortal Migration: replaced manual root OverlayEntry and translucent backdrop with Flutter native OverlayPortal and TapRegion. Completely eliminates ghost overlay leaks and touch interception.',
+      'Unblocked Toolbar & Search Bar GUI: buttons (Refresh / Обновить, Clear Filters / Сбросить, random post, filter chips) and search chip crosses now respond immediately to taps without being swallowed by overlay backdrops.',
+      'Instant Chip Removal: deleting a tag chip (via its X cross icon) now updates the search immediately in real time, synchronizing the feed without restoring deleted tags on rebuild.',
+      'Search Clear Synchronization: tapping the search bar clear button (X) resets the query and clears active filters immediately.',
+      'Non-Blocking Outside Tap: tapping outside the suggestion dropdown smoothly dismisses suggestions while allowing the touch event to pass through directly to the underlying button or post.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.3',
+    title: 'Tag Suggestions Overlay Fix & Rule34 API Alignment',
+    bullets: [
+      'Tag Suggestions Hanging Fix: eliminated the bug where the tag suggestion card remained stuck on screen after clearing text or tapping outside. Added immediate dismissal on empty input, outside-tap backdrop dismissal, controller listener, and unfocus on submission.',
+      'Rule34 Dedicated Autocomplete: connected Rule34 directly to its official fast /autocomplete.php?q= endpoint, displaying real-time tag suggestions with accurate post counts (e.g. braid (216,984)).',
+      'Rule34 Tag Types (fields=tag_info): added tag_info field to post query for accurate tag categories per post.',
+      'Rule34 Authentication & Outage Handling: added detection for "missing authentication", rate limits, and server overload/search down ("success": false) with informative guidance to enter API Key & User ID.',
+    ],
+  ),
+  LunarisChange(
+    version: '2.3.2',
+    title: 'Gelbooru DAPI Compliance & Tag Query Optimization',
+    bullets: [
+      'Official Gelbooru DAPI Alignment: fixed tag suggestions pattern to use SQL LIKE wildcard (%) instead of literal asterisk (*), restoring accurate tag autocompletion.',
+      'Popularity Tag Sorting: added orderby=count and order=DESC to Gelbooru tag search so the most relevant and widely used tags appear first.',
+      'Batch Tag Categorization: migrated post tag metadata queries to the official "names" parameter, resolving categories for up to 80 tags in a single batch request instead of dozens of sequential requests.',
+      'Throttling & Auth Guidance: enhanced API credentials helper text and informative error messages with direct instructions to configure API Key & User ID from Gelbooru account options.',
+    ],
+  ),
   LunarisChange(
     version: '2.3.1',
     title: 'Cloud Mirrors & Author Announcements Fixes',

lib/backend/backend.dart

@@ -11,6 +11,8 @@ export 'models/cloud_media_link.dart';
 export 'models/download_task.dart';
 export 'models/downloaded_media.dart';
 export 'models/favorite.dart';
+export 'models/favorite_artist_item.dart';
+export 'models/pawchive_account.dart';
 export 'models/post.dart';
 export 'models/post_comment.dart';
 export 'models/provider_diagnostics.dart';
@@ -27,6 +29,7 @@ export 'services/download_manager_service.dart';
 export 'services/downloaded_media_service.dart';
 export 'services/favorite_service.dart';
 export 'services/feed_service.dart';
+export 'services/pawchive_sync_service.dart';
 export 'services/provider_check_service.dart';
 export 'services/search_service.dart';
 export 'services/tag_cache_service.dart';

lib/backend/models/app_update_info.dart

@@ -7,6 +7,9 @@ class AppUpdateInfo {
     required this.htmlUrl,
     required this.publishedAt,
     this.apkUrl,
+    this.apkArm64Url,
+    this.apkArmv7Url,
+    this.apkX86_64Url,
     this.windowsInstallerUrl,
     this.portableZipUrl,
     this.linuxTarGzUrl,
@@ -18,13 +21,36 @@ class AppUpdateInfo {
   final String body;
   final String htmlUrl;
   final DateTime? publishedAt;
+
+  /// Generic APK (fat / universal build). Used as a fallback.
   final String? apkUrl;
+
+  /// Per-ABI APKs produced by `flutter build apk --split-per-abi`.
+  final String? apkArm64Url;   // app-arm64-v8a-release.apk
+  final String? apkArmv7Url;   // app-armeabi-v7a-release.apk
+  final String? apkX86_64Url;  // app-x86_64-release.apk
+
   final String? windowsInstallerUrl;
   final String? portableZipUrl;
   final String? linuxTarGzUrl;
 
+  /// Returns the best APK URL for [abi], falling back to the generic APK.
+  String? apkUrlForAbi(String abi) {
+    if (abi.contains('arm64') || abi == 'arm64-v8a') {
+      return apkArm64Url ?? apkUrl;
+    }
+    if (abi.contains('x86_64')) {
+      return apkX86_64Url ?? apkUrl;
+    }
+    // armeabi-v7a and everything else
+    return apkArmv7Url ?? apkArm64Url ?? apkUrl;
+  }
+
   bool get hasAssets =>
       apkUrl != null ||
+      apkArm64Url != null ||
+      apkArmv7Url != null ||
+      apkX86_64Url != null ||
       windowsInstallerUrl != null ||
       portableZipUrl != null ||
       linuxTarGzUrl != null;

lib/backend/models/favorite_artist_item.dart

@@ -0,0 +1,68 @@
+class FavoriteArtistItem {
+  const FavoriteArtistItem({
+    required this.id,
+    required this.service,
+    required this.providerId,
+    required this.name,
+    this.avatarUrl,
+  });
+
+  const FavoriteArtistItem.empty()
+      : id = '',
+        service = '',
+        providerId = '',
+        name = '',
+        avatarUrl = null;
+
+  final String id;
+  final String service;
+  final String providerId;
+  final String name;
+  final String? avatarUrl;
+
+  bool get isEmpty => id.isEmpty;
+  String get key => '$providerId:$service:$id';
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'service': service,
+        'providerId': providerId,
+        'name': name,
+        'avatarUrl': avatarUrl,
+      };
+
+  factory FavoriteArtistItem.fromJson(Map<String, dynamic> json) =>
+      FavoriteArtistItem(
+        id: (json['id'] ?? '').toString(),
+        service: (json['service'] ?? '').toString(),
+        providerId: (json['providerId'] ?? '').toString(),
+        name: (json['name'] ?? '').toString(),
+        avatarUrl: json['avatarUrl'] as String?,
+      );
+
+  FavoriteArtistItem copyWith({
+    String? id,
+    String? service,
+    String? providerId,
+    String? name,
+    String? avatarUrl,
+  }) {
+    return FavoriteArtistItem(
+      id: id ?? this.id,
+      service: service ?? this.service,
+      providerId: providerId ?? this.providerId,
+      name: name ?? this.name,
+      avatarUrl: avatarUrl ?? this.avatarUrl,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is FavoriteArtistItem &&
+          runtimeType == other.runtimeType &&
+          key == other.key;
+
+  @override
+  int get hashCode => key.hashCode;
+}

lib/backend/models/pawchive_account.dart

@@ -0,0 +1,81 @@
+class PawchiveAccount {
+  const PawchiveAccount({
+    required this.id,
+    required this.username,
+    required this.sessionCookie,
+    this.baseUrl = 'https://pawchive.pw',
+    required this.createdAt,
+    this.lastSyncedAt,
+    this.isActive = true,
+    this.syncedArtistsCount = 0,
+  });
+
+  final String id;
+  final String username;
+  final String sessionCookie;
+  final String baseUrl;
+  final DateTime createdAt;
+  final DateTime? lastSyncedAt;
+  final bool isActive;
+  final int syncedArtistsCount;
+
+  PawchiveAccount copyWith({
+    String? id,
+    String? username,
+    String? sessionCookie,
+    String? baseUrl,
+    DateTime? createdAt,
+    DateTime? lastSyncedAt,
+    bool? isActive,
+    int? syncedArtistsCount,
+  }) {
+    return PawchiveAccount(
+      id: id ?? this.id,
+      username: username ?? this.username,
+      sessionCookie: sessionCookie ?? this.sessionCookie,
+      baseUrl: baseUrl ?? this.baseUrl,
+      createdAt: createdAt ?? this.createdAt,
+      lastSyncedAt: lastSyncedAt ?? this.lastSyncedAt,
+      isActive: isActive ?? this.isActive,
+      syncedArtistsCount: syncedArtistsCount ?? this.syncedArtistsCount,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'username': username,
+        'sessionCookie': sessionCookie,
+        'baseUrl': baseUrl,
+        'createdAt': createdAt.toIso8601String(),
+        'lastSyncedAt': lastSyncedAt?.toIso8601String(),
+        'isActive': isActive,
+        'syncedArtistsCount': syncedArtistsCount,
+      };
+
+  factory PawchiveAccount.fromJson(Map<String, dynamic> json) {
+    return PawchiveAccount(
+      id: (json['id'] ?? '').toString(),
+      username: (json['username'] ?? '').toString(),
+      sessionCookie: (json['sessionCookie'] ?? '').toString(),
+      baseUrl: (json['baseUrl'] ?? 'https://pawchive.pw').toString(),
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt'].toString()) ?? DateTime.now()
+          : DateTime.now(),
+      lastSyncedAt: json['lastSyncedAt'] != null
+          ? DateTime.tryParse(json['lastSyncedAt'].toString())
+          : null,
+      isActive: json['isActive'] as bool? ?? true,
+      syncedArtistsCount: (json['syncedArtistsCount'] as num?)?.toInt() ?? 0,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PawchiveAccount &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}

lib/backend/providers/gelbooru_provider.dart

@@ -65,6 +65,7 @@ class GelbooruProvider
       if (rating != null && rating.isNotEmpty) 'rating:$rating',
       ..._topTags(topPeriod),
     ];
+    try {
       final response = await _dio.get<dynamic>(
         '/index.php',
         queryParameters: {
@@ -78,15 +79,20 @@ class GelbooruProvider
           ..._queryParameters,
         },
       );
+      _checkResponse(response);
       return GelbooruMapper.postsFromResponse(
         response.data,
         providerId: id,
         providerName: name,
       );
+    } on DioException catch (e) {
+      _handleDioError(e);
+    }
   }
 
   @override
   Future<Post?> getPost(String id) async {
+    try {
       final response = await _dio.get<dynamic>(
         '/index.php',
         queryParameters: {
@@ -98,12 +104,16 @@ class GelbooruProvider
           ..._queryParameters,
         },
       );
+      _checkResponse(response);
       final posts = GelbooruMapper.postsFromResponse(
         response.data,
         providerId: this.id,
         providerName: name,
       );
       return posts.isEmpty ? null : posts.first;
+    } on DioException catch (e) {
+      _handleDioError(e);
+    }
   }
 
   @override
@@ -142,6 +152,7 @@ class GelbooruProvider
 
   @override
   Future<List<PostComment>> getComments(String postId) async {
+    try {
       final response = await _dio.get<dynamic>(
         '/index.php',
         queryParameters: {
@@ -154,6 +165,9 @@ class GelbooruProvider
         },
       );
       return _commentsFromResponse(response.data, postId);
+    } catch (_) {
+      return const [];
+    }
   }
 
   @override
@@ -161,6 +175,7 @@ class GelbooruProvider
       {int limit = 20}) async {
     final trimmed = query.trim();
     if (trimmed.isEmpty) return const [];
+    try {
       final response = await _dio.get<dynamic>(
         '/index.php',
         queryParameters: {
@@ -168,7 +183,9 @@ class GelbooruProvider
           's': 'tag',
           'q': 'index',
           'json': '1',
-        'name_pattern': '$trimmed*',
+          'name_pattern': '$trimmed%',
+          'orderby': 'count',
+          'order': 'DESC',
           'limit': limit.clamp(1, 100),
           ..._queryParameters,
         },
@@ -188,6 +205,9 @@ class GelbooruProvider
           })
           .where((tag) => tag.name.isNotEmpty)
           .toList(growable: false);
+    } catch (_) {
+      return const [];
+    }
   }
 
   @override
@@ -201,11 +221,43 @@ class GelbooruProvider
     if (cleaned.isEmpty) return const {};
 
     final groups = <String, List<String>>{};
-    for (final tag in cleaned) {
+    final tagToCategory = <String, TagCategory>{};
+
+    // Batch query tag metadata using Gelbooru DAPI "names" parameter
     try {
-        final suggestions = await suggestTags(tag, limit: 3);
+      for (var i = 0; i < cleaned.length; i += 50) {
-        final exact = suggestions.where((item) => item.name == tag).firstOrNull;
+        final chunk = cleaned.sublist(
-        final category = exact?.category ?? TagCategory.general;
+          i,
+          (i + 50 > cleaned.length) ? cleaned.length : i + 50,
+        );
+        final response = await _dio.get<dynamic>(
+          '/index.php',
+          queryParameters: {
+            'page': 'dapi',
+            's': 'tag',
+            'q': 'index',
+            'json': '1',
+            'names': chunk.join(' '),
+            'limit': chunk.length.clamp(1, 100),
+            ..._queryParameters,
+          },
+        );
+        for (final item in _tagItems(response.data).whereType<Map>()) {
+          final json = Map<String, dynamic>.from(item);
+          final name = (json['name'] ?? '').toString().trim();
+          if (name.isNotEmpty) {
+            tagToCategory[name] = tagCategoryFromString(
+              (json['type'] ?? json['tag_type'] ?? json['category']).toString(),
+            );
+          }
+        }
+      }
+    } catch (_) {
+      // Gracefully continue to fallback categorization
+    }
+
+    for (final tag in cleaned) {
+      final category = tagToCategory[tag] ?? TagCategory.general;
       final key = switch (category) {
         TagCategory.artist => 'artist',
         TagCategory.copyright => 'copyright',
@@ -215,13 +267,35 @@ class GelbooruProvider
         TagCategory.general || TagCategory.unknown => 'general',
       };
       groups.putIfAbsent(key, () => <String>[]).add(tag);
-      } catch (_) {
-        groups.putIfAbsent('general', () => <String>[]).add(tag);
-      }
     }
     return groups;
   }
 
+  void _checkResponse(Response<dynamic> response) {
+    if (response.data is String) {
+      final text = (response.data as String).toLowerCase();
+      if (text.contains('throttled') ||
+          text.contains('authentication required') ||
+          text.contains('requires authentication')) {
+        unavailable(
+          '$name requires authentication or is throttled. '
+          'Please configure API Key & User ID in Settings -> Providers.',
+        );
+      }
+    }
+  }
+
+  Never _handleDioError(DioException error) {
+    final status = error.response?.statusCode;
+    if (status == 401 || status == 403 || status == 429) {
+      unavailable(
+        '$name requires authentication or rate limit exceeded ($status). '
+        'Please enter your API Key and User ID in Settings -> Providers.',
+      );
+    }
+    throw error;
+  }
+
   Never unavailable(String message) =>
       throw ProviderUnavailableException(message);
 

lib/backend/providers/rule34_provider.dart

@@ -1,5 +1,8 @@
+import 'package:dio/dio.dart';
+
 import '../mappers/rule34_mapper.dart';
 import '../models/post.dart';
+import '../models/tag_suggestion.dart';
 import '../models/top_period_filter.dart';
 import 'gelbooru_provider.dart';
 
@@ -36,6 +39,7 @@ class Rule34Provider extends GelbooruProvider {
       TopPeriodFilter.month || TopPeriodFilter.year => const <String>[],
       TopPeriodFilter.allTime => const ['sort:score:desc'],
     };
+    try {
       final response = await dio.get<dynamic>(
         '/index.php',
         queryParameters: {
@@ -45,6 +49,7 @@ class Rule34Provider extends GelbooruProvider {
           'json': '1',
           'pid': page,
           'limit': limit,
+          'fields': 'tag_info',
           'tags': [
             ...tags,
             if (rating != null) 'rating:$rating',
@@ -53,10 +58,123 @@ class Rule34Provider extends GelbooruProvider {
           ...queryParameters,
         },
       );
+      _checkRule34Response(response);
       return Rule34Mapper.postsFromResponse(
         response.data,
         providerId: id,
         providerName: name,
       );
+    } on DioException catch (e) {
+      _handleRule34DioError(e);
+    }
+  }
+
+  @override
+  Future<Post?> getPost(String id) async {
+    try {
+      final response = await dio.get<dynamic>(
+        '/index.php',
+        queryParameters: {
+          'page': 'dapi',
+          's': 'post',
+          'q': 'index',
+          'json': '1',
+          'id': id,
+          'fields': 'tag_info',
+          ...queryParameters,
+        },
+      );
+      _checkRule34Response(response);
+      final posts = Rule34Mapper.postsFromResponse(
+        response.data,
+        providerId: this.id,
+        providerName: name,
+      );
+      return posts.isEmpty ? null : posts.first;
+    } on DioException catch (e) {
+      _handleRule34DioError(e);
+    }
+  }
+
+  @override
+  Future<List<TagSuggestion>> suggestTags(String query,
+      {int limit = 20}) async {
+    final trimmed = query.trim();
+    if (trimmed.isEmpty) return const [];
+    try {
+      // Official Rule34 autocomplete endpoint (fast, public, with exact post count)
+      final response = await dio.get<dynamic>(
+        '/autocomplete.php',
+        queryParameters: {
+          'q': trimmed,
+        },
+      );
+      if (response.data is List) {
+        final list = response.data as List;
+        final suggestions = list
+            .whereType<Map>()
+            .map((item) {
+              final json = Map<String, dynamic>.from(item);
+              final rawLabel = (json['label'] ?? '').toString();
+              final rawValue = (json['value'] ?? '').toString();
+              // Parse label "braid (216984)" -> name: "braid", postCount: 216984
+              final match =
+                  RegExp(r'^(.*?)\s*\((\d+)\)$').firstMatch(rawLabel);
+              final name = (match?.group(1) ?? rawValue).trim();
+              final postCount = int.tryParse(match?.group(2) ?? '') ?? 0;
+              return TagSuggestion(
+                name: name.isNotEmpty ? name : rawValue,
+                category: TagCategory.general,
+                postCount: postCount,
+                providerId: id,
+              );
+            })
+            .where((tag) => tag.name.isNotEmpty)
+            .take(limit)
+            .toList(growable: false);
+        if (suggestions.isNotEmpty) return suggestions;
+      }
+    } catch (_) {
+      // Gracefully fall back to standard DAPI tag search
+    }
+    return super.suggestTags(query, limit: limit);
+  }
+
+  void _checkRule34Response(Response<dynamic> response) {
+    if (response.data is String) {
+      final text = (response.data as String).toLowerCase();
+      if (text.contains('missing authentication') ||
+          text.contains('throttled') ||
+          text.contains('authentication required')) {
+        unavailable(
+          '$name requires authentication. '
+          'Please configure your API Key and User ID in Settings -> Providers '
+          '(obtain from https://rule34.xxx/index.php?page=account&s=options).',
+        );
+      }
+      if (text.contains('search down') ||
+          text.contains('server is overloaded')) {
+        unavailable(
+          '$name searcher is temporarily down or overloaded. Please try again in a few minutes.',
+        );
+      }
+    } else if (response.data is Map) {
+      final map = response.data as Map;
+      if (map['success'] == false || map['success'] == 'false') {
+        final msg = map['message'] ?? 'search down';
+        unavailable('$name error: $msg');
+      }
+    }
+  }
+
+  Never _handleRule34DioError(DioException error) {
+    final status = error.response?.statusCode;
+    if (status == 401 || status == 403 || status == 429) {
+      unavailable(
+        '$name requires authentication or rate limit reached ($status). '
+        'Please enter your API Key and User ID in Settings -> Providers.',
+      );
+    }
+    throw error;
   }
 }

lib/backend/services/pawchive_sync_service.dart

@@ -0,0 +1,530 @@
+import 'dart:convert';
+import 'package:dio/dio.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../core/http/dio_client.dart';
+import '../models/favorite_artist_item.dart';
+import '../models/pawchive_account.dart';
+import 'settings_service.dart';
+
+final pawchiveSyncServiceProvider = Provider<PawchiveSyncService>((ref) {
+  return PawchiveSyncService(dio: DioClient().dio);
+});
+
+class PawchiveSyncResult {
+  const PawchiveSyncResult({
+    required this.updatedSettings,
+    required this.newlyAddedToLocal,
+    required this.totalSyncedCount,
+    this.pushedToRemoteCount = 0,
+    this.errorMessage,
+  });
+
+  final AppSettings updatedSettings;
+  final int newlyAddedToLocal;
+  final int totalSyncedCount;
+  final int pushedToRemoteCount;
+  final String? errorMessage;
+
+  bool get isSuccess => errorMessage == null;
+}
+
+class PawchivePushResult {
+  const PawchivePushResult({
+    required this.pushedCount,
+    required this.totalRemoteCount,
+    required this.totalLocalCandidates,
+    this.updatedSettings,
+    this.errorMessage,
+  });
+
+  final int pushedCount;
+  final int totalRemoteCount;
+  final int totalLocalCandidates;
+  final AppSettings? updatedSettings;
+  final String? errorMessage;
+
+  bool get isSuccess => errorMessage == null;
+}
+
+class PawchiveSyncService {
+  PawchiveSyncService({Dio? dio}) : _dio = dio ?? Dio();
+
+  final Dio _dio;
+
+  static String _normalizeCookie(String rawCookie) {
+    var c = rawCookie.trim();
+    if (c.startsWith('session=')) {
+      c = c.substring('session='.length);
+    }
+    // strip semicolons if trailing
+    final semiIdx = c.indexOf(';');
+    if (semiIdx != -1) {
+      c = c.substring(0, semiIdx);
+    }
+    return c.trim();
+  }
+
+  /// Logs into Pawchive with username & password, returns new PawchiveAccount on success.
+  Future<PawchiveAccount> loginWithCredentials({
+    required String username,
+    required String password,
+    String baseUrl = 'https://pawchive.pw',
+  }) async {
+    final cleanUser = username.trim();
+    final cleanPass = password.trim();
+    if (cleanUser.isEmpty || cleanPass.isEmpty) {
+      throw ArgumentError('Логин и пароль не могут быть пустыми');
+    }
+
+    final normalizedBase = baseUrl.endsWith('/')
+        ? baseUrl.substring(0, baseUrl.length - 1)
+        : baseUrl;
+
+    try {
+      final response = await _dio.post<dynamic>(
+        '$normalizedBase/account/login',
+        data: {
+          'username': cleanUser,
+          'password': cleanPass,
+          'location': '/artists',
+        },
+        options: Options(
+          contentType: Headers.formUrlEncodedContentType,
+          followRedirects: false,
+          validateStatus: (status) => status != null && status < 500,
+          headers: const {
+            'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+          },
+        ),
+      );
+
+      final redirectLocation = response.headers.value('location') ?? '';
+      final setCookies = response.headers['set-cookie'] ?? const [];
+
+      String? sessionValue;
+      for (final cookie in setCookies) {
+        final match = RegExp(r'session=([^;]+)').firstMatch(cookie);
+        if (match != null) {
+          sessionValue = match.group(1);
+          break;
+        }
+      }
+
+      if (sessionValue == null || sessionValue.isEmpty) {
+        throw StateError('Не удалось получить сессию. Проверьте данные для входа.');
+      }
+
+      // Check if redirect points back to login with flash error
+      if (redirectLocation.contains('/account/login') ||
+          redirectLocation.contains('/login')) {
+        throw StateError('Неверный логин или пароль');
+      }
+
+      // Check for flash errors in session cookie if present
+      try {
+        final dotIdx = sessionValue.indexOf('.');
+        final payloadBase64 =
+            dotIdx != -1 ? sessionValue.substring(0, dotIdx) : sessionValue;
+        final normalizedB64 = base64Url.normalize(payloadBase64);
+        final decoded = utf8.decode(base64Url.decode(normalizedB64));
+        if (decoded.contains('is incorrect') || decoded.contains('_flashes')) {
+          throw StateError('Неверный логин или пароль');
+        }
+      } catch (e) {
+        if (e is StateError) rethrow;
+      }
+
+      // Verify session and fetch initial artists
+      final remoteArtists = await fetchRemoteFavoriteArtists(
+        baseUrl: normalizedBase,
+        sessionCookie: sessionValue,
+      );
+
+      return PawchiveAccount(
+        id: cleanUser.toLowerCase(),
+        username: cleanUser,
+        sessionCookie: sessionValue,
+        baseUrl: normalizedBase,
+        createdAt: DateTime.now(),
+        lastSyncedAt: DateTime.now(),
+        isActive: true,
+        syncedArtistsCount: remoteArtists.length,
+      );
+    } on DioException catch (e) {
+      final code = e.response?.statusCode;
+      if (code == 401 || code == 403) {
+        throw StateError('Неверный логин или пароль');
+      } else if (code != null) {
+        throw StateError('Ошибка сервера Pawchive (HTTP $code)');
+      } else {
+        throw StateError('Ошибка сети: ${e.message ?? e.type.name}');
+      }
+    } catch (e) {
+      if (e is StateError || e is ArgumentError) rethrow;
+      throw StateError('Ошибка входа в Pawchive: $e');
+    }
+  }
+
+  /// Validates session cookie directly and creates PawchiveAccount.
+  Future<PawchiveAccount> loginWithSession({
+    required String sessionCookie,
+    required String username,
+    String baseUrl = 'https://pawchive.pw',
+  }) async {
+    final cleanUser = username.trim().isEmpty ? 'Pawchive User' : username.trim();
+    final cleanCookie = _normalizeCookie(sessionCookie);
+    if (cleanCookie.isEmpty) {
+      throw ArgumentError('Сессионная кука не может быть пустой');
+    }
+
+    final normalizedBase = baseUrl.endsWith('/')
+        ? baseUrl.substring(0, baseUrl.length - 1)
+        : baseUrl;
+
+    try {
+      final remoteArtists = await fetchRemoteFavoriteArtists(
+        baseUrl: normalizedBase,
+        sessionCookie: cleanCookie,
+      );
+
+      return PawchiveAccount(
+        id: cleanUser.toLowerCase(),
+        username: cleanUser,
+        sessionCookie: cleanCookie,
+        baseUrl: normalizedBase,
+        createdAt: DateTime.now(),
+        lastSyncedAt: DateTime.now(),
+        isActive: true,
+        syncedArtistsCount: remoteArtists.length,
+      );
+    } on DioException catch (e) {
+      final code = e.response?.statusCode;
+      if (code == 401 || code == 403) {
+        throw StateError('Сессия недействительна или истекла');
+      } else if (code != null) {
+        throw StateError('Ошибка сервера Pawchive (HTTP $code)');
+      } else {
+        throw StateError('Ошибка сети: ${e.message ?? e.type.name}');
+      }
+    } catch (e) {
+      if (e is StateError || e is ArgumentError) rethrow;
+      throw StateError('Сессия недействительна или истекла: $e');
+    }
+  }
+
+  /// Fetches favorite creators from Pawchive account.
+  Future<List<FavoriteArtistItem>> fetchRemoteFavoriteArtists({
+    required String baseUrl,
+    required String sessionCookie,
+  }) async {
+    final cleanCookie = _normalizeCookie(sessionCookie);
+    final normalizedBase = baseUrl.endsWith('/')
+        ? baseUrl.substring(0, baseUrl.length - 1)
+        : baseUrl;
+
+    final response = await _dio.get<dynamic>(
+      '$normalizedBase/api/v1/account/favorites',
+      queryParameters: {'type': 'artist'},
+      options: Options(
+        headers: {
+          'Cookie': 'session=$cleanCookie',
+          'Accept': 'application/json',
+          'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
+        },
+        validateStatus: (status) => status != null && status < 500,
+      ),
+    );
+
+    if (response.statusCode == 401 || response.statusCode == 403) {
+      throw StateError('Сессия истекла или недействительна');
+    }
+    if (response.statusCode != 200) {
+      throw StateError('Ошибка сервера Pawchive (HTTP ${response.statusCode})');
+    }
+
+    final data = response.data;
+    if (data is! List) return const [];
+
+    final list = <FavoriteArtistItem>[];
+    for (final raw in data) {
+      if (raw is! Map) continue;
+      final item = Map<String, dynamic>.from(raw);
+      final id = (item['id'] ?? '').toString();
+      final service = (item['service'] ?? '').toString();
+      final name = (item['name'] ?? id).toString();
+      if (id.isEmpty || service.isEmpty) continue;
+
+      final avatarUrl = '$normalizedBase/icons/$service/$id';
+      list.add(FavoriteArtistItem(
+        id: id,
+        service: service,
+        providerId: 'pawchive',
+        name: name,
+        avatarUrl: avatarUrl,
+      ));
+    }
+    return list;
+  }
+
+  /// Synchronizes a specific Pawchive account with current local AppSettings.
+  /// If [pushLocalPawchiveArtists] is true (or [settings.pawchiveBidirectionalSync] is enabled),
+  /// local favorites are also pushed to the Pawchive server.
+  Future<PawchiveSyncResult> syncAccountFavorites({
+    required PawchiveAccount account,
+    required AppSettings settings,
+    bool? pushLocalPawchiveArtists,
+  }) async {
+    try {
+      final remoteArtists = await fetchRemoteFavoriteArtists(
+        baseUrl: account.baseUrl,
+        sessionCookie: account.sessionCookie,
+      );
+
+      final currentFavorites = List<String>.from(settings.favoriteArtists);
+      final existingKeys = <String>{};
+      final existingServiceId = <String>{};
+      for (final raw in currentFavorites) {
+        try {
+          final parsed = FavoriteArtistItem.fromJson(
+            jsonDecode(raw) as Map<String, dynamic>,
+          );
+          existingKeys.add(parsed.key);
+          if (parsed.service.isNotEmpty && parsed.id.isNotEmpty) {
+            existingServiceId.add('${parsed.service}:${parsed.id}'.toLowerCase());
+          }
+        } catch (_) {}
+      }
+
+      var addedCount = 0;
+      for (final artist in remoteArtists) {
+        final pair = '${artist.service}:${artist.id}'.toLowerCase();
+        if (!existingKeys.contains(artist.key) && !existingServiceId.contains(pair)) {
+          currentFavorites.insert(0, jsonEncode(artist.toJson()));
+          existingKeys.add(artist.key);
+          existingServiceId.add(pair);
+          addedCount++;
+        }
+      }
+
+      var pushedCount = 0;
+      final shouldPush =
+          pushLocalPawchiveArtists ?? settings.pawchiveBidirectionalSync;
+      if (shouldPush) {
+        final remotePairSet = remoteArtists
+            .map((a) => '${a.service}:${a.id}'.toLowerCase())
+            .toSet();
+
+        for (final raw in currentFavorites) {
+          try {
+            final parsed = FavoriteArtistItem.fromJson(
+              jsonDecode(raw) as Map<String, dynamic>,
+            );
+            if (parsed.service.isNotEmpty && parsed.id.isNotEmpty) {
+              final pair = '${parsed.service}:${parsed.id}'.toLowerCase();
+              if (!remotePairSet.contains(pair)) {
+                final ok = await toggleRemoteFavorite(
+                  account: account,
+                  service: parsed.service,
+                  artistId: parsed.id,
+                  isFavorite: true,
+                );
+                if (ok) {
+                  pushedCount++;
+                  remotePairSet.add(pair);
+                }
+              }
+            }
+          } catch (_) {}
+        }
+      }
+
+      // Update account sync stats in settings
+      final updatedAccount = account.copyWith(
+        lastSyncedAt: DateTime.now(),
+        syncedArtistsCount: remoteArtists.length + pushedCount,
+      );
+
+      final updatedAccountsList = settings.parsedPawchiveAccounts.map((a) {
+        return a.id == updatedAccount.id ? updatedAccount : a;
+      }).toList();
+
+      final newSettings = settings.copyWith(
+        favoriteArtists: currentFavorites,
+        pawchiveAccounts:
+            updatedAccountsList.map((a) => jsonEncode(a.toJson())).toList(),
+      );
+
+      return PawchiveSyncResult(
+        updatedSettings: newSettings,
+        newlyAddedToLocal: addedCount,
+        pushedToRemoteCount: pushedCount,
+        totalSyncedCount: remoteArtists.length + pushedCount,
+      );
+    } catch (e) {
+      return PawchiveSyncResult(
+        updatedSettings: settings,
+        newlyAddedToLocal: 0,
+        pushedToRemoteCount: 0,
+        totalSyncedCount: 0,
+        errorMessage: e.toString(),
+      );
+    }
+  }
+
+  /// Explicitly pushes all local favorite artists into a specified Pawchive account.
+  Future<PawchivePushResult> pushLocalFavoritesToAccount({
+    required PawchiveAccount account,
+    required AppSettings settings,
+  }) async {
+    try {
+      final remoteArtists = await fetchRemoteFavoriteArtists(
+        baseUrl: account.baseUrl,
+        sessionCookie: account.sessionCookie,
+      );
+
+      final remotePairSet = remoteArtists
+          .map((a) => '${a.service}:${a.id}'.toLowerCase())
+          .toSet();
+
+      var pushedCount = 0;
+      var totalLocalCandidates = 0;
+
+      for (final raw in settings.favoriteArtists) {
+        try {
+          final parsed = FavoriteArtistItem.fromJson(
+            jsonDecode(raw) as Map<String, dynamic>,
+          );
+          if (parsed.service.isNotEmpty && parsed.id.isNotEmpty) {
+            totalLocalCandidates++;
+            final pair = '${parsed.service}:${parsed.id}'.toLowerCase();
+            if (!remotePairSet.contains(pair)) {
+              final ok = await toggleRemoteFavorite(
+                account: account,
+                service: parsed.service,
+                artistId: parsed.id,
+                isFavorite: true,
+              );
+              if (ok) {
+                pushedCount++;
+                remotePairSet.add(pair);
+              }
+            }
+          }
+        } catch (_) {}
+      }
+
+      final updatedAccount = account.copyWith(
+        lastSyncedAt: DateTime.now(),
+        syncedArtistsCount: remoteArtists.length + pushedCount,
+      );
+
+      final updatedAccountsList = settings.parsedPawchiveAccounts.map((a) {
+        return a.id == updatedAccount.id ? updatedAccount : a;
+      }).toList();
+
+      final newSettings = settings.copyWith(
+        pawchiveAccounts:
+            updatedAccountsList.map((a) => jsonEncode(a.toJson())).toList(),
+      );
+
+      return PawchivePushResult(
+        pushedCount: pushedCount,
+        totalRemoteCount: remoteArtists.length + pushedCount,
+        totalLocalCandidates: totalLocalCandidates,
+        updatedSettings: newSettings,
+      );
+    } catch (e) {
+      return PawchivePushResult(
+        pushedCount: 0,
+        totalRemoteCount: 0,
+        totalLocalCandidates: 0,
+        errorMessage: e.toString(),
+      );
+    }
+  }
+
+  /// Synchronizes ALL connected Pawchive accounts with local AppSettings.
+  Future<PawchiveSyncResult> syncAllAccounts({
+    required AppSettings settings,
+    bool? pushLocalArtists,
+  }) async {
+    final accounts = settings.parsedPawchiveAccounts;
+    if (accounts.isEmpty) {
+      return PawchiveSyncResult(
+        updatedSettings: settings,
+        newlyAddedToLocal: 0,
+        pushedToRemoteCount: 0,
+        totalSyncedCount: 0,
+        errorMessage: 'Нет добавленных аккаунтов Pawchive',
+      );
+    }
+
+    final doPush = pushLocalArtists ?? settings.pawchiveBidirectionalSync;
+    var runningSettings = settings;
+    var totalAdded = 0;
+    var totalSynced = 0;
+    var totalPushed = 0;
+    String? firstError;
+
+    for (final account in accounts) {
+      final res = await syncAccountFavorites(
+        account: account,
+        settings: runningSettings,
+        pushLocalPawchiveArtists: doPush,
+      );
+      if (res.isSuccess) {
+        runningSettings = res.updatedSettings;
+        totalAdded += res.newlyAddedToLocal;
+        totalPushed += res.pushedToRemoteCount;
+        totalSynced += res.totalSyncedCount;
+      } else {
+        firstError ??= res.errorMessage;
+      }
+    }
+
+    return PawchiveSyncResult(
+      updatedSettings: runningSettings,
+      newlyAddedToLocal: totalAdded,
+      pushedToRemoteCount: totalPushed,
+      totalSyncedCount: totalSynced,
+      errorMessage: firstError,
+    );
+  }
+
+  /// Toggles favorite creator on Pawchive server (POST or DELETE).
+  Future<bool> toggleRemoteFavorite({
+    required PawchiveAccount account,
+    required String service,
+    required String artistId,
+    required bool isFavorite,
+  }) async {
+    final cleanCookie = _normalizeCookie(account.sessionCookie);
+    final normalizedBase = account.baseUrl.endsWith('/')
+        ? account.baseUrl.substring(0, account.baseUrl.length - 1)
+        : account.baseUrl;
+
+    final path = '$normalizedBase/api/v1/favorites/creator/$service/$artistId';
+    final options = Options(
+      headers: {
+        'Cookie': 'session=$cleanCookie',
+        'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
+      },
+      validateStatus: (status) =>
+          status != null && (status == 200 || status == 201 || status == 204),
+    );
+
+    try {
+      if (isFavorite) {
+        final response = await _dio.post<dynamic>(path, options: options);
+        return response.statusCode != null && response.statusCode! < 300;
+      } else {
+        final response = await _dio.delete<dynamic>(path, options: options);
+        return response.statusCode != null && response.statusCode! < 300;
+      }
+    } catch (_) {
+      return false;
+    }
+  }
+}

lib/backend/services/settings_service.dart

@@ -7,6 +7,7 @@ import '../../core/database/database_service.dart';
 import '../../core/errors/failure.dart';
 import '../../core/utils/result.dart';
 import '../models/content_provider_config.dart';
+import '../models/pawchive_account.dart';
 import '../models/provider_diagnostics.dart';
 import '../repositories/provider_repository.dart';
 
@@ -49,6 +50,8 @@ class AppSettings {
     required this.lastFeedTopPeriod,
     required this.lastFeedScrollOffset,
     this.favoriteArtists = const [],
+    this.pawchiveAccounts = const [],
+    this.pawchiveBidirectionalSync = false,
     this.skippedUpdateVersion,
     this.lastUpdateCheckAt,
     this.defaultRatingFilter,
@@ -63,6 +66,8 @@ class AppSettings {
   });
 
   final List<String> favoriteArtists;
+  final List<String> pawchiveAccounts;
+  final bool pawchiveBidirectionalSync;
   final List<String> enabledProviderIds;
   final bool nsfwEnabled;
   final int cacheTtlHours;
@@ -118,6 +123,8 @@ class AppSettings {
     cacheMaxItems: 2000,
     providerPriority: {'gelbooru': 0, 'rule34': 1, 'realbooru': 2},
     favoriteArtists: [],
+    pawchiveAccounts: [],
+    pawchiveBidirectionalSync: false,
     themeMode: 'dark',
     languageCode: 'ru',
     appSeedColor: 0xFFE84D8A,
@@ -200,6 +207,8 @@ class AppSettings {
     String? lastFeedRating,
     bool clearLastFeedRating = false,
     List<String>? favoriteArtists,
+    List<String>? pawchiveAccounts,
+    bool? pawchiveBidirectionalSync,
     bool? amoledMode,
     bool? useDynamicColor,
     String? gridMode,
@@ -210,6 +219,9 @@ class AppSettings {
   }) {
     return AppSettings(
       favoriteArtists: favoriteArtists ?? this.favoriteArtists,
+      pawchiveAccounts: pawchiveAccounts ?? this.pawchiveAccounts,
+      pawchiveBidirectionalSync:
+          pawchiveBidirectionalSync ?? this.pawchiveBidirectionalSync,
       enabledProviderIds: enabledProviderIds ?? this.enabledProviderIds,
       nsfwEnabled: nsfwEnabled ?? this.nsfwEnabled,
       cacheTtlHours: cacheTtlHours ?? this.cacheTtlHours,
@@ -269,6 +281,8 @@ class AppSettings {
 
   Map<String, dynamic> toJson() => {
         'favoriteArtists': favoriteArtists,
+        'pawchiveAccounts': pawchiveAccounts,
+        'pawchiveBidirectionalSync': pawchiveBidirectionalSync,
         'enabledProviderIds': enabledProviderIds,
         'nsfwEnabled': nsfwEnabled,
         'cacheTtlHours': cacheTtlHours,
@@ -411,6 +425,12 @@ class AppSettings {
         favoriteArtists: List<String>.from(
           (json['favoriteArtists'] as List?) ?? defaults.favoriteArtists,
         ),
+        pawchiveAccounts: List<String>.from(
+          (json['pawchiveAccounts'] as List?) ?? defaults.pawchiveAccounts,
+        ),
+        pawchiveBidirectionalSync:
+            (json['pawchiveBidirectionalSync'] as bool?) ??
+                defaults.pawchiveBidirectionalSync,
         skippedUpdateVersion: json['skippedUpdateVersion'] as String?,
         lastUpdateCheckAt: json['lastUpdateCheckAt'] as String?,
         defaultRatingFilter: json['defaultRatingFilter'] as String?,
@@ -428,6 +448,25 @@ class AppSettings {
         tagCacheLimit: (json['tagCacheLimit'] as num?)?.toInt() ??
             defaults.tagCacheLimit,
       );
+
+  List<PawchiveAccount> get parsedPawchiveAccounts {
+    final list = <PawchiveAccount>[];
+    for (final raw in pawchiveAccounts) {
+      try {
+        final decoded = jsonDecode(raw);
+        if (decoded is Map<String, dynamic>) {
+          list.add(PawchiveAccount.fromJson(decoded));
+        }
+      } catch (_) {}
+    }
+    return list;
+  }
+
+  PawchiveAccount? get activePawchiveAccount {
+    final accounts = parsedPawchiveAccounts;
+    if (accounts.isEmpty) return null;
+    return accounts.firstWhere((a) => a.isActive, orElse: () => accounts.first);
+  }
 }
 
 class SettingsService {

lib/backend/services/update_service.dart

@@ -1,6 +1,8 @@
 import 'package:dio/dio.dart';
 import 'dart:io';
 
+import 'package:flutter/services.dart';
+
 import '../../app/app_version.dart';
 import '../../core/errors/failure.dart';
 import '../../core/utils/result.dart';
@@ -15,9 +17,39 @@ class UpdateService {
   static const releasesUrl =
       'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Lunaris/releases';
 
+  static const _deviceChannel = MethodChannel('rulegel/device');
+
   final Dio _dio;
   final SettingsService _settingsService;
 
+  // Cached primary ABI (e.g. "arm64-v8a").
+  String? _cachedPrimaryAbi;
+
+  /// Returns the primary ABI of the running device.
+  /// On non-Android platforms returns an empty string.
+  Future<String> getPrimaryAbi() async {
+    if (_cachedPrimaryAbi != null) return _cachedPrimaryAbi!;
+    if (!Platform.isAndroid) return '';
+    try {
+      final abi = await _deviceChannel.invokeMethod<String>('getPrimaryAbi');
+      _cachedPrimaryAbi = abi ?? 'armeabi-v7a';
+    } catch (_) {
+      _cachedPrimaryAbi = 'armeabi-v7a';
+    }
+    return _cachedPrimaryAbi!;
+  }
+
+  /// Returns all supported ABIs of the running device.
+  Future<List<String>> getSupportedAbis() async {
+    if (!Platform.isAndroid) return const [];
+    try {
+      final abis = await _deviceChannel.invokeMethod<List<Object?>>('getSupportedAbis');
+      return abis?.whereType<String>().toList() ?? const [];
+    } catch (_) {
+      return const [];
+    }
+  }
+
   Future<Result<AppUpdateInfo?>> checkForUpdates({bool force = false}) async {
     final settingsResult = await _settingsService.getSettings();
     final settings = settingsResult is Success<AppSettings>
@@ -97,21 +129,40 @@ class UpdateService {
   AppUpdateInfo _releaseFromJson(Map<String, dynamic> json) {
     final tag = (json['tag_name'] ?? '').toString();
     final assets = (json['assets'] as List?) ?? const [];
+
     String? apkUrl;
+    String? apkArm64Url;
+    String? apkArmv7Url;
+    String? apkX86_64Url;
     String? installerUrl;
     String? portableUrl;
     String? linuxTarGzUrl;
+
     for (final item in assets.whereType<Map>()) {
       final name = (item['name'] ?? '').toString().toLowerCase();
       final url = (item['browser_download_url'] ?? '').toString();
       if (url.isEmpty) continue;
-      if (name.endsWith('.apk')) apkUrl = url;
+
+      if (name.endsWith('.apk')) {
+        // Detect per-ABI APKs by name pattern produced by --split-per-abi.
+        if (name.contains('arm64-v8a') || name.contains('arm64_v8a')) {
+          apkArm64Url = url;
+        } else if (name.contains('armeabi-v7a') || name.contains('armeabi_v7a')) {
+          apkArmv7Url = url;
+        } else if (name.contains('x86_64')) {
+          apkX86_64Url = url;
+        } else {
+          // Universal / fat APK
+          apkUrl = url;
+        }
+      }
       if (name.endsWith('.exe')) installerUrl = url;
       if (name.endsWith('.zip')) portableUrl = url;
       if (name.endsWith('.tar.gz') || name.endsWith('.tgz')) {
         linuxTarGzUrl = url;
       }
     }
+
     return AppUpdateInfo(
       version: _versionFromTag(tag),
       tagName: tag,
@@ -120,15 +171,21 @@ class UpdateService {
       htmlUrl: (json['html_url'] ?? '').toString(),
       publishedAt: DateTime.tryParse((json['published_at'] ?? '').toString()),
       apkUrl: apkUrl,
+      apkArm64Url: apkArm64Url,
+      apkArmv7Url: apkArmv7Url,
+      apkX86_64Url: apkX86_64Url,
       windowsInstallerUrl: installerUrl,
       portableZipUrl: portableUrl,
       linuxTarGzUrl: linuxTarGzUrl,
     );
   }
 
-  String? assetUrlForCurrentPlatform(AppUpdateInfo info) {
+  /// Returns the download URL for the current platform/ABI.
+  /// Pass [abi] (e.g. from [getPrimaryAbi]) on Android for per-ABI selection.
+  Future<String?> assetUrlForCurrentPlatform(AppUpdateInfo info) async {
     if (Platform.isAndroid) {
-      return info.apkUrl;
+      final abi = await getPrimaryAbi();
+      return info.apkUrlForAbi(abi);
     }
     if (Platform.isLinux) {
       return info.linuxTarGzUrl ?? info.portableZipUrl;

lib/features/artists/presentation/artist_posts_screen.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
@@ -12,6 +14,7 @@ import '../../../shared/widgets/empty_view.dart';
 import '../../../shared/widgets/error_view.dart';
 import '../../../shared/widgets/post_masonry_grid.dart';
 import '../../favorites/presentation/favorites_controller.dart';
+import '../../settings/presentation/settings_controller.dart';
 
 final artistPostsProvider =
     FutureProvider.family<List<Post>, ArtistWorkQuery>((ref, query) async {
@@ -401,6 +404,54 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
     );
   }
 
+  Future<void> _toggleArtistFavorite(
+    AppSettings settings,
+    bool isCurrentlyFav,
+  ) async {
+    final current = List<String>.from(settings.favoriteArtists);
+    final artistKey =
+        '${widget.providerId}:${widget.service}:${widget.artistId}';
+    if (isCurrentlyFav) {
+      current.removeWhere((e) {
+        try {
+          return FavoriteArtistItem.fromJson(
+                      jsonDecode(e) as Map<String, dynamic>)
+                  .key ==
+              artistKey;
+        } catch (_) {
+          return false;
+        }
+      });
+    } else {
+      final avatarUrl = widget.providerId == 'pawchive'
+          ? 'https://pawchive.pw/icons/${widget.service}/${widget.artistId}'
+          : null;
+      final item = FavoriteArtistItem(
+        id: widget.artistId,
+        service: widget.service,
+        providerId: widget.providerId,
+        name: widget.artistName,
+        avatarUrl: avatarUrl,
+      );
+      current.insert(0, jsonEncode(item.toJson()));
+    }
+    await ref.read(settingsControllerProvider.notifier).saveSettings(
+          settings.copyWith(favoriteArtists: current),
+        );
+
+    if (widget.service.isNotEmpty && widget.artistId.isNotEmpty) {
+      final activeAcc = settings.activePawchiveAccount;
+      if (activeAcc != null) {
+        unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
+              account: activeAcc,
+              service: widget.service,
+              artistId: widget.artistId,
+              isFavorite: !isCurrentlyFav,
+            ));
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final settings =
@@ -408,12 +459,33 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
     final favoriteKeys = ref.watch(favoriteKeysProvider).value ?? <String>{};
     final viewedKeys = ref.watch(viewedKeysProvider).value ?? <String>{};
 
+    final artistKey =
+        '${widget.providerId}:${widget.service}:${widget.artistId}';
+    final isArtistFavorite = settings.favoriteArtists.any((e) {
+      try {
+        return FavoriteArtistItem.fromJson(
+                    jsonDecode(e) as Map<String, dynamic>)
+                .key ==
+            artistKey;
+      } catch (_) {
+        return false;
+      }
+    });
+
     final displayedPosts =
         _posts.where(_matchesTypeFilter).toList(growable: false);
 
     return AdaptiveScaffold(
       title: widget.artistName,
       actions: [
+        IconButton(
+          tooltip: isArtistFavorite ? 'В избранном' : 'В избранное',
+          icon: Icon(
+            isArtistFavorite ? Icons.star_rounded : Icons.star_outline_rounded,
+            color: isArtistFavorite ? Colors.amber : null,
+          ),
+          onPressed: () => _toggleArtistFavorite(settings, isArtistFavorite),
+        ),
         if (_announcements.isNotEmpty)
           IconButton(
             tooltip: 'Анонсы автора',

lib/features/artists/presentation/artists_screen.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
@@ -13,6 +14,7 @@ import '../../../shared/widgets/empty_view.dart';
 import '../../../shared/widgets/error_view.dart';
 import '../../settings/presentation/settings_controller.dart';
 import 'artist_posts_screen.dart';
+import 'widgets/pawchive_accounts_sheet.dart';
 
 final artistProviderConfigsProvider =
     FutureProvider<List<ContentProviderConfig>>((ref) async {
@@ -49,7 +51,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
     ArtistProfile artist,
   ) async {
     final current = List<String>.from(settings.favoriteArtists);
-    final item = _FavoriteArtistItem(
+    final item = FavoriteArtistItem(
       id: artist.id,
       service: artist.service,
       providerId: artist.providerId,
@@ -60,13 +62,14 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
     final index = current.indexWhere((e) {
       try {
         final parsed =
-            _FavoriteArtistItem.fromJson(jsonDecode(e) as Map<String, dynamic>);
+            FavoriteArtistItem.fromJson(jsonDecode(e) as Map<String, dynamic>);
         return parsed.key == key;
       } catch (_) {
         return false;
       }
     });
-    if (index >= 0) {
+    final isAdding = index < 0;
+    if (!isAdding) {
       current.removeAt(index);
     } else {
       current.insert(0, jsonEncode(item.toJson()));
@@ -74,6 +77,19 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
     await ref.read(settingsControllerProvider.notifier).saveSettings(
           settings.copyWith(favoriteArtists: current),
         );
+
+    // Sync with active Pawchive account if available
+    if (artist.service.isNotEmpty && artist.id.isNotEmpty) {
+      final activeAcc = settings.activePawchiveAccount;
+      if (activeAcc != null) {
+        unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
+              account: activeAcc,
+              service: artist.service,
+              artistId: artist.id,
+              isFavorite: isAdding,
+            ));
+      }
+    }
   }
 
   @override
@@ -99,19 +115,29 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
     final favoriteItems = settings.favoriteArtists
         .map((e) {
           try {
-            return _FavoriteArtistItem.fromJson(
+            return FavoriteArtistItem.fromJson(
                 jsonDecode(e) as Map<String, dynamic>);
           } catch (_) {
             return null;
           }
         })
-        .whereType<_FavoriteArtistItem>()
+        .whereType<FavoriteArtistItem>()
         .toList();
     final favoriteKeys = favoriteItems.map((e) => e.key).toSet();
 
     return AdaptiveScaffold(
       title: 'Artists',
       actions: [
+        IconButton(
+          tooltip: 'Синхронизация Pawchive',
+          icon: Badge(
+            isLabelVisible: settings.parsedPawchiveAccounts.isNotEmpty,
+            backgroundColor: Colors.green,
+            smallSize: 8,
+            child: const Icon(Icons.cloud_sync_rounded),
+          ),
+          onPressed: () => PawchiveAccountsSheet.show(context),
+        ),
         IconButton(
           tooltip: 'Любимые авторы',
           icon: Badge(
@@ -318,7 +344,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
   void _showFavoriteArtistsModal(
     BuildContext context,
     AppSettings settings,
-    List<_FavoriteArtistItem> favorites,
+    List<FavoriteArtistItem> favorites,
   ) {
     showModalBottomSheet<void>(
       context: context,
@@ -341,7 +367,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
             final updated = List<String>.from(settings.favoriteArtists)
               ..removeWhere((e) {
                 try {
-                  return _FavoriteArtistItem.fromJson(
+                  return FavoriteArtistItem.fromJson(
                               jsonDecode(e) as Map<String, dynamic>)
                           .key ==
                       fav.key;
@@ -352,6 +378,18 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
             await ref
                 .read(settingsControllerProvider.notifier)
                 .saveSettings(settings.copyWith(favoriteArtists: updated));
+
+            if (fav.providerId == 'pawchive') {
+              final activeAcc = settings.activePawchiveAccount;
+              if (activeAcc != null) {
+                unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
+                      account: activeAcc,
+                      service: fav.service,
+                      artistId: fav.id,
+                      isFavorite: false,
+                    ));
+              }
+            }
             setState(() {});
           },
         );
@@ -570,49 +608,6 @@ class _ArtistCard extends StatelessWidget {
   }
 }
 
-class _FavoriteArtistItem {
-  const _FavoriteArtistItem({
-    required this.id,
-    required this.service,
-    required this.providerId,
-    required this.name,
-    this.avatarUrl,
-  });
-
-  const _FavoriteArtistItem.empty()
-      : id = '',
-        service = '',
-        providerId = '',
-        name = '',
-        avatarUrl = null;
-
-  final String id;
-  final String service;
-  final String providerId;
-  final String name;
-  final String? avatarUrl;
-
-  bool get isEmpty => id.isEmpty;
-  String get key => '$providerId:$service:$id';
-
-  Map<String, dynamic> toJson() => {
-        'id': id,
-        'service': service,
-        'providerId': providerId,
-        'name': name,
-        'avatarUrl': avatarUrl,
-      };
-
-  factory _FavoriteArtistItem.fromJson(Map<String, dynamic> json) =>
-      _FavoriteArtistItem(
-        id: (json['id'] ?? '').toString(),
-        service: (json['service'] ?? '').toString(),
-        providerId: (json['providerId'] ?? '').toString(),
-        name: (json['name'] ?? '').toString(),
-        avatarUrl: json['avatarUrl'] as String?,
-      );
-}
-
 class _FavoriteArtistsModal extends StatefulWidget {
   const _FavoriteArtistsModal({
     required this.favorites,
@@ -622,11 +617,11 @@ class _FavoriteArtistsModal extends StatefulWidget {
     required this.onRemoveFavorite,
   });
 
-  final List<_FavoriteArtistItem> favorites;
+  final List<FavoriteArtistItem> favorites;
   final String? initialSelectedKey;
-  final ValueChanged<_FavoriteArtistItem> onSelect;
+  final ValueChanged<FavoriteArtistItem> onSelect;
-  final ValueChanged<_FavoriteArtistItem> onOpenArtist;
+  final ValueChanged<FavoriteArtistItem> onOpenArtist;
-  final ValueChanged<_FavoriteArtistItem> onRemoveFavorite;
+  final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
 
   @override
   State<_FavoriteArtistsModal> createState() => _FavoriteArtistsModalState();
@@ -648,7 +643,7 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
       (e) => e.key == _selectedKey,
       orElse: () => widget.favorites.isNotEmpty
           ? widget.favorites.first
-          : const _FavoriteArtistItem.empty(),
+          : const FavoriteArtistItem.empty(),
     );
 
     return DraggableScrollableSheet(
@@ -716,6 +711,77 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
                 ),
               ),
               const Divider(height: 1),
+              Consumer(
+                builder: (context, ref, _) {
+                  final settings =
+                      ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
+                  final activeAcc = settings.activePawchiveAccount;
+                  final accounts = settings.parsedPawchiveAccounts;
+
+                  return Container(
+                    margin: const EdgeInsets.fromLTRB(16, 8, 16, 6),
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                    decoration: BoxDecoration(
+                      color: scheme.surfaceContainerHigh,
+                      borderRadius: BorderRadius.circular(12),
+                      border: Border.all(
+                        color: activeAcc != null
+                            ? scheme.primary.withValues(alpha: 0.35)
+                            : scheme.outlineVariant.withValues(alpha: 0.25),
+                      ),
+                    ),
+                    child: Row(
+                      children: [
+                        Icon(
+                          Icons.cloud_sync_rounded,
+                          size: 20,
+                          color: activeAcc != null
+                              ? scheme.primary
+                              : scheme.onSurfaceVariant,
+                        ),
+                        const SizedBox(width: 8),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Text(
+                                activeAcc != null
+                                    ? 'Pawchive: @${activeAcc.username}'
+                                    : 'Pawchive не подключён',
+                                style: const TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  fontSize: 12,
+                                ),
+                              ),
+                              Text(
+                                activeAcc != null
+                                    ? '${activeAcc.syncedArtistsCount} авторов в облаке'
+                                    : 'Синхронизируйте избранное с сервером',
+                                style: TextStyle(
+                                  color: scheme.onSurfaceVariant,
+                                  fontSize: 11,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        FilledButton.tonal(
+                          style: FilledButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 10,
+                              vertical: 4,
+                            ),
+                            visualDensity: VisualDensity.compact,
+                          ),
+                          onPressed: () => PawchiveAccountsSheet.show(context),
+                          child: Text(accounts.isEmpty ? 'Войти' : 'Аккаунты'),
+                        ),
+                      ],
+                    ),
+                  );
+                },
+              ),
               if (widget.favorites.isEmpty)
                 Padding(
                   padding: const EdgeInsets.fromLTRB(24, 36, 24, 40),
@@ -792,11 +858,11 @@ class _FavoriteArtistsSection extends ConsumerWidget {
     required this.onRemoveFavorite,
   });
 
-  final List<_FavoriteArtistItem> favorites;
+  final List<FavoriteArtistItem> favorites;
   final String? selectedKey;
-  final ValueChanged<_FavoriteArtistItem> onSelect;
+  final ValueChanged<FavoriteArtistItem> onSelect;
-  final ValueChanged<_FavoriteArtistItem> onOpenArtist;
+  final ValueChanged<FavoriteArtistItem> onOpenArtist;
-  final ValueChanged<_FavoriteArtistItem> onRemoveFavorite;
+  final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -986,7 +1052,7 @@ class _FavoriteArtistsSection extends ConsumerWidget {
 class _FavoriteArtistMediaStrip extends ConsumerWidget {
   const _FavoriteArtistMediaStrip({required this.artist});
 
-  final _FavoriteArtistItem artist;
+  final FavoriteArtistItem artist;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/features/artists/presentation/widgets/pawchive_accounts_sheet.dart

@@ -0,0 +1,936 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../app/app.dart';
+import '../../../../backend/backend.dart';
+import '../../../settings/presentation/settings_controller.dart';
+
+class PawchiveAccountsSheet extends ConsumerStatefulWidget {
+  const PawchiveAccountsSheet({super.key});
+
+  static Future<void> show(BuildContext context) {
+    return showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (_) => const PawchiveAccountsSheet(),
+    );
+  }
+
+  @override
+  ConsumerState<PawchiveAccountsSheet> createState() =>
+      _PawchiveAccountsSheetState();
+}
+
+class _PawchiveAccountsSheetState extends ConsumerState<PawchiveAccountsSheet>
+    with SingleTickerProviderStateMixin {
+  late final TabController _addTabController;
+  final _usernameController = TextEditingController();
+  final _passwordController = TextEditingController();
+  final _cookieController = TextEditingController();
+
+  bool _isAdding = false;
+  bool _obscurePassword = true;
+  String? _syncingAccountId;
+  String? _pushingAccountId;
+  bool _syncingAll = false;
+  String? _errorMessage;
+
+  @override
+  void initState() {
+    super.initState();
+    _addTabController = TabController(length: 2, vsync: this);
+  }
+
+  @override
+  void dispose() {
+    _addTabController.dispose();
+    _usernameController.dispose();
+    _passwordController.dispose();
+    _cookieController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _handleLoginCredentials() async {
+    final username = _usernameController.text.trim();
+    final password = _passwordController.text.trim();
+    if (username.isEmpty || password.isEmpty) {
+      setState(() => _errorMessage = 'Введите логин и пароль');
+      return;
+    }
+
+    setState(() {
+      _isAdding = true;
+      _errorMessage = null;
+    });
+
+    try {
+      final syncService = ref.read(pawchiveSyncServiceProvider);
+      final account = await syncService.loginWithCredentials(
+        username: username,
+        password: password,
+      );
+
+      final settings =
+          ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+      final existingAccounts = settings.parsedPawchiveAccounts.where((a) => a.id != account.id).toList();
+      // Set as active
+      final updatedList = [
+        account.copyWith(isActive: true),
+        ...existingAccounts.map((a) => a.copyWith(isActive: false)),
+      ];
+
+      var newSettings = settings.copyWith(
+        pawchiveAccounts:
+            updatedList.map((a) => jsonEncode(a.toJson())).toList(),
+      );
+
+      // Perform initial sync
+      final syncResult = await syncService.syncAccountFavorites(
+        account: account,
+        settings: newSettings,
+      );
+      if (syncResult.isSuccess) {
+        newSettings = syncResult.updatedSettings;
+      }
+
+      await ref
+          .read(settingsControllerProvider.notifier)
+          .saveSettings(newSettings);
+
+      _usernameController.clear();
+      _passwordController.clear();
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              'Аккаунт @${account.username} добавлен! Синхронизировано ${account.syncedArtistsCount} авторов.',
+            ),
+            backgroundColor: Colors.green.shade700,
+          ),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() => _errorMessage = e.toString().replaceFirst('Exception: ', '').replaceFirst('StateError: ', ''));
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _isAdding = false);
+      }
+    }
+  }
+
+  Future<void> _handleLoginCookie() async {
+    final cookie = _cookieController.text.trim();
+    final username = _usernameController.text.trim();
+    if (cookie.isEmpty) {
+      setState(() => _errorMessage = 'Введите сессионную куку');
+      return;
+    }
+
+    setState(() {
+      _isAdding = true;
+      _errorMessage = null;
+    });
+
+    try {
+      final syncService = ref.read(pawchiveSyncServiceProvider);
+      final account = await syncService.loginWithSession(
+        sessionCookie: cookie,
+        username: username.isEmpty ? 'Pawchive User' : username,
+      );
+
+      final settings =
+          ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+      final existingAccounts = settings.parsedPawchiveAccounts.where((a) => a.id != account.id).toList();
+      final updatedList = [
+        account.copyWith(isActive: true),
+        ...existingAccounts.map((a) => a.copyWith(isActive: false)),
+      ];
+
+      var newSettings = settings.copyWith(
+        pawchiveAccounts:
+            updatedList.map((a) => jsonEncode(a.toJson())).toList(),
+      );
+
+      final syncResult = await syncService.syncAccountFavorites(
+        account: account,
+        settings: newSettings,
+      );
+      if (syncResult.isSuccess) {
+        newSettings = syncResult.updatedSettings;
+      }
+
+      await ref
+          .read(settingsControllerProvider.notifier)
+          .saveSettings(newSettings);
+
+      _cookieController.clear();
+      _usernameController.clear();
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              'Кука сохранена! Синхронизировано ${account.syncedArtistsCount} авторов.',
+            ),
+            backgroundColor: Colors.green.shade700,
+          ),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() => _errorMessage = e.toString().replaceFirst('Exception: ', '').replaceFirst('StateError: ', ''));
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _isAdding = false);
+      }
+    }
+  }
+
+  Future<void> _syncSingleAccount(PawchiveAccount account) async {
+    setState(() => _syncingAccountId = account.id);
+    try {
+      final syncService = ref.read(pawchiveSyncServiceProvider);
+      final settings =
+          ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+      final result = await syncService.syncAccountFavorites(
+        account: account,
+        settings: settings,
+      );
+
+      if (result.isSuccess) {
+        await ref
+            .read(settingsControllerProvider.notifier)
+            .saveSettings(result.updatedSettings);
+        if (mounted) {
+          final pushedMsg = result.pushedToRemoteCount > 0
+              ? ', выгружено в Pawchive: +${result.pushedToRemoteCount}'
+              : '';
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                'Синхронизировано: ${result.totalSyncedCount} авторов (+${result.newlyAddedToLocal} новых в приложении$pushedMsg)',
+              ),
+            ),
+          );
+        }
+      } else {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('Ошибка синхронизации: ${result.errorMessage}'),
+              backgroundColor: Colors.red.shade700,
+            ),
+          );
+        }
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _syncingAccountId = null);
+      }
+    }
+  }
+
+  Future<void> _pushFavoritesToAccount(PawchiveAccount account) async {
+    final settings =
+        ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+    final totalLocal = settings.favoriteArtists.length;
+    if (totalLocal == 0) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('В локальном избранном пока нет авторов')),
+      );
+      return;
+    }
+
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Выгрузить избранное в Pawchive?'),
+        content: Text(
+          'Все локальные авторы из приложения ($totalLocal) будут добавлены в избранное аккаунта @${account.username} на сервере Pawchive.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, false),
+            child: const Text('Отмена'),
+          ),
+          FilledButton.icon(
+            onPressed: () => Navigator.pop(ctx, true),
+            icon: const Icon(Icons.cloud_upload_rounded),
+            label: const Text('Выгрузить'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true) return;
+
+    setState(() => _pushingAccountId = account.id);
+    try {
+      final syncService = ref.read(pawchiveSyncServiceProvider);
+      final result = await syncService.pushLocalFavoritesToAccount(
+        account: account,
+        settings: settings,
+      );
+
+      if (result.isSuccess) {
+        if (result.updatedSettings != null) {
+          await ref
+              .read(settingsControllerProvider.notifier)
+              .saveSettings(result.updatedSettings!);
+        }
+
+        if (mounted) {
+          if (result.pushedCount > 0) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  'Выгружено ${result.pushedCount} авторов в @${account.username}! Всего в аккаунте: ${result.totalRemoteCount}.',
+                ),
+                backgroundColor: Colors.green.shade700,
+              ),
+            );
+          } else {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  'Все авторы (${result.totalLocalCandidates}) уже есть в аккаунте @${account.username}.',
+                ),
+              ),
+            );
+          }
+        }
+      } else {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('Ошибка выгрузки: ${result.errorMessage}'),
+              backgroundColor: Colors.red.shade700,
+            ),
+          );
+        }
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _pushingAccountId = null);
+      }
+    }
+  }
+
+  Future<void> _syncAllAccounts() async {
+    setState(() => _syncingAll = true);
+    try {
+      final syncService = ref.read(pawchiveSyncServiceProvider);
+      final settings =
+          ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+      final result = await syncService.syncAllAccounts(settings: settings);
+
+      if (result.isSuccess) {
+        await ref
+            .read(settingsControllerProvider.notifier)
+            .saveSettings(result.updatedSettings);
+        if (mounted) {
+          final pushedMsg = result.pushedToRemoteCount > 0
+              ? ', выгружено в Pawchive: +${result.pushedToRemoteCount}'
+              : '';
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                'Все аккаунты синхронизированы! Всего: ${result.totalSyncedCount} (+${result.newlyAddedToLocal} новых в приложении$pushedMsg)',
+              ),
+              backgroundColor: Colors.green.shade700,
+            ),
+          );
+        }
+      } else {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('Ошибка синхронизации: ${result.errorMessage}'),
+              backgroundColor: Colors.red.shade700,
+            ),
+          );
+        }
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _syncingAll = false);
+      }
+    }
+  }
+
+  Future<void> _setActiveAccount(PawchiveAccount target) async {
+    final settings =
+        ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+    final updatedList = settings.parsedPawchiveAccounts.map((a) {
+      return a.copyWith(isActive: a.id == target.id);
+    }).toList();
+
+    await ref.read(settingsControllerProvider.notifier).saveSettings(
+          settings.copyWith(
+            pawchiveAccounts:
+                updatedList.map((a) => jsonEncode(a.toJson())).toList(),
+          ),
+        );
+  }
+
+  Future<void> _removeAccount(PawchiveAccount target) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Удалить аккаунт Pawchive?'),
+        content: Text(
+          'Вы уверены, что хотите удалить аккаунт @${target.username}? Локальные авторы останутся в приложении.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, false),
+            child: const Text('Отмена'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            style: FilledButton.styleFrom(
+              backgroundColor: Theme.of(context).colorScheme.error,
+            ),
+            child: const Text('Удалить'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true) return;
+
+    final settings =
+        ref.read(appSettingsProvider).value ?? AppSettings.defaults;
+    final filtered =
+        settings.parsedPawchiveAccounts.where((a) => a.id != target.id).toList();
+
+    // If active was removed, make first remaining active
+    if (filtered.isNotEmpty && !filtered.any((a) => a.isActive)) {
+      filtered[0] = filtered[0].copyWith(isActive: true);
+    }
+
+    await ref.read(settingsControllerProvider.notifier).saveSettings(
+          settings.copyWith(
+            pawchiveAccounts:
+                filtered.map((a) => jsonEncode(a.toJson())).toList(),
+          ),
+        );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final settings =
+        ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
+    final accounts = settings.parsedPawchiveAccounts;
+
+    final keyboardPadding = MediaQuery.of(context).viewInsets.bottom;
+
+    return DraggableScrollableSheet(
+      initialChildSize: accounts.isEmpty ? 0.8 : 0.75,
+      minChildSize: 0.4,
+      maxChildSize: 0.95,
+      builder: (context, scrollController) {
+        return Container(
+          decoration: BoxDecoration(
+            color: scheme.surface,
+            borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.black.withValues(alpha: 0.35),
+                blurRadius: 18,
+                offset: const Offset(0, -2),
+              ),
+            ],
+          ),
+          child: Column(
+            children: [
+              // Drag handle
+              Center(
+                child: Container(
+                  margin: const EdgeInsets.only(top: 10, bottom: 6),
+                  width: 44,
+                  height: 5,
+                  decoration: BoxDecoration(
+                    color: scheme.onSurfaceVariant.withValues(alpha: 0.3),
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+              ),
+              // Header
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+                child: Row(
+                  children: [
+                    Container(
+                      padding: const EdgeInsets.all(8),
+                      decoration: BoxDecoration(
+                        color: scheme.primaryContainer,
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                      child: Icon(
+                        Icons.cloud_sync_rounded,
+                        color: scheme.onPrimaryContainer,
+                        size: 22,
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            'Аккаунты Pawchive',
+                            style: theme.textTheme.titleLarge?.copyWith(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          Text(
+                            'Синхронизация авторов и избранного',
+                            style: theme.textTheme.bodySmall?.copyWith(
+                              color: scheme.onSurfaceVariant,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    if (accounts.isNotEmpty)
+                      FilledButton.tonalIcon(
+                        onPressed: _syncingAll ? null : _syncAllAccounts,
+                        icon: _syncingAll
+                            ? const SizedBox(
+                                width: 16,
+                                height: 16,
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              )
+                            : const Icon(Icons.sync_rounded, size: 18),
+                        label: const Text('Синхронизировать'),
+                      ),
+                  ],
+                ),
+              ),
+              const Divider(height: 1),
+
+              // Body
+              Expanded(
+                child: ListView(
+                  controller: scrollController,
+                  padding: EdgeInsets.fromLTRB(16, 12, 16, 16 + keyboardPadding),
+                  children: [
+                    // Connected accounts section
+                    if (accounts.isNotEmpty) ...[
+                      Padding(
+                        padding: const EdgeInsets.only(bottom: 8, left: 4),
+                        child: Text(
+                          'ПОДКЛЮЧЁННЫЕ АККАУНТЫ (${accounts.length})',
+                          style: theme.textTheme.labelSmall?.copyWith(
+                            color: scheme.primary,
+                            fontWeight: FontWeight.bold,
+                            letterSpacing: 0.8,
+                          ),
+                        ),
+                      ),
+                      ...accounts.map((acc) => _buildAccountCard(acc, scheme, theme)),
+                      const SizedBox(height: 12),
+
+                      // Two-way sync & Export to Pawchive panel
+                      Card(
+                        elevation: 0,
+                        color: scheme.surfaceContainerHigh.withValues(alpha: 0.6),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(16),
+                          side: BorderSide(
+                            color: scheme.outlineVariant.withValues(alpha: 0.3),
+                          ),
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.stretch,
+                            children: [
+                              Row(
+                                children: [
+                                  Icon(Icons.swap_vert_rounded, size: 20, color: scheme.primary),
+                                  const SizedBox(width: 8),
+                                  Expanded(
+                                    child: Text(
+                                      'Двусторонняя синхронизация',
+                                      style: theme.textTheme.titleSmall?.copyWith(
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                  ),
+                                  Switch(
+                                    value: settings.pawchiveBidirectionalSync,
+                                    onChanged: (val) async {
+                                      final newSettings = settings.copyWith(
+                                        pawchiveBidirectionalSync: val,
+                                      );
+                                      await ref
+                                          .read(settingsControllerProvider.notifier)
+                                          .saveSettings(newSettings);
+                                    },
+                                  ),
+                                ],
+                              ),
+                              Text(
+                                'При обычной синхронизации также выгружать всех локальных авторов на сервер Pawchive.',
+                                style: TextStyle(
+                                  color: scheme.onSurfaceVariant,
+                                  fontSize: 12,
+                                ),
+                              ),
+                              const SizedBox(height: 10),
+                              OutlinedButton.icon(
+                                onPressed: (_syncingAll || _pushingAccountId != null)
+                                    ? null
+                                    : () {
+                                        final target = settings.activePawchiveAccount ?? accounts.first;
+                                        _pushFavoritesToAccount(target);
+                                      },
+                                icon: _pushingAccountId != null
+                                    ? const SizedBox(
+                                        width: 16,
+                                        height: 16,
+                                        child: CircularProgressIndicator(strokeWidth: 2),
+                                      )
+                                    : const Icon(Icons.cloud_upload_rounded, size: 18),
+                                label: Text(
+                                  'Выгрузить избранное (${settings.favoriteArtists.length}) в @${(settings.activePawchiveAccount ?? accounts.first).username}',
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                    ],
+
+                    // Add account section
+                    Padding(
+                      padding: const EdgeInsets.only(bottom: 8, left: 4),
+                      child: Text(
+                        accounts.isEmpty ? 'ДОБАВИТЬ АККАУНТ' : 'ДОБАВИТЬ ЕЩЁ АККАУНТ',
+                        style: theme.textTheme.labelSmall?.copyWith(
+                          color: scheme.primary,
+                          fontWeight: FontWeight.bold,
+                          letterSpacing: 0.8,
+                        ),
+                      ),
+                    ),
+                    Card(
+                      elevation: 0,
+                      color: scheme.surfaceContainerHigh,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(16),
+                        side: BorderSide(
+                          color: scheme.outlineVariant.withValues(alpha: 0.4),
+                        ),
+                      ),
+                      child: Padding(
+                        padding: const EdgeInsets.all(16),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            TabBar(
+                              controller: _addTabController,
+                              tabs: const [
+                                Tab(text: 'Логин и пароль'),
+                                Tab(text: 'Session Cookie'),
+                              ],
+                            ),
+                            const SizedBox(height: 16),
+                            if (_errorMessage != null) ...[
+                              Container(
+                                padding: const EdgeInsets.all(10),
+                                decoration: BoxDecoration(
+                                  color: scheme.errorContainer,
+                                  borderRadius: BorderRadius.circular(8),
+                                ),
+                                child: Row(
+                                  children: [
+                                    Icon(
+                                      Icons.error_outline_rounded,
+                                      size: 18,
+                                      color: scheme.onErrorContainer,
+                                    ),
+                                    const SizedBox(width: 8),
+                                    Expanded(
+                                      child: Text(
+                                        _errorMessage!,
+                                        style: TextStyle(
+                                          color: scheme.onErrorContainer,
+                                          fontSize: 13,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              const SizedBox(height: 12),
+                            ],
+                            SizedBox(
+                              height: 190,
+                              child: TabBarView(
+                                controller: _addTabController,
+                                children: [
+                                  // Tab 1: Username & Password
+                                  Column(
+                                    children: [
+                                      TextField(
+                                        controller: _usernameController,
+                                        decoration: const InputDecoration(
+                                          labelText: 'Имя пользователя',
+                                          prefixIcon: Icon(Icons.person_outline_rounded),
+                                          isDense: true,
+                                        ),
+                                      ),
+                                      const SizedBox(height: 12),
+                                      TextField(
+                                        controller: _passwordController,
+                                        obscureText: _obscurePassword,
+                                        decoration: InputDecoration(
+                                          labelText: 'Пароль',
+                                          prefixIcon: const Icon(Icons.lock_outline_rounded),
+                                          isDense: true,
+                                          suffixIcon: IconButton(
+                                            icon: Icon(
+                                              _obscurePassword
+                                                  ? Icons.visibility_outlined
+                                                  : Icons.visibility_off_outlined,
+                                            ),
+                                            onPressed: () => setState(
+                                              () => _obscurePassword = !_obscurePassword,
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                      const Spacer(),
+                                      FilledButton.icon(
+                                        onPressed: _isAdding ? null : _handleLoginCredentials,
+                                        icon: _isAdding
+                                            ? const SizedBox(
+                                                width: 16,
+                                                height: 16,
+                                                child: CircularProgressIndicator(
+                                                  strokeWidth: 2,
+                                                  color: Colors.white,
+                                                ),
+                                              )
+                                            : const Icon(Icons.login_rounded),
+                                        label: const Text('Войти и синхронизировать'),
+                                      ),
+                                    ],
+                                  ),
+                                  // Tab 2: Session Cookie
+                                  Column(
+                                    children: [
+                                      TextField(
+                                        controller: _usernameController,
+                                        decoration: const InputDecoration(
+                                          labelText: 'Никнейм (необязательно)',
+                                          prefixIcon: Icon(Icons.badge_outlined),
+                                          isDense: true,
+                                        ),
+                                      ),
+                                      const SizedBox(height: 12),
+                                      TextField(
+                                        controller: _cookieController,
+                                        maxLines: 2,
+                                        decoration: const InputDecoration(
+                                          labelText: 'Сессионная кука',
+                                          hintText: 'session=ey... или значение куки',
+                                          prefixIcon: Icon(Icons.cookie_outlined),
+                                          isDense: true,
+                                        ),
+                                      ),
+                                      const Spacer(),
+                                      FilledButton.icon(
+                                        onPressed: _isAdding ? null : _handleLoginCookie,
+                                        icon: _isAdding
+                                            ? const SizedBox(
+                                                width: 16,
+                                                height: 16,
+                                                child: CircularProgressIndicator(
+                                                  strokeWidth: 2,
+                                                  color: Colors.white,
+                                                ),
+                                              )
+                                            : const Icon(Icons.check_circle_outline_rounded),
+                                        label: const Text('Сохранить куку'),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildAccountCard(PawchiveAccount acc, ColorScheme scheme, ThemeData theme) {
+    final isSyncing = _syncingAccountId == acc.id;
+    final isPushing = _pushingAccountId == acc.id;
+    final isBusy = isSyncing || isPushing;
+
+    return Card(
+      margin: const EdgeInsets.only(bottom: 8),
+      elevation: 0,
+      color: acc.isActive
+          ? scheme.primaryContainer.withValues(alpha: 0.35)
+          : scheme.surfaceContainerHigh,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16),
+        side: BorderSide(
+          color: acc.isActive
+              ? scheme.primary.withValues(alpha: 0.6)
+              : scheme.outlineVariant.withValues(alpha: 0.3),
+          width: acc.isActive ? 1.5 : 1,
+        ),
+      ),
+      child: ListTile(
+        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+        leading: CircleAvatar(
+          backgroundColor: acc.isActive ? scheme.primary : scheme.surfaceContainerHighest,
+          foregroundColor: acc.isActive ? scheme.onPrimary : scheme.onSurfaceVariant,
+          child: Text(
+            acc.username.isNotEmpty ? acc.username[0].toUpperCase() : 'P',
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+        ),
+        title: Row(
+          children: [
+            Expanded(
+              child: Text(
+                acc.username,
+                style: const TextStyle(fontWeight: FontWeight.bold),
+              ),
+            ),
+            if (acc.isActive)
+              Container(
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                decoration: BoxDecoration(
+                  color: scheme.primary,
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: Text(
+                  'Активен',
+                  style: TextStyle(
+                    color: scheme.onPrimary,
+                    fontSize: 11,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+          ],
+        ),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SizedBox(height: 2),
+            Text(
+              'Авторов: ${acc.syncedArtistsCount} • ${acc.lastSyncedAt != null ? _formatDate(acc.lastSyncedAt!) : "не синхр."}',
+              style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12),
+            ),
+          ],
+        ),
+        trailing: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            IconButton(
+              icon: isPushing
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Icon(Icons.cloud_upload_outlined),
+              tooltip: 'Выгрузить локальное избранное в этот аккаунт',
+              onPressed: isBusy ? null : () => _pushFavoritesToAccount(acc),
+            ),
+            IconButton(
+              icon: isSyncing
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Icon(Icons.sync_rounded),
+              tooltip: 'Синхронизировать этот аккаунт',
+              onPressed: isBusy ? null : () => _syncSingleAccount(acc),
+            ),
+            PopupMenuButton<String>(
+              icon: const Icon(Icons.more_vert_rounded),
+              onSelected: (val) {
+                if (val == 'active') {
+                  _setActiveAccount(acc);
+                } else if (val == 'push') {
+                  _pushFavoritesToAccount(acc);
+                } else if (val == 'delete') {
+                  _removeAccount(acc);
+                }
+              },
+              itemBuilder: (ctx) => [
+                if (!acc.isActive)
+                  const PopupMenuItem(
+                    value: 'active',
+                    child: Row(
+                      children: [
+                        Icon(Icons.check_circle_outline_rounded, size: 20),
+                        SizedBox(width: 8),
+                        Text('Сделать активным'),
+                      ],
+                    ),
+                  ),
+                const PopupMenuItem(
+                  value: 'push',
+                  child: Row(
+                    children: [
+                      Icon(Icons.cloud_upload_outlined, size: 20),
+                      SizedBox(width: 8),
+                      Text('Выгрузить в Pawchive'),
+                    ],
+                  ),
+                ),
+                const PopupMenuItem(
+                  value: 'delete',
+                  child: Row(
+                    children: [
+                      Icon(Icons.delete_outline_rounded, color: Colors.red, size: 20),
+                      SizedBox(width: 8),
+                      Text('Удалить аккаунт', style: TextStyle(color: Colors.red)),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatDate(DateTime dt) {
+    final now = DateTime.now();
+    if (now.difference(dt).inMinutes < 1) return 'только что';
+    if (now.difference(dt).inHours < 1) return '${now.difference(dt).inMinutes} мин назад';
+    return '${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')} ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}';
+  }
+}

lib/features/feed/presentation/widgets/feed_toolbar.dart

@@ -98,6 +98,14 @@ class _FeedToolbarState extends State<FeedToolbar> {
                     _query = value;
                     widget.onSuggestionTap(value);
                   },
+                  onTagRemoved: (value) {
+                    _query = value;
+                    widget.onSearch(value);
+                  },
+                  onCleared: () {
+                    _query = '';
+                    widget.onClearFilters();
+                  },
                 ),
               ),
               const SizedBox(width: 8),
@@ -221,6 +229,14 @@ class _FeedToolbarState extends State<FeedToolbar> {
                     _query = value;
                     widget.onSuggestionTap(value);
                   },
+                  onTagRemoved: (value) {
+                    _query = value;
+                    widget.onSearch(value);
+                  },
+                  onCleared: () {
+                    _query = '';
+                    widget.onClearFilters();
+                  },
                 ),
               ),
               const SizedBox(width: 6),

lib/features/post/presentation/post_details_screen.dart

@@ -1185,7 +1185,7 @@ class _CommentsSectionState extends ConsumerState<_CommentsSection> {
   }
 }
 
-class _PostInfoCard extends StatelessWidget {
+class _PostInfoCard extends StatefulWidget {
   const _PostInfoCard({
     required this.post,
     required this.strings,
@@ -1198,8 +1198,90 @@ class _PostInfoCard extends StatelessWidget {
   final DownloadedMedia? localMedia;
   final int? fileSizeBytes;
 
+  @override
+  State<_PostInfoCard> createState() => _PostInfoCardState();
+}
+
+class _PostInfoCardState extends State<_PostInfoCard> {
+  // Lazily resolved dimensions (used when post.width/height == 0).
+  int? _resolvedWidth;
+  int? _resolvedHeight;
+  bool _resolvingDimensions = false;
+
+  static final _dimensionCache = <String, (int, int)>{};
+
+  static bool _isImageType(String fileType) {
+    const imageTypes = {'image', 'jpeg', 'jpg', 'png', 'gif', 'webp', 'avif'};
+    return imageTypes.contains(fileType.toLowerCase());
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _maybeResolveDimensions();
+  }
+
+  @override
+  void didUpdateWidget(_PostInfoCard old) {
+    super.didUpdateWidget(old);
+    if (old.post.fileUrl != widget.post.fileUrl) {
+      _resolvedWidth = null;
+      _resolvedHeight = null;
+      _resolvingDimensions = false;
+      _maybeResolveDimensions();
+    }
+  }
+
+  void _maybeResolveDimensions() {
+    final post = widget.post;
+    // Only attempt lazy resolution when dimensions are unknown (0) and it's
+    // an image (not video/link which we can't resolve this way).
+    if (post.width != 0 || post.height != 0) return;
+    if (!_isImageType(post.fileType)) return;
+    final url = post.fileUrl.isNotEmpty ? post.fileUrl : post.sampleUrl;
+    if (url.isEmpty) return;
+
+    // Check cache first.
+    if (_dimensionCache.containsKey(url)) {
+      final cached = _dimensionCache[url]!;
+      _resolvedWidth = cached.$1;
+      _resolvedHeight = cached.$2;
+      return;
+    }
+
+    if (_resolvingDimensions) return;
+    _resolvingDimensions = true;
+
+    final imageProvider = NetworkImage(url);
+    final completer = imageProvider.resolve(ImageConfiguration.empty);
+    completer.addListener(
+      ImageStreamListener(
+        (info, _) {
+          final w = info.image.width;
+          final h = info.image.height;
+          _dimensionCache[url] = (w, h);
+          if (mounted) {
+            setState(() {
+              _resolvedWidth = w;
+              _resolvedHeight = h;
+              _resolvingDimensions = false;
+            });
+          }
+        },
+        onError: (_, __) {
+          if (mounted) setState(() => _resolvingDimensions = false);
+        },
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
+    final post = widget.post;
+    final strings = widget.strings;
+    final localMedia = widget.localMedia;
+    final fileSizeBytes = widget.fileSizeBytes;
+
     final theme = Theme.of(context);
     final scheme = theme.colorScheme;
     final artists = post.tagGroups['artist'] ??
@@ -1208,6 +1290,14 @@ class _PostInfoCard extends StatelessWidget {
             .map((t) => t.replaceFirst('artist:', ''))
             .toList();
 
+    // Determine which dimensions to display.
+    final displayWidth = post.width != 0 ? post.width : _resolvedWidth;
+    final displayHeight = post.height != 0 ? post.height : _resolvedHeight;
+    final hasDimensions = displayWidth != null && displayHeight != null;
+    final dimensionLabel = hasDimensions
+        ? '$displayWidth × $displayHeight'
+        : (_resolvingDimensions ? '… × …' : null);
+
     return Container(
       padding: const EdgeInsets.all(14),
       decoration: BoxDecoration(
@@ -1293,7 +1383,7 @@ class _PostInfoCard extends StatelessWidget {
                           ),
                         ),
                         Text(
-                          _formatDate(post.createdAt),
+                          _formatPostDate(post.createdAt),
                           style: theme.textTheme.bodySmall?.copyWith(
                             color: scheme.onSurfaceVariant,
                           ),
@@ -1321,8 +1411,8 @@ class _PostInfoCard extends StatelessWidget {
                       ),
                       const SizedBox(width: 4),
                       Text(
-                        fileSizeBytes != null && fileSizeBytes! > 0
+                        fileSizeBytes != null && fileSizeBytes > 0
-                            ? DownloadedMediaService.formatBytes(fileSizeBytes!)
+                            ? DownloadedMediaService.formatBytes(fileSizeBytes)
                             : (strings.ru ? 'Офлайн' : 'Offline'),
                         style: theme.textTheme.labelSmall?.copyWith(
                           color: scheme.onPrimaryContainer,
@@ -1341,9 +1431,10 @@ class _PostInfoCard extends StatelessWidget {
             runSpacing: 8,
             crossAxisAlignment: WrapCrossAlignment.center,
             children: [
+              if (dimensionLabel != null)
                 _SpecBadge(
                   icon: Icons.aspect_ratio_rounded,
-                label: '${post.width} × ${post.height}',
+                  label: dimensionLabel,
                 ),
               if (post.fileType.isNotEmpty)
                 _SpecBadge(
@@ -1373,10 +1464,10 @@ class _PostInfoCard extends StatelessWidget {
       ),
     );
   }
+}
 
-  static String _formatDate(DateTime date) {
+String _formatPostDate(DateTime date) {
   return '${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
-  }
 }
 
 class _SpecBadge extends StatelessWidget {

lib/features/post/presentation/widgets/post_media_viewer.dart

@@ -701,6 +701,7 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
   late bool _muted;
   late bool _loopVideo;
   late bool _halfVolume;
+  late bool _isLandscape;
   Timer? _hideTimer;
 
   @override
@@ -710,13 +711,30 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
     _muted = widget.muted;
     _loopVideo = widget.loopVideo;
     _halfVolume = widget.halfVolume;
+    _isLandscape = widget.aspectRatio > 1.05;
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    _applyOrientation();
+    _scheduleControlsHide();
+  }
+
+  void _applyOrientation() {
+    if (_isLandscape) {
       SystemChrome.setPreferredOrientations([
         DeviceOrientation.landscapeLeft,
         DeviceOrientation.landscapeRight,
-      DeviceOrientation.portraitUp,
       ]);
-    _scheduleControlsHide();
+    } else {
+      SystemChrome.setPreferredOrientations([
+        DeviceOrientation.portraitUp,
+        DeviceOrientation.portraitDown,
+      ]);
+    }
+  }
+
+  void _toggleOrientation() {
+    setState(() => _isLandscape = !_isLandscape);
+    _applyOrientation();
+    _showControls();
   }
 
   @override
@@ -814,7 +832,20 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
                     top: 12,
                     right: 12,
                     child: SafeArea(
-                      child: IconButton.filledTonal(
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          IconButton.filledTonal(
+                            tooltip: _isLandscape
+                                ? 'Портретная ориентация'
+                                : 'Альбомная ориентация',
+                            onPressed: _toggleOrientation,
+                            icon: Icon(_isLandscape
+                                ? Icons.screen_lock_portrait_rounded
+                                : Icons.screen_lock_landscape_rounded),
+                          ),
+                          const SizedBox(width: 8),
+                          IconButton.filledTonal(
                             tooltip: 'Close fullscreen',
                             onPressed: () => Navigator.of(
                               context,
@@ -822,6 +853,8 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
                             ).pop(_snapshot()),
                             icon: const Icon(Icons.close_rounded),
                           ),
+                        ],
+                      ),
                     ),
                   ),
                 ],

lib/features/providers/presentation/provider_form_screen.dart

@@ -129,7 +129,8 @@ class _ProviderFormScreenState extends ConsumerState<ProviderFormScreen> {
             controller: _apiKey,
             decoration: const InputDecoration(
               labelText: 'API key',
-              helperText: 'Gelbooru: api_key, Danbooru: api_key',
+              helperText:
+                  'Gelbooru/Rule34/Danbooru API key (Account -> Options)',
             ),
           ),
           const SizedBox(height: 12),
@@ -137,7 +138,8 @@ class _ProviderFormScreenState extends ConsumerState<ProviderFormScreen> {
             controller: _userId,
             decoration: const InputDecoration(
               labelText: 'User ID',
-              helperText: 'Gelbooru-compatible APIs may require user_id',
+              helperText:
+                  'Gelbooru/Rule34 User ID (required for API access, see Options)',
             ),
           ),
           const SizedBox(height: 12),

lib/features/search/presentation/search_screen.dart

@@ -105,6 +105,12 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
                         onSuggestionApplied: (query) => ref
                             .read(searchControllerProvider.notifier)
                             .updateQuery(query),
+                        onTagRemoved: (query) => ref
+                            .read(searchControllerProvider.notifier)
+                            .updateQuery(query),
+                        onCleared: () => ref
+                            .read(searchControllerProvider.notifier)
+                            .updateQuery(''),
                       ),
                       const SizedBox(height: 12),
                       SingleChildScrollView(

lib/features/settings/presentation/settings_screen.dart

@@ -15,6 +15,7 @@ import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
 import '../../../shared/widgets/error_view.dart';
+import '../../artists/presentation/widgets/pawchive_accounts_sheet.dart';
 import 'settings_controller.dart';
 
 class SettingsScreen extends ConsumerWidget {
@@ -54,6 +55,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
   final _feedKey = GlobalKey();
   final _filtersKey = GlobalKey();
   final _storageKey = GlobalKey();
+  final _accountsKey = GlobalKey();
   final _diagnosticsKey = GlobalKey();
   final _aboutKey = GlobalKey();
 
@@ -126,6 +128,12 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
         icon: Icons.storage_rounded,
         color: const Color(0xFF06B6D4),
       ),
+      (
+        key: _accountsKey,
+        label: isRu ? 'Аккаунты' : 'Accounts',
+        icon: Icons.cloud_sync_rounded,
+        color: const Color(0xFF0EA5E9),
+      ),
       (
         key: _diagnosticsKey,
         label: isRu ? 'Диагностика' : 'Diagnostics',
@@ -751,6 +759,42 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
                       ],
                     ),
 
+                    // Accounts & Sync Section
+                    _SettingsCardGroup(
+                      sectionKey: _accountsKey,
+                      title: isRu ? 'Аккаунты и синхронизация' : 'Accounts & Sync',
+                      icon: Icons.cloud_sync_rounded,
+                      accentColor: const Color(0xFF0EA5E9),
+                      children: [
+                        ListTile(
+                          contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                          leading: const CircleAvatar(
+                            backgroundColor: Color(0xFF0EA5E9),
+                            foregroundColor: Colors.white,
+                            child: Icon(Icons.cloud_sync_rounded),
+                          ),
+                          title: Text(
+                            isRu ? 'Аккаунты Pawchive' : 'Pawchive Accounts',
+                            style: const TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                          subtitle: Text(
+                            settings.parsedPawchiveAccounts.isEmpty
+                                ? (isRu
+                                    ? 'Вход для синхронизации избранных авторов'
+                                    : 'Sign in to sync favorite creators')
+                                : '${settings.parsedPawchiveAccounts.length} ${isRu ? "аккаунт(ов)" : "account(s)"}'
+                                    '${settings.activePawchiveAccount != null ? " • @${settings.activePawchiveAccount!.username}" : ""}',
+                          ),
+                          trailing: FilledButton.tonal(
+                            onPressed: () => PawchiveAccountsSheet.show(context),
+                            child: Text(settings.parsedPawchiveAccounts.isEmpty
+                                ? (isRu ? 'Войти' : 'Login')
+                                : (isRu ? 'Управление' : 'Manage')),
+                          ),
+                        ),
+                      ],
+                    ),
+
                     // 6. Providers & Diagnostics Section
                     _SettingsCardGroup(
                       sectionKey: _diagnosticsKey,
@@ -986,7 +1030,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
 
   Future<void> _downloadUpdate(WidgetRef ref, AppUpdateInfo info) async {
     final updateService = ref.read(updateServiceProvider);
-    final assetUrl = updateService.assetUrlForCurrentPlatform(info);
+    final assetUrl = await updateService.assetUrlForCurrentPlatform(info);
     if (assetUrl == null) {
       final url = Uri.tryParse(info.htmlUrl);
       if (url != null) {

lib/shared/widgets/app_search_bar.dart

@@ -28,6 +28,8 @@ class TagInputSearchBar extends StatefulWidget {
     required this.onSubmitted,
     this.onChanged,
     this.onSuggestionApplied,
+    this.onTagRemoved,
+    this.onCleared,
     this.initialValue,
     this.hintText = 'Search tags',
     this.suggestions = const [],
@@ -37,6 +39,8 @@ class TagInputSearchBar extends StatefulWidget {
   final ValueChanged<String> onSubmitted;
   final ValueChanged<String>? onChanged;
   final ValueChanged<String>? onSuggestionApplied;
+  final ValueChanged<String>? onTagRemoved;
+  final VoidCallback? onCleared;
   final String? initialValue;
   final String hintText;
   final List<TagSuggestion> suggestions;
@@ -48,10 +52,10 @@ class TagInputSearchBar extends StatefulWidget {
 class _TagInputSearchBarState extends State<TagInputSearchBar> {
   final _fieldKey = GlobalKey();
   final _layerLink = LayerLink();
+  final _portalController = OverlayPortalController();
   late final TextEditingController _controller;
   late final FocusNode _focusNode;
   late final ScrollController _tagScrollController;
-  OverlayEntry? _suggestionsOverlay;
   Timer? _debounce;
   List<String> _tags = [];
   String _lastExternalValue = '';
@@ -64,10 +68,17 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
     _focusNode = FocusNode();
     _tagScrollController = ScrollController();
     _focusNode.addListener(_handleFocusChanged);
+    _controller.addListener(_handleControllerChanged);
     _lastExternalValue = widget.initialValue ?? '';
     _setFromQuery(_lastExternalValue);
   }
 
+  void _handleControllerChanged() {
+    if (_controller.text.trim().isEmpty && _portalController.isShowing) {
+      _portalController.hide();
+    }
+  }
+
   @override
   void didUpdateWidget(covariant TagInputSearchBar oldWidget) {
     super.didUpdateWidget(oldWidget);
@@ -80,15 +91,18 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
       _localDirty = false;
     }
     if (oldWidget.suggestions != widget.suggestions) {
-      _syncSuggestionsOverlay();
+      _syncSuggestions();
     }
   }
 
   @override
   void dispose() {
     _debounce?.cancel();
-    _removeSuggestionsOverlay();
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
     _tagScrollController.dispose();
+    _controller.removeListener(_handleControllerChanged);
     _focusNode.removeListener(_handleFocusChanged);
     _focusNode.dispose();
     _controller.dispose();
@@ -97,24 +111,115 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
 
   void _handleFocusChanged() {
     if (!mounted) return;
-    if (!_focusNode.hasFocus && !_localDirty) {
+    if (!_focusNode.hasFocus) {
+      if (_portalController.isShowing) {
+        _portalController.hide();
+      }
+      if (!_localDirty) {
         final next = widget.initialValue ?? '';
         if (next != _lastExternalValue) {
           _setFromQuery(next);
           _lastExternalValue = next;
         }
       }
+    } else {
+      _syncSuggestions();
+    }
     setState(() {});
-    _syncSuggestionsOverlay();
+  }
+
+  void _syncSuggestions() {
+    if (!mounted) return;
+    final token = _activeToken;
+    if (!_focusNode.hasFocus || token.isEmpty) {
+      if (_portalController.isShowing) {
+        _portalController.hide();
+      }
+      return;
+    }
+    final matches = _matchingSuggestions;
+    if (matches.isEmpty) {
+      if (_portalController.isShowing) {
+        _portalController.hide();
+      }
+      return;
+    }
+    if (!_portalController.isShowing) {
+      _portalController.show();
+    }
+  }
+
+  List<TagSuggestion> get _matchingSuggestions {
+    final token = _activeToken;
+    if (token.isEmpty) return const [];
+    return widget.suggestions
+        .where((item) => item.name.toLowerCase().startsWith(token))
+        .toList(growable: false);
+  }
+
+  void _hideSuggestions() {
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
+    _focusNode.unfocus();
+  }
+
+  void _scrollToEnd() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (_tagScrollController.hasClients) {
+        _tagScrollController.animateTo(
+          _tagScrollController.position.maxScrollExtent,
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeOut,
+        );
+      }
+    });
   }
 
   @override
   Widget build(BuildContext context) {
     final scheme = Theme.of(context).colorScheme;
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+
-      if (mounted) _syncSuggestionsOverlay();
+    return TapRegion(
-    });
+      groupId: _fieldKey,
-    return CompositedTransformTarget(
+      onTapOutside: (_) => _hideSuggestions(),
+      child: OverlayPortal(
+        controller: _portalController,
+        overlayChildBuilder: (context) {
+          final token = _activeToken;
+          final suggestions = _matchingSuggestions;
+          if (suggestions.isEmpty || token.isEmpty) {
+            return const SizedBox.shrink();
+          }
+
+          final renderBox =
+              _fieldKey.currentContext?.findRenderObject() as RenderBox?;
+          final width =
+              renderBox?.hasSize == true ? renderBox!.size.width : 360.0;
+          final height =
+              renderBox?.hasSize == true ? renderBox!.size.height : 48.0;
+
+          return CompositedTransformFollower(
+            link: _layerLink,
+            showWhenUnlinked: false,
+            offset: Offset(0, height + 6),
+            child: Align(
+              alignment: Alignment.topLeft,
+              child: TapRegion(
+                groupId: _fieldKey,
+                child: SizedBox(
+                  width: width.clamp(280.0, 620.0),
+                  child: _TagSuggestionDropdown(
+                    suggestions: suggestions,
+                    query: token,
+                    onSelected: _applySuggestion,
+                  ),
+                ),
+              ),
+            ),
+          );
+        },
+        child: CompositedTransformTarget(
           link: _layerLink,
           child: DecoratedBox(
             key: _fieldKey,
@@ -133,11 +238,13 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
               borderRadius: BorderRadius.circular(22),
               onTap: _focusNode.requestFocus,
               child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                Icon(Icons.search_rounded, color: scheme.onSurfaceVariant),
+                    Icon(Icons.search_rounded,
+                        color: scheme.onSurfaceVariant),
                     const SizedBox(width: 8),
                     Expanded(
                       child: SizedBox(
@@ -167,7 +274,8 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
                                       focusNode: _focusNode,
                                       autocorrect: false,
                                       enableSuggestions: false,
-                                  textInputAction: TextInputAction.search,
+                                      textInputAction:
+                                          TextInputAction.search,
                                       onSubmitted: (_) => _submit(),
                                       onChanged: _handleDraftChanged,
                                       decoration: InputDecoration(
@@ -176,11 +284,13 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
                                         enabledBorder: InputBorder.none,
                                         focusedBorder: InputBorder.none,
                                         filled: false,
-                                    contentPadding: const EdgeInsets.symmetric(
+                                        contentPadding:
+                                            const EdgeInsets.symmetric(
                                           vertical: 8,
                                         ),
-                                    hintText:
+                                        hintText: _tags.isEmpty
-                                        _tags.isEmpty ? widget.hintText : 'tag',
+                                            ? widget.hintText
+                                            : 'tag',
                                         prefixIcon: null,
                                         suffixIcon: null,
                                       ),
@@ -204,41 +314,9 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
               ),
             ),
           ),
-    );
+        ),
-  }
-
-  void _syncSuggestionsOverlay() {
-    final token = _activeToken;
-    final suggestions = widget.suggestions
-        .where((item) => item.name.toLowerCase().startsWith(token))
-        .toList(growable: false);
-    if (!_focusNode.hasFocus || token.isEmpty || suggestions.isEmpty) {
-      _removeSuggestionsOverlay();
-      return;
-    }
-    final overlay = Overlay.maybeOf(context);
-    final renderBox =
-        _fieldKey.currentContext?.findRenderObject() as RenderBox?;
-    if (overlay == null || renderBox == null || !renderBox.hasSize) return;
-
-    final size = renderBox.size;
-    _removeSuggestionsOverlay();
-    _suggestionsOverlay = OverlayEntry(
-      builder: (context) => _TagSuggestionOverlay(
-        link: _layerLink,
-        width: size.width,
-        yOffset: size.height + 8,
-        suggestions: suggestions,
-        query: token,
-        onSelected: _applySuggestion,
       ),
     );
-    overlay.insert(_suggestionsOverlay!);
-  }
-
-  void _removeSuggestionsOverlay() {
-    _suggestionsOverlay?.remove();
-    _suggestionsOverlay = null;
   }
 
   Widget _buildTagChip(BuildContext context, String tag) {
@@ -302,10 +380,17 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
 
   void _handleDraftChanged(String value) {
     _localDirty = true;
+    if (value.trim().isEmpty) {
+      _debounce?.cancel();
+      if (_portalController.isShowing) {
+        _portalController.hide();
+      }
+      setState(() {});
+      _notifyChanged();
+      return;
+    }
     final composing = _controller.value.composing;
-    if (!composing.isValid &&
+    if (!composing.isValid && RegExp(r'\s$').hasMatch(value)) {
-        value.isNotEmpty &&
-        RegExp(r'\s$').hasMatch(value)) {
       _commitDraft(value);
       return;
     }
@@ -329,31 +414,47 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
       }
       _controller.clear();
     });
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
+    _scrollToEnd();
     _notifyChanged();
   }
 
   void _submit() {
     _debounce?.cancel();
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
     _commitDraft(_controller.text);
-    _removeSuggestionsOverlay();
     _lastExternalValue = _query;
     _localDirty = false;
+    _focusNode.unfocus();
     widget.onSubmitted(_query);
   }
 
   void _clear() {
     _debounce?.cancel();
-    _localDirty = true;
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
+    _localDirty = false;
     setState(() {
       _tags = [];
       _controller.clear();
     });
+    _lastExternalValue = '';
     _notifyChanged();
-    _focusNode.requestFocus();
+    _focusNode.unfocus();
+    widget.onCleared?.call();
+    widget.onSubmitted('');
   }
 
   void _editTag(String tag) {
     _localDirty = true;
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
     setState(() {
       _tags = _tags.where((item) => item != tag).toList(growable: true);
       _controller.value = TextEditingValue(
@@ -367,10 +468,17 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
 
   void _removeTag(String tag) {
     _localDirty = true;
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
     setState(() {
       _tags = _tags.where((item) => item != tag).toList(growable: true);
     });
+    _lastExternalValue = _query;
     _notifyChanged();
+    if (widget.onTagRemoved != null) {
+      widget.onTagRemoved!(_query);
+    }
   }
 
   void _applySuggestion(String suggestion) {
@@ -393,8 +501,12 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
       }
       _controller.clear();
     });
+    if (_portalController.isShowing) {
+      _portalController.hide();
+    }
+    _lastExternalValue = _query;
+    _scrollToEnd();
     _notifyChanged();
-    _removeSuggestionsOverlay();
     widget.onSuggestionApplied?.call(_query);
     _focusNode.requestFocus();
   }
@@ -407,7 +519,7 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
   void _notifyChanged() {
     _localDirty = true;
     widget.onChanged?.call(_query);
-    _syncSuggestionsOverlay();
+    _syncSuggestions();
   }
 
   List<String> _parseTags(String query) {
@@ -438,46 +550,6 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
   bool get _isEditing => _focusNode.hasFocus || _localDirty;
 }
 
-class _TagSuggestionOverlay extends StatelessWidget {
-  const _TagSuggestionOverlay({
-    required this.link,
-    required this.width,
-    required this.yOffset,
-    required this.suggestions,
-    required this.query,
-    required this.onSelected,
-  });
-
-  final LayerLink link;
-  final double width;
-  final double yOffset;
-  final List<TagSuggestion> suggestions;
-  final String query;
-  final ValueChanged<String> onSelected;
-
-  @override
-  Widget build(BuildContext context) {
-    return Positioned.fill(
-      child: CompositedTransformFollower(
-        link: link,
-        showWhenUnlinked: false,
-        offset: Offset(0, yOffset),
-        child: Align(
-          alignment: Alignment.topLeft,
-          child: SizedBox(
-            width: width.clamp(280, 620).toDouble(),
-            child: _TagSuggestionDropdown(
-              suggestions: suggestions,
-              query: query,
-              onSelected: onSelected,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
 class _TagSuggestionDropdown extends StatelessWidget {
   const _TagSuggestionDropdown({
     required this.suggestions,

pubspec.yaml

@@ -1,7 +1,7 @@
 name: gel_rule_app
 description: Local backend/core layer for a Flutter booru browser app.
 publish_to: "none"
-version: 2.3.1+41
+version: 2.3.10+50
 
 environment:
   sdk: ">=3.3.0 <4.0.0"

test/backend/gelbooru_dapi_test.dart

@@ -0,0 +1,45 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gel_rule_app/backend/models/content_provider_config.dart';
+import 'package:gel_rule_app/backend/providers/gelbooru_provider.dart';
+import 'package:gel_rule_app/backend/providers/provider_factory.dart';
+import 'package:gel_rule_app/core/http/dio_client.dart';
+
+void main() {
+  test('ProviderFactory creates GelbooruProvider with query credentials', () {
+    final factory = ProviderFactory();
+    final config = ContentProviderConfig(
+      id: 'gelbooru',
+      name: 'Gelbooru',
+      baseUrl: 'https://gelbooru.com',
+      apiType: 'gelbooru',
+      enabled: true,
+      priority: 10,
+      timeoutSeconds: 20,
+      customHeaders: const {
+        'query.api_key': 'test_api_key',
+        'query.user_id': '123456',
+      },
+      createdAt: DateTime(2026),
+      updatedAt: DateTime(2026),
+    );
+
+    final provider = factory.create(config);
+    expect(provider, isA<GelbooruProvider>());
+    final gelbooru = provider as GelbooruProvider;
+    expect(gelbooru.id, 'gelbooru');
+    expect(gelbooru.queryParameters['api_key'], 'test_api_key');
+    expect(gelbooru.queryParameters['user_id'], '123456');
+  });
+
+  test('GelbooruProvider mediaHeaders contains Referer and User-Agent', () {
+    final client = DioClient(baseUrl: 'https://gelbooru.com');
+    final provider = GelbooruProvider(
+      id: 'gelbooru',
+      name: 'Gelbooru',
+      baseUrl: 'https://gelbooru.com',
+      dioClient: client,
+    );
+
+    expect(provider.baseUrl, 'https://gelbooru.com');
+  });
+}

test/backend/pawchive_sync_test.dart

@@ -0,0 +1,347 @@
+import 'dart:convert';
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gel_rule_app/backend/models/favorite_artist_item.dart';
+import 'package:gel_rule_app/backend/models/pawchive_account.dart';
+import 'package:gel_rule_app/backend/services/pawchive_sync_service.dart';
+import 'package:gel_rule_app/backend/services/settings_service.dart';
+
+class _FakeAdapter implements HttpClientAdapter {
+  _FakeAdapter(this.handler);
+  final Future<ResponseBody> Function(RequestOptions options) handler;
+
+  @override
+  Future<ResponseBody> fetch(
+    RequestOptions options,
+    Stream<dynamic>? requestStream,
+    Future<void>? cancelFuture,
+  ) {
+    return handler(options);
+  }
+
+  @override
+  void close({bool force = false}) {}
+}
+
+void main() {
+  group('FavoriteArtistItem Tests', () {
+    test('roundtrip serialization and key generation', () {
+      const item = FavoriteArtistItem(
+        id: '12345',
+        service: 'fanbox',
+        providerId: 'pawchive',
+        name: 'CoolArtist',
+        avatarUrl: 'https://pawchive.pw/icons/fanbox/12345',
+      );
+
+      expect(item.key, equals('pawchive:fanbox:12345'));
+      expect(item.isEmpty, isFalse);
+
+      final json = item.toJson();
+      final restored = FavoriteArtistItem.fromJson(json);
+      expect(restored.key, equals(item.key));
+      expect(restored.name, equals('CoolArtist'));
+      expect(restored.avatarUrl, equals('https://pawchive.pw/icons/fanbox/12345'));
+      expect(restored == item, isTrue);
+    });
+
+    test('empty factory behaves correctly', () {
+      const empty = FavoriteArtistItem.empty();
+      expect(empty.isEmpty, isTrue);
+      expect(empty.key, equals('::'));
+    });
+  });
+
+  group('PawchiveAccount Tests', () {
+    test('roundtrip serialization and copyWith', () {
+      final now = DateTime(2026, 9, 4, 12, 0, 0);
+      final account = PawchiveAccount(
+        id: 'tester',
+        username: 'Tester',
+        sessionCookie: 'eySessionToken123',
+        baseUrl: 'https://pawchive.pw',
+        createdAt: now,
+        lastSyncedAt: now,
+        isActive: true,
+        syncedArtistsCount: 15,
+      );
+
+      final json = account.toJson();
+      final restored = PawchiveAccount.fromJson(json);
+
+      expect(restored.id, equals('tester'));
+      expect(restored.username, equals('Tester'));
+      expect(restored.sessionCookie, equals('eySessionToken123'));
+      expect(restored.isActive, isTrue);
+      expect(restored.syncedArtistsCount, equals(15));
+      expect(restored == account, isTrue);
+
+      final updated = account.copyWith(isActive: false, syncedArtistsCount: 20);
+      expect(updated.isActive, isFalse);
+      expect(updated.syncedArtistsCount, equals(20));
+      expect(updated.id, equals('tester'));
+    });
+  });
+
+  group('AppSettings Pawchive integration tests', () {
+    test('serializes and parses pawchive accounts correctly', () {
+      final acc1 = PawchiveAccount(
+        id: 'user1',
+        username: 'User1',
+        sessionCookie: 'token1',
+        createdAt: DateTime(2026, 9, 1),
+        isActive: true,
+        syncedArtistsCount: 5,
+      );
+      final acc2 = PawchiveAccount(
+        id: 'user2',
+        username: 'User2',
+        sessionCookie: 'token2',
+        createdAt: DateTime(2026, 9, 2),
+        isActive: false,
+        syncedArtistsCount: 10,
+      );
+
+      final settings = AppSettings.defaults.copyWith(
+        pawchiveAccounts: [
+          jsonEncode(acc1.toJson()),
+          jsonEncode(acc2.toJson()),
+        ],
+      );
+
+      expect(settings.parsedPawchiveAccounts.length, equals(2));
+      expect(settings.activePawchiveAccount?.id, equals('user1'));
+
+      final json = settings.toJson();
+      final restored = AppSettings.fromJson(json);
+      expect(restored.parsedPawchiveAccounts.length, equals(2));
+      expect(restored.activePawchiveAccount?.username, equals('User1'));
+    });
+  });
+
+  group('PawchiveSyncService Tests', () {
+    test('fetchRemoteFavoriteArtists parses server response correctly', () async {
+      final dio = Dio();
+      dio.httpClientAdapter = _FakeAdapter((options) async {
+        if (options.path.endsWith('/account/favorites') &&
+            options.queryParameters['type'] == 'artist') {
+          final cookie = options.headers['Cookie'] as String?;
+          expect(cookie, contains('session=test_cookie_123'));
+
+          final payload = jsonEncode([
+            {
+              'id': '98765',
+              'service': 'fanbox',
+              'name': 'AlphaCreator',
+              'updated': '2026-09-04T10:00:00.000Z',
+            },
+            {
+              'id': '43210',
+              'service': 'patreon',
+              'name': 'BetaCreator',
+              'updated': '2026-09-03T15:00:00.000Z',
+            },
+          ]);
+
+          return ResponseBody.fromString(
+            payload,
+            200,
+            headers: {
+              Headers.contentTypeHeader: [Headers.jsonContentType],
+            },
+          );
+        }
+        return ResponseBody.fromString('Not found', 404);
+      });
+
+      final service = PawchiveSyncService(dio: dio);
+      final items = await service.fetchRemoteFavoriteArtists(
+        baseUrl: 'https://pawchive.pw',
+        sessionCookie: 'session=test_cookie_123;',
+      );
+
+      expect(items.length, equals(2));
+      expect(items[0].id, equals('98765'));
+      expect(items[0].service, equals('fanbox'));
+      expect(items[0].name, equals('AlphaCreator'));
+      expect(items[0].avatarUrl, equals('https://pawchive.pw/icons/fanbox/98765'));
+
+      expect(items[1].id, equals('43210'));
+      expect(items[1].service, equals('patreon'));
+      expect(items[1].name, equals('BetaCreator'));
+    });
+
+    test('syncAccountFavorites merges remote artists into AppSettings', () async {
+      final dio = Dio();
+      dio.httpClientAdapter = _FakeAdapter((options) async {
+        final payload = jsonEncode([
+          {
+            'id': 'remote_1',
+            'service': 'fanbox',
+            'name': 'RemoteArtistOne',
+          },
+          {
+            'id': 'existing_local',
+            'service': 'patreon',
+            'name': 'AlreadyPresent',
+          },
+        ]);
+        return ResponseBody.fromString(
+          payload,
+          200,
+          headers: {
+            Headers.contentTypeHeader: [Headers.jsonContentType],
+          },
+        );
+      });
+
+      final service = PawchiveSyncService(dio: dio);
+
+      const existingItem = FavoriteArtistItem(
+        id: 'existing_local',
+        service: 'patreon',
+        providerId: 'pawchive',
+        name: 'AlreadyPresent',
+      );
+
+      final initialSettings = AppSettings.defaults.copyWith(
+        favoriteArtists: [jsonEncode(existingItem.toJson())],
+      );
+
+      final account = PawchiveAccount(
+        id: 'myuser',
+        username: 'myuser',
+        sessionCookie: 'cookie123',
+        createdAt: DateTime.now(),
+      );
+
+      final result = await service.syncAccountFavorites(
+        account: account,
+        settings: initialSettings,
+      );
+
+      expect(result.isSuccess, isTrue);
+      expect(result.totalSyncedCount, equals(2));
+      expect(result.newlyAddedToLocal, equals(1)); // remote_1 added, existing_local skipped
+      expect(result.updatedSettings.favoriteArtists.length, equals(2));
+    });
+
+    test('toggleRemoteFavorite sends POST and DELETE successfully', () async {
+      var lastMethod = '';
+      var lastPath = '';
+
+      final dio = Dio();
+      dio.httpClientAdapter = _FakeAdapter((options) async {
+        lastMethod = options.method;
+        lastPath = options.path;
+        return ResponseBody.fromString('ok', 200);
+      });
+
+      final service = PawchiveSyncService(dio: dio);
+      final account = PawchiveAccount(
+        id: 'user1',
+        username: 'user1',
+        sessionCookie: 'session=abc',
+        createdAt: DateTime.now(),
+      );
+
+      final addResult = await service.toggleRemoteFavorite(
+        account: account,
+        service: 'fanbox',
+        artistId: '12345',
+        isFavorite: true,
+      );
+      expect(addResult, isTrue);
+      expect(lastMethod, equals('POST'));
+      expect(lastPath, equals('https://pawchive.pw/api/v1/favorites/creator/fanbox/12345'));
+
+      final removeResult = await service.toggleRemoteFavorite(
+        account: account,
+        service: 'fanbox',
+        artistId: '12345',
+        isFavorite: false,
+      );
+      expect(removeResult, isTrue);
+      expect(lastMethod, equals('DELETE'));
+      expect(lastPath, equals('https://pawchive.pw/api/v1/favorites/creator/fanbox/12345'));
+    });
+
+    test('pushLocalFavoritesToAccount exports local artists to Pawchive', () async {
+      final postedPaths = <String>[];
+      final dio = Dio();
+      dio.httpClientAdapter = _FakeAdapter((options) async {
+        if (options.path.endsWith('/api/v1/account/favorites')) {
+          final payload = jsonEncode([
+            {
+              'id': 'already_remote_1',
+              'service': 'fanbox',
+              'name': 'AlreadyRemote',
+            },
+          ]);
+          return ResponseBody.fromString(
+            payload,
+            200,
+            headers: {
+              Headers.contentTypeHeader: [Headers.jsonContentType],
+            },
+          );
+        }
+        if (options.method == 'POST' &&
+            options.path.contains('/api/v1/favorites/creator/')) {
+          postedPaths.add(options.path);
+          return ResponseBody.fromString('ok', 204);
+        }
+        return ResponseBody.fromString('Not found', 404);
+      });
+
+      final service = PawchiveSyncService(dio: dio);
+
+      const itemAlreadyRemote = FavoriteArtistItem(
+        id: 'already_remote_1',
+        service: 'fanbox',
+        providerId: 'pawchive',
+        name: 'AlreadyRemote',
+      );
+      const itemToUpload1 = FavoriteArtistItem(
+        id: 'local_creator_99',
+        service: 'patreon',
+        providerId: 'kemono',
+        name: 'LocalPatreonCreator',
+      );
+      const itemToUpload2 = FavoriteArtistItem(
+        id: 'local_creator_88',
+        service: 'subscribestar',
+        providerId: 'coomer',
+        name: 'LocalSubscribeStarCreator',
+      );
+
+      final settings = AppSettings.defaults.copyWith(
+        favoriteArtists: [
+          jsonEncode(itemAlreadyRemote.toJson()),
+          jsonEncode(itemToUpload1.toJson()),
+          jsonEncode(itemToUpload2.toJson()),
+        ],
+      );
+
+      final account = PawchiveAccount(
+        id: 'myacc',
+        username: 'myacc',
+        sessionCookie: 'session=123',
+        createdAt: DateTime.now(),
+      );
+
+      final pushResult = await service.pushLocalFavoritesToAccount(
+        account: account,
+        settings: settings,
+      );
+
+      expect(pushResult.isSuccess, isTrue);
+      expect(pushResult.pushedCount, equals(2));
+      expect(pushResult.totalLocalCandidates, equals(3));
+      expect(pushResult.totalRemoteCount, equals(3)); // 1 existing + 2 pushed
+      expect(postedPaths.length, equals(2));
+      expect(postedPaths[0], contains('/api/v1/favorites/creator/patreon/local_creator_99'));
+      expect(postedPaths[1], contains('/api/v1/favorites/creator/subscribestar/local_creator_88'));
+    });
+  });
+}

test/backend/rule34_provider_test.dart

@@ -0,0 +1,33 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gel_rule_app/backend/models/content_provider_config.dart';
+import 'package:gel_rule_app/backend/providers/provider_factory.dart';
+import 'package:gel_rule_app/backend/providers/rule34_provider.dart';
+
+void main() {
+  test('ProviderFactory creates Rule34Provider with credentials', () {
+    final factory = ProviderFactory();
+    final config = ContentProviderConfig(
+      id: 'rule34',
+      name: 'Rule34',
+      baseUrl: 'https://api.rule34.xxx',
+      apiType: 'rule34',
+      enabled: true,
+      priority: 1,
+      timeoutSeconds: 20,
+      customHeaders: const {
+        'query.api_key': 'test_key',
+        'query.user_id': '99999',
+      },
+      createdAt: DateTime(2026),
+      updatedAt: DateTime(2026),
+    );
+
+    final provider = factory.create(config);
+    expect(provider, isA<Rule34Provider>());
+    final r34 = provider as Rule34Provider;
+    expect(r34.id, 'rule34');
+    expect(r34.baseUrl, 'https://api.rule34.xxx');
+    expect(r34.queryParameters['api_key'], 'test_key');
+    expect(r34.queryParameters['user_id'], '99999');
+  });
+}

test/shared/tag_input_search_bar_test.dart

@@ -339,6 +339,123 @@ void main() {
     expect(find.text('AND'), findsOneWidget);
     expect(find.text('dog'), findsOneWidget);
   });
+
+  testWidgets('deleting chip triggers onTagRemoved', (tester) async {
+    String? removedQuery;
+    await tester.pumpWidget(_Harness(
+      child: TagInputSearchBar(
+        initialValue: 'cat dog',
+        onSubmitted: (_) {},
+        onTagRemoved: (query) => removedQuery = query,
+      ),
+    ));
+
+    expect(find.text('cat'), findsOneWidget);
+    expect(find.text('dog'), findsOneWidget);
+
+    await tester.tap(find.byIcon(Icons.close_rounded).first);
+    await tester.pump();
+
+    expect(removedQuery, 'dog');
+    expect(find.text('cat'), findsNothing);
+    expect(find.text('dog'), findsOneWidget);
+  });
+
+  testWidgets('clear button triggers onCleared and onSubmitted with empty string',
+      (tester) async {
+    bool cleared = false;
+    String? submitted;
+    await tester.pumpWidget(_Harness(
+      child: TagInputSearchBar(
+        initialValue: 'cat dog',
+        onSubmitted: (query) => submitted = query,
+        onCleared: () => cleared = true,
+      ),
+    ));
+
+    await tester.tap(find.byTooltip('Clear'));
+    await tester.pump();
+
+    expect(cleared, isTrue);
+    expect(submitted, '');
+    expect(find.text('cat'), findsNothing);
+    expect(find.text('dog'), findsNothing);
+  });
+
+  testWidgets(
+      'tapping external button while suggestions are visible triggers button and hides suggestions',
+      (tester) async {
+    bool externalButtonPressed = false;
+    await tester.pumpWidget(MaterialApp(
+      home: Scaffold(
+        body: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Row(
+            children: [
+              Expanded(
+                child: TagInputSearchBar(
+                  suggestions: const [
+                    TagSuggestion(
+                      name: 'genshin',
+                      category: TagCategory.copyright,
+                      postCount: 100,
+                      providerId: 'test',
+                    ),
+                  ],
+                  onSubmitted: (_) {},
+                ),
+              ),
+              const SizedBox(width: 8),
+              ElevatedButton(
+                onPressed: () => externalButtonPressed = true,
+                child: const Text('Обновить'),
+              ),
+            ],
+          ),
+        ),
+      ),
+    ));
+
+    await tester.tap(find.byType(TextField));
+    await tester.enterText(find.byType(TextField), 'gen');
+    await tester.pumpAndSettle();
+
+    expect(find.text('genshin'), findsOneWidget);
+
+    // Tap external 'Обновить' button directly while suggestions are up
+    await tester.tap(find.text('Обновить'));
+    await tester.pumpAndSettle();
+
+    expect(externalButtonPressed, isTrue);
+    expect(find.text('genshin'), findsNothing);
+  });
+
+  testWidgets('erasing draft immediately hides suggestions', (tester) async {
+    await tester.pumpWidget(_Harness(
+      child: TagInputSearchBar(
+        suggestions: const [
+          TagSuggestion(
+            name: 'genshin',
+            category: TagCategory.copyright,
+            postCount: 100,
+            providerId: 'test',
+          ),
+        ],
+        onSubmitted: (_) {},
+      ),
+    ));
+
+    await tester.tap(find.byType(TextField));
+    await tester.enterText(find.byType(TextField), 'gen');
+    await tester.pumpAndSettle();
+
+    expect(find.text('genshin'), findsOneWidget);
+
+    await tester.enterText(find.byType(TextField), '');
+    await tester.pumpAndSettle();
+
+    expect(find.text('genshin'), findsNothing);
+  });
 }
 
 class _Harness extends StatelessWidget {