💄 Optimize thoughts

assets/i18n/en-US.json

@@ -1087,6 +1087,7 @@
     "levelingStage10": "Immortal",
     "levelingStage11": "Divine",
     "levelingStage12": "Transcendent",
+    "uploadTasks": "Upload Tasks",
     "uploadAttachment": "Upload Attachment",
     "attachmentPreview": "Attachment Preview",
     "selectPool": "Select Pool",

devtools_options.yaml

@@ -1,3 +1,6 @@
 description: This file stores settings for Dart & Flutter DevTools.
 documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
 extensions:
+  - drift: true
+  - provider: true
+  - shared_preferences: true

ios/Podfile.lock

@@ -1,7 +1,5 @@
 PODS:
   - Alamofire (5.10.2)
-  - app_links (6.4.1):
-    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
   - croppy (0.0.1):
@@ -52,18 +50,18 @@ PODS:
   - Firebase/Messaging (12.4.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 12.4.0)
-  - firebase_analytics (12.0.3):
+  - firebase_analytics (12.0.4):
     - firebase_core
     - FirebaseAnalytics (= 12.4.0)
     - Flutter
-  - firebase_core (4.2.0):
+  - firebase_core (4.2.1):
     - Firebase/CoreOnly (= 12.4.0)
     - Flutter
-  - firebase_crashlytics (5.0.3):
+  - firebase_crashlytics (5.0.4):
     - Firebase/Crashlytics (= 12.4.0)
     - firebase_core
     - Flutter
-  - firebase_messaging (16.0.3):
+  - firebase_messaging (16.0.4):
     - Firebase/Messaging (= 12.4.0)
     - firebase_core
     - Flutter
@@ -265,6 +263,8 @@ PODS:
   - PromisesObjC (2.4.0)
   - PromisesSwift (2.4.0):
     - PromisesObjC (= 2.4.0)
+  - protocol_handler_ios (0.0.1):
+    - Flutter
   - receive_sharing_intent (1.8.1):
     - Flutter
   - record_ios (1.1.0):
@@ -323,7 +323,6 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire
-  - app_links (from `.symlinks/plugins/app_links/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - croppy (from `.symlinks/plugins/croppy/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
@@ -358,6 +357,7 @@ DEPENDENCIES:
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
+  - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - record_ios (from `.symlinks/plugins/record_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -404,8 +404,6 @@ SPEC REPOS:
     - WebRTC-SDK
 
 EXTERNAL SOURCES:
-  app_links:
-    :path: ".symlinks/plugins/app_links/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   croppy:
@@ -470,6 +468,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   pointer_interceptor_ios:
     :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
+  protocol_handler_ios:
+    :path: ".symlinks/plugins/protocol_handler_ios/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
   record_ios:
@@ -497,7 +497,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
-  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   croppy: 979e8ddc254f4642bffe7d52dc7193354b27ba30
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
@@ -506,10 +505,10 @@ SPEC CHECKSUMS:
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
-  firebase_analytics: 1d024068b1d4707d5ba7a42a12976ddf3316d835
+  firebase_analytics: 67fbdd9f3c04e55048024f3da21cfc36f05e56cf
-  firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464
+  firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
-  firebase_crashlytics: f3a9a4338ab99b67042f64e9e22e1bf349cb44ed
+  firebase_crashlytics: 83c7467d7534975a4d779af43bd226d0a4616464
-  firebase_messaging: 82c70650c426a0a14873e1acdb9ec2b443c4e8b4
+  firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde
   FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
   FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
   FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
@@ -553,6 +552,7 @@ SPEC CHECKSUMS:
   pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
+  protocol_handler_ios: 59f23ee71f3ec602d67902ca7f669a80957888d5
   receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c

ios/Solian Watch App/ContentView.swift

@@ -48,3 +48,11 @@ struct ContentView: View {
         }
     }
 }
+
+// --- Placeholder Implementations for Preview ---
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}

lib/main.dart

@@ -59,6 +59,8 @@ void main() async {
 
   try {
     await EasyLocalization.ensureInitialized();
+    // Disable logs
+    EasyLocalization.logger.enableBuildModes = [];
 
     if (kIsWeb || !Platform.isLinux) {
       await Firebase.initializeApp(

lib/models/drive_task.dart

@@ -0,0 +1,57 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/file.dart';
+
+part 'drive_task.freezed.dart';
+part 'drive_task.g.dart';
+
+enum DriveTaskStatus {
+  pending,
+  inProgress,
+  paused,
+  completed,
+  failed,
+  expired,
+  cancelled,
+}
+
+@freezed
+sealed class DriveTask with _$DriveTask {
+  const DriveTask._();
+
+  const factory DriveTask({
+    required String id,
+    required String taskId,
+    required String fileName,
+    required String contentType,
+    required int fileSize,
+    required int uploadedBytes,
+    required int totalChunks,
+    required int uploadedChunks,
+    required DriveTaskStatus status,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required String type, // Task type (e.g., 'FileUpload')
+    double? transmissionProgress, // Local file upload progress (0.0-1.0)
+    String? errorMessage,
+    String? statusMessage,
+    SnCloudFile? result,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+  }) = _DriveTask;
+
+  factory DriveTask.fromJson(Map<String, dynamic> json) =>
+      _$DriveTaskFromJson(json);
+
+  double get progress => totalChunks > 0 ? uploadedChunks / totalChunks : 0.0;
+
+  Duration get estimatedTimeRemaining {
+    if (uploadedBytes == 0 || fileSize == 0) return Duration.zero;
+    final remainingBytes = fileSize - uploadedBytes;
+    final uploadRate =
+        uploadedBytes / createdAt.difference(DateTime.now()).inSeconds.abs();
+    if (uploadRate == 0) return Duration.zero;
+    return Duration(seconds: (remainingBytes / uploadRate).round());
+  }
+}

lib/models/drive_task.freezed.dart

@@ -0,0 +1,356 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'drive_task.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$DriveTask {
+
+ String get id; String get taskId; String get fileName; String get contentType; int get fileSize; int get uploadedBytes; int get totalChunks; int get uploadedChunks; DriveTaskStatus get status; DateTime get createdAt; DateTime get updatedAt; String get type;// Task type (e.g., 'FileUpload')
+ double? get transmissionProgress;// Local file upload progress (0.0-1.0)
+ String? get errorMessage; String? get statusMessage; SnCloudFile? get result; String? get poolId; String? get bundleId; String? get encryptPassword; String? get expiredAt;
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$DriveTaskCopyWith<DriveTask> get copyWith => _$DriveTaskCopyWithImpl<DriveTask>(this as DriveTask, _$identity);
+
+  /// Serializes this DriveTask to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is DriveTask&&(identical(other.id, id) || other.id == id)&&(identical(other.taskId, taskId) || other.taskId == taskId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.uploadedBytes, uploadedBytes) || other.uploadedBytes == uploadedBytes)&&(identical(other.totalChunks, totalChunks) || other.totalChunks == totalChunks)&&(identical(other.uploadedChunks, uploadedChunks) || other.uploadedChunks == uploadedChunks)&&(identical(other.status, status) || other.status == status)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.type, type) || other.type == type)&&(identical(other.transmissionProgress, transmissionProgress) || other.transmissionProgress == transmissionProgress)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.statusMessage, statusMessage) || other.statusMessage == statusMessage)&&(identical(other.result, result) || other.result == result)&&(identical(other.poolId, poolId) || other.poolId == poolId)&&(identical(other.bundleId, bundleId) || other.bundleId == bundleId)&&(identical(other.encryptPassword, encryptPassword) || other.encryptPassword == encryptPassword)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,taskId,fileName,contentType,fileSize,uploadedBytes,totalChunks,uploadedChunks,status,createdAt,updatedAt,type,transmissionProgress,errorMessage,statusMessage,result,poolId,bundleId,encryptPassword,expiredAt]);
+
+@override
+String toString() {
+  return 'DriveTask(id: $id, taskId: $taskId, fileName: $fileName, contentType: $contentType, fileSize: $fileSize, uploadedBytes: $uploadedBytes, totalChunks: $totalChunks, uploadedChunks: $uploadedChunks, status: $status, createdAt: $createdAt, updatedAt: $updatedAt, type: $type, transmissionProgress: $transmissionProgress, errorMessage: $errorMessage, statusMessage: $statusMessage, result: $result, poolId: $poolId, bundleId: $bundleId, encryptPassword: $encryptPassword, expiredAt: $expiredAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $DriveTaskCopyWith<$Res>  {
+  factory $DriveTaskCopyWith(DriveTask value, $Res Function(DriveTask) _then) = _$DriveTaskCopyWithImpl;
+@useResult
+$Res call({
+ String id, String taskId, String fileName, String contentType, int fileSize, int uploadedBytes, int totalChunks, int uploadedChunks, DriveTaskStatus status, DateTime createdAt, DateTime updatedAt, String type, double? transmissionProgress, String? errorMessage, String? statusMessage, SnCloudFile? result, String? poolId, String? bundleId, String? encryptPassword, String? expiredAt
+});
+
+
+$SnCloudFileCopyWith<$Res>? get result;
+
+}
+/// @nodoc
+class _$DriveTaskCopyWithImpl<$Res>
+    implements $DriveTaskCopyWith<$Res> {
+  _$DriveTaskCopyWithImpl(this._self, this._then);
+
+  final DriveTask _self;
+  final $Res Function(DriveTask) _then;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? taskId = null,Object? fileName = null,Object? contentType = null,Object? fileSize = null,Object? uploadedBytes = null,Object? totalChunks = null,Object? uploadedChunks = null,Object? status = null,Object? createdAt = null,Object? updatedAt = null,Object? type = null,Object? transmissionProgress = freezed,Object? errorMessage = freezed,Object? statusMessage = freezed,Object? result = freezed,Object? poolId = freezed,Object? bundleId = freezed,Object? encryptPassword = freezed,Object? expiredAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,taskId: null == taskId ? _self.taskId : taskId // ignore: cast_nullable_to_non_nullable
+as String,fileName: null == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String,contentType: null == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String,fileSize: null == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
+as int,uploadedBytes: null == uploadedBytes ? _self.uploadedBytes : uploadedBytes // ignore: cast_nullable_to_non_nullable
+as int,totalChunks: null == totalChunks ? _self.totalChunks : totalChunks // ignore: cast_nullable_to_non_nullable
+as int,uploadedChunks: null == uploadedChunks ? _self.uploadedChunks : uploadedChunks // ignore: cast_nullable_to_non_nullable
+as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as DriveTaskStatus,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,transmissionProgress: freezed == transmissionProgress ? _self.transmissionProgress : transmissionProgress // ignore: cast_nullable_to_non_nullable
+as double?,errorMessage: freezed == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String?,statusMessage: freezed == statusMessage ? _self.statusMessage : statusMessage // ignore: cast_nullable_to_non_nullable
+as String?,result: freezed == result ? _self.result : result // ignore: cast_nullable_to_non_nullable
+as SnCloudFile?,poolId: freezed == poolId ? _self.poolId : poolId // ignore: cast_nullable_to_non_nullable
+as String?,bundleId: freezed == bundleId ? _self.bundleId : bundleId // ignore: cast_nullable_to_non_nullable
+as String?,encryptPassword: freezed == encryptPassword ? _self.encryptPassword : encryptPassword // ignore: cast_nullable_to_non_nullable
+as String?,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res>? get result {
+    if (_self.result == null) {
+    return null;
+  }
+
+  return $SnCloudFileCopyWith<$Res>(_self.result!, (value) {
+    return _then(_self.copyWith(result: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [DriveTask].
+extension DriveTaskPatterns on DriveTask {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _DriveTask value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _DriveTask value)  $default,){
+final _that = this;
+switch (_that) {
+case _DriveTask():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _DriveTask value)?  $default,){
+final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)  $default,) {final _that = this;
+switch (_that) {
+case _DriveTask():
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String taskId,  String fileName,  String contentType,  int fileSize,  int uploadedBytes,  int totalChunks,  int uploadedChunks,  DriveTaskStatus status,  DateTime createdAt,  DateTime updatedAt,  String type,  double? transmissionProgress,  String? errorMessage,  String? statusMessage,  SnCloudFile? result,  String? poolId,  String? bundleId,  String? encryptPassword,  String? expiredAt)?  $default,) {final _that = this;
+switch (_that) {
+case _DriveTask() when $default != null:
+return $default(_that.id,_that.taskId,_that.fileName,_that.contentType,_that.fileSize,_that.uploadedBytes,_that.totalChunks,_that.uploadedChunks,_that.status,_that.createdAt,_that.updatedAt,_that.type,_that.transmissionProgress,_that.errorMessage,_that.statusMessage,_that.result,_that.poolId,_that.bundleId,_that.encryptPassword,_that.expiredAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _DriveTask extends DriveTask {
+  const _DriveTask({required this.id, required this.taskId, required this.fileName, required this.contentType, required this.fileSize, required this.uploadedBytes, required this.totalChunks, required this.uploadedChunks, required this.status, required this.createdAt, required this.updatedAt, required this.type, this.transmissionProgress, this.errorMessage, this.statusMessage, this.result, this.poolId, this.bundleId, this.encryptPassword, this.expiredAt}): super._();
+  factory _DriveTask.fromJson(Map<String, dynamic> json) => _$DriveTaskFromJson(json);
+
+@override final  String id;
+@override final  String taskId;
+@override final  String fileName;
+@override final  String contentType;
+@override final  int fileSize;
+@override final  int uploadedBytes;
+@override final  int totalChunks;
+@override final  int uploadedChunks;
+@override final  DriveTaskStatus status;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  String type;
+// Task type (e.g., 'FileUpload')
+@override final  double? transmissionProgress;
+// Local file upload progress (0.0-1.0)
+@override final  String? errorMessage;
+@override final  String? statusMessage;
+@override final  SnCloudFile? result;
+@override final  String? poolId;
+@override final  String? bundleId;
+@override final  String? encryptPassword;
+@override final  String? expiredAt;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$DriveTaskCopyWith<_DriveTask> get copyWith => __$DriveTaskCopyWithImpl<_DriveTask>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$DriveTaskToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _DriveTask&&(identical(other.id, id) || other.id == id)&&(identical(other.taskId, taskId) || other.taskId == taskId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.uploadedBytes, uploadedBytes) || other.uploadedBytes == uploadedBytes)&&(identical(other.totalChunks, totalChunks) || other.totalChunks == totalChunks)&&(identical(other.uploadedChunks, uploadedChunks) || other.uploadedChunks == uploadedChunks)&&(identical(other.status, status) || other.status == status)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.type, type) || other.type == type)&&(identical(other.transmissionProgress, transmissionProgress) || other.transmissionProgress == transmissionProgress)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.statusMessage, statusMessage) || other.statusMessage == statusMessage)&&(identical(other.result, result) || other.result == result)&&(identical(other.poolId, poolId) || other.poolId == poolId)&&(identical(other.bundleId, bundleId) || other.bundleId == bundleId)&&(identical(other.encryptPassword, encryptPassword) || other.encryptPassword == encryptPassword)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,taskId,fileName,contentType,fileSize,uploadedBytes,totalChunks,uploadedChunks,status,createdAt,updatedAt,type,transmissionProgress,errorMessage,statusMessage,result,poolId,bundleId,encryptPassword,expiredAt]);
+
+@override
+String toString() {
+  return 'DriveTask(id: $id, taskId: $taskId, fileName: $fileName, contentType: $contentType, fileSize: $fileSize, uploadedBytes: $uploadedBytes, totalChunks: $totalChunks, uploadedChunks: $uploadedChunks, status: $status, createdAt: $createdAt, updatedAt: $updatedAt, type: $type, transmissionProgress: $transmissionProgress, errorMessage: $errorMessage, statusMessage: $statusMessage, result: $result, poolId: $poolId, bundleId: $bundleId, encryptPassword: $encryptPassword, expiredAt: $expiredAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$DriveTaskCopyWith<$Res> implements $DriveTaskCopyWith<$Res> {
+  factory _$DriveTaskCopyWith(_DriveTask value, $Res Function(_DriveTask) _then) = __$DriveTaskCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String taskId, String fileName, String contentType, int fileSize, int uploadedBytes, int totalChunks, int uploadedChunks, DriveTaskStatus status, DateTime createdAt, DateTime updatedAt, String type, double? transmissionProgress, String? errorMessage, String? statusMessage, SnCloudFile? result, String? poolId, String? bundleId, String? encryptPassword, String? expiredAt
+});
+
+
+@override $SnCloudFileCopyWith<$Res>? get result;
+
+}
+/// @nodoc
+class __$DriveTaskCopyWithImpl<$Res>
+    implements _$DriveTaskCopyWith<$Res> {
+  __$DriveTaskCopyWithImpl(this._self, this._then);
+
+  final _DriveTask _self;
+  final $Res Function(_DriveTask) _then;
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? taskId = null,Object? fileName = null,Object? contentType = null,Object? fileSize = null,Object? uploadedBytes = null,Object? totalChunks = null,Object? uploadedChunks = null,Object? status = null,Object? createdAt = null,Object? updatedAt = null,Object? type = null,Object? transmissionProgress = freezed,Object? errorMessage = freezed,Object? statusMessage = freezed,Object? result = freezed,Object? poolId = freezed,Object? bundleId = freezed,Object? encryptPassword = freezed,Object? expiredAt = freezed,}) {
+  return _then(_DriveTask(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,taskId: null == taskId ? _self.taskId : taskId // ignore: cast_nullable_to_non_nullable
+as String,fileName: null == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String,contentType: null == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String,fileSize: null == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
+as int,uploadedBytes: null == uploadedBytes ? _self.uploadedBytes : uploadedBytes // ignore: cast_nullable_to_non_nullable
+as int,totalChunks: null == totalChunks ? _self.totalChunks : totalChunks // ignore: cast_nullable_to_non_nullable
+as int,uploadedChunks: null == uploadedChunks ? _self.uploadedChunks : uploadedChunks // ignore: cast_nullable_to_non_nullable
+as int,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as DriveTaskStatus,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,transmissionProgress: freezed == transmissionProgress ? _self.transmissionProgress : transmissionProgress // ignore: cast_nullable_to_non_nullable
+as double?,errorMessage: freezed == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String?,statusMessage: freezed == statusMessage ? _self.statusMessage : statusMessage // ignore: cast_nullable_to_non_nullable
+as String?,result: freezed == result ? _self.result : result // ignore: cast_nullable_to_non_nullable
+as SnCloudFile?,poolId: freezed == poolId ? _self.poolId : poolId // ignore: cast_nullable_to_non_nullable
+as String?,bundleId: freezed == bundleId ? _self.bundleId : bundleId // ignore: cast_nullable_to_non_nullable
+as String?,encryptPassword: freezed == encryptPassword ? _self.encryptPassword : encryptPassword // ignore: cast_nullable_to_non_nullable
+as String?,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+/// Create a copy of DriveTask
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res>? get result {
+    if (_self.result == null) {
+    return null;
+  }
+
+  return $SnCloudFileCopyWith<$Res>(_self.result!, (value) {
+    return _then(_self.copyWith(result: value));
+  });
+}
+}
+
+// dart format on

lib/models/drive_task.g.dart

@@ -0,0 +1,67 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'drive_task.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_DriveTask _$DriveTaskFromJson(Map<String, dynamic> json) => _DriveTask(
+  id: json['id'] as String,
+  taskId: json['task_id'] as String,
+  fileName: json['file_name'] as String,
+  contentType: json['content_type'] as String,
+  fileSize: (json['file_size'] as num).toInt(),
+  uploadedBytes: (json['uploaded_bytes'] as num).toInt(),
+  totalChunks: (json['total_chunks'] as num).toInt(),
+  uploadedChunks: (json['uploaded_chunks'] as num).toInt(),
+  status: $enumDecode(_$DriveTaskStatusEnumMap, json['status']),
+  createdAt: DateTime.parse(json['created_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  type: json['type'] as String,
+  transmissionProgress: (json['transmission_progress'] as num?)?.toDouble(),
+  errorMessage: json['error_message'] as String?,
+  statusMessage: json['status_message'] as String?,
+  result:
+      json['result'] == null
+          ? null
+          : SnCloudFile.fromJson(json['result'] as Map<String, dynamic>),
+  poolId: json['pool_id'] as String?,
+  bundleId: json['bundle_id'] as String?,
+  encryptPassword: json['encrypt_password'] as String?,
+  expiredAt: json['expired_at'] as String?,
+);
+
+Map<String, dynamic> _$DriveTaskToJson(_DriveTask instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'task_id': instance.taskId,
+      'file_name': instance.fileName,
+      'content_type': instance.contentType,
+      'file_size': instance.fileSize,
+      'uploaded_bytes': instance.uploadedBytes,
+      'total_chunks': instance.totalChunks,
+      'uploaded_chunks': instance.uploadedChunks,
+      'status': _$DriveTaskStatusEnumMap[instance.status]!,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'type': instance.type,
+      'transmission_progress': instance.transmissionProgress,
+      'error_message': instance.errorMessage,
+      'status_message': instance.statusMessage,
+      'result': instance.result?.toJson(),
+      'pool_id': instance.poolId,
+      'bundle_id': instance.bundleId,
+      'encrypt_password': instance.encryptPassword,
+      'expired_at': instance.expiredAt,
+    };
+
+const _$DriveTaskStatusEnumMap = {
+  DriveTaskStatus.pending: 'pending',
+  DriveTaskStatus.inProgress: 'inProgress',
+  DriveTaskStatus.paused: 'paused',
+  DriveTaskStatus.completed: 'completed',
+  DriveTaskStatus.failed: 'failed',
+  DriveTaskStatus.expired: 'expired',
+  DriveTaskStatus.cancelled: 'cancelled',
+};

lib/models/file.dart

@@ -60,3 +60,19 @@ sealed class SnCloudFile with _$SnCloudFile {
   factory SnCloudFile.fromJson(Map<String, dynamic> json) =>
       _$SnCloudFileFromJson(json);
 }
+
+@freezed
+sealed class SnCloudFileIndex with _$SnCloudFileIndex {
+  const factory SnCloudFileIndex({
+    required String id,
+    required String path,
+    required String fileId,
+    required SnCloudFile file,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnCloudFileIndex;
+
+  factory SnCloudFileIndex.fromJson(Map<String, dynamic> json) =>
+      _$SnCloudFileIndexFromJson(json);
+}

lib/models/file.freezed.dart

@@ -622,4 +622,297 @@ $SnFilePoolCopyWith<$Res>? get pool {
 }
 }
 
+
+/// @nodoc
+mixin _$SnCloudFileIndex {
+
+ String get id; String get path; String get fileId; SnCloudFile get file; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnCloudFileIndexCopyWith<SnCloudFileIndex> get copyWith => _$SnCloudFileIndexCopyWithImpl<SnCloudFileIndex>(this as SnCloudFileIndex, _$identity);
+
+  /// Serializes this SnCloudFileIndex to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnCloudFileIndex&&(identical(other.id, id) || other.id == id)&&(identical(other.path, path) || other.path == path)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.file, file) || other.file == file)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,path,fileId,file,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnCloudFileIndex(id: $id, path: $path, fileId: $fileId, file: $file, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnCloudFileIndexCopyWith<$Res>  {
+  factory $SnCloudFileIndexCopyWith(SnCloudFileIndex value, $Res Function(SnCloudFileIndex) _then) = _$SnCloudFileIndexCopyWithImpl;
+@useResult
+$Res call({
+ String id, String path, String fileId, SnCloudFile file, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+$SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class _$SnCloudFileIndexCopyWithImpl<$Res>
+    implements $SnCloudFileIndexCopyWith<$Res> {
+  _$SnCloudFileIndexCopyWithImpl(this._self, this._then);
+
+  final SnCloudFileIndex _self;
+  final $Res Function(SnCloudFileIndex) _then;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? path = null,Object? fileId = null,Object? file = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,path: null == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [SnCloudFileIndex].
+extension SnCloudFileIndexPatterns on SnCloudFileIndex {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnCloudFileIndex value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnCloudFileIndex value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnCloudFileIndex value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that.id,_that.path,_that.fileId,_that.file,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex():
+return $default(_that.id,_that.path,_that.fileId,_that.file,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String path,  String fileId,  SnCloudFile file,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFileIndex() when $default != null:
+return $default(_that.id,_that.path,_that.fileId,_that.file,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnCloudFileIndex implements SnCloudFileIndex {
+  const _SnCloudFileIndex({required this.id, required this.path, required this.fileId, required this.file, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  factory _SnCloudFileIndex.fromJson(Map<String, dynamic> json) => _$SnCloudFileIndexFromJson(json);
+
+@override final  String id;
+@override final  String path;
+@override final  String fileId;
+@override final  SnCloudFile file;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnCloudFileIndexCopyWith<_SnCloudFileIndex> get copyWith => __$SnCloudFileIndexCopyWithImpl<_SnCloudFileIndex>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnCloudFileIndexToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnCloudFileIndex&&(identical(other.id, id) || other.id == id)&&(identical(other.path, path) || other.path == path)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.file, file) || other.file == file)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,path,fileId,file,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnCloudFileIndex(id: $id, path: $path, fileId: $fileId, file: $file, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnCloudFileIndexCopyWith<$Res> implements $SnCloudFileIndexCopyWith<$Res> {
+  factory _$SnCloudFileIndexCopyWith(_SnCloudFileIndex value, $Res Function(_SnCloudFileIndex) _then) = __$SnCloudFileIndexCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String path, String fileId, SnCloudFile file, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+@override $SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class __$SnCloudFileIndexCopyWithImpl<$Res>
+    implements _$SnCloudFileIndexCopyWith<$Res> {
+  __$SnCloudFileIndexCopyWithImpl(this._self, this._then);
+
+  final _SnCloudFileIndex _self;
+  final $Res Function(_SnCloudFileIndex) _then;
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? path = null,Object? fileId = null,Object? file = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_SnCloudFileIndex(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,path: null == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+/// Create a copy of SnCloudFileIndex
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
 // dart format on

lib/models/file.g.dart

@@ -78,3 +78,28 @@ Map<String, dynamic> _$SnCloudFileToJson(_SnCloudFile instance) =>
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
     };
+
+_SnCloudFileIndex _$SnCloudFileIndexFromJson(Map<String, dynamic> json) =>
+    _SnCloudFileIndex(
+      id: json['id'] as String,
+      path: json['path'] as String,
+      fileId: json['file_id'] as String,
+      file: SnCloudFile.fromJson(json['file'] as Map<String, dynamic>),
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt:
+          json['deleted_at'] == null
+              ? null
+              : DateTime.parse(json['deleted_at'] as String),
+    );
+
+Map<String, dynamic> _$SnCloudFileIndexToJson(_SnCloudFileIndex instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'path': instance.path,
+      'file_id': instance.fileId,
+      'file': instance.file.toJson(),
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };

lib/models/file_list_item.dart

@@ -0,0 +1,12 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/file.dart';
+
+part 'file_list_item.freezed.dart';
+
+@freezed
+sealed class FileListItem with _$FileListItem {
+  const factory FileListItem.file(SnCloudFileIndex fileIndex) = FileItem;
+  const factory FileListItem.folder(String folderName) = FolderItem;
+  const factory FileListItem.unindexedFile(SnCloudFile file) =
+      UnindexedFileItem;
+}

lib/models/file_list_item.freezed.dart

@@ -0,0 +1,396 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'file_list_item.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$FileListItem {
+
+
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FileListItem);
+}
+
+
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'FileListItem()';
+}
+
+
+}
+
+/// @nodoc
+class $FileListItemCopyWith<$Res>  {
+$FileListItemCopyWith(FileListItem _, $Res Function(FileListItem) __);
+}
+
+
+/// Adds pattern-matching-related methods to [FileListItem].
+extension FileListItemPatterns on FileListItem {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>({TResult Function( FileItem value)?  file,TResult Function( FolderItem value)?  folder,TResult Function( UnindexedFileItem value)?  unindexedFile,required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that);case FolderItem() when folder != null:
+return folder(_that);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>({required TResult Function( FileItem value)  file,required TResult Function( FolderItem value)  folder,required TResult Function( UnindexedFileItem value)  unindexedFile,}){
+final _that = this;
+switch (_that) {
+case FileItem():
+return file(_that);case FolderItem():
+return folder(_that);case UnindexedFileItem():
+return unindexedFile(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>({TResult? Function( FileItem value)?  file,TResult? Function( FolderItem value)?  folder,TResult? Function( UnindexedFileItem value)?  unindexedFile,}){
+final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that);case FolderItem() when folder != null:
+return folder(_that);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>({TResult Function( SnCloudFileIndex fileIndex)?  file,TResult Function( String folderName)?  folder,TResult Function( SnCloudFile file)?  unindexedFile,required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that.fileIndex);case FolderItem() when folder != null:
+return folder(_that.folderName);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that.file);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>({required TResult Function( SnCloudFileIndex fileIndex)  file,required TResult Function( String folderName)  folder,required TResult Function( SnCloudFile file)  unindexedFile,}) {final _that = this;
+switch (_that) {
+case FileItem():
+return file(_that.fileIndex);case FolderItem():
+return folder(_that.folderName);case UnindexedFileItem():
+return unindexedFile(_that.file);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>({TResult? Function( SnCloudFileIndex fileIndex)?  file,TResult? Function( String folderName)?  folder,TResult? Function( SnCloudFile file)?  unindexedFile,}) {final _that = this;
+switch (_that) {
+case FileItem() when file != null:
+return file(_that.fileIndex);case FolderItem() when folder != null:
+return folder(_that.folderName);case UnindexedFileItem() when unindexedFile != null:
+return unindexedFile(_that.file);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class FileItem implements FileListItem {
+  const FileItem(this.fileIndex);
+  
+
+ final  SnCloudFileIndex fileIndex;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$FileItemCopyWith<FileItem> get copyWith => _$FileItemCopyWithImpl<FileItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FileItem&&(identical(other.fileIndex, fileIndex) || other.fileIndex == fileIndex));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,fileIndex);
+
+@override
+String toString() {
+  return 'FileListItem.file(fileIndex: $fileIndex)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $FileItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $FileItemCopyWith(FileItem value, $Res Function(FileItem) _then) = _$FileItemCopyWithImpl;
+@useResult
+$Res call({
+ SnCloudFileIndex fileIndex
+});
+
+
+$SnCloudFileIndexCopyWith<$Res> get fileIndex;
+
+}
+/// @nodoc
+class _$FileItemCopyWithImpl<$Res>
+    implements $FileItemCopyWith<$Res> {
+  _$FileItemCopyWithImpl(this._self, this._then);
+
+  final FileItem _self;
+  final $Res Function(FileItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? fileIndex = null,}) {
+  return _then(FileItem(
+null == fileIndex ? _self.fileIndex : fileIndex // ignore: cast_nullable_to_non_nullable
+as SnCloudFileIndex,
+  ));
+}
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileIndexCopyWith<$Res> get fileIndex {
+  
+  return $SnCloudFileIndexCopyWith<$Res>(_self.fileIndex, (value) {
+    return _then(_self.copyWith(fileIndex: value));
+  });
+}
+}
+
+/// @nodoc
+
+
+class FolderItem implements FileListItem {
+  const FolderItem(this.folderName);
+  
+
+ final  String folderName;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$FolderItemCopyWith<FolderItem> get copyWith => _$FolderItemCopyWithImpl<FolderItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is FolderItem&&(identical(other.folderName, folderName) || other.folderName == folderName));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,folderName);
+
+@override
+String toString() {
+  return 'FileListItem.folder(folderName: $folderName)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $FolderItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $FolderItemCopyWith(FolderItem value, $Res Function(FolderItem) _then) = _$FolderItemCopyWithImpl;
+@useResult
+$Res call({
+ String folderName
+});
+
+
+
+
+}
+/// @nodoc
+class _$FolderItemCopyWithImpl<$Res>
+    implements $FolderItemCopyWith<$Res> {
+  _$FolderItemCopyWithImpl(this._self, this._then);
+
+  final FolderItem _self;
+  final $Res Function(FolderItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? folderName = null,}) {
+  return _then(FolderItem(
+null == folderName ? _self.folderName : folderName // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+/// @nodoc
+
+
+class UnindexedFileItem implements FileListItem {
+  const UnindexedFileItem(this.file);
+  
+
+ final  SnCloudFile file;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$UnindexedFileItemCopyWith<UnindexedFileItem> get copyWith => _$UnindexedFileItemCopyWithImpl<UnindexedFileItem>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is UnindexedFileItem&&(identical(other.file, file) || other.file == file));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,file);
+
+@override
+String toString() {
+  return 'FileListItem.unindexedFile(file: $file)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $UnindexedFileItemCopyWith<$Res> implements $FileListItemCopyWith<$Res> {
+  factory $UnindexedFileItemCopyWith(UnindexedFileItem value, $Res Function(UnindexedFileItem) _then) = _$UnindexedFileItemCopyWithImpl;
+@useResult
+$Res call({
+ SnCloudFile file
+});
+
+
+$SnCloudFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class _$UnindexedFileItemCopyWithImpl<$Res>
+    implements $UnindexedFileItemCopyWith<$Res> {
+  _$UnindexedFileItemCopyWithImpl(this._self, this._then);
+
+  final UnindexedFileItem _self;
+  final $Res Function(UnindexedFileItem) _then;
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? file = null,}) {
+  return _then(UnindexedFileItem(
+null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as SnCloudFile,
+  ));
+}
+
+/// Create a copy of FileListItem
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnCloudFileCopyWith<$Res> get file {
+  
+  return $SnCloudFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+// dart format on

lib/models/folder.dart

@@ -0,0 +1,19 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'folder.freezed.dart';
+part 'folder.g.dart';
+
+@freezed
+sealed class SnCloudFolder with _$SnCloudFolder {
+  const factory SnCloudFolder({
+    required String id,
+    required String name,
+    required String? parentFolderId,
+    required String accountId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+  }) = _SnCloudFolder;
+
+  factory SnCloudFolder.fromJson(Map<String, dynamic> json) =>
+      _$SnCloudFolderFromJson(json);
+}

lib/models/folder.freezed.dart

@@ -0,0 +1,286 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'folder.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnCloudFolder {
+
+ String get id; String get name; String? get parentFolderId; String get accountId; DateTime get createdAt; DateTime get updatedAt;
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnCloudFolderCopyWith<SnCloudFolder> get copyWith => _$SnCloudFolderCopyWithImpl<SnCloudFolder>(this as SnCloudFolder, _$identity);
+
+  /// Serializes this SnCloudFolder to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnCloudFolder&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.parentFolderId, parentFolderId) || other.parentFolderId == parentFolderId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,parentFolderId,accountId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnCloudFolder(id: $id, name: $name, parentFolderId: $parentFolderId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnCloudFolderCopyWith<$Res>  {
+  factory $SnCloudFolderCopyWith(SnCloudFolder value, $Res Function(SnCloudFolder) _then) = _$SnCloudFolderCopyWithImpl;
+@useResult
+$Res call({
+ String id, String name, String? parentFolderId, String accountId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnCloudFolderCopyWithImpl<$Res>
+    implements $SnCloudFolderCopyWith<$Res> {
+  _$SnCloudFolderCopyWithImpl(this._self, this._then);
+
+  final SnCloudFolder _self;
+  final $Res Function(SnCloudFolder) _then;
+
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? parentFolderId = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,parentFolderId: freezed == parentFolderId ? _self.parentFolderId : parentFolderId // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnCloudFolder].
+extension SnCloudFolderPatterns on SnCloudFolder {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnCloudFolder value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnCloudFolder value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnCloudFolder value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFolder():
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String? parentFolderId,  String accountId,  DateTime createdAt,  DateTime updatedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnCloudFolder() when $default != null:
+return $default(_that.id,_that.name,_that.parentFolderId,_that.accountId,_that.createdAt,_that.updatedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnCloudFolder implements SnCloudFolder {
+  const _SnCloudFolder({required this.id, required this.name, required this.parentFolderId, required this.accountId, required this.createdAt, required this.updatedAt});
+  factory _SnCloudFolder.fromJson(Map<String, dynamic> json) => _$SnCloudFolderFromJson(json);
+
+@override final  String id;
+@override final  String name;
+@override final  String? parentFolderId;
+@override final  String accountId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnCloudFolderCopyWith<_SnCloudFolder> get copyWith => __$SnCloudFolderCopyWithImpl<_SnCloudFolder>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnCloudFolderToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnCloudFolder&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.parentFolderId, parentFolderId) || other.parentFolderId == parentFolderId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,parentFolderId,accountId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnCloudFolder(id: $id, name: $name, parentFolderId: $parentFolderId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnCloudFolderCopyWith<$Res> implements $SnCloudFolderCopyWith<$Res> {
+  factory _$SnCloudFolderCopyWith(_SnCloudFolder value, $Res Function(_SnCloudFolder) _then) = __$SnCloudFolderCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String name, String? parentFolderId, String accountId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnCloudFolderCopyWithImpl<$Res>
+    implements _$SnCloudFolderCopyWith<$Res> {
+  __$SnCloudFolderCopyWithImpl(this._self, this._then);
+
+  final _SnCloudFolder _self;
+  final $Res Function(_SnCloudFolder) _then;
+
+/// Create a copy of SnCloudFolder
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? parentFolderId = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  return _then(_SnCloudFolder(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,parentFolderId: freezed == parentFolderId ? _self.parentFolderId : parentFolderId // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/folder.g.dart

@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'folder.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnCloudFolder _$SnCloudFolderFromJson(Map<String, dynamic> json) =>
+    _SnCloudFolder(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      parentFolderId: json['parent_folder_id'] as String?,
+      accountId: json['account_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+    );
+
+Map<String, dynamic> _$SnCloudFolderToJson(_SnCloudFolder instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'parent_folder_id': instance.parentFolderId,
+      'account_id': instance.accountId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+    };

lib/models/thought.dart

@@ -38,6 +38,31 @@ class ThinkingChunkTypeConverter
   int toJson(ThinkingChunkType object) => object.value;
 }
 
+enum ThinkingMessagePartType {
+  text(0),
+  functionCall(1),
+  functionResult(2);
+
+  const ThinkingMessagePartType(this.value);
+  final int value;
+
+  static ThinkingMessagePartType fromValue(int value) {
+    return values.firstWhere((e) => e.value == value, orElse: () => text);
+  }
+}
+
+class ThinkingMessagePartTypeConverter
+    implements JsonConverter<ThinkingMessagePartType, int> {
+  const ThinkingMessagePartTypeConverter();
+
+  @override
+  ThinkingMessagePartType fromJson(int json) =>
+      ThinkingMessagePartType.fromValue(json);
+
+  @override
+  int toJson(ThinkingMessagePartType object) => object.value;
+}
+
 @freezed
 sealed class StreamThinkingRequest with _$StreamThinkingRequest {
   const factory StreamThinkingRequest({
@@ -77,6 +102,43 @@ sealed class SnThinkingChunk with _$SnThinkingChunk {
       _$SnThinkingChunkFromJson(json);
 }
 
+@freezed
+sealed class SnFunctionCall with _$SnFunctionCall {
+  const factory SnFunctionCall({
+    required String id,
+    required String name,
+    required String arguments,
+  }) = _SnFunctionCall;
+
+  factory SnFunctionCall.fromJson(Map<String, dynamic> json) =>
+      _$SnFunctionCallFromJson(json);
+}
+
+@freezed
+sealed class SnFunctionResult with _$SnFunctionResult {
+  const factory SnFunctionResult({
+    required String callId,
+    required dynamic result,
+    required bool isError,
+  }) = _SnFunctionResult;
+
+  factory SnFunctionResult.fromJson(Map<String, dynamic> json) =>
+      _$SnFunctionResultFromJson(json);
+}
+
+@freezed
+sealed class SnThinkingMessagePart with _$SnThinkingMessagePart {
+  const factory SnThinkingMessagePart({
+    @ThinkingMessagePartTypeConverter() required ThinkingMessagePartType type,
+    String? text,
+    SnFunctionCall? functionCall,
+    SnFunctionResult? functionResult,
+  }) = _SnThinkingMessagePart;
+
+  factory SnThinkingMessagePart.fromJson(Map<String, dynamic> json) =>
+      _$SnThinkingMessagePartFromJson(json);
+}
+
 @freezed
 sealed class SnThinkingSequence with _$SnThinkingSequence {
   const factory SnThinkingSequence({
@@ -98,9 +160,8 @@ sealed class SnThinkingSequence with _$SnThinkingSequence {
 sealed class SnThinkingThought with _$SnThinkingThought {
   const factory SnThinkingThought({
     required String id,
-    String? content,
+    @Default([]) List<SnThinkingMessagePart> parts,
     @Default([]) List<SnCloudFile> files,
-    @Default([]) List<SnThinkingChunk> chunks,
     @ThinkingThoughtRoleConverter() required ThinkingThoughtRole role,
     int? tokenCount,
     String? modelName,

lib/models/thought.g.dart

@@ -50,6 +50,64 @@ Map<String, dynamic> _$SnThinkingChunkToJson(_SnThinkingChunk instance) =>
       'data': instance.data,
     };
 
+_SnFunctionCall _$SnFunctionCallFromJson(Map<String, dynamic> json) =>
+    _SnFunctionCall(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      arguments: json['arguments'] as String,
+    );
+
+Map<String, dynamic> _$SnFunctionCallToJson(_SnFunctionCall instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'arguments': instance.arguments,
+    };
+
+_SnFunctionResult _$SnFunctionResultFromJson(Map<String, dynamic> json) =>
+    _SnFunctionResult(
+      callId: json['call_id'] as String,
+      result: json['result'],
+      isError: json['is_error'] as bool,
+    );
+
+Map<String, dynamic> _$SnFunctionResultToJson(_SnFunctionResult instance) =>
+    <String, dynamic>{
+      'call_id': instance.callId,
+      'result': instance.result,
+      'is_error': instance.isError,
+    };
+
+_SnThinkingMessagePart _$SnThinkingMessagePartFromJson(
+  Map<String, dynamic> json,
+) => _SnThinkingMessagePart(
+  type: const ThinkingMessagePartTypeConverter().fromJson(
+    (json['type'] as num).toInt(),
+  ),
+  text: json['text'] as String?,
+  functionCall:
+      json['function_call'] == null
+          ? null
+          : SnFunctionCall.fromJson(
+            json['function_call'] as Map<String, dynamic>,
+          ),
+  functionResult:
+      json['function_result'] == null
+          ? null
+          : SnFunctionResult.fromJson(
+            json['function_result'] as Map<String, dynamic>,
+          ),
+);
+
+Map<String, dynamic> _$SnThinkingMessagePartToJson(
+  _SnThinkingMessagePart instance,
+) => <String, dynamic>{
+  'type': const ThinkingMessagePartTypeConverter().toJson(instance.type),
+  'text': instance.text,
+  'function_call': instance.functionCall?.toJson(),
+  'function_result': instance.functionResult?.toJson(),
+};
+
 _SnThinkingSequence _$SnThinkingSequenceFromJson(Map<String, dynamic> json) =>
     _SnThinkingSequence(
       id: json['id'] as String,
@@ -80,17 +138,19 @@ Map<String, dynamic> _$SnThinkingSequenceToJson(_SnThinkingSequence instance) =>
 _SnThinkingThought _$SnThinkingThoughtFromJson(Map<String, dynamic> json) =>
     _SnThinkingThought(
       id: json['id'] as String,
-      content: json['content'] as String?,
+      parts:
+          (json['parts'] as List<dynamic>?)
+              ?.map(
+                (e) =>
+                    SnThinkingMessagePart.fromJson(e as Map<String, dynamic>),
+              )
+              .toList() ??
+          const [],
       files:
           (json['files'] as List<dynamic>?)
               ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
               .toList() ??
           const [],
-      chunks:
-          (json['chunks'] as List<dynamic>?)
-              ?.map((e) => SnThinkingChunk.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
       role: const ThinkingThoughtRoleConverter().fromJson(
         (json['role'] as num).toInt(),
       ),
@@ -114,9 +174,8 @@ _SnThinkingThought _$SnThinkingThoughtFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnThinkingThoughtToJson(_SnThinkingThought instance) =>
     <String, dynamic>{
       'id': instance.id,
-      'content': instance.content,
+      'parts': instance.parts.map((e) => e.toJson()).toList(),
       'files': instance.files.map((e) => e.toJson()).toList(),
-      'chunks': instance.chunks.map((e) => e.toJson()).toList(),
       'role': const ThinkingThoughtRoleConverter().toJson(instance.role),
       'token_count': instance.tokenCount,
       'model_name': instance.modelName,

lib/pods/chat/messages_notifier.dart

@@ -3,6 +3,7 @@ import "package:dio/dio.dart";
 import "package:drift/drift.dart" show Variable;
 import "package:easy_localization/easy_localization.dart";
 import "package:flutter/material.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:island/database/drift_db.dart";
 import "package:island/database/message.dart";
 import "package:island/models/chat.dart";
@@ -28,7 +29,7 @@ class MessagesNotifier extends _$MessagesNotifier {
   late final SnChatMember _identity;
 
   final Map<String, LocalChatMessage> _pendingMessages = {};
-  final Map<String, Map<int, double>> _fileUploadProgress = {};
+  final Map<String, Map<int, double?>> _fileUploadProgress = {};
   int? _totalCount;
   String? _searchQuery;
   bool? _withLinks;
@@ -433,12 +434,13 @@ class MessagesNotifier extends _$MessagesNotifier {
   }
 
   Future<void> sendMessage(
+    WidgetRef ref,
     String content,
     List<UniversalFile> attachments, {
     SnChatMessage? editingTo,
     SnChatMessage? forwardingTo,
     SnChatMessage? replyingTo,
-    Function(String, Map<int, double>)? onProgress,
+    Function(String, Map<int, double?>)? onProgress,
   }) async {
     final nonce = const Uuid().v4();
     talker.log('Sending message with nonce $nonce');
@@ -471,10 +473,10 @@ class MessagesNotifier extends _$MessagesNotifier {
       for (var idx = 0; idx < attachments.length; idx++) {
         final cloudFile =
             await FileUploader.createCloudFile(
+              ref: ref,
               fileData: attachments[idx],
-              client: ref.read(apiClientProvider),
               onProgress: (progress, _) {
-                _fileUploadProgress[localMessage.id]?[idx] = progress;
+                _fileUploadProgress[localMessage.id]?[idx] = progress ?? 0.0;
                 onProgress?.call(
                   localMessage.id,
                   _fileUploadProgress[localMessage.id] ?? {},

lib/pods/chat/messages_notifier.g.dart

@@ -6,7 +6,7 @@ part of 'messages_notifier.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$messagesNotifierHash() => r'6adefd9152cdd686c2a863964993f24c42d405b5';
+String _$messagesNotifierHash() => r'c009eb8598e8b5fbcece2d0b5213b2e434edb3b2';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/pods/file_list.dart

@@ -0,0 +1,104 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/models/file_list_item.dart';
+import 'package:island/pods/network.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+
+part 'file_list.g.dart';
+
+@riverpod
+class CloudFileListNotifier extends _$CloudFileListNotifier
+    with CursorPagingNotifierMixin<FileListItem> {
+  String _currentPath = '/';
+
+  void setPath(String path) {
+    _currentPath = path;
+    ref.invalidateSelf();
+  }
+
+  @override
+  Future<CursorPagingData<FileListItem>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<FileListItem>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+
+    final response = await client.get(
+      '/drive/index/browse',
+      queryParameters: {'path': _currentPath},
+    );
+
+    final List<String> folders =
+        (response.data['folders'] as List).map((e) => e as String).toList();
+    final List<SnCloudFileIndex> files =
+        (response.data['files'] as List)
+            .map((e) => SnCloudFileIndex.fromJson(e as Map<String, dynamic>))
+            .toList();
+
+    final List<FileListItem> items = [
+      ...folders.map((folderName) => FileListItem.folder(folderName)),
+      ...files.map((file) => FileListItem.file(file)),
+    ];
+
+    // The new API returns all files in the path, no pagination
+    return CursorPagingData(items: items, hasMore: false, nextCursor: null);
+  }
+}
+
+@riverpod
+Future<Map<String, dynamic>?> billingUsage(Ref ref) async {
+  final client = ref.read(apiClientProvider);
+  final response = await client.get('/drive/billing/usage');
+  return response.data;
+}
+
+@riverpod
+class UnindexedFileListNotifier extends _$UnindexedFileListNotifier
+    with CursorPagingNotifierMixin<FileListItem> {
+  @override
+  Future<CursorPagingData<FileListItem>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<FileListItem>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+
+    final offset = cursor != null ? int.tryParse(cursor) ?? 0 : 0;
+    const take = 50; // Default page size
+
+    final response = await client.get(
+      '/drive/index/unindexed',
+      queryParameters: {'take': take.toString(), 'offset': offset.toString()},
+    );
+
+    final total = int.tryParse(response.headers.value('x-total') ?? '0') ?? 0;
+
+    final List<SnCloudFile> files =
+        (response.data as List)
+            .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+            .toList();
+
+    final List<FileListItem> items =
+        files.map((file) => FileListItem.unindexedFile(file)).toList();
+
+    final hasMore = offset + take < total;
+    final nextCursor = hasMore ? (offset + take).toString() : null;
+
+    return CursorPagingData(
+      items: items,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+@riverpod
+Future<Map<String, dynamic>?> billingQuota(Ref ref) async {
+  final client = ref.read(apiClientProvider);
+  final response = await client.get('/drive/billing/quota');
+  return response.data;
+}

lib/pods/file_list.g.dart

@@ -45,13 +45,13 @@ final billingQuotaProvider =
 // ignore: unused_element
 typedef BillingQuotaRef = AutoDisposeFutureProviderRef<Map<String, dynamic>?>;
 String _$cloudFileListNotifierHash() =>
-    r'22c45a8ea23147a3835ba870ad2f0bb833f853ea';
+    r'5f2f80357cb31ac6473df5ac2101f9a462004f81';
 
 /// See also [CloudFileListNotifier].
 @ProviderFor(CloudFileListNotifier)
 final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
   CloudFileListNotifier,
-  CursorPagingData<SnCloudFile>
+  CursorPagingData<FileListItem>
 >.internal(
   CloudFileListNotifier.new,
   name: r'cloudFileListNotifierProvider',
@@ -64,6 +64,27 @@ final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
 );
 
 typedef _$CloudFileListNotifier =
-    AutoDisposeAsyncNotifier<CursorPagingData<SnCloudFile>>;
+    AutoDisposeAsyncNotifier<CursorPagingData<FileListItem>>;
+String _$unindexedFileListNotifierHash() =>
+    r'48fc92432a50a562190da5fe8ed0920d171b07b6';
+
+/// See also [UnindexedFileListNotifier].
+@ProviderFor(UnindexedFileListNotifier)
+final unindexedFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  UnindexedFileListNotifier,
+  CursorPagingData<FileListItem>
+>.internal(
+  UnindexedFileListNotifier.new,
+  name: r'unindexedFileListNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$unindexedFileListNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$UnindexedFileListNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<FileListItem>>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/pods/upload_tasks.dart

@@ -0,0 +1,494 @@
+import 'dart:async';
+import 'dart:typed_data';
+import 'package:cross_file/cross_file.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/models/drive_task.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/services/file_uploader.dart';
+import 'package:island/talker.dart';
+
+final uploadTasksProvider =
+    StateNotifierProvider<UploadTasksNotifier, List<DriveTask>>(
+      (ref) => UploadTasksNotifier(ref),
+    );
+
+class UploadTasksNotifier extends StateNotifier<List<DriveTask>> {
+  final Ref ref;
+  StreamSubscription? _websocketSubscription;
+  final Map<String, Map<String, dynamic>> _pendingUploads = {};
+
+  UploadTasksNotifier(this.ref) : super([]) {
+    _listenToWebSocket();
+  }
+
+  void _listenToWebSocket() {
+    final WebSocketService websocketService = ref.read(websocketProvider);
+    _websocketSubscription = websocketService.dataStream.listen(
+      _handleWebSocketPacket,
+    );
+  }
+
+  void _handleWebSocketPacket(dynamic packet) {
+    if (packet.type.startsWith('task.')) {
+      final data = packet.data;
+      if (data == null) return;
+
+      // Debug logging
+      talker.info(
+        '[UploadTasks] Received WebSocket packet: ${packet.type}, data: $data',
+      );
+
+      final taskId = data['task_id'] as String?;
+      if (taskId == null) return;
+
+      switch (packet.type) {
+        case 'task.created':
+          _handleTaskCreated(taskId, data);
+          break;
+        case 'task.progress':
+          _handleProgressUpdate(taskId, data);
+          break;
+        case 'task.completed':
+          _handleUploadCompleted(taskId, data);
+          break;
+        case 'task.failed':
+          _handleUploadFailed(taskId, data);
+          break;
+      }
+    }
+  }
+
+  void _handleTaskCreated(String taskId, Map<String, dynamic> data) {
+    talker.info('[UploadTasks] Handling task.created for taskId: $taskId');
+
+    // Check if task already exists (might have been created locally)
+    final existingTask =
+        state.where((task) => task.taskId == taskId).firstOrNull;
+    if (existingTask != null) {
+      talker.info('[UploadTasks] Task already exists, updating status');
+      // Task already exists, just update its status to confirm server creation
+      state =
+          state.map((task) {
+            if (task.taskId == taskId) {
+              return task.copyWith(
+                status: DriveTaskStatus.pending,
+                updatedAt: DateTime.now(),
+              );
+            }
+            return task;
+          }).toList();
+      return;
+    }
+
+    // Check if we have stored metadata for this task
+    final metadata = _pendingUploads[taskId];
+    talker.info('[UploadTasks] Metadata for taskId $taskId: $metadata');
+
+    if (metadata != null) {
+      talker.info('[UploadTasks] Creating task with full metadata');
+      // Create task with full metadata
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: metadata['file_name'] as String,
+        contentType: metadata['mime_type'] as String,
+        fileSize: metadata['file_size'] as int,
+        uploadedBytes: 0,
+        totalChunks: metadata['total_chunks'] as int,
+        uploadedChunks: 0,
+        status: DriveTaskStatus.pending,
+        createdAt: DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: 'FileUpload',
+        poolId: metadata['pool_id'] as String?,
+        bundleId: metadata['bundleId'] as String?,
+        encryptPassword: metadata['encrypt_password'] as String?,
+        expiredAt: metadata['expired_at'] as String?,
+      );
+
+      state = [...state, uploadTask];
+      talker.info(
+        '[UploadTasks] Task created successfully. Total tasks: ${state.length}',
+      );
+      // Clean up stored metadata
+      _pendingUploads.remove(taskId);
+    } else {
+      talker.info('[UploadTasks] No metadata found, creating minimal task');
+      // Create minimal task if no metadata is stored
+      final params = data['parameters'];
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: params['file_name'] as String? ?? 'Unknown file',
+        contentType: params['content_type'],
+        fileSize: params['file_size'],
+        uploadedBytes:
+            (params['chunk_size'] as int) * (params['chunks_uploaded'] as int),
+        totalChunks: params['chunks_count'],
+        uploadedChunks: params['chunks_uploaded'],
+        status: DriveTaskStatus.pending,
+        createdAt: DateTime.tryParse(data['created_at']) ?? DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: data['type'],
+      );
+
+      state = [...state, uploadTask];
+      talker.info(
+        '[UploadTasks] Minimal task created. Total tasks: ${state.length}',
+      );
+    }
+  }
+
+  void _handleProgressUpdate(String taskId, Map<String, dynamic> data) {
+    final progress = data['progress'] as num? ?? 0.0;
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            final uploadedBytes = (progress / 100.0 * task.fileSize).toInt();
+            return task.copyWith(
+              statusMessage: data['status'],
+              uploadedBytes: uploadedBytes,
+              status: DriveTaskStatus.inProgress,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void _handleUploadCompleted(String taskId, Map<String, dynamic> data) {
+    final results = data['results'] as Map<String, dynamic>?;
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: DriveTaskStatus.completed,
+              uploadedChunks: task.totalChunks,
+              uploadedBytes: task.fileSize,
+              // Update file information from Results if available
+              fileName: results?['file_name'] as String? ?? task.fileName,
+              fileSize: results?['file_size'] as int? ?? task.fileSize,
+              contentType: results?['mime_type'] as String? ?? task.contentType,
+              result:
+                  results?['file_info'] != null
+                      ? SnCloudFile.fromJson(results!['file_info'])
+                      : null,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void _handleUploadFailed(String taskId, Map<String, dynamic> data) {
+    final errorMessage = data['error_message'] as String? ?? 'Upload failed';
+
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: DriveTaskStatus.failed,
+              errorMessage: errorMessage,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void addUploadTask(DriveTask task) {
+    state = [...state, task];
+  }
+
+  void storeUploadMetadata(
+    String taskId, {
+    required String fileName,
+    required String contentType,
+    required int fileSize,
+    required int totalChunks,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+  }) {
+    _pendingUploads[taskId] = {
+      'file_name': fileName,
+      'mime_type': contentType,
+      'file_size': fileSize,
+      'total_chunks': totalChunks,
+      'pool_id': poolId,
+      'bundleId': bundleId,
+      'encrypt_password': encryptPassword,
+      'expired_at': expiredAt,
+    };
+  }
+
+  void updateTaskStatus(
+    String taskId,
+    DriveTaskStatus status, {
+    String? errorMessage,
+  }) {
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              status: status,
+              errorMessage: errorMessage,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void updateTransmissionProgress(String taskId, double progress) {
+    state =
+        state.map((task) {
+          if (task.taskId == taskId) {
+            return task.copyWith(
+              transmissionProgress: progress,
+              updatedAt: DateTime.now(),
+            );
+          }
+          return task;
+        }).toList();
+  }
+
+  void removeTask(String taskId) {
+    state = state.where((task) => task.taskId != taskId).toList();
+  }
+
+  void clearCompletedTasks() {
+    state =
+        state
+            .where(
+              (task) =>
+                  task.status != DriveTaskStatus.completed &&
+                  task.status != DriveTaskStatus.failed &&
+                  task.status != DriveTaskStatus.cancelled &&
+                  task.status != DriveTaskStatus.expired,
+            )
+            .toList();
+  }
+
+  DriveTask? getTask(String taskId) {
+    return state.where((task) => task.taskId == taskId).firstOrNull;
+  }
+
+  List<DriveTask> getActiveTasks() {
+    return state
+        .where(
+          (task) =>
+              task.status == DriveTaskStatus.pending ||
+              task.status == DriveTaskStatus.inProgress ||
+              task.status == DriveTaskStatus.paused ||
+              task.status == DriveTaskStatus.completed,
+        )
+        .toList();
+  }
+
+  @override
+  void dispose() {
+    _websocketSubscription?.cancel();
+    super.dispose();
+  }
+}
+
+// Provider for the enhanced FileUploader that integrates with upload tasks
+final enhancedFileUploaderProvider = Provider<EnhancedFileUploader>((ref) {
+  final dio = ref.watch(apiClientProvider);
+  return EnhancedFileUploader(dio, ref);
+});
+
+class EnhancedFileUploader extends FileUploader {
+  final Ref ref;
+
+  EnhancedFileUploader(super.client, this.ref);
+
+  /// Reads the next chunk from a stream subscription.
+  Future<Uint8List> _readNextChunkFromStream(
+    StreamSubscription<List<int>> subscription,
+    int size,
+  ) async {
+    final completer = Completer<Uint8List>();
+    final buffer = <int>[];
+    int remaining = size;
+
+    void onData(List<int> data) {
+      buffer.addAll(data);
+      remaining -= data.length;
+      if (remaining <= 0) {
+        subscription.pause();
+        completer.complete(Uint8List.fromList(buffer.sublist(0, size)));
+      }
+    }
+
+    void onDone() {
+      if (!completer.isCompleted) {
+        completer.complete(Uint8List.fromList(buffer));
+      }
+    }
+
+    subscription.onData(onData);
+    subscription.onDone(onDone);
+
+    return completer.future;
+  }
+
+  @override
+  Future<SnCloudFile> uploadFile({
+    required dynamic fileData,
+    required String fileName,
+    required String contentType,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+    int? customChunkSize,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
+  }) async {
+    // Step 1: Create upload task
+    onProgress?.call(null, Duration.zero);
+    final createResponse = await createUploadTask(
+      fileData: fileData,
+      fileName: fileName,
+      contentType: contentType,
+      poolId: poolId,
+      bundleId: bundleId,
+      encryptPassword: encryptPassword,
+      expiredAt: expiredAt,
+      chunkSize: customChunkSize,
+      path: path,
+    );
+
+    int totalSize;
+    if (fileData is XFile) {
+      totalSize = await fileData.length();
+    } else if (fileData is Uint8List) {
+      totalSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
+
+    if (createResponse['file_exists'] == true) {
+      // File already exists, create a local task to show it was found
+      final existingFile = SnCloudFile.fromJson(createResponse['file']);
+
+      // Create a task that shows as completed immediately
+      // Use a generated taskId since the server might not provide one for existing files
+      final taskId =
+          createResponse['task_id'] as String? ??
+          'existing-${DateTime.now().millisecondsSinceEpoch}';
+
+      final uploadTask = DriveTask(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        taskId: taskId,
+        fileName: fileName,
+        contentType: contentType,
+        fileSize: totalSize,
+        uploadedBytes: totalSize,
+        totalChunks: 1, // For existing files, we consider it as 1 chunk
+        uploadedChunks: 1,
+        status: DriveTaskStatus.completed,
+        createdAt: DateTime.now(),
+        updatedAt: DateTime.now(),
+        type: 'FileUpload',
+        poolId: poolId,
+        bundleId: bundleId,
+        encryptPassword: encryptPassword,
+        expiredAt: expiredAt,
+      );
+
+      ref.read(uploadTasksProvider.notifier).addUploadTask(uploadTask);
+
+      return existingFile;
+    }
+
+    final taskId = createResponse['task_id'] as String;
+    final chunkSize = createResponse['chunk_size'] as int;
+    final chunksCount = createResponse['chunks_count'] as int;
+
+    // Store upload metadata for when task.created event arrives
+    talker.info('[UploadTasks] Storing metadata for taskId: $taskId');
+    ref
+        .read(uploadTasksProvider.notifier)
+        .storeUploadMetadata(
+          taskId,
+          fileName: fileName,
+          contentType: contentType,
+          fileSize: totalSize,
+          totalChunks: chunksCount,
+          poolId: poolId,
+          bundleId: bundleId,
+          encryptPassword: encryptPassword,
+          expiredAt: expiredAt,
+        );
+
+    // Step 2: Upload chunks
+    int bytesUploaded = 0;
+    if (fileData is XFile) {
+      // Use stream for XFile
+      final subscription = fileData.openRead().listen(null);
+      subscription.pause();
+      for (int i = 0; i < chunksCount; i++) {
+        subscription.resume();
+        final chunkData = await _readNextChunkFromStream(
+          subscription,
+          chunkSize,
+        );
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunkData,
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+            // Update transmission progress in UI
+            ref
+                .read(uploadTasksProvider.notifier)
+                .updateTransmissionProgress(taskId, overallProgress);
+          },
+        );
+        bytesUploaded += chunkData.length;
+      }
+      subscription.cancel();
+    } else if (fileData is Uint8List) {
+      // Use old way for Uint8List
+      final chunks = <Uint8List>[];
+      for (int i = 0; i < fileData.length; i += chunkSize) {
+        final end =
+            i + chunkSize > fileData.length ? fileData.length : i + chunkSize;
+        chunks.add(Uint8List.fromList(fileData.sublist(i, end)));
+      }
+
+      // Upload each chunk
+      for (int i = 0; i < chunks.length; i++) {
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunks[i],
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+            // Update transmission progress in UI
+            ref
+                .read(uploadTasksProvider.notifier)
+                .updateTransmissionProgress(taskId, overallProgress);
+          },
+        );
+        bytesUploaded += chunks[i].length;
+      }
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
+
+    // Step 3: Complete upload
+    onProgress?.call(null, Duration.zero);
+    return await completeUpload(taskId);
+  }
+}

lib/route.dart

@@ -12,7 +12,9 @@ import 'package:island/screens/developers/hub.dart';
 import 'package:island/screens/developers/edit_project.dart';
 import 'package:island/screens/developers/new_project.dart';
 import 'package:island/screens/discovery/articles.dart';
+import 'package:island/models/file.dart';
 import 'package:island/screens/files/file_list.dart';
+import 'package:island/screens/files/file_detail.dart';
 import 'package:island/screens/posts/post_categories_list.dart';
 import 'package:island/screens/posts/post_category_detail.dart';
 import 'package:island/screens/posts/post_search.dart';
@@ -42,7 +44,6 @@ import 'package:island/screens/stickers/pack_detail.dart';
 import 'package:island/screens/discovery/feeds/feed_marketplace.dart';
 import 'package:island/screens/discovery/feeds/feed_detail.dart';
 import 'package:island/screens/creators/poll/poll_list.dart';
-import 'package:island/screens/creators/publishers_form.dart';
 import 'package:island/screens/creators/webfeed/webfeed_list.dart';
 import 'package:island/screens/poll/poll_editor.dart';
 import 'package:island/screens/posts/compose.dart';
@@ -396,11 +397,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                     path: '/account/wallet',
                     builder: (context, state) => const WalletScreen(),
                   ),
-                  GoRoute(
-                    name: 'files',
-                    path: '/account/files',
-                    builder: (context, state) => const FileListScreen(),
-                  ),
                   GoRoute(
                     name: 'relationships',
                     path: '/account/relationships',
@@ -445,6 +441,31 @@ final routerProvider = Provider<GoRouter>((ref) {
                   return AccountProfileScreen(name: name);
                 },
               ),
+
+              // Files tab
+              GoRoute(
+                name: 'files',
+                path: '/files',
+                builder: (context, state) => const FileListScreen(),
+                routes: [
+                  GoRoute(
+                    name: 'fileDetail',
+                    path: ':id',
+                    builder: (context, state) {
+                      // For now, we'll need to pass the file object through extra
+                      // This will be updated when we modify the file list navigation
+                      final file = state.extra as SnCloudFile?;
+                      if (file != null) {
+                        return FileDetailScreen(item: file);
+                      }
+                      // Fallback - this shouldn't happen in normal flow
+                      Navigator.of(context).pop();
+                      return const SizedBox.shrink();
+                    },
+                  ),
+                ],
+              ),
+
               // Creator hub tab
               GoRoute(
                 name: 'creatorHub',
@@ -507,19 +528,6 @@ final routerProvider = Provider<GoRouter>((ref) {
                       return StickersScreen(pubName: name);
                     },
                   ),
-                  GoRoute(
-                    name: 'creatorNew',
-                    path: 'new',
-                    builder: (context, state) => const NewPublisherScreen(),
-                  ),
-                  GoRoute(
-                    name: 'creatorEdit',
-                    path: ':name/edit',
-                    builder: (context, state) {
-                      final name = state.pathParameters['name']!;
-                      return EditPublisherScreen(name: name);
-                    },
-                  ),
                 ],
               ),
 

lib/screens/account.dart

@@ -129,7 +129,7 @@ class AccountScreen extends HookConsumerWidget {
                                   pathParameters: {'name': user.value!.name},
                                 );
                               },
-                            ),
+                            ).padding(bottom: 12),
                           Expanded(
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
@@ -375,6 +375,16 @@ class AccountScreen extends HookConsumerWidget {
                 );
               },
             ),
+            ListTile(
+              minTileHeight: 48,
+              leading: const Icon(Symbols.files),
+              trailing: const Icon(Symbols.chevron_right),
+              contentPadding: EdgeInsets.symmetric(horizontal: 24),
+              title: Text('files').tr(),
+              onTap: () {
+                context.goNamed('files');
+              },
+            ),
             ListTile(
               minTileHeight: 48,
               leading: const Icon(Symbols.wallet),
@@ -385,16 +395,6 @@ class AccountScreen extends HookConsumerWidget {
                 context.pushNamed('wallet');
               },
             ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.files),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('files').tr(),
-              onTap: () {
-                context.pushNamed('files');
-              },
-            ),
             ListTile(
               minTileHeight: 48,
               leading: const Icon(Symbols.people),

lib/screens/account/me/account_settings.dart

@@ -84,9 +84,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
         'accountPasswordChange'.tr(),
       );
       if (!confirm || !context.mounted) return;
-      final captchaTk = await Navigator.of(
+      final captchaTk = await CaptchaScreen.show(context);
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
       if (captchaTk == null) return;
       try {
         if (context.mounted) showLoadingModal(context);

lib/screens/account/me/profile_update.dart

@@ -76,7 +76,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/auth/captcha.native.dart

@@ -2,9 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:island/screens/auth/captcha.config.dart';
-import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/sheet.dart';
 
 class CaptchaScreen extends ConsumerWidget {
+  static Future<String?> show(BuildContext context) {
+    return showModalBottomSheet<String>(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => const CaptchaScreen(),
+    );
+  }
+
   const CaptchaScreen({super.key});
 
   @override
@@ -13,9 +21,9 @@ class CaptchaScreen extends ConsumerWidget {
 
     if (!captchaUrl.hasValue) return Center(child: CircularProgressIndicator());
 
-    return AppScaffold(
+    return SheetScaffold(
-      appBar: AppBar(title: Text("Anti-Robot")),
+      titleText: "Anti-Robot",
-      body: InAppWebView(
+      child: InAppWebView(
         initialUrlRequest: URLRequest(
           url: WebUri('${captchaUrl.value}?redirect_uri=solian://captcha'),
         ),

lib/screens/auth/captcha.web.dart

@@ -4,11 +4,19 @@ import 'dart:ui_web' as ui;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/screens/auth/captcha.config.dart';
-import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:web/web.dart' as web;
 import 'package:flutter/material.dart';
 
 class CaptchaScreen extends ConsumerStatefulWidget {
+  static Future<String?> show(BuildContext context) {
+    return showModalBottomSheet<String>(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => const CaptchaScreen(),
+    );
+  }
+
   const CaptchaScreen({super.key});
 
   @override
@@ -61,9 +69,9 @@ class _CaptchaScreenState extends ConsumerState<CaptchaScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return AppScaffold(
+    return SheetScaffold(
-      appBar: AppBar(title: Text("Anti-Robot")),
+      titleText: "Anti-Robot",
-      body:
+      child:
           _isInitialized
               ? HtmlElementView(viewType: 'captcha-iframe')
               : Center(child: CircularProgressIndicator()),

lib/screens/auth/create_account.dart

@@ -38,9 +38,7 @@ class CreateAccountScreen extends HookConsumerWidget {
     void performAction() async {
       if (!formKey.currentState!.validate()) return;
 
-      final captchaTk = await Navigator.of(
+      final captchaTk = await CaptchaScreen.show(context);
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
       if (captchaTk == null) return;
 
       if (!context.mounted) return;

lib/screens/auth/login.dart

@@ -523,9 +523,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
         showErrorAlert('loginResetPasswordHint'.tr());
         return;
       }
-      final captchaTk = await Navigator.of(
+      final captchaTk = await CaptchaScreen.show(context);
-        context,
-      ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
       if (captchaTk == null) return;
       isBusy.value = true;
       try {

lib/screens/chat/chat_form.dart

@@ -99,7 +99,7 @@ class EditChatScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/chat/room.dart

@@ -2,6 +2,7 @@ import "dart:async";
 import "dart:math" as math;
 import "package:easy_localization/easy_localization.dart";
 import "package:file_picker/file_picker.dart";
+import "package:image_picker/image_picker.dart";
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
@@ -148,7 +149,7 @@ class ChatRoomScreen extends HookConsumerWidget {
     final messageForwardingTo = useState<SnChatMessage?>(null);
     final messageEditingTo = useState<SnChatMessage?>(null);
     final attachments = useState<List<UniversalFile>>([]);
-    final attachmentProgress = useState<Map<String, Map<int, double>>>({});
+    final attachmentProgress = useState<Map<String, Map<int, double?>>>({});
 
     // Selection mode state
     final isSelectionMode = useState<bool>(false);
@@ -181,16 +182,13 @@ class ChatRoomScreen extends HookConsumerWidget {
     }, [scrollController]);
 
     Future<void> pickPhotoMedia() async {
-      final result = await FilePicker.platform.pickFiles(
+      final ImagePicker picker = ImagePicker();
-        type: FileType.image,
+      final List<XFile> results = await picker.pickMultiImage();
-        allowMultiple: true,
+      if (results.isEmpty) return;
-        allowCompression: false,
-      );
-      if (result == null || result.count == 0) return;
       attachments.value = [
         ...attachments.value,
-        ...result.files.map(
+        ...results.map(
-          (e) => UniversalFile(data: e.xFile, type: UniversalFileType.image),
+          (xfile) => UniversalFile(data: xfile, type: UniversalFileType.image),
         ),
       ];
     }
@@ -267,6 +265,7 @@ class ChatRoomScreen extends HookConsumerWidget {
       if (messageController.text.trim().isNotEmpty ||
           attachments.value.isNotEmpty) {
         messagesNotifier.sendMessage(
+          ref,
           messageController.text.trim(),
           attachments.value,
           editingTo: messageEditingTo.value,
@@ -563,7 +562,7 @@ class ChatRoomScreen extends HookConsumerWidget {
 
         final cloudFile =
             await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
               fileData: attachment,
               poolId: config.poolId,
               mode:
@@ -573,7 +572,7 @@ class ChatRoomScreen extends HookConsumerWidget {
               onProgress: (progress, _) {
                 attachmentProgress.value = {
                   ...attachmentProgress.value,
-                  'chat-upload': {index: progress},
+                  'chat-upload': {index: progress ?? 0.0},
                 };
               },
             ).future;

lib/screens/creators/hub.dart

@@ -261,7 +261,11 @@ class _PublisherUnselectedWidget extends HookConsumerWidget {
             subtitle: Text('createPublisherHint').tr(),
             trailing: const Icon(Symbols.chevron_right),
             onTap: () {
-              context.pushNamed('creatorNew').then((value) {
+              showModalBottomSheet(
+                context: context,
+                isScrollControlled: true,
+                builder: (context) => const NewPublisherScreen(),
+              ).then((value) {
                 if (value != null) {
                   ref.invalidate(publishersManagedProvider);
                 }
@@ -285,19 +289,18 @@ class CreatorHubScreen extends HookConsumerWidget {
     );
 
     void updatePublisher() {
-      context
+      showModalBottomSheet(
-          .pushNamed(
+        context: context,
-            'creatorEdit',
+        isScrollControlled: true,
-            pathParameters: {'name': currentPublisher.value!.name},
+        builder:
-          )
+            (context) =>
-          .then((value) async {
+                EditPublisherScreen(name: currentPublisher.value!.name),
-            if (value == null) return;
+      ).then((value) async {
-            final data = await ref.refresh(publishersManagedProvider.future);
+        if (value == null) return;
-            currentPublisher.value =
+        final data = await ref.refresh(publishersManagedProvider.future);
-                data
+        currentPublisher.value =
-                    .where((e) => e.id == currentPublisher.value!.id)
+            data.where((e) => e.id == currentPublisher.value!.id).firstOrNull;
-                    .firstOrNull;
+      });
-          });
     }
 
     void deletePublisher() {

lib/screens/creators/publishers_form.dart

@@ -16,8 +16,8 @@ import 'package:island/screens/realm/realms.dart';
 import 'package:island/services/file.dart';
 import 'package:island/services/file_uploader.dart';
 import 'package:island/widgets/alert.dart';
-import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -95,11 +95,11 @@ class EditPublisherScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              client: ref.read(apiClientProvider),
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');
@@ -177,13 +177,11 @@ class EditPublisherScreen extends HookConsumerWidget {
       }
     }
 
-    return AppScaffold(
+    final titleText = (name == null ? 'createPublisher' : 'editPublisher').tr();
-      isNoBackground: false,
+
-      appBar: AppBar(
+    return SheetScaffold(
-        title: Text(name == null ? 'createPublisher' : 'editPublisher').tr(),
+      titleText: titleText,
-        leading: const PageBackButton(),
+      child: SingleChildScrollView(
-      ),
-      body: SingleChildScrollView(
         padding: EdgeInsets.only(bottom: 16),
         child: Column(
           children: [

lib/screens/developers/edit_app.dart

@@ -141,7 +141,7 @@ class EditAppScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/developers/edit_bot.dart

@@ -127,11 +127,11 @@ class EditBotScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,
               ),
-              client: ref.read(apiClientProvider),
             ).future;
         if (cloudFile == null) {
           throw ArgumentError('Failed to upload the file...');

lib/screens/explore.dart

@@ -19,7 +19,6 @@ import 'package:island/widgets/check_in.dart';
 import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:island/widgets/post/post_featured.dart';
 import 'package:island/widgets/post/post_item.dart';
-import 'package:island/widgets/post/compose_card.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -341,7 +340,6 @@ class ExploreScreen extends HookConsumerWidget {
                         margin: EdgeInsets.zero,
                       ),
                     PostFeaturedList(),
-                    const PostComposeCard(),
                   ],
                 ),
               ),

lib/screens/files/file_detail.dart

@@ -0,0 +1,231 @@
+import 'dart:io';
+
+import 'package:file_saver/file_saver.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gal/gal.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/file_info_sheet.dart';
+import 'package:island/widgets/content/file_viewer_contents.dart';
+import 'package:path/path.dart' show extension;
+import 'package:path_provider/path_provider.dart';
+
+class FileDetailScreen extends HookConsumerWidget {
+  final SnCloudFile item;
+
+  const FileDetailScreen({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final serverUrl = ref.watch(serverUrlProvider);
+    final isWide = isWideScreen(context);
+
+    // Animation controller for the drawer
+    final animationController = useAnimationController(
+      duration: const Duration(milliseconds: 300),
+    );
+    final animation = useMemoized(
+      () => Tween<double>(begin: 0, end: 1).animate(
+        CurvedAnimation(parent: animationController, curve: Curves.easeInOut),
+      ),
+      [animationController],
+    );
+
+    final showDrawer = useState(false);
+
+    void showInfoSheet() {
+      if (isWide) {
+        // Show as animated right panel on wide screens
+        showDrawer.value = !showDrawer.value;
+        if (showDrawer.value) {
+          animationController.forward();
+        } else {
+          animationController.reverse();
+        }
+      } else {
+        // Show as bottom sheet on narrow screens
+        showModalBottomSheet(
+          useRootNavigator: true,
+          context: context,
+          isScrollControlled: true,
+          builder: (context) => FileInfoSheet(item: item),
+        );
+      }
+    }
+
+    // Listen to drawer state changes
+    useEffect(() {
+      void listener() {
+        if (!animationController.isAnimating) {
+          if (animationController.value == 0) {
+            showDrawer.value = false;
+          }
+        }
+      }
+
+      animationController.addListener(listener);
+      return () => animationController.removeListener(listener);
+    }, [animationController]);
+
+    return AppScaffold(
+      isNoBackground: true,
+      appBar: AppBar(
+        elevation: 0,
+        leading: IconButton(
+          icon: Icon(Icons.close),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        title: Text(item.name.isEmpty ? 'File Details' : item.name),
+        actions: _buildAppBarActions(context, ref, showInfoSheet),
+      ),
+      body: AnimatedBuilder(
+        animation: animation,
+        builder: (context, child) {
+          return Row(
+            children: [
+              // Main content area
+              Expanded(child: _buildContent(context, ref, serverUrl)),
+              // Animated drawer panel
+              if (isWide)
+                SizedBox(
+                  height: double.infinity,
+                  width: animation.value * 400, // Max width of 400px
+                  child: Container(
+                    child:
+                        animation.value > 0.1
+                            ? FileInfoSheet(item: item, onClose: showInfoSheet)
+                            : const SizedBox.shrink(),
+                  ),
+                ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+
+  List<Widget> _buildAppBarActions(
+    BuildContext context,
+    WidgetRef ref,
+    VoidCallback showInfoSheet,
+  ) {
+    final actions = <Widget>[];
+
+    // Add content-specific actions
+    switch (item.mimeType?.split('/').firstOrNull) {
+      case 'image':
+        if (!kIsWeb) {
+          actions.add(
+            IconButton(
+              icon: Icon(Icons.save_alt),
+              onPressed: () async => _saveToGallery(ref),
+            ),
+          );
+        }
+        // HD/SD toggle will be handled in the image content overlay
+        break;
+      default:
+        if (!kIsWeb) {
+          actions.add(
+            IconButton(
+              icon: Icon(Icons.save_alt),
+              onPressed: () async => _downloadFile(ref),
+            ),
+          );
+        }
+        break;
+    }
+
+    // Always add info button
+    actions.add(
+      IconButton(icon: Icon(Icons.info_outline), onPressed: showInfoSheet),
+    );
+
+    actions.add(const Gap(8));
+
+    return actions;
+  }
+
+  Future<void> _saveToGallery(WidgetRef ref) async {
+    try {
+      showSnackBar('Saving image...');
+
+      final client = ref.read(apiClientProvider);
+      final tempDir = await getTemporaryDirectory();
+      var extName = extension(item.name).trim();
+      if (extName.isEmpty) {
+        extName = item.mimeType?.split('/').lastOrNull ?? 'jpeg';
+      }
+      final filePath = '${tempDir.path}/${item.id}.$extName';
+
+      await client.download(
+        '/drive/files/${item.id}',
+        filePath,
+        queryParameters: {'original': true},
+      );
+      if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
+        await Gal.putImage(filePath, album: 'Solar Network');
+        showSnackBar('Image saved to gallery');
+      } else {
+        await FileSaver.instance.saveFile(
+          name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
+          file: File(filePath),
+        );
+        showSnackBar('Image saved to $filePath');
+      }
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> _downloadFile(WidgetRef ref) async {
+    try {
+      showSnackBar('Downloading file...');
+
+      final client = ref.read(apiClientProvider);
+      final tempDir = await getTemporaryDirectory();
+      var extName = extension(item.name).trim();
+      if (extName.isEmpty) {
+        extName = item.mimeType?.split('/').lastOrNull ?? 'bin';
+      }
+      final filePath = '${tempDir.path}/${item.id}.$extName';
+
+      await client.download(
+        '/drive/files/${item.id}',
+        filePath,
+        queryParameters: {'original': true},
+      );
+
+      await FileSaver.instance.saveFile(
+        name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
+        file: File(filePath),
+      );
+      showSnackBar('File saved to downloads');
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  Widget _buildContent(BuildContext context, WidgetRef ref, String serverUrl) {
+    final uri = '$serverUrl/drive/files/${item.id}';
+
+    return switch (item.mimeType?.split('/').firstOrNull) {
+      'image' => ImageFileContent(item: item, uri: uri),
+      'video' => VideoFileContent(item: item, uri: uri),
+      'audio' => AudioFileContent(item: item, uri: uri),
+      _ when item.mimeType == 'application/pdf' => PdfFileContent(uri: uri),
+      _ when item.mimeType?.startsWith('text/') == true => TextFileContent(
+        uri: uri,
+      ),
+      _ => GenericFileContent(item: item),
+    };
+  }
+}

lib/screens/files/file_list.dart

@@ -1,122 +1,64 @@
-import 'package:easy_localization/easy_localization.dart';
+import 'package:cross_file/cross_file.dart';
-import 'package:fl_chart/fl_chart.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
-import 'package:island/pods/network.dart';
+import 'package:island/pods/file_list.dart';
-import 'package:island/pods/file_pool.dart';
+import 'package:island/services/file_uploader.dart';
-import 'package:island/utils/format.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
-import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
-import 'package:island/widgets/content/file_info_sheet.dart';
+import 'package:island/widgets/file_list_view.dart';
+import 'package:island/widgets/usage_overview.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
-import 'package:styled_widget/styled_widget.dart';
-
-part 'file_list.g.dart';
-
-@riverpod
-class CloudFileListNotifier extends _$CloudFileListNotifier
-    with CursorPagingNotifierMixin<SnCloudFile> {
-  String? _poolId;
-  bool _includeRecycled = false;
-
-  void setFilters(String? poolId, bool includeRecycled) {
-    _poolId = poolId;
-    _includeRecycled = includeRecycled;
-    ref.invalidateSelf();
-  }
-
-  @override
-  Future<CursorPagingData<SnCloudFile>> build() => fetch(cursor: null);
-
-  @override
-  Future<CursorPagingData<SnCloudFile>> fetch({required String? cursor}) async {
-    final client = ref.read(apiClientProvider);
-    final offset = cursor == null ? 0 : int.parse(cursor);
-    final take = 20;
-
-    final queryParameters = <String, dynamic>{'offset': offset, 'take': take};
-
-    // Add filter parameters
-    if (_poolId != null) {
-      queryParameters['pool'] = _poolId!;
-    }
-    if (_includeRecycled) {
-      queryParameters['recycled'] = 'true';
-    }
-
-    final response = await client.get(
-      '/drive/files/me',
-      queryParameters: queryParameters,
-    );
-
-    final List<SnCloudFile> items =
-        (response.data as List)
-            .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
-            .toList();
-    final total = int.parse(response.headers.value('X-Total') ?? '0');
-
-    final hasMore = offset + items.length < total;
-    final nextCursor = hasMore ? (offset + items.length).toString() : null;
-
-    return CursorPagingData(
-      items: items,
-      hasMore: hasMore,
-      nextCursor: nextCursor,
-    );
-  }
-}
-
-@riverpod
-Future<Map<String, dynamic>?> billingUsage(Ref ref) async {
-  final client = ref.read(apiClientProvider);
-  final response = await client.get('/drive/billing/usage');
-  return response.data;
-}
-
-@riverpod
-Future<Map<String, dynamic>?> billingQuota(Ref ref) async {
-  final client = ref.read(apiClientProvider);
-  final response = await client.get('/drive/billing/quota');
-  return response.data;
-}
 
 class FileListScreen extends HookConsumerWidget {
   const FileListScreen({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    // Filter state
+    // Path navigation state
-    final selectedPool = useState<String?>(null);
+    final currentPath = useState<String>('/');
-    final includeRecycled = useState(false);
+    final mode = useState<FileListMode>(FileListMode.normal);
 
     final usageAsync = ref.watch(billingUsageProvider);
     final quotaAsync = ref.watch(billingQuotaProvider);
 
-    // Update notifier filters when state changes
+    final viewMode = useState(FileListViewMode.list);
-    useEffect(() {
-      final notifier = ref.read(cloudFileListNotifierProvider.notifier);
-      notifier.setFilters(selectedPool.value, includeRecycled.value);
-      return null;
-    }, [selectedPool.value, includeRecycled.value]);
 
     return AppScaffold(
-      appBar: AppBar(title: Text('Files'), leading: const PageBackButton()),
+      isNoBackground: false,
+      appBar: AppBar(
+        title: Text('Files'),
+        leading: const PageBackButton(),
+        actions: [
+          IconButton(
+            icon: const Icon(Symbols.bar_chart),
+            onPressed:
+                () => _showUsageSheet(
+                  context,
+                  usageAsync.value,
+                  quotaAsync.value,
+                ),
+          ),
+          const Gap(8),
+        ],
+      ),
       body: usageAsync.when(
         data:
             (usage) => quotaAsync.when(
               data:
-                  (quota) => _buildQuotaUI(
+                  (quota) => FileListView(
-                    usage,
+                    usage: usage,
-                    quota,
+                    quota: quota,
-                    ref,
+                    currentPath: currentPath,
-                    selectedPool,
+                    onPickAndUpload:
-                    includeRecycled,
+                        () => _pickAndUploadFile(ref, currentPath.value),
+                    onShowCreateDirectory: _showCreateDirectoryDialog,
+                    mode: mode,
+                    viewMode: viewMode,
                   ),
               loading: () => const Center(child: CircularProgressIndicator()),
               error: (e, _) => Center(child: Text('Error loading quota')),
@@ -127,430 +69,135 @@ class FileListScreen extends HookConsumerWidget {
     );
   }
 
-  Widget _buildQuotaUI(
+  Future<void> _pickAndUploadFile(WidgetRef ref, String currentPath) async {
-    Map<String, dynamic>? usage,
-    Map<String, dynamic>? quota,
-    WidgetRef ref,
-    ValueNotifier<String?> selectedPool,
-    ValueNotifier<bool> includeRecycled,
-  ) {
-    if (usage == null) return const SizedBox.shrink();
-    return CustomScrollView(
-      slivers: [
-        const SliverGap(8),
-        SliverToBoxAdapter(
-          child: Column(
-            children: [
-              Row(
-                children: [
-                  Expanded(
-                    child: _buildStatCard(
-                      'All Uploads',
-                      '${((usage['total_usage_bytes'] as num) / (1024 * 1024 * 1024)).toStringAsFixed(3)} GiB',
-                    ),
-                  ),
-                  Expanded(
-                    child: _buildStatCard(
-                      'All Files',
-                      '${usage['total_file_count']}',
-                    ),
-                  ),
-                ],
-              ),
-              Row(
-                children: [
-                  Expanded(
-                    child: _buildStatCard(
-                      'Quota',
-                      '${usage['total_quota']} MiB',
-                    ),
-                  ),
-                  Expanded(
-                    child: _buildStatCard(
-                      'Used Quota',
-                      '${((usage['used_quota'] as num) / (usage['total_quota'] as num) * 100).toStringAsFixed(2)}%',
-                      progress:
-                          (usage['used_quota'] as num) /
-                          (usage['total_quota'] as num),
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ).padding(horizontal: 8),
-        ),
-        SliverToBoxAdapter(
-          child: Row(
-            children: [
-              Expanded(
-                child: Card(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16),
-                    child: Column(
-                      children: [
-                        const Text('Pool Usage'),
-                        SizedBox(
-                          height: 200,
-                          child: PieChart(_buildPoolChartData(usage)),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-              Expanded(
-                child: Card(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16),
-                    child: Column(
-                      children: [
-                        const Text('Verbose Quota'),
-                        SizedBox(
-                          height: 200,
-                          child: PieChart(_buildQuotaChartData(quota)),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ).padding(horizontal: 8),
-        ),
-        const SliverGap(8),
-        SliverToBoxAdapter(
-          child: _buildFilters(ref, selectedPool, includeRecycled),
-        ),
-        const SliverGap(8),
-        PagingHelperSliverView(
-          provider: cloudFileListNotifierProvider,
-          futureRefreshable: cloudFileListNotifierProvider.future,
-          notifierRefreshable: cloudFileListNotifierProvider.notifier,
-          contentBuilder:
-              (data, widgetCount, endItemView) => SliverList.builder(
-                itemCount: widgetCount,
-                itemBuilder: (context, index) {
-                  if (index == widgetCount - 1) {
-                    return endItemView;
-                  }
-
-                  final item = data.items[index];
-                  final itemType = item.mimeType?.split('/').firstOrNull;
-                  return ListTile(
-                    leading: ClipRRect(
-                      borderRadius: const BorderRadius.all(Radius.circular(8)),
-                      child: SizedBox(
-                        height: 48,
-                        width: 48,
-                        child: switch (itemType) {
-                          'image' => CloudImageWidget(file: item),
-                          'audio' =>
-                            const Icon(Symbols.audio_file, fill: 1).center(),
-                          'video' =>
-                            const Icon(Symbols.video_file, fill: 1).center(),
-                          _ =>
-                            const Icon(Symbols.body_system, fill: 1).center(),
-                        },
-                      ),
-                    ),
-                    title:
-                        item.name.isEmpty
-                            ? Text('untitled').tr().italic()
-                            : Text(
-                              item.name,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                    subtitle: Text(formatFileSize(item.size)),
-                    onTap: () {
-                      showModalBottomSheet(
-                        useRootNavigator: true,
-                        context: context,
-                        isScrollControlled: true,
-                        builder: (context) => FileInfoSheet(item: item),
-                      );
-                    },
-                    trailing: IconButton(
-                      icon: const Icon(Symbols.delete),
-                      onPressed: () async {
-                        final confirmed = await showConfirmAlert(
-                          'confirmDeleteFile'.tr(),
-                          'deleteFile'.tr(),
-                        );
-                        if (!confirmed) return;
-
-                        if (context.mounted) showLoadingModal(context);
-                        try {
-                          final client = ref.read(apiClientProvider);
-                          await client.delete('/drive/files/${item.id}');
-                          ref.invalidate(cloudFileListNotifierProvider);
-                        } catch (e) {
-                          showSnackBar('failedToDeleteFile'.tr());
-                        } finally {
-                          if (context.mounted) hideLoadingModal(context);
-                        }
-                      },
-                    ),
-                  );
-                },
-              ),
-        ),
-      ],
-    );
-  }
-
-  PieChartData _buildPoolChartData(Map<String, dynamic> usage) {
-    final pools = usage['pool_usages'] as List<dynamic>;
-    final colors = [
-      Colors.blue,
-      Colors.green,
-      Colors.orange,
-      Colors.red,
-      Colors.purple,
-    ];
-    return PieChartData(
-      sections:
-          pools.asMap().entries.map((entry) {
-            final pool = entry.value as Map<String, dynamic>;
-            final title = pool['pool_name'] as String;
-            final truncatedTitle =
-                title.length > 8 ? '${title.substring(0, 8)}...' : title;
-            return PieChartSectionData(
-              value: (pool['usage_bytes'] as num).toDouble(),
-              title: truncatedTitle,
-              color: colors[entry.key % colors.length],
-              radius: 60,
-              titleStyle: const TextStyle(
-                fontSize: 12,
-                color: Colors.white,
-                fontWeight: FontWeight.bold,
-              ),
-            );
-          }).toList(),
-    );
-  }
-
-  PieChartData _buildQuotaChartData(Map<String, dynamic>? quota) {
-    if (quota == null) return PieChartData(sections: []);
-    return PieChartData(
-      sections: [
-        PieChartSectionData(
-          value: (quota['based_quota'] as num).toDouble(),
-          title: 'Base',
-          color: Colors.green,
-          radius: 60,
-          titleStyle: const TextStyle(
-            fontSize: 12,
-            color: Colors.white,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-        PieChartSectionData(
-          value: (quota['extra_quota'] as num).toDouble(),
-          title: 'Extra',
-          color: Colors.orange,
-          radius: 60,
-          titleStyle: const TextStyle(
-            fontSize: 12,
-            color: Colors.white,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildFilters(
-    WidgetRef ref,
-    ValueNotifier<String?> selectedPool,
-    ValueNotifier<bool> includeRecycled,
-  ) {
-    final poolsAsync = ref.watch(poolsProvider);
-
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              'filters'.tr(),
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-            ),
-            const Gap(16),
-            LayoutBuilder(
-              builder: (context, constraints) {
-                final isWide = constraints.maxWidth > 600;
-                return isWide
-                    ? Row(
-                      children: [
-                        Expanded(
-                          flex: 2,
-                          child: poolsAsync.when(
-                            data:
-                                (pools) => DropdownButtonFormField<String?>(
-                                  value: selectedPool.value,
-                                  decoration: InputDecoration(
-                                    labelText: 'Pool',
-                                    border: const OutlineInputBorder(),
-                                  ),
-                                  items: [
-                                    DropdownMenuItem<String?>(
-                                      value: null,
-                                      child: Text('allPools'.tr()),
-                                    ),
-                                    ...pools.map(
-                                      (pool) => DropdownMenuItem<String?>(
-                                        value: pool.id,
-                                        child: Text(pool.name),
-                                      ),
-                                    ),
-                                  ],
-                                  onChanged:
-                                      (value) => selectedPool.value = value,
-                                ),
-                            loading: () => const CircularProgressIndicator(),
-                            error: (e, _) => const Text('Error loading pools'),
-                          ),
-                        ),
-                        const Gap(8),
-                        Expanded(
-                          child: Row(
-                            children: [
-                              Text('includeRecycled'.tr()),
-                              const Gap(8),
-                              Switch(
-                                value: includeRecycled.value,
-                                onChanged:
-                                    (value) => includeRecycled.value = value,
-                                padding: EdgeInsets.zero,
-                              ),
-                            ],
-                          ),
-                        ),
-                        const Gap(16),
-                        IconButton(
-                          icon: const Icon(Symbols.delete_sweep),
-                          tooltip: 'deleteRecycledFiles'.tr(),
-                          onPressed:
-                              includeRecycled.value
-                                  ? () => _deleteRecycledFiles(ref)
-                                  : null,
-                        ),
-                      ],
-                    )
-                    : Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        poolsAsync.when(
-                          data:
-                              (pools) => DropdownButtonFormField<String?>(
-                                value: selectedPool.value,
-                                decoration: const InputDecoration(
-                                  labelText: 'Pool',
-                                  border: OutlineInputBorder(),
-                                ),
-                                items: [
-                                  DropdownMenuItem<String?>(
-                                    value: null,
-                                    child: Text('allPools'.tr()),
-                                  ),
-                                  ...pools.map(
-                                    (pool) => DropdownMenuItem<String?>(
-                                      value: pool.id,
-                                      child: Text(pool.name),
-                                    ),
-                                  ),
-                                ],
-                                onChanged:
-                                    (value) => selectedPool.value = value,
-                              ),
-                          loading: () => const CircularProgressIndicator(),
-                          error: (e, _) => const Text('Error loading pools'),
-                        ),
-                        const Gap(16),
-                        Row(
-                          children: [
-                            Text('includeRecycled'.tr()),
-                            const Gap(8),
-                            Switch(
-                              value: includeRecycled.value,
-                              onChanged:
-                                  (value) => includeRecycled.value = value,
-                            ),
-                            const Spacer(),
-                            IconButton(
-                              icon: const Icon(Symbols.delete_sweep),
-                              tooltip: 'deleteRecycledFiles'.tr(),
-                              onPressed:
-                                  includeRecycled.value
-                                      ? () => _deleteRecycledFiles(ref)
-                                      : null,
-                            ),
-                          ],
-                        ),
-                      ],
-                    );
-              },
-            ),
-          ],
-        ),
-      ),
-    ).padding(horizontal: 8);
-  }
-
-  Future<void> _deleteRecycledFiles(WidgetRef ref) async {
-    final confirmed = await showConfirmAlert(
-      'confirmDeleteRecycledFiles'.tr(),
-      'deleteRecycledFiles'.tr(),
-    );
-    if (!confirmed) return;
-
-    if (ref.context.mounted) showLoadingModal(ref.context);
     try {
-      final client = ref.read(apiClientProvider);
+      final result = await FilePicker.platform.pickFiles(
-      await client.delete('/drive/files/recycled');
+        allowMultiple: true,
-      ref.invalidate(cloudFileListNotifierProvider);
+        withData: false,
-      showSnackBar('recycledFilesDeleted'.tr());
+      );
+
+      if (result != null && result.files.isNotEmpty) {
+        for (final file in result.files) {
+          if (file.path != null) {
+            // Create UniversalFile from the picked file
+            final universalFile = UniversalFile(
+              data: XFile(file.path!),
+              type: UniversalFileType.file,
+              displayName: file.name,
+            );
+
+            // Upload the file with the current path
+            final completer = FileUploader.createCloudFile(
+              fileData: universalFile,
+              ref: ref,
+              path: currentPath,
+              onProgress: (progress, _) {
+                // Progress is handled by the upload tasks system
+                if (progress != null) {
+                  debugPrint('Upload progress: ${(progress * 100).toInt()}%');
+                }
+              },
+            );
+
+            completer.future
+                .then((uploadedFile) {
+                  if (uploadedFile != null) {
+                    ref.invalidate(cloudFileListNotifierProvider);
+                  }
+                })
+                .catchError((error) {
+                  showSnackBar('Failed to upload file: $error');
+                });
+          }
+        }
+      }
     } catch (e) {
-      showSnackBar('failedToDeleteRecycledFiles'.tr());
+      showSnackBar('Error picking file: $e');
-    } finally {
-      if (ref.context.mounted) hideLoadingModal(ref.context);
     }
   }
 
-  Widget _buildStatCard(String label, String value, {double? progress}) {
+  Future<void> _showCreateDirectoryDialog(
-    return Card(
+    BuildContext context,
-      child: Padding(
+    ValueNotifier<String> currentPath,
-        padding: const EdgeInsets.all(16),
+  ) async {
-        child: Column(
+    final controller = TextEditingController(text: currentPath.value);
-          mainAxisAlignment: MainAxisAlignment.center,
+    String? newPath;
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+
-          children: [
+    void handleChangeDirectory(BuildContext context) {
-            Text(label, style: const TextStyle(fontSize: 14)),
+      newPath = controller.text.trim();
-            Row(
+      if (newPath!.isNotEmpty) {
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        // Normalize the path
+        String fullPath = newPath!;
+
+        // Ensure it starts with /
+        if (!fullPath.startsWith('/')) {
+          fullPath = '/$fullPath';
+        }
+
+        // Remove double slashes and normalize
+        fullPath = fullPath.replaceAll(RegExp(r'/+'), '/');
+
+        currentPath.value = fullPath;
+        Navigator.of(context).pop();
+      }
+    }
+
+    await showDialog(
+      context: context,
+      builder:
+          (context) => AlertDialog(
+            title: const Text('Navigate to Directory'),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
+                const Gap(8),
-                  value,
+                TextField(
-                  style: const TextStyle(
+                  controller: controller,
-                    fontSize: 24,
+                  decoration: const InputDecoration(
-                    fontWeight: FontWeight.bold,
+                    labelText: 'Directory path',
+                    hintText: 'e.g., documents, projects/my-app',
+                    helperText:
+                        'Enter a directory path. The directory will be created when you upload files to it.',
+                    helperMaxLines: 3,
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(12)),
+                    ),
                   ),
+                  onSubmitted: (_) {
+                    handleChangeDirectory(context);
+                  },
                 ),
-                if (progress != null) ...[
-                  const SizedBox(height: 8),
-                  SizedBox(
-                    width: 28,
-                    height: 28,
-                    child: CircularProgressIndicator(value: progress),
-                  ),
-                ],
               ],
             ),
-          ],
+            actions: [
-        ),
+              TextButton(
-      ),
+                onPressed: () => Navigator.of(context).pop(),
+                child: const Text('Cancel'),
+              ),
+              TextButton.icon(
+                onPressed: () => handleChangeDirectory(context),
+                label: const Text('Go to Directory'),
+                icon: const Icon(Symbols.arrow_right_alt),
+              ),
+            ],
+          ),
+    );
+  }
+
+  void _showUsageSheet(
+    BuildContext context,
+    Map<String, dynamic>? usage,
+    Map<String, dynamic>? quota,
+  ) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder:
+          (context) => SheetScaffold(
+            titleText: 'Usage Overview',
+            child: UsageOverviewWidget(usage: usage, quota: quota),
+          ),
     );
   }
 }

lib/screens/posts/compose_article.dart

@@ -306,7 +306,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
                         ],
                       ),
                       children: [
-                        ValueListenableBuilder<Map<int, double>>(
+                        ValueListenableBuilder<Map<int, double?>>(
                           valueListenable: state.attachmentProgress,
                           builder: (context, progressMap, _) {
                             return Wrap(

lib/screens/realm/realm_form.dart

@@ -92,7 +92,7 @@ class EditRealmScreen extends HookConsumerWidget {
       try {
         final cloudFile =
             await FileUploader.createCloudFile(
-              client: ref.read(apiClientProvider),
+              ref: ref,
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/tabs.dart

@@ -5,8 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/navigation/conditional_bottom_nav.dart';
 import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -21,6 +23,7 @@ const kTabRoutes = [
   '/chat',
   '/realms',
   '/account',
+  '/files',
   '/creators',
   '/developers',
 ];
@@ -66,19 +69,36 @@ class TabsScreen extends HookConsumerWidget {
         icon: Badge.count(
           count: notificationUnreadCount.value ?? 0,
           isLabelVisible: (notificationUnreadCount.value ?? 0) > 0,
-          child: const Icon(Symbols.person_rounded),
+          child: Consumer(
+            child: const Icon(Symbols.account_circle_rounded),
+            builder: (context, ref, fallbackChild) {
+              final userInfo = ref.watch(userInfoProvider);
+              if (userInfo.value?.profile.picture != null) {
+                return ProfilePictureWidget(
+                  file: userInfo.value!.profile.picture,
+                  radius: 12,
+                );
+              }
+              return fallbackChild!;
+            },
+          ),
         ),
       ),
       if (wideScreen)
-        NavigationDestination(
+        ...([
-          label: 'creatorHub'.tr(),
+          NavigationDestination(
-          icon: const Icon(Symbols.design_services_rounded),
+            label: 'files'.tr(),
-        ),
+            icon: const Icon(Symbols.folder_rounded),
-      if (wideScreen)
+          ),
-        NavigationDestination(
+          NavigationDestination(
-          label: 'developerHub'.tr(),
+            label: 'creatorHub'.tr(),
-          icon: const Icon(Symbols.data_object_rounded),
+            icon: const Icon(Symbols.design_services_rounded),
-        ),
+          ),
+          NavigationDestination(
+            label: 'developerHub'.tr(),
+            icon: const Icon(Symbols.data_object_rounded),
+          ),
+        ]),
     ];
 
     int getCurrentIndex() {

lib/screens/thought/think.dart

@@ -1,6 +1,3 @@
-import "dart:convert";
-import "dart:math" as math;
-import "package:dio/dio.dart";
 import "package:easy_localization/easy_localization.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
@@ -9,15 +6,11 @@ import "package:riverpod_annotation/riverpod_annotation.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:island/models/thought.dart";
 import "package:island/pods/network.dart";
-import "package:island/pods/userinfo.dart";
-import "package:island/widgets/alert.dart";
 import "package:island/widgets/app_scaffold.dart";
 import "package:island/widgets/response.dart";
 import "package:island/widgets/thought/thought_sequence_list.dart";
 import "package:island/widgets/thought/thought_shared.dart";
 import "package:material_symbols_icons/material_symbols_icons.dart";
-import "package:super_sliver_list/super_sliver_list.dart";
-import "package:collection/collection.dart";
 
 part 'think.g.dart';
 
@@ -46,203 +39,18 @@ class ThoughtScreen extends HookConsumerWidget {
             ? ref.watch(thoughtSequenceProvider(selectedSequenceId.value!))
             : const AsyncValue<List<SnThinkingThought>>.data([]);
 
-    final localThoughts = useState<List<SnThinkingThought>>([]);
+    // Get initial thoughts and topic from provider
-    final currentTopic = useState<String?>('aiThought'.tr());
+    final initialThoughts = thoughts.valueOrNull;
-
+    final initialTopic =
-    final messageController = useTextEditingController();
+        (initialThoughts?.isNotEmpty ?? false) &&
-    final scrollController = useScrollController();
+                initialThoughts!.first.sequence?.topic != null
-    final isStreaming = useState(false);
+            ? initialThoughts.first.sequence!.topic
-    final streamingText = useState<String>('');
+            : 'aiThought'.tr();
-    final functionCalls = useState<List<String>>([]);
-    final reasoningChunks = useState<List<String>>([]);
-
-    final listController = useMemoized(() => ListController(), []);
-
-    // Scroll animation notifiers
-    final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
-
-    // Update local thoughts when provider data changes
-    useEffect(() {
-      thoughts.whenData((data) {
-        // Server returns messages in DESC order (newest first), keep as-is for UI
-        localThoughts.value = data;
-        // Update topic from the first thought's sequence
-        if (data.isNotEmpty && data.first.sequence?.topic != null) {
-          currentTopic.value = data.first.sequence!.topic;
-        } else {
-          currentTopic.value = 'aiThought'.tr();
-        }
-      });
-      return null;
-    }, [thoughts]);
-
-    // Scroll to bottom when thoughts change or streaming state changes
-    useEffect(() {
-      if (localThoughts.value.isNotEmpty || isStreaming.value) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          scrollController.animateTo(
-            0,
-            duration: const Duration(milliseconds: 300),
-            curve: Curves.easeOut,
-          );
-        });
-      }
-      return null;
-    }, [localThoughts.value.length, isStreaming.value]);
-
-    // Add scroll listener for gradient animations
-    useEffect(() {
-      void onScroll() {
-        // Update gradient animations
-        final pixels = scrollController.position.pixels;
-
-        // Bottom gradient: appears when not at bottom (pixels > 0)
-        bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
-      }
-
-      scrollController.addListener(onScroll);
-      return () => scrollController.removeListener(onScroll);
-    }, [scrollController]);
-
-    void sendMessage() async {
-      if (messageController.text.trim().isEmpty) return;
-
-      final userMessage = messageController.text.trim();
-
-      // Add user message to local thoughts
-      final userInfo = ref.read(userInfoProvider);
-      final now = DateTime.now();
-      final userThought = SnThinkingThought(
-        id: 'user-${DateTime.now().millisecondsSinceEpoch}',
-        content: userMessage,
-        files: [],
-        role: ThinkingThoughtRole.user,
-        sequenceId: selectedSequenceId.value ?? '',
-        createdAt: now,
-        updatedAt: now,
-        sequence:
-            selectedSequenceId.value != null
-                ? thoughts.value?.firstOrNull?.sequence ??
-                    SnThinkingSequence(
-                      id: selectedSequenceId.value!,
-                      accountId: '',
-                      createdAt: now,
-                      updatedAt: now,
-                    )
-                : SnThinkingSequence(
-                  id: '',
-                  accountId: userInfo.value!.id,
-                  createdAt: now,
-                  updatedAt: now,
-                ),
-      );
-      localThoughts.value = [userThought, ...localThoughts.value];
-
-      final request = StreamThinkingRequest(
-        userMessage: userMessage,
-        sequenceId: selectedSequenceId.value,
-        accpetProposals: ['post_create'],
-        attachedMessages: [], // Message datas
-        attachedPosts: [], // ID list for posts
-      );
-
-      try {
-        isStreaming.value = true;
-        streamingText.value = '';
-        functionCalls.value = [];
-        reasoningChunks.value = [];
-
-        final apiClient = ref.read(apiClientProvider);
-        final response = await apiClient.post(
-          '/insight/thought',
-          data: request.toJson(),
-          options: Options(
-            responseType: ResponseType.stream,
-            sendTimeout: Duration(minutes: 1),
-            receiveTimeout: Duration(minutes: 1),
-          ),
-        );
-
-        final stream = response.data.stream;
-        final lineBuffer = StringBuffer();
-
-        stream.listen(
-          (data) {
-            final chunk = utf8.decode(data);
-            lineBuffer.write(chunk);
-            final lines = lineBuffer.toString().split('\n');
-            lineBuffer.clear();
-            lineBuffer.write(lines.last); // keep incomplete line
-
-            for (final line in lines.sublist(0, lines.length - 1)) {
-              if (line.trim().isEmpty) continue;
-              try {
-                if (line.startsWith('data: ')) {
-                  final jsonStr = line.substring(6);
-                  final event = jsonDecode(jsonStr);
-                  final type = event['type'];
-                  final eventData = event['data'];
-                  if (type == 'text') {
-                    streamingText.value += eventData;
-                  } else if (type == 'function_call') {
-                    functionCalls.value = [
-                      ...functionCalls.value,
-                      JsonEncoder.withIndent('  ').convert(eventData),
-                    ];
-                  } else if (type == 'reasoning') {
-                    reasoningChunks.value = [
-                      ...reasoningChunks.value,
-                      eventData,
-                    ];
-                  }
-                } else if (line.startsWith('topic: ')) {
-                  final jsonStr = line.substring(7);
-                  final event = jsonDecode(jsonStr);
-                  currentTopic.value = event['data'];
-                } else if (line.startsWith('thought: ')) {
-                  final jsonStr = line.substring(9);
-                  final event = jsonDecode(jsonStr);
-                  final aiThought = SnThinkingThought.fromJson(event['data']);
-                  localThoughts.value = [aiThought, ...localThoughts.value];
-                  if (selectedSequenceId.value == null &&
-                      aiThought.sequenceId.isNotEmpty) {
-                    selectedSequenceId.value = aiThought.sequenceId;
-                  }
-                  isStreaming.value = false;
-                }
-              } catch (e) {
-                // Ignore parsing errors for individual events
-              }
-            }
-          },
-          onDone: () {
-            if (isStreaming.value) {
-              isStreaming.value = false;
-              showErrorAlert('thoughtParseError'.tr());
-            }
-          },
-          onError: (error) {
-            isStreaming.value = false;
-            if (error is DioException && error.response?.data is ResponseBody) {
-              showErrorAlert('toughtParseError'.tr());
-            } else {
-              showErrorAlert(error);
-            }
-          },
-        );
-
-        messageController.clear();
-        FocusManager.instance.primaryFocus?.unfocus();
-      } catch (error) {
-        isStreaming.value = false;
-        showErrorAlert(error);
-      }
-    }
 
     return AppScaffold(
       isNoBackground: false,
       appBar: AppBar(
-        title: Text(currentTopic.value ?? 'aiThought'.tr()),
+        title: Text(initialTopic ?? 'aiThought'.tr()),
         actions: [
           IconButton(
             icon: const Icon(Symbols.history),
@@ -259,137 +67,28 @@ class ThoughtScreen extends HookConsumerWidget {
               );
             },
           ),
-          if (localThoughts.value.isNotEmpty &&
+          // TODO: Need to access chat state for actions
-              !isStreaming.value &&
-              localThoughts.value.last.role == ThinkingThoughtRole.assistant)
-            IconButton(
-              icon: const Icon(Symbols.add),
-              tooltip: 'thoughtNewConversation'.tr(),
-              onPressed: () {
-                // Clear current conversation and start new one
-                selectedSequenceId.value = null;
-                localThoughts.value = [];
-                currentTopic.value = 'aiThought'.tr();
-                messageController.clear();
-              },
-            ),
           const Gap(8),
         ],
       ),
-      body: Stack(
+      body: thoughts.when(
-        children: [
+        data:
-          // Thoughts list
+            (thoughtList) => ThoughtChatInterface(
-          Center(
+              initialThoughts: thoughtList,
-            child: Container(
+              initialTopic: initialTopic,
-              constraints: BoxConstraints(maxWidth: 640),
-              child: Column(
-                children: [
-                  Expanded(
-                    child: thoughts.when(
-                      data:
-                          (thoughtList) => SuperListView.builder(
-                            listController: listController,
-                            controller: scrollController,
-                            padding: EdgeInsets.only(
-                              top: 16,
-                              bottom:
-                                  MediaQuery.of(context).padding.bottom +
-                                  80, // Leave space for thought input
-                            ),
-                            reverse: true,
-                            itemCount:
-                                localThoughts.value.length +
-                                (isStreaming.value ? 1 : 0),
-                            itemBuilder: (context, index) {
-                              if (isStreaming.value && index == 0) {
-                                return ThoughtItem(
-                                  isStreaming: true,
-                                  streamingText: streamingText.value,
-                                  reasoningChunks: reasoningChunks.value,
-                                  streamingFunctionCalls: functionCalls.value,
-                                );
-                              }
-                              final thoughtIndex =
-                                  isStreaming.value ? index - 1 : index;
-                              final thought = localThoughts.value[thoughtIndex];
-                              return ThoughtItem(
-                                thought: thought,
-                                thoughtIndex: thoughtIndex,
-                              );
-                            },
-                          ),
-                      loading:
-                          () =>
-                              const Center(child: CircularProgressIndicator()),
-                      error:
-                          (error, _) => ResponseErrorWidget(
-                            error: error,
-                            onRetry:
-                                () =>
-                                    selectedSequenceId.value != null
-                                        ? ref.invalidate(
-                                          thoughtSequenceProvider(
-                                            selectedSequenceId.value!,
-                                          ),
-                                        )
-                                        : null,
-                          ),
-                    ),
-                  ),
-                ],
-              ),
             ),
-          ),
+        loading: () => const Center(child: CircularProgressIndicator()),
-          // Bottom gradient - appears when scrolling towards newer thoughts (behind thought input)
+        error:
-          AnimatedBuilder(
+            (error, _) => ResponseErrorWidget(
-            animation: bottomGradientNotifier.value,
+              error: error,
-            builder:
+              onRetry:
-                (context, child) => Positioned(
+                  () =>
-                  left: 0,
+                      selectedSequenceId.value != null
-                  right: 0,
+                          ? ref.invalidate(
-                  bottom: 0,
+                            thoughtSequenceProvider(selectedSequenceId.value!),
-                  child: Opacity(
+                          )
-                    opacity: bottomGradientNotifier.value.value,
+                          : null,
-                    child: Container(
-                      height: math.min(
-                        MediaQuery.of(context).size.height * 0.1,
-                        128,
-                      ),
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.bottomCenter,
-                          end: Alignment.topCenter,
-                          colors: [
-                            Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainer.withOpacity(0.8),
-                            Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainer.withOpacity(0.0),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-          ),
-          // Thought Input positioned above gradient (higher z-index)
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0, // At the very bottom, above gradient
-            child: Center(
-              child: Container(
-                constraints: BoxConstraints(maxWidth: 640),
-                child: ThoughtInput(
-                  messageController: messageController,
-                  isStreaming: isStreaming.value,
-                  onSend: sendMessage,
-                ),
-              ),
             ),
-          ),
-        ],
       ),
     );
   }

lib/screens/thought/think_sheet.dart

@@ -1,17 +1,8 @@
-import "dart:convert";
-import "dart:math" as math;
-import "package:dio/dio.dart";
 import "package:easy_localization/easy_localization.dart";
 import "package:flutter/material.dart";
-import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:island/models/thought.dart";
-import "package:island/pods/network.dart";
-import "package:island/pods/userinfo.dart";
-import "package:island/widgets/alert.dart";
 import "package:island/widgets/content/sheet.dart";
 import "package:island/widgets/thought/thought_shared.dart";
-import "package:super_sliver_list/super_sliver_list.dart";
 
 class ThoughtSheet extends HookConsumerWidget {
   final List<Map<String, dynamic>> attachedMessages;
@@ -42,275 +33,17 @@ class ThoughtSheet extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final sequenceId = useState<String?>(null);
+    final chatState = useThoughtChat(
-    final localThoughts = useState<List<SnThinkingThought>>([]);
+      ref,
-    final currentTopic = useState<String?>('aiThought'.tr());
+      attachedMessages: attachedMessages,
-
+      attachedPosts: attachedPosts,
-    final messageController = useTextEditingController();
+    );
-    final scrollController = useScrollController();
-    final isStreaming = useState(false);
-    final streamingText = useState<String>('');
-    final functionCalls = useState<List<String>>([]);
-    final reasoningChunks = useState<List<String>>([]);
-
-    final listController = useMemoized(() => ListController(), []);
-
-    // Scroll animation notifiers
-    final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
-
-    // Scroll to bottom when thoughts change or streaming state changes
-    useEffect(() {
-      if (localThoughts.value.isNotEmpty || isStreaming.value) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          scrollController.animateTo(
-            0,
-            duration: const Duration(milliseconds: 300),
-            curve: Curves.easeOut,
-          );
-        });
-      }
-      return null;
-    }, [localThoughts.value.length, isStreaming.value]);
-
-    // Add scroll listener for gradient animations
-    useEffect(() {
-      void onScroll() {
-        // Update gradient animations
-        final pixels = scrollController.position.pixels;
-
-        // Bottom gradient: appears when not at bottom (pixels > 0)
-        bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
-      }
-
-      scrollController.addListener(onScroll);
-      return () => scrollController.removeListener(onScroll);
-    }, [scrollController]);
-
-    void sendMessage() async {
-      if (messageController.text.trim().isEmpty) return;
-
-      final userMessage = messageController.text.trim();
-
-      // Add user message to local thoughts
-      final userInfo = ref.read(userInfoProvider);
-      final now = DateTime.now();
-      final userThought = SnThinkingThought(
-        id: 'user-${DateTime.now().millisecondsSinceEpoch}',
-        content: userMessage,
-        files: [],
-        role: ThinkingThoughtRole.user,
-        sequenceId: sequenceId.value ?? '',
-        createdAt: now,
-        updatedAt: now,
-        sequence: SnThinkingSequence(
-          id: sequenceId.value ?? '',
-          accountId: userInfo.value!.id,
-          createdAt: now,
-          updatedAt: now,
-        ),
-      );
-      localThoughts.value = [userThought, ...localThoughts.value];
-
-      final request = StreamThinkingRequest(
-        userMessage: userMessage,
-        sequenceId: sequenceId.value,
-        accpetProposals: ['post_create'],
-        attachedMessages: attachedMessages,
-        attachedPosts: attachedPosts,
-      );
-
-      try {
-        isStreaming.value = true;
-        streamingText.value = '';
-        functionCalls.value = [];
-        reasoningChunks.value = [];
-
-        final apiClient = ref.read(apiClientProvider);
-        final response = await apiClient.post(
-          '/insight/thought',
-          data: request.toJson(),
-          options: Options(
-            responseType: ResponseType.stream,
-            sendTimeout: Duration(minutes: 1),
-            receiveTimeout: Duration(minutes: 1),
-          ),
-        );
-
-        final stream = response.data.stream;
-        final lineBuffer = StringBuffer();
-
-        stream.listen(
-          (data) {
-            final chunk = utf8.decode(data);
-            lineBuffer.write(chunk);
-            final lines = lineBuffer.toString().split('\n');
-            lineBuffer.clear();
-            lineBuffer.write(lines.last); // keep incomplete line
-
-            for (final line in lines.sublist(0, lines.length - 1)) {
-              if (line.trim().isEmpty) continue;
-              try {
-                if (line.startsWith('data: ')) {
-                  final jsonStr = line.substring(6);
-                  final event = jsonDecode(jsonStr);
-                  final type = event['type'];
-                  final eventData = event['data'];
-                  if (type == 'text') {
-                    streamingText.value += eventData;
-                  } else if (type == 'function_call') {
-                    functionCalls.value = [
-                      ...functionCalls.value,
-                      JsonEncoder.withIndent('  ').convert(eventData),
-                    ];
-                  } else if (type == 'reasoning') {
-                    reasoningChunks.value = [
-                      ...reasoningChunks.value,
-                      eventData,
-                    ];
-                  }
-                } else if (line.startsWith('topic: ')) {
-                  final jsonStr = line.substring(7);
-                  final event = jsonDecode(jsonStr);
-                  currentTopic.value = event['data'];
-                } else if (line.startsWith('thought: ')) {
-                  final jsonStr = line.substring(9);
-                  final event = jsonDecode(jsonStr);
-                  final aiThought = SnThinkingThought.fromJson(event['data']);
-                  localThoughts.value = [aiThought, ...localThoughts.value];
-                  if (sequenceId.value == null &&
-                      aiThought.sequenceId.isNotEmpty) {
-                    sequenceId.value = aiThought.sequenceId;
-                  }
-                  isStreaming.value = false;
-                }
-              } catch (e) {
-                // Ignore parsing errors for individual events
-              }
-            }
-          },
-          onDone: () {
-            if (isStreaming.value) {
-              isStreaming.value = false;
-              showErrorAlert('thoughtParseError'.tr());
-            }
-          },
-          onError: (error) {
-            isStreaming.value = false;
-            if (error is DioException && error.response?.data is ResponseBody) {
-              showErrorAlert('toughtParseError'.tr());
-            } else {
-              showErrorAlert(error);
-            }
-          },
-        );
-
-        messageController.clear();
-        FocusManager.instance.primaryFocus?.unfocus();
-      } catch (error) {
-        isStreaming.value = false;
-        showErrorAlert(error);
-      }
-    }
 
     return SheetScaffold(
-      titleText: currentTopic.value ?? 'aiThought'.tr(),
+      titleText: chatState.currentTopic.value ?? 'aiThought'.tr(),
-      child: Stack(
+      child: ThoughtChatInterface(
-        children: [
+        attachedMessages: attachedMessages,
-          // Thoughts list
+        attachedPosts: attachedPosts,
-          Center(
-            child: Container(
-              constraints: BoxConstraints(maxWidth: 640),
-              child: Column(
-                children: [
-                  Expanded(
-                    child: SuperListView.builder(
-                      listController: listController,
-                      controller: scrollController,
-                      padding: EdgeInsets.only(
-                        top: 16,
-                        bottom:
-                            MediaQuery.of(context).padding.bottom +
-                            80, // Leave space for thought input
-                      ),
-                      reverse: true,
-                      itemCount:
-                          localThoughts.value.length +
-                          (isStreaming.value ? 1 : 0),
-                      itemBuilder: (context, index) {
-                        if (isStreaming.value && index == 0) {
-                          return ThoughtItem(
-                            isStreaming: true,
-                            streamingText: streamingText.value,
-                            reasoningChunks: reasoningChunks.value,
-                            streamingFunctionCalls: functionCalls.value,
-                          );
-                        }
-                        final thoughtIndex =
-                            isStreaming.value ? index - 1 : index;
-                        final thought = localThoughts.value[thoughtIndex];
-                        return ThoughtItem(
-                          thought: thought,
-                          thoughtIndex: thoughtIndex,
-                        );
-                      },
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-          // Bottom gradient - appears when scrolling towards newer thoughts (behind thought input)
-          AnimatedBuilder(
-            animation: bottomGradientNotifier.value,
-            builder:
-                (context, child) => Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  child: Opacity(
-                    opacity: bottomGradientNotifier.value.value,
-                    child: Container(
-                      height: math.min(
-                        MediaQuery.of(context).size.height * 0.1,
-                        128,
-                      ),
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.bottomCenter,
-                          end: Alignment.topCenter,
-                          colors: [
-                            Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainer.withOpacity(0.8),
-                            Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainer.withOpacity(0.0),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-          ),
-          // Thought Input positioned above gradient (higher z-index)
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0, // At the very bottom, above gradient
-            child: Center(
-              child: Container(
-                constraints: BoxConstraints(maxWidth: 640),
-                child: ThoughtInput(
-                  messageController: messageController,
-                  isStreaming: isStreaming.value,
-                  onSend: sendMessage,
-                  attachedMessages: attachedMessages,
-                  attachedPosts: attachedPosts,
-                ),
-              ),
-            ),
-          ),
-        ],
       ),
     );
   }

lib/services/file_uploader.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:convert/convert.dart';
 import 'package:cross_file/cross_file.dart';
 import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
@@ -6,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/pods/upload_tasks.dart';
 import 'package:mime/mime.dart';
 import 'package:native_exif/native_exif.dart';
 import 'package:path/path.dart' show extension;
@@ -21,9 +23,51 @@ class FileUploader {
     return digest.toString();
   }
 
+  /// Calculates the MD5 hash from a stream.
+  Future<String> _calculateFileHashFromStream(Stream<List<int>> stream) async {
+    final accumulator = AccumulatorSink<Digest>();
+    final converter = md5.startChunkedConversion(accumulator);
+    await for (final chunk in stream) {
+      converter.add(chunk);
+    }
+    converter.close();
+    final digest = accumulator.events.single;
+    return digest.toString();
+  }
+
+  /// Reads the next chunk from a stream subscription.
+  Future<Uint8List> _readNextChunk(
+    StreamSubscription<List<int>> subscription,
+    int size,
+  ) async {
+    final completer = Completer<Uint8List>();
+    final buffer = <int>[];
+    int remaining = size;
+
+    void onData(List<int> data) {
+      buffer.addAll(data);
+      remaining -= data.length;
+      if (remaining <= 0) {
+        subscription.pause();
+        completer.complete(Uint8List.fromList(buffer.sublist(0, size)));
+      }
+    }
+
+    void onDone() {
+      if (!completer.isCompleted) {
+        completer.complete(Uint8List.fromList(buffer));
+      }
+    }
+
+    subscription.onData(onData);
+    subscription.onDone(onDone);
+
+    return completer.future;
+  }
+
   /// Creates an upload task for the given file.
   Future<Map<String, dynamic>> createUploadTask({
-    required Uint8List bytes,
+    required dynamic fileData,
     required String fileName,
     required String contentType,
     String? poolId,
@@ -31,9 +75,19 @@ class FileUploader {
     String? encryptPassword,
     String? expiredAt,
     int? chunkSize,
+    String? path,
   }) async {
-    final hash = _calculateFileHash(bytes);
+    String hash;
-    final fileSize = bytes.length;
+    int fileSize;
+    if (fileData is XFile) {
+      fileSize = await fileData.length();
+      hash = await _calculateFileHashFromStream(fileData.openRead());
+    } else if (fileData is Uint8List) {
+      hash = _calculateFileHash(fileData);
+      fileSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
 
     final response = await _client.post(
       '/drive/files/upload/create',
@@ -47,6 +101,7 @@ class FileUploader {
         'encrypt_password': encryptPassword,
         'expired_at': expiredAt,
         'chunk_size': chunkSize,
+        'path': path,
       },
     );
 
@@ -58,6 +113,7 @@ class FileUploader {
     required String taskId,
     required int chunkIndex,
     required Uint8List chunkData,
+    ProgressCallback? onSendProgress,
   }) async {
     final formData = FormData.fromMap({
       'chunk': MultipartFile.fromBytes(
@@ -69,19 +125,26 @@ class FileUploader {
     await _client.post(
       '/drive/files/upload/chunk/$taskId/$chunkIndex',
       data: formData,
+      onSendProgress: onSendProgress,
     );
   }
 
   /// Completes the upload and returns the CloudFile object.
   Future<SnCloudFile> completeUpload(String taskId) async {
-    final response = await _client.post('/drive/files/upload/complete/$taskId');
+    final response = await _client.post(
+      '/drive/files/upload/complete/$taskId',
+      options: Options(
+        sendTimeout: Duration(minutes: 1),
+        receiveTimeout: Duration(minutes: 1),
+      ),
+    );
 
     return SnCloudFile.fromJson(response.data);
   }
 
   /// Uploads a file in chunks using the multi-part API.
   Future<SnCloudFile> uploadFile({
-    required Uint8List bytes,
+    required dynamic fileData,
     required String fileName,
     required String contentType,
     String? poolId,
@@ -89,10 +152,13 @@ class FileUploader {
     String? encryptPassword,
     String? expiredAt,
     int? customChunkSize,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
   }) async {
     // Step 1: Create upload task
+    onProgress?.call(null, Duration.zero);
     final createResponse = await createUploadTask(
-      bytes: bytes,
+      fileData: fileData,
       fileName: fileName,
       contentType: contentType,
       poolId: poolId,
@@ -100,6 +166,7 @@ class FileUploader {
       encryptPassword: encryptPassword,
       expiredAt: expiredAt,
       chunkSize: customChunkSize,
+      path: path,
     );
 
     if (createResponse['file_exists'] == true) {
@@ -110,36 +177,74 @@ class FileUploader {
     final taskId = createResponse['task_id'] as String;
     final chunkSize = createResponse['chunk_size'] as int;
     final chunksCount = createResponse['chunks_count'] as int;
+    int totalSize;
+    if (fileData is XFile) {
+      totalSize = await fileData.length();
+    } else if (fileData is Uint8List) {
+      totalSize = fileData.length;
+    } else {
+      throw ArgumentError('Invalid fileData type');
+    }
 
     // Step 2: Upload chunks
-    final chunks = <Uint8List>[];
+    int bytesUploaded = 0;
-    for (int i = 0; i < bytes.length; i += chunkSize) {
+    if (fileData is XFile) {
-      final end = i + chunkSize > bytes.length ? bytes.length : i + chunkSize;
+      // Use stream for XFile
-      chunks.add(Uint8List.fromList(bytes.sublist(i, end)));
+      final subscription = fileData.openRead().listen(null);
-    }
+      subscription.pause();
+      for (int i = 0; i < chunksCount; i++) {
+        subscription.resume();
+        final chunkData = await _readNextChunk(subscription, chunkSize);
+        await uploadChunk(
+          taskId: taskId,
+          chunkIndex: i,
+          chunkData: chunkData,
+          onSendProgress: (sent, total) {
+            final overallProgress = (bytesUploaded + sent) / totalSize;
+            onProgress?.call(overallProgress, Duration.zero);
+          },
+        );
+        bytesUploaded += chunkData.length;
+      }
+      subscription.cancel();
+    } else if (fileData is Uint8List) {
+      // Use old way for Uint8List
+      final chunks = <Uint8List>[];
+      for (int i = 0; i < fileData.length; i += chunkSize) {
+        final end =
+            i + chunkSize > fileData.length ? fileData.length : i + chunkSize;
+        chunks.add(Uint8List.fromList(fileData.sublist(i, end)));
+      }
 
-    // Ensure we have the correct number of chunks
+      // Upload each chunk
-    if (chunks.length != chunksCount) {
+      for (int i = 0; i < chunks.length; i++) {
-      throw Exception(
+        await uploadChunk(
-        'Chunk count mismatch: expected $chunksCount, got ${chunks.length}',
+          taskId: taskId,
-      );
+          chunkIndex: i,
-    }
+          chunkData: chunks[i],
-
+          onSendProgress: (sent, total) {
-    // Upload each chunk
+            final overallProgress = (bytesUploaded + sent) / totalSize;
-    for (int i = 0; i < chunks.length; i++) {
+            onProgress?.call(overallProgress, Duration.zero);
-      await uploadChunk(taskId: taskId, chunkIndex: i, chunkData: chunks[i]);
+          },
+        );
+        bytesUploaded += chunks[i].length;
+      }
+    } else {
+      throw ArgumentError('Invalid fileData type');
     }
 
     // Step 3: Complete upload
+    onProgress?.call(null, Duration.zero);
     return await completeUpload(taskId);
   }
 
   static Completer<SnCloudFile?> createCloudFile({
     required UniversalFile fileData,
-    required Dio client,
+    required WidgetRef ref,
     String? poolId,
+    String? path,
     FileUploadMode? mode,
-    Function(double progress, Duration estimate)? onProgress,
+    Function(double? progress, Duration estimate)? onProgress,
   }) {
     final completer = Completer<SnCloudFile?>();
 
@@ -175,8 +280,9 @@ class FileUploader {
             .then(
               (_) => _processUpload(
                 fileData,
-                client,
+                ref,
                 poolId,
+                path,
                 onProgress,
                 completer,
               ),
@@ -185,8 +291,9 @@ class FileUploader {
               debugPrint('Error removing GPS EXIF data: $e');
               return _processUpload(
                 fileData,
-                client,
+                ref,
                 poolId,
+                path,
                 onProgress,
                 completer,
               );
@@ -196,16 +303,17 @@ class FileUploader {
       }
     }
 
-    _processUpload(fileData, client, poolId, onProgress, completer);
+    _processUpload(fileData, ref, poolId, path, onProgress, completer);
     return completer;
   }
 
-  // Helper method to process the upload
+  // Helper method to process the upload with enhanced uploader
   static Completer<SnCloudFile?> _processUpload(
     UniversalFile fileData,
-    Dio client,
+    WidgetRef ref,
     String? poolId,
-    Function(double progress, Duration estimate)? onProgress,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
     Completer<SnCloudFile?> completer,
   ) {
     String actualMimetype = getMimeType(fileData);
@@ -216,23 +324,16 @@ class FileUploader {
     final data = fileData.data;
 
     if (data is XFile) {
-      // Read bytes from XFile
+      _performUpload(
-      data
+        fileData: data,
-          .readAsBytes()
+        fileName: fileData.displayName ?? data.name,
-          .then((readBytes) {
+        path: path,
-            _performUpload(
+        contentType: actualMimetype,
-              bytes: readBytes,
+        ref: ref,
-              fileName: fileData.displayName ?? data.name,
+        poolId: poolId,
-              contentType: actualMimetype,
+        onProgress: onProgress,
-              client: client,
+        completer: completer,
-              poolId: poolId,
+      );
-              onProgress: onProgress,
-              completer: completer,
-            );
-          })
-          .catchError((e) {
-            completer.completeError(e);
-          });
       return completer;
     } else if (data is List<int> || data is Uint8List) {
       bytes = data is List<int> ? Uint8List.fromList(data) : data;
@@ -252,10 +353,11 @@ class FileUploader {
 
     if (bytes != null) {
       _performUpload(
-        bytes: bytes,
+        fileData: bytes,
         fileName: actualFilename,
         contentType: actualMimetype,
-        client: client,
+        path: path,
+        ref: ref,
         poolId: poolId,
         onProgress: onProgress,
         completer: completer,
@@ -265,30 +367,34 @@ class FileUploader {
     return completer;
   }
 
-  // Helper method to perform the actual upload
+  // Helper method to perform the actual upload with enhanced uploader
   static void _performUpload({
-    required Uint8List bytes,
+    required dynamic fileData,
     required String fileName,
     required String contentType,
-    required Dio client,
+    required WidgetRef ref,
     String? poolId,
-    Function(double progress, Duration estimate)? onProgress,
+    String? path,
+    Function(double? progress, Duration estimate)? onProgress,
     required Completer<SnCloudFile?> completer,
   }) {
-    final uploader = FileUploader(client);
+    // Use the enhanced uploader with task tracking
+    final uploader = ref.read(enhancedFileUploaderProvider);
 
     // Call progress start
-    onProgress?.call(0.0, Duration.zero);
+    onProgress?.call(null, Duration.zero);
     uploader
         .uploadFile(
-          bytes: bytes,
+          fileData: fileData,
           fileName: fileName,
           contentType: contentType,
           poolId: poolId,
+          path: path,
+          onProgress: onProgress,
         )
         .then((result) {
           // Call progress end
-          onProgress?.call(1.0, Duration.zero);
+          onProgress?.call(null, Duration.zero);
           completer.complete(result);
         })
         .catchError((e) {

lib/utils/file_icon_utils.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+import '../models/file.dart';
+import '../widgets/content/cloud_files.dart';
+
+/// Returns an appropriate icon widget for the given file based on its MIME type
+Widget getFileIcon(
+  SnCloudFile file, {
+  required double size,
+  bool tinyPreview = true,
+}) {
+  final itemType = file.mimeType?.split('/').firstOrNull;
+  final mimeType = file.mimeType ?? '';
+  final extension = file.name.split('.').lastOrNull?.toLowerCase() ?? '';
+
+  // For images, show the actual image thumbnail
+  if (itemType == 'image' && tinyPreview) {
+    return CloudImageWidget(file: file);
+  }
+
+  // Return icon based on MIME type or file extension
+  final icon = switch ((itemType, mimeType, extension)) {
+    ('image', _, _) => Symbols.image,
+    ('audio', _, _) => Symbols.audio_file,
+    ('video', _, _) => Symbols.video_file,
+    ('application', 'application/pdf', _) => Symbols.picture_as_pdf,
+    ('application', 'application/zip', _) => Symbols.archive,
+    ('application', 'application/x-rar-compressed', _) => Symbols.archive,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      _,
+    ) ||
+    ('application', 'application/msword', _) => Symbols.description,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      _,
+    ) ||
+    ('application', 'application/vnd.ms-excel', _) => Symbols.table_chart,
+    (
+      'application',
+      'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      _,
+    ) ||
+    ('application', 'application/vnd.ms-powerpoint', _) => Symbols.slideshow,
+    ('text', _, _) => Symbols.article,
+    ('application', _, 'js') ||
+    ('application', _, 'dart') ||
+    ('application', _, 'py') ||
+    ('application', _, 'java') ||
+    ('application', _, 'cpp') ||
+    ('application', _, 'c') ||
+    ('application', _, 'cs') => Symbols.code,
+    ('application', _, 'json') ||
+    ('application', _, 'xml') => Symbols.data_object,
+    (_, _, 'md') => Symbols.article,
+    (_, _, 'html') => Symbols.web,
+    (_, _, 'css') => Symbols.css,
+    _ => Symbols.description, // Default icon
+  };
+
+  return Icon(icon, size: size, fill: 1).center();
+}

lib/widgets/app_scaffold.dart

@@ -13,6 +13,7 @@ import 'package:island/route.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/upload_overlay.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -198,6 +199,7 @@ class WindowScaffold extends HookConsumerWidget {
                   ],
                 ),
                 _WebSocketIndicator(),
+                const UploadOverlay(),
               ],
             ),
           ),
@@ -213,7 +215,11 @@ class WindowScaffold extends HookConsumerWidget {
         actions: <Type, Action<Intent>>{PopIntent: PopAction(ref)},
         child: Stack(
           fit: StackFit.expand,
-          children: [Positioned.fill(child: child), _WebSocketIndicator()],
+          children: [
+            Positioned.fill(child: child),
+            _WebSocketIndicator(),
+            const UploadOverlay(),
+          ],
         ),
       ),
     );

lib/widgets/chat/chat_input.dart

@@ -44,7 +44,7 @@ class ChatInput extends HookConsumerWidget {
   final Function(int) onDeleteAttachment;
   final Function(int, int) onMoveAttachment;
   final Function(List<UniversalFile>) onAttachmentsChanged;
-  final Map<String, Map<int, double>> attachmentProgress;
+  final Map<String, Map<int, double?>> attachmentProgress;
 
   const ChatInput({
     super.key,

lib/widgets/chat/message_item.dart

@@ -40,7 +40,7 @@ class MessageItem extends HookConsumerWidget {
   final LocalChatMessage message;
   final bool isCurrentUser;
   final Function(String action)? onAction;
-  final Map<int, double>? progress;
+  final Map<int, double?>? progress;
   final bool showAvatar;
   final Function(String messageId) onJump;
   final bool isSelectionMode;
@@ -689,7 +689,7 @@ class MessageHoverActionMenu extends StatelessWidget {
 class MessageItemDisplayBubble extends HookConsumerWidget {
   final LocalChatMessage message;
   final bool isCurrentUser;
-  final Map<int, double>? progress;
+  final Map<int, double?>? progress;
   final bool showAvatar;
   final Function(String messageId) onJump;
   final String? translatedText;
@@ -821,7 +821,7 @@ class MessageItemDisplayBubble extends HookConsumerWidget {
 class MessageItemDisplayIRC extends HookConsumerWidget {
   final LocalChatMessage message;
   final bool isCurrentUser;
-  final Map<int, double>? progress;
+  final Map<int, double?>? progress;
   final bool showAvatar;
   final Function(String messageId) onJump;
   final String? translatedText;
@@ -949,7 +949,7 @@ class MessageItemDisplayIRC extends HookConsumerWidget {
 class MessageItemDisplayDiscord extends HookConsumerWidget {
   final LocalChatMessage message;
   final bool isCurrentUser;
-  final Map<int, double>? progress;
+  final Map<int, double?>? progress;
   final bool showAvatar;
   final Function(String messageId) onJump;
   final String? translatedText;
@@ -1238,7 +1238,7 @@ class MessageQuoteWidget extends HookConsumerWidget {
 }
 
 class FileUploadProgressWidget extends StatelessWidget {
-  final Map<int, double>? progress;
+  final Map<int, double?>? progress;
   final Color textColor;
   final bool hasContent;
 
@@ -1266,7 +1266,9 @@ class FileUploadProgressWidget extends StatelessWidget {
                 'fileUploadingProgress'.tr(
                   args: [
                     (entry.key + 1).toString(),
-                    (entry.value * 100).toStringAsFixed(1),
+                    entry.value != null
+                        ? (entry.value! * 100).toStringAsFixed(1)
+                        : '0.0',
                   ],
                 ),
                 style: TextStyle(

lib/widgets/check_in.dart

@@ -104,9 +104,7 @@ class CheckInWidget extends HookConsumerWidget {
       } catch (err) {
         if (err is DioException) {
           if (err.response?.statusCode == 423 && context.mounted) {
-            final captchaTk = await Navigator.of(
+            final captchaTk = await CaptchaScreen.show(context);
-              context,
-            ).push(MaterialPageRoute(builder: (context) => CaptchaScreen()));
             if (captchaTk == null) return;
             return await checkIn(captchatTk: captchaTk);
           }

lib/widgets/content/attachment_preview.dart

@@ -401,7 +401,7 @@ class AttachmentPreview extends HookConsumerWidget {
                           children: [
                             if (progress != null)
                               Text(
-                                '${progress!.toStringAsFixed(2)}%',
+                                '${(progress! * 100).toStringAsFixed(2)}%',
                                 style: TextStyle(color: Colors.white),
                               )
                             else
@@ -411,10 +411,7 @@ class AttachmentPreview extends HookConsumerWidget {
                               ),
                             Gap(6),
                             Center(
-                              child: LinearProgressIndicator(
+                              child: LinearProgressIndicator(value: progress),
-                                value:
-                                    progress != null ? progress! / 100.0 : null,
-                              ),
                             ),
                           ],
                         ),

lib/widgets/content/cloud_file_picker.dart

@@ -6,7 +6,6 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
-import 'package:island/pods/network.dart';
 import 'package:island/services/file_uploader.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/attachment_preview.dart';
@@ -61,7 +60,7 @@ class CloudFilePicker extends HookConsumerWidget {
           final cloudFile =
               await FileUploader.createCloudFile(
                 fileData: file,
-                client: ref.read(apiClientProvider),
+                ref: ref,
                 onProgress: (progress, _) {
                   uploadProgress.value = progress;
                 },
@@ -112,23 +111,28 @@ class CloudFilePicker extends HookConsumerWidget {
 
     void pickImage() async {
       showLoadingModal(context);
-      final result = await FilePicker.platform.pickFiles(
+      final ImagePicker picker = ImagePicker();
-        allowMultiple: allowMultiple,
+      List<XFile> results;
-        type: FileType.image,
+      if (allowMultiple) {
-      );
+        results = await picker.pickMultiImage();
-      if (result == null || result.files.isEmpty) {
+      } else {
+        final XFile? result = await picker.pickImage(
+          source: ImageSource.gallery,
+        );
+        results = result != null ? [result] : [];
+      }
+      if (results.isEmpty) {
         if (context.mounted) hideLoadingModal(context);
         return;
       }
 
       final newFiles =
-          result.files.map((e) {
+          results
-            final xfile =
+              .map(
-                e.bytes != null
+                (xfile) =>
-                    ? XFile.fromData(e.bytes!, name: e.name)
+                    UniversalFile(data: xfile, type: UniversalFileType.image),
-                    : XFile(e.path!);
+              )
-            return UniversalFile(data: xfile, type: UniversalFileType.image);
+              .toList();
-          }).toList();
 
       if (!allowMultiple) {
         files.value = newFiles;

lib/widgets/content/cloud_files.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:math' as math;
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -14,15 +13,14 @@ import 'package:island/pods/network.dart';
 import 'package:island/services/time.dart';
 import 'package:island/utils/format.dart';
 import 'package:island/widgets/alert.dart';
-import 'package:island/widgets/content/audio.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:path/path.dart' show extension;
 import 'package:path_provider/path_provider.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
 import 'package:island/widgets/data_saving_gate.dart';
 import 'package:island/widgets/content/file_info_sheet.dart';
 
+import 'file_viewer_contents.dart';
 import 'image.dart';
 import 'video.dart';
 
@@ -68,8 +66,6 @@ class CloudFileWidget extends HookConsumerWidget {
     );
 
     if (item.mimeType == 'application/pdf') {
-      final pdfViewer = useMemoized(() => SfPdfViewer.network(uri), [uri]);
-
       Future<void> downloadFile() async {
         try {
           showSnackBar('Downloading file...');
@@ -109,7 +105,7 @@ class CloudFileWidget extends HookConsumerWidget {
         ),
         child: Stack(
           children: [
-            pdfViewer,
+            PdfFileContent(uri: uri),
             Positioned(
               top: 8,
               left: 8,
@@ -205,14 +201,6 @@ class CloudFileWidget extends HookConsumerWidget {
     }
 
     if (item.mimeType?.startsWith('text/') == true) {
-      final textFuture = useMemoized(
-        () => ref
-            .read(apiClientProvider)
-            .get(uri)
-            .then((response) => response.data as String),
-        [uri],
-      );
-
       Future<void> downloadFile() async {
         try {
           showSnackBar('Downloading file...');
@@ -252,29 +240,9 @@ class CloudFileWidget extends HookConsumerWidget {
         ),
         child: Stack(
           children: [
-            FutureBuilder<String>(
+            Padding(
-              future: textFuture,
+              padding: const EdgeInsets.fromLTRB(20, 68, 20, 20),
-              builder: (context, snapshot) {
+              child: TextFileContent(uri: uri),
-                if (snapshot.connectionState == ConnectionState.waiting) {
-                  return const Center(child: CircularProgressIndicator());
-                } else if (snapshot.hasError) {
-                  return Center(
-                    child: Text('Error loading text: ${snapshot.error}'),
-                  );
-                } else if (snapshot.hasData) {
-                  return SingleChildScrollView(
-                    padding: const EdgeInsets.fromLTRB(20, 20 + 48, 20, 20),
-                    child: SelectableText(
-                      snapshot.data!,
-                      style: const TextStyle(
-                        fontFamily: 'monospace',
-                        fontSize: 14,
-                      ),
-                    ),
-                  );
-                }
-                return const Center(child: Text('No content'));
-              },
             ),
             Positioned(
               top: 8,
@@ -371,21 +339,13 @@ class CloudFileWidget extends HookConsumerWidget {
     }
 
     var content = switch (item.mimeType?.split('/').firstOrNull) {
-      'image' =>
+      'image' => AspectRatio(
-        ratio == 1.0
+        aspectRatio: ratio,
-            ? IntrinsicHeight(
+        child:
-              child:
+            (useInternalGate && dataSaving && !unlocked.value)
-                  (useInternalGate && dataSaving && !unlocked.value)
+                ? dataPlaceHolder(Symbols.image)
-                      ? dataPlaceHolder(Symbols.image)
+                : cloudImage(),
-                      : cloudImage(),
+      ),
-            )
-            : AspectRatio(
-              aspectRatio: ratio,
-              child:
-                  (useInternalGate && dataSaving && !unlocked.value)
-                      ? dataPlaceHolder(Symbols.image)
-                      : cloudImage(),
-            ),
       'video' => AspectRatio(
         aspectRatio: ratio,
         child:
@@ -393,14 +353,7 @@ class CloudFileWidget extends HookConsumerWidget {
                 ? dataPlaceHolder(Symbols.play_arrow)
                 : cloudVideo(),
       ),
-      'audio' => Center(
+      'audio' => AudioFileContent(item: item, uri: uri),
-        child: ConstrainedBox(
-          constraints: BoxConstraints(
-            maxWidth: math.min(360, MediaQuery.of(context).size.width * 0.8),
-          ),
-          child: UniversalAudio(uri: uri, filename: item.name),
-        ),
-      ),
       _ => Builder(
         builder: (context) {
           Future<void> downloadFile() async {

lib/widgets/content/file_info_sheet.dart

@@ -13,8 +13,8 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 class FileInfoSheet extends StatelessWidget {
   final SnCloudFile item;
-
+  final VoidCallback? onClose;
-  const FileInfoSheet({super.key, required this.item});
+  const FileInfoSheet({super.key, required this.item, this.onClose});
 
   @override
   Widget build(BuildContext context) {
@@ -22,6 +22,7 @@ class FileInfoSheet extends StatelessWidget {
     final exifData = item.fileMeta?['exif'] as Map<String, dynamic>? ?? {};
 
     return SheetScaffold(
+      onClose: onClose,
       titleText: 'fileInfoTitle'.tr(),
       child: SingleChildScrollView(
         child: Column(

lib/widgets/content/file_viewer_contents.dart

@@ -0,0 +1,313 @@
+import 'dart:io';
+import 'dart:math' as math;
+
+import 'package:file_saver/file_saver.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/utils/format.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/audio.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/file_info_sheet.dart';
+import 'package:island/widgets/content/video.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:path/path.dart' show extension;
+import 'package:path_provider/path_provider.dart';
+import 'package:photo_view/photo_view.dart';
+import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
+
+class PdfFileContent extends HookConsumerWidget {
+  final String uri;
+
+  const PdfFileContent({required this.uri, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final pdfViewer = useMemoized(() => SfPdfViewer.network(uri), [uri]);
+    return pdfViewer;
+  }
+}
+
+class TextFileContent extends HookConsumerWidget {
+  final String uri;
+
+  const TextFileContent({required this.uri, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final textFuture = useMemoized(
+      () => ref
+          .read(apiClientProvider)
+          .get(uri)
+          .then((response) => response.data as String),
+      [uri],
+    );
+
+    return FutureBuilder<String>(
+      future: textFuture,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Center(child: CircularProgressIndicator());
+        } else if (snapshot.hasError) {
+          return Center(child: Text('Error loading text: ${snapshot.error}'));
+        } else if (snapshot.hasData) {
+          return SingleChildScrollView(
+            padding: EdgeInsets.all(20),
+            child: SelectableText(
+              snapshot.data!,
+              style: const TextStyle(fontFamily: 'monospace', fontSize: 14),
+            ),
+          );
+        }
+        return const Center(child: Text('No content'));
+      },
+    );
+  }
+}
+
+class ImageFileContent extends HookConsumerWidget {
+  final SnCloudFile item;
+  final String uri;
+
+  const ImageFileContent({required this.item, required this.uri, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final photoViewController = useMemoized(() => PhotoViewController(), []);
+    final rotation = useState(0);
+    final showOriginal = useState(false);
+
+    final shadow = [
+      Shadow(color: Colors.black54, blurRadius: 5.0, offset: Offset(1.0, 1.0)),
+    ];
+
+    return Stack(
+      children: [
+        Positioned.fill(
+          child: PhotoView(
+            backgroundDecoration: BoxDecoration(
+              color: Colors.black.withOpacity(0.9),
+            ),
+            controller: photoViewController,
+            imageProvider: CloudImageWidget.provider(
+              fileId: item.id,
+              serverUrl: ref.watch(serverUrlProvider),
+              original: showOriginal.value,
+            ),
+            customSize: MediaQuery.of(context).size,
+            basePosition: Alignment.center,
+            filterQuality: FilterQuality.high,
+          ),
+        ),
+        // Controls overlay
+        Positioned(
+          bottom: MediaQuery.of(context).padding.bottom + 16,
+          left: 16,
+          right: 16,
+          child: Row(
+            children: [
+              IconButton(
+                icon: Icon(Icons.remove, color: Colors.white, shadows: shadow),
+                onPressed: () {
+                  photoViewController.scale =
+                      (photoViewController.scale ?? 1) - 0.05;
+                },
+              ),
+              IconButton(
+                icon: Icon(Icons.add, color: Colors.white, shadows: shadow),
+                onPressed: () {
+                  photoViewController.scale =
+                      (photoViewController.scale ?? 1) + 0.05;
+                },
+              ),
+              const Gap(8),
+              IconButton(
+                icon: Icon(
+                  Icons.rotate_left,
+                  color: Colors.white,
+                  shadows: shadow,
+                ),
+                onPressed: () {
+                  rotation.value = (rotation.value - 1) % 4;
+                  photoViewController.rotation = rotation.value * -math.pi / 2;
+                },
+              ),
+              IconButton(
+                icon: Icon(
+                  Icons.rotate_right,
+                  color: Colors.white,
+                  shadows: shadow,
+                ),
+                onPressed: () {
+                  rotation.value = (rotation.value + 1) % 4;
+                  photoViewController.rotation = rotation.value * -math.pi / 2;
+                },
+              ),
+              const Spacer(),
+              IconButton(
+                onPressed: () {
+                  showOriginal.value = !showOriginal.value;
+                },
+                icon: Icon(
+                  showOriginal.value ? Symbols.hd : Symbols.sd,
+                  color: Colors.white,
+                  shadows: shadow,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class VideoFileContent extends HookConsumerWidget {
+  final SnCloudFile item;
+  final String uri;
+
+  const VideoFileContent({required this.item, required this.uri, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    var ratio =
+        item.fileMeta?['ratio'] is num
+            ? item.fileMeta!['ratio'].toDouble()
+            : 1.0;
+    if (ratio == 0) ratio = 1.0;
+
+    return Center(
+      child: AspectRatio(
+        aspectRatio: ratio,
+        child: UniversalVideo(uri: uri, autoplay: true),
+      ),
+    );
+  }
+}
+
+class AudioFileContent extends HookConsumerWidget {
+  final SnCloudFile item;
+  final String uri;
+
+  const AudioFileContent({required this.item, required this.uri, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Center(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxWidth: math.min(360, MediaQuery.of(context).size.width * 0.8),
+        ),
+        child: UniversalAudio(uri: uri, filename: item.name),
+      ),
+    );
+  }
+}
+
+class GenericFileContent extends HookConsumerWidget {
+  final SnCloudFile item;
+
+  const GenericFileContent({required this.item, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Future<void> downloadFile() async {
+      try {
+        showSnackBar('Downloading file...');
+
+        final client = ref.read(apiClientProvider);
+        final tempDir = await getTemporaryDirectory();
+        var extName = extension(item.name).trim();
+        if (extName.isEmpty) {
+          extName = item.mimeType?.split('/').lastOrNull ?? 'bin';
+        }
+        final filePath = '${tempDir.path}/${item.id}.$extName';
+
+        await client.download(
+          '/drive/files/${item.id}',
+          filePath,
+          queryParameters: {'original': true},
+        );
+
+        await FileSaver.instance.saveFile(
+          name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
+          file: File(filePath),
+        );
+        showSnackBar('File saved to downloads');
+      } catch (e) {
+        showErrorAlert(e);
+      }
+    }
+
+    return Center(
+      child: Container(
+        margin: const EdgeInsets.all(32),
+        padding: const EdgeInsets.all(32),
+        decoration: BoxDecoration(
+          border: Border.all(
+            color: Theme.of(context).colorScheme.outline,
+            width: 1,
+          ),
+          borderRadius: BorderRadius.circular(16),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              Symbols.insert_drive_file,
+              size: 64,
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+            const Gap(16),
+            Text(
+              item.name,
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.bold,
+                color: Theme.of(context).colorScheme.onSurface,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            const Gap(8),
+            Text(
+              formatFileSize(item.size),
+              style: TextStyle(
+                fontSize: 16,
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+            ),
+            const Gap(24),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                FilledButton.icon(
+                  onPressed: downloadFile,
+                  icon: const Icon(Symbols.download),
+                  label: Text('download'),
+                ),
+                const Gap(16),
+                OutlinedButton.icon(
+                  onPressed: () {
+                    showModalBottomSheet(
+                      useRootNavigator: true,
+                      context: context,
+                      isScrollControlled: true,
+                      builder: (context) => FileInfoSheet(item: item),
+                    );
+                  },
+                  icon: const Icon(Symbols.info),
+                  label: Text('info'),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/content/sheet.dart

@@ -8,6 +8,7 @@ class SheetScaffold extends StatelessWidget {
   final Widget child;
   final double heightFactor;
   final double? height;
+  final VoidCallback? onClose;
   const SheetScaffold({
     super.key,
     this.title,
@@ -16,6 +17,7 @@ class SheetScaffold extends StatelessWidget {
     this.actions = const [],
     this.heightFactor = 0.8,
     this.height,
+    this.onClose,
   });
 
   @override
@@ -50,7 +52,11 @@ class SheetScaffold extends StatelessWidget {
                 ...actions,
                 IconButton(
                   icon: const Icon(Symbols.close),
-                  onPressed: () => Navigator.pop(context),
+                  onPressed:
+                      () =>
+                          onClose != null
+                              ? onClose?.call()
+                              : Navigator.pop(context),
                   style: IconButton.styleFrom(minimumSize: const Size(36, 36)),
                 ),
               ],

lib/widgets/file_list_view.dart

@@ -0,0 +1,957 @@
+import 'package:desktop_drop/desktop_drop.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file_list_item.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/file_list.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/services/file_uploader.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/utils/file_icon_utils.dart';
+import 'package:island/utils/format.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+enum FileListMode { normal, unindexed }
+
+enum FileListViewMode { list, waterfall }
+
+class FileListView extends HookConsumerWidget {
+  final Map<String, dynamic>? usage;
+  final Map<String, dynamic>? quota;
+  final ValueNotifier<String> currentPath;
+  final VoidCallback onPickAndUpload;
+  final Function(BuildContext, ValueNotifier<String>) onShowCreateDirectory;
+  final ValueNotifier<FileListMode> mode;
+  final ValueNotifier<FileListViewMode> viewMode;
+
+  const FileListView({
+    required this.usage,
+    required this.quota,
+    required this.currentPath,
+    required this.onPickAndUpload,
+    required this.onShowCreateDirectory,
+    required this.mode,
+    required this.viewMode,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final dragging = useState(false);
+
+    useEffect(() {
+      if (mode.value == FileListMode.normal) {
+        final notifier = ref.read(cloudFileListNotifierProvider.notifier);
+        notifier.setPath(currentPath.value);
+      }
+      return null;
+    }, [currentPath.value, mode.value]);
+
+    if (usage == null) return const SizedBox.shrink();
+
+    final bodyWidget = switch (mode.value) {
+      FileListMode.unindexed => PagingHelperSliverView(
+        provider: unindexedFileListNotifierProvider,
+        futureRefreshable: unindexedFileListNotifierProvider.future,
+        notifierRefreshable: unindexedFileListNotifierProvider.notifier,
+        contentBuilder:
+            (data, widgetCount, endItemView) =>
+                data.items.isEmpty
+                    ? SliverToBoxAdapter(
+                      child: _buildEmptyUnindexedFilesHint(ref),
+                    )
+                    : _buildUnindexedFileListContent(
+                      data.items,
+                      widgetCount,
+                      endItemView,
+                      ref,
+                      context,
+                      viewMode,
+                    ),
+      ),
+      _ => PagingHelperSliverView(
+        provider: cloudFileListNotifierProvider,
+        futureRefreshable: cloudFileListNotifierProvider.future,
+        notifierRefreshable: cloudFileListNotifierProvider.notifier,
+        contentBuilder:
+            (data, widgetCount, endItemView) =>
+                data.items.isEmpty
+                    ? SliverToBoxAdapter(
+                      child: _buildEmptyDirectoryHint(ref, currentPath),
+                    )
+                    : _buildFileListContent(
+                      data.items,
+                      widgetCount,
+                      endItemView,
+                      ref,
+                      context,
+                      currentPath,
+                      viewMode,
+                    ),
+      ),
+    };
+
+    return DropTarget(
+      onDragDone: (details) async {
+        dragging.value = false;
+        // Handle file upload
+        for (final file in details.files) {
+          final universalFile = UniversalFile(
+            data: file,
+            type: UniversalFileType.file,
+            displayName: file.name,
+          );
+
+          final completer = FileUploader.createCloudFile(
+            fileData: universalFile,
+            ref: ref,
+            path: currentPath.value,
+            onProgress: (progress, _) {
+              // Progress is handled by the upload tasks system
+              if (progress != null) {
+                debugPrint('Upload progress: ${(progress * 100).toInt()}%');
+              }
+            },
+          );
+
+          completer.future
+              .then((uploadedFile) {
+                if (uploadedFile != null) {
+                  ref.invalidate(cloudFileListNotifierProvider);
+                }
+              })
+              .catchError((error) {
+                showSnackBar('Failed to upload file: $error');
+              });
+        }
+      },
+      onDragEntered: (details) {
+        dragging.value = true;
+      },
+      onDragExited: (details) {
+        dragging.value = false;
+      },
+      child: Container(
+        color:
+            dragging.value
+                ? Theme.of(context).primaryColor.withOpacity(0.1)
+                : null,
+        child: Column(
+          children: [
+            const Gap(8),
+            _buildPathNavigation(ref, currentPath),
+            const Gap(8),
+            if (mode.value == FileListMode.normal && currentPath.value == '/')
+              _buildUnindexedFilesEntry(ref).padding(bottom: 12),
+            Expanded(
+              child: CustomScrollView(
+                slivers: [bodyWidget, const SliverGap(12)],
+              ).padding(
+                horizontal:
+                    viewMode.value == FileListViewMode.waterfall ? 12 : null,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFileListContent(
+    List<FileListItem> items,
+    int widgetCount,
+    Widget endItemView,
+    WidgetRef ref,
+    BuildContext context,
+    ValueNotifier<String> currentPath,
+    ValueNotifier<FileListViewMode> currentViewMode,
+  ) {
+    return switch (currentViewMode.value) {
+      // Waterfall mode
+      FileListViewMode.waterfall => SliverMasonryGrid(
+        gridDelegate: SliverSimpleGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: isWideScreen(context) ? 340 : 240,
+        ),
+        crossAxisSpacing: 8,
+        mainAxisSpacing: 8,
+        delegate: SliverChildBuilderDelegate((context, index) {
+          if (index == widgetCount - 1) {
+            return endItemView;
+          }
+
+          if (index >= items.length) {
+            return const SizedBox.shrink();
+          }
+
+          final item = items[index];
+          return item.map(
+            file: (fileItem) => _buildWaterfallFileTile(fileItem, ref, context),
+            folder:
+                (folderItem) =>
+                    _buildWaterfallFolderTile(folderItem, currentPath, context),
+            unindexedFile: (unindexedFileItem) {
+              // Should not happen
+              return const SizedBox.shrink();
+            },
+          );
+        }, childCount: widgetCount),
+      ),
+      // ListView mode
+      _ => SliverList.builder(
+        itemCount: widgetCount,
+        itemBuilder: (context, index) {
+          if (index == widgetCount - 1) {
+            return endItemView;
+          }
+
+          final item = items[index];
+          return item.map(
+            file: (fileItem) {
+              final file = fileItem.fileIndex.file;
+              return ListTile(
+                leading: ClipRRect(
+                  borderRadius: const BorderRadius.all(Radius.circular(8)),
+                  child: SizedBox(
+                    height: 48,
+                    width: 48,
+                    child: getFileIcon(file, size: 24),
+                  ),
+                ),
+                title:
+                    file.name.isEmpty
+                        ? Text('untitled').tr().italic()
+                        : Text(
+                          file.name,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                subtitle: Text(formatFileSize(file.size)),
+                onTap: () {
+                  context.push('/files/${fileItem.fileIndex.id}', extra: file);
+                },
+                trailing: IconButton(
+                  icon: const Icon(Symbols.delete),
+                  onPressed: () async {
+                    final confirmed = await showConfirmAlert(
+                      'confirmDeleteFile'.tr(),
+                      'deleteFile'.tr(),
+                    );
+                    if (!confirmed) return;
+
+                    if (context.mounted) {
+                      showLoadingModal(context);
+                    }
+                    try {
+                      final client = ref.read(apiClientProvider);
+                      await client.delete(
+                        '/drive/index/remove/${fileItem.fileIndex.id}',
+                      );
+                      ref.invalidate(cloudFileListNotifierProvider);
+                    } catch (e) {
+                      showSnackBar('failedToDeleteFile'.tr());
+                    } finally {
+                      if (context.mounted) {
+                        hideLoadingModal(context);
+                      }
+                    }
+                  },
+                ),
+              );
+            },
+            folder:
+                (folderItem) => ListTile(
+                  leading: ClipRRect(
+                    borderRadius: const BorderRadius.all(Radius.circular(8)),
+                    child: SizedBox(
+                      height: 48,
+                      width: 48,
+                      child: const Icon(Symbols.folder, fill: 1).center(),
+                    ),
+                  ),
+                  title: Text(
+                    folderItem.folderName,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  subtitle: const Text('Folder'),
+                  onTap: () {
+                    final newPath =
+                        currentPath.value == '/'
+                            ? '/${folderItem.folderName}'
+                            : '${currentPath.value}/${folderItem.folderName}';
+                    currentPath.value = newPath;
+                  },
+                ),
+            unindexedFile: (unindexedFileItem) {
+              // Should not happen in normal mode
+              return const SizedBox.shrink();
+            },
+          );
+        },
+      ),
+    };
+  }
+
+  Widget _buildPathNavigation(
+    WidgetRef ref,
+    ValueNotifier<String> currentPath,
+  ) {
+    Widget pathContent;
+    if (mode.value == FileListMode.unindexed) {
+      pathContent = Row(
+        children: [
+          Text(
+            'Unindexed Files',
+            style: TextStyle(fontWeight: FontWeight.bold),
+          ),
+        ],
+      );
+    } else if (currentPath.value == '/') {
+      pathContent = Text(
+        'Root Directory',
+        style: TextStyle(fontWeight: FontWeight.bold),
+      );
+    } else {
+      final pathParts =
+          currentPath.value
+              .split('/')
+              .where((part) => part.isNotEmpty)
+              .toList();
+      final breadcrumbs = <Widget>[];
+
+      // Add root
+      breadcrumbs.add(
+        InkWell(onTap: () => currentPath.value = '/', child: Text('Root')),
+      );
+
+      // Add path parts
+      String currentPathBuilder = '';
+      for (int i = 0; i < pathParts.length; i++) {
+        currentPathBuilder += '/${pathParts[i]}';
+        final path = currentPathBuilder;
+
+        breadcrumbs.add(const Text(' / '));
+        if (i == pathParts.length - 1) {
+          // Current directory
+          breadcrumbs.add(
+            Text(pathParts[i], style: TextStyle(fontWeight: FontWeight.bold)),
+          );
+        } else {
+          // Clickable parent directory
+          breadcrumbs.add(
+            InkWell(
+              onTap: () => currentPath.value = path,
+              child: Text(pathParts[i]),
+            ),
+          );
+        }
+      }
+
+      pathContent = Wrap(
+        crossAxisAlignment: WrapCrossAlignment.center,
+        children: breadcrumbs,
+      );
+    }
+
+    return SizedBox(
+      height: 64,
+      child: Card(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Row(
+            children: [
+              IconButton(
+                icon: Icon(
+                  mode.value == FileListMode.unindexed
+                      ? Symbols.inventory_2
+                      : currentPath.value != '/'
+                      ? Symbols.arrow_back
+                      : Symbols.folder,
+                ),
+                onPressed: () {
+                  if (mode.value == FileListMode.unindexed) {
+                    mode.value = FileListMode.normal;
+                    currentPath.value = '/';
+                  } else {
+                    final pathParts =
+                        currentPath.value
+                            .split('/')
+                            .where((part) => part.isNotEmpty)
+                            .toList();
+                    if (pathParts.isNotEmpty) {
+                      pathParts.removeLast();
+                      currentPath.value =
+                          pathParts.isEmpty ? '/' : '/${pathParts.join('/')}';
+                    }
+                  }
+                },
+                visualDensity: const VisualDensity(
+                  horizontal: -4,
+                  vertical: -4,
+                ),
+              ),
+              const Gap(8),
+              Expanded(child: pathContent),
+              IconButton(
+                icon: Icon(
+                  viewMode.value == FileListViewMode.list
+                      ? Symbols.view_module
+                      : Symbols.list,
+                ),
+                onPressed:
+                    () =>
+                        viewMode.value =
+                            viewMode.value == FileListViewMode.list
+                                ? FileListViewMode.waterfall
+                                : FileListViewMode.list,
+                tooltip:
+                    viewMode.value == FileListViewMode.list
+                        ? 'Switch to Waterfall View'
+                        : 'Switch to List View',
+                visualDensity: const VisualDensity(
+                  horizontal: -4,
+                  vertical: -4,
+                ),
+              ),
+              if (mode.value == FileListMode.normal) ...[
+                IconButton(
+                  icon: const Icon(Symbols.create_new_folder),
+                  onPressed:
+                      () => onShowCreateDirectory(ref.context, currentPath),
+                  tooltip: 'Create Directory',
+                  visualDensity: const VisualDensity(
+                    horizontal: -4,
+                    vertical: -4,
+                  ),
+                ),
+                IconButton(
+                  icon: const Icon(Symbols.upload_file),
+                  onPressed: onPickAndUpload,
+                  tooltip: 'Upload File',
+                  visualDensity: const VisualDensity(
+                    horizontal: -4,
+                    vertical: -4,
+                  ),
+                ),
+              ],
+            ],
+          ),
+        ),
+      ).padding(horizontal: 8),
+    );
+  }
+
+  Widget _buildUnindexedFilesEntry(WidgetRef ref) {
+    return Container(
+      decoration: BoxDecoration(
+        border: Border.all(color: Theme.of(ref.context).colorScheme.outline),
+        borderRadius: const BorderRadius.all(Radius.circular(8)),
+      ),
+      margin: const EdgeInsets.symmetric(horizontal: 12),
+      child: InkWell(
+        borderRadius: const BorderRadius.all(Radius.circular(8)),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+          child: Row(
+            children: [
+              const Icon(Symbols.inventory_2).padding(horizontal: 8),
+              const Gap(8),
+              const Text('Unindexed Files').bold(),
+              const Spacer(),
+              const Icon(Symbols.chevron_right).padding(horizontal: 8),
+            ],
+          ),
+        ),
+        onTap: () {
+          mode.value = FileListMode.unindexed;
+          currentPath.value = '/';
+        },
+      ),
+    );
+  }
+
+  Widget _buildEmptyDirectoryHint(
+    WidgetRef ref,
+    ValueNotifier<String> currentPath,
+  ) {
+    return Card(
+      margin: const EdgeInsets.fromLTRB(12, 0, 12, 16),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 48),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Symbols.folder_off, size: 64, color: Colors.grey),
+            const Gap(16),
+            Text(
+              'This directory is empty',
+              style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+                color: Theme.of(ref.context).textTheme.bodyLarge?.color,
+              ),
+            ),
+            const Gap(8),
+            Text(
+              'Upload files or create subdirectories to populate this path.\n'
+              'Directories are created implicitly when you upload files to them.',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Theme.of(
+                  ref.context,
+                ).textTheme.bodyMedium?.color?.withOpacity(0.7),
+              ),
+            ),
+            const Gap(16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                ElevatedButton.icon(
+                  onPressed: onPickAndUpload,
+                  icon: const Icon(Symbols.upload_file),
+                  label: const Text('Upload Files'),
+                ),
+                const Gap(12),
+                OutlinedButton.icon(
+                  onPressed:
+                      () => onShowCreateDirectory(ref.context, currentPath),
+                  icon: const Icon(Symbols.create_new_folder),
+                  label: const Text('Create Directory'),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildWaterfallFileTile(
+    FileItem fileItem,
+    WidgetRef ref,
+    BuildContext context,
+  ) {
+    return _buildWaterfallFileTileBase(
+      fileItem.fileIndex.file,
+      () => '/files/${fileItem.fileIndex.id}',
+      ref,
+      context,
+      [
+        IconButton(
+          icon: const Icon(Symbols.delete),
+          onPressed: () async {
+            final confirmed = await showConfirmAlert(
+              'confirmDeleteFile'.tr(),
+              'deleteFile'.tr(),
+            );
+            if (!confirmed) return;
+
+            if (context.mounted) {
+              showLoadingModal(context);
+            }
+            try {
+              final client = ref.read(apiClientProvider);
+              await client.delete(
+                '/drive/index/remove/${fileItem.fileIndex.id}',
+              );
+              ref.invalidate(cloudFileListNotifierProvider);
+            } catch (e) {
+              showSnackBar('failedToDeleteFile'.tr());
+            } finally {
+              if (context.mounted) {
+                hideLoadingModal(context);
+              }
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildWaterfallFileTileBase(
+    SnCloudFile file,
+    String Function() getRoutePath,
+    WidgetRef ref,
+    BuildContext context,
+    List<Widget>? actions,
+  ) {
+    final meta = file.fileMeta is Map ? (file.fileMeta as Map) : const {};
+    final ratio =
+        meta['ratio'] is num ? (meta['ratio'] as num).toDouble() : 1.0;
+    final itemType = file.mimeType?.split('/').first;
+    final uri =
+        '${ref.read(apiClientProvider).options.baseUrl}/drive/files/${file.id}';
+
+    Widget previewWidget;
+    switch (itemType) {
+      case 'image':
+        previewWidget = CloudImageWidget(
+          file: file,
+          aspectRatio: ratio,
+          fit: BoxFit.cover,
+        );
+        break;
+      case 'video':
+        previewWidget = CloudVideoWidget(item: file);
+        break;
+      case 'audio':
+        previewWidget = getFileIcon(file, size: 48);
+        break;
+      case 'text':
+        previewWidget = Container(
+          color: Theme.of(context).colorScheme.surfaceContainer,
+          child: FutureBuilder<String>(
+            future: ref
+                .read(apiClientProvider)
+                .get(uri)
+                .then((response) => response.data as String),
+            builder:
+                (context, snapshot) =>
+                    snapshot.hasData
+                        ? SingleChildScrollView(
+                          padding: EdgeInsets.all(24),
+                          child: Text(
+                            snapshot.data!,
+                            style: const TextStyle(
+                              fontSize: 9,
+                              fontFamily: 'monospace',
+                            ),
+                            maxLines: 20,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        )
+                        : const Center(child: CircularProgressIndicator()),
+          ),
+        );
+        break;
+      case 'application' when file.mimeType == 'application/pdf':
+        previewWidget = SfPdfViewer.network(
+          uri,
+          canShowScrollStatus: false,
+          canShowScrollHead: false,
+          enableDoubleTapZooming: false,
+          pageSpacing: 0,
+        );
+        break;
+      default:
+        previewWidget = getFileIcon(file, size: 48);
+        break;
+    }
+
+    return InkWell(
+      borderRadius: BorderRadius.circular(8),
+      onTap: () {
+        context.push(getRoutePath(), extra: file);
+      },
+      child: Container(
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(
+            color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
+          ),
+        ),
+        child: Column(
+          children: [
+            ClipRRect(
+              borderRadius: BorderRadius.only(
+                topLeft: Radius.circular(8),
+                topRight: Radius.circular(8),
+              ),
+              child: AspectRatio(
+                aspectRatio: ratio,
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(4),
+                  child: Container(color: Colors.white, child: previewWidget),
+                ),
+              ),
+            ),
+            Row(
+              children: [
+                getFileIcon(file, size: 24, tinyPreview: false),
+                const Gap(16),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        file.name,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      Text(
+                        formatFileSize(file.size),
+                        maxLines: 1,
+                        style: Theme.of(
+                          context,
+                        ).textTheme.bodySmall!.copyWith(fontSize: 11),
+                      ),
+                    ],
+                  ),
+                ),
+                if (actions != null) ...actions,
+              ],
+            ).padding(horizontal: 16, vertical: 4),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildWaterfallFolderTile(
+    FolderItem folderItem,
+    ValueNotifier<String> currentPath,
+    BuildContext context,
+  ) {
+    return InkWell(
+      borderRadius: BorderRadius.circular(8),
+      onTap: () {
+        final newPath =
+            currentPath.value == '/'
+                ? '/${folderItem.folderName}'
+                : '${currentPath.value}/${folderItem.folderName}';
+        currentPath.value = newPath;
+      },
+      child: Container(
+        padding: const EdgeInsets.all(16),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(
+            color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
+          ),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Icon(
+              Symbols.folder,
+              fill: 1,
+              size: 24,
+              color: Theme.of(context).colorScheme.primaryFixedDim,
+            ),
+            const Gap(16),
+            Text(
+              folderItem.folderName,
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+              textAlign: TextAlign.center,
+              style: Theme.of(
+                context,
+              ).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildUnindexedFileListContent(
+    List<FileListItem> items,
+    int widgetCount,
+    Widget endItemView,
+    WidgetRef ref,
+    BuildContext context,
+    ValueNotifier<FileListViewMode> currentViewMode,
+  ) {
+    return switch (currentViewMode.value) {
+      // Waterfall mode
+      FileListViewMode.waterfall => SliverMasonryGrid(
+        gridDelegate: SliverSimpleGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: isWideScreen(context) ? 340 : 240,
+        ),
+        crossAxisSpacing: 12,
+        mainAxisSpacing: 12,
+        delegate: SliverChildBuilderDelegate((context, index) {
+          if (index == widgetCount - 1) {
+            return endItemView;
+          }
+
+          if (index >= items.length) {
+            return const SizedBox.shrink();
+          }
+
+          final item = items[index];
+          return item.map(
+            file: (fileItem) {
+              // Should not happen in unindexed mode
+              return const SizedBox.shrink();
+            },
+            folder: (folderItem) {
+              // Should not happen in unindexed mode
+              return const SizedBox.shrink();
+            },
+            unindexedFile:
+                (unindexedFileItem) => _buildWaterfallUnindexedFileTile(
+                  unindexedFileItem,
+                  ref,
+                  context,
+                ),
+          );
+        }, childCount: widgetCount),
+      ),
+      // ListView mode
+      _ => SliverList.builder(
+        itemCount: widgetCount,
+        itemBuilder: (context, index) {
+          if (index == widgetCount - 1) {
+            return endItemView;
+          }
+
+          final item = items[index];
+          return item.map(
+            file: (fileItem) {
+              // Should not happen in unindexed mode
+              return const SizedBox.shrink();
+            },
+            folder: (folderItem) {
+              // Should not happen in unindexed mode
+              return const SizedBox.shrink();
+            },
+            unindexedFile:
+                (unindexedFileItem) => _buildListUnindexedFileTile(
+                  unindexedFileItem,
+                  ref,
+                  context,
+                ),
+          );
+        },
+      ),
+    };
+  }
+
+  Widget _buildWaterfallUnindexedFileTile(
+    UnindexedFileItem unindexedFileItem,
+    WidgetRef ref,
+    BuildContext context,
+  ) {
+    return _buildWaterfallFileTileBase(
+      unindexedFileItem.file,
+      () => '/files/${unindexedFileItem.file.id}',
+      ref,
+      context,
+      [
+        IconButton(
+          icon: const Icon(Symbols.delete),
+          onPressed: () async {
+            final confirmed = await showConfirmAlert(
+              'confirmDeleteFile'.tr(),
+              'deleteFile'.tr(),
+            );
+            if (!confirmed) return;
+
+            if (context.mounted) {
+              showLoadingModal(context);
+            }
+            try {
+              final client = ref.read(apiClientProvider);
+              await client.delete('/drive/files/${unindexedFileItem.file.id}');
+              ref.invalidate(unindexedFileListNotifierProvider);
+            } catch (e) {
+              showSnackBar('failedToDeleteFile'.tr());
+            } finally {
+              if (context.mounted) {
+                hideLoadingModal(context);
+              }
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildListUnindexedFileTile(
+    UnindexedFileItem unindexedFileItem,
+    WidgetRef ref,
+    BuildContext context,
+  ) {
+    final file = unindexedFileItem.file;
+    return ListTile(
+      leading: ClipRRect(
+        borderRadius: const BorderRadius.all(Radius.circular(8)),
+        child: SizedBox(
+          height: 48,
+          width: 48,
+          child: getFileIcon(file, size: 24),
+        ),
+      ),
+      title:
+          file.name.isEmpty
+              ? Text('untitled').tr().italic()
+              : Text(file.name, maxLines: 1, overflow: TextOverflow.ellipsis),
+      subtitle: Text(formatFileSize(file.size)),
+      onTap: () {
+        context.push('/files/${file.id}', extra: file);
+      },
+      trailing: IconButton(
+        icon: const Icon(Symbols.delete),
+        onPressed: () async {
+          final confirmed = await showConfirmAlert(
+            'confirmDeleteFile'.tr(),
+            'deleteFile'.tr(),
+          );
+          if (!confirmed) return;
+
+          if (context.mounted) {
+            showLoadingModal(context);
+          }
+          try {
+            final client = ref.read(apiClientProvider);
+            await client.delete('/drive/files/${file.id}');
+            ref.invalidate(unindexedFileListNotifierProvider);
+          } catch (e) {
+            showSnackBar('failedToDeleteFile'.tr());
+          } finally {
+            if (context.mounted) {
+              hideLoadingModal(context);
+            }
+          }
+        },
+      ),
+    );
+  }
+
+  Widget _buildEmptyUnindexedFilesHint(WidgetRef ref) {
+    return Card(
+      margin: const EdgeInsets.fromLTRB(16, 0, 16, 0),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 48),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Symbols.inventory_2, size: 64, color: Colors.grey),
+            const Gap(16),
+            Text(
+              'No unindexed files',
+              style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+                color: Theme.of(ref.context).textTheme.bodyLarge?.color,
+              ),
+            ),
+            const Gap(8),
+            Text(
+              'All files have been assigned to paths.\n'
+              'Files without paths will appear here.',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Theme.of(
+                  ref.context,
+                ).textTheme.bodyMedium?.color?.withOpacity(0.7),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/post/compose_attachments.dart

@@ -131,7 +131,7 @@ class ArticleComposeAttachments extends ConsumerWidget {
               ],
             ),
             children: [
-              ValueListenableBuilder<Map<int, double>>(
+              ValueListenableBuilder<Map<int, double?>>(
                 valueListenable: state.attachmentProgress,
                 builder: (context, progressMap, _) {
                   return Wrap(

lib/widgets/post/compose_card.dart

@@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/post.dart';
@@ -330,7 +329,13 @@ class PostComposeCard extends HookConsumerWidget {
                               if (isContained) {
                                 Navigator.of(context).pop();
                               }
-                              context.pushNamed('creatorNew').then((value) {
+                              showModalBottomSheet(
+                                context: context,
+                                isScrollControlled: true,
+                                useRootNavigator: true,
+                                builder:
+                                    (context) => const NewPublisherScreen(),
+                              ).then((value) {
                                 if (value != null) {
                                   composeState.currentPublisher.value =
                                       value as SnPublisher;
@@ -368,9 +373,14 @@ class PostComposeCard extends HookConsumerWidget {
                                     if (isContained) {
                                       Navigator.of(context).pop();
                                     }
-                                    context.pushNamed('creatorNew').then((
+                                    showModalBottomSheet(
-                                      value,
+                                      context: context,
-                                    ) {
+                                      isScrollControlled: true,
+                                      useRootNavigator: true,
+                                      builder:
+                                          (context) =>
+                                              const NewPublisherScreen(),
+                                    ).then((value) {
                                       if (value != null) {
                                         composeState.currentPublisher.value =
                                             value as SnPublisher;

lib/widgets/post/compose_shared.dart

@@ -33,7 +33,7 @@ class ComposeState {
   final TextEditingController slugController;
   final ValueNotifier<int> visibility;
   final ValueNotifier<List<UniversalFile>> attachments;
-  final ValueNotifier<Map<int, double>> attachmentProgress;
+  final ValueNotifier<Map<int, double?>> attachmentProgress;
   final ValueNotifier<SnPublisher?> currentPublisher;
   final ValueNotifier<bool> submitting;
   final ValueNotifier<List<SnPostCategory>> categories;
@@ -123,7 +123,7 @@ class ComposeLogic {
       slugController: TextEditingController(text: originalPost?.slug),
       visibility: ValueNotifier<int>(originalPost?.visibility ?? 0),
       submitting: ValueNotifier<bool>(false),
-      attachmentProgress: ValueNotifier<Map<int, double>>({}),
+      attachmentProgress: ValueNotifier<Map<int, double?>>({}),
       currentPublisher: ValueNotifier<SnPublisher?>(originalPost?.publisher),
       tags: ValueNotifier<List<String>>(tags),
       categories: ValueNotifier<List<SnPostCategory>>(categories),
@@ -149,7 +149,7 @@ class ComposeLogic {
       slugController: TextEditingController(text: draft.slug),
       visibility: ValueNotifier<int>(draft.visibility),
       submitting: ValueNotifier<bool>(false),
-      attachmentProgress: ValueNotifier<Map<int, double>>({}),
+      attachmentProgress: ValueNotifier<Map<int, double?>>({}),
       currentPublisher: ValueNotifier<SnPublisher?>(null),
       tags: ValueNotifier<List<String>>(tags),
       categories: ValueNotifier<List<SnPostCategory>>(draft.categories),
@@ -180,7 +180,7 @@ class ComposeLogic {
           try {
             final cloudFile =
                 await FileUploader.createCloudFile(
-                  client: ref.read(apiClientProvider),
+                  ref: ref,
                   fileData: attachment,
                 ).future;
             if (cloudFile != null) {
@@ -402,16 +402,13 @@ class ComposeLogic {
   }
 
   static Future<void> pickPhotoMedia(WidgetRef ref, ComposeState state) async {
-    final result = await FilePicker.platform.pickFiles(
+    final ImagePicker picker = ImagePicker();
-      type: FileType.image,
+    final List<XFile> results = await picker.pickMultiImage();
-      allowMultiple: true,
+    if (results.isEmpty) return;
-      allowCompression: false,
-    );
-    if (result == null || result.count == 0) return;
     state.attachments.value = [
       ...state.attachments.value,
-      ...result.files.map(
+      ...results.map(
-        (e) => UniversalFile(data: e.xFile, type: UniversalFileType.image),
+        (xfile) => UniversalFile(data: xfile, type: UniversalFileType.image),
       ),
     ];
   }
@@ -503,7 +500,7 @@ class ComposeLogic {
     try {
       state.attachmentProgress.value = {
         ...state.attachmentProgress.value,
-        index: 0,
+        index: 0.0,
       };
 
       SnCloudFile? cloudFile;
@@ -513,7 +510,7 @@ class ComposeLogic {
 
       cloudFile =
           await FileUploader.createCloudFile(
-            client: ref.read(apiClientProvider),
+            ref: ref,
             fileData: attachment,
             poolId: poolId ?? selectedPoolId,
             mode:
@@ -523,7 +520,7 @@ class ComposeLogic {
             onProgress: (progress, _) {
               state.attachmentProgress.value = {
                 ...state.attachmentProgress.value,
-                index: progress,
+                index: progress ?? 0.0,
               };
             },
           ).future;

lib/widgets/post/post_list.g.dart

@@ -6,7 +6,7 @@ part of 'post_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$postListNotifierHash() => r'8241120dc3c2004387c6cf881e5cb9224cbd3a97';
+String _$postListNotifierHash() => r'bfc3d652dffc5ff3a94a6c3d04aac65354fe63b5';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/widgets/post/publishers_modal.dart

@@ -3,7 +3,6 @@ import 'dart:math' as math;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/screens/creators/publishers_form.dart';
 import 'package:island/widgets/content/cloud_files.dart';
@@ -43,9 +42,13 @@ class PublisherModal extends HookConsumerWidget {
                                     const Gap(12),
                                     ElevatedButton(
                                       onPressed: () {
-                                        context.pushNamed('creatorNew').then((
+                                        showModalBottomSheet(
-                                          value,
+                                          context: context,
-                                        ) {
+                                          isScrollControlled: true,
+                                          builder:
+                                              (context) =>
+                                                  const NewPublisherScreen(),
+                                        ).then((value) {
                                           if (value != null) {
                                             ref.invalidate(
                                               publishersManagedProvider,

lib/widgets/share/share_sheet.dart

@@ -241,12 +241,13 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
               final file = universalFiles[idx];
               final cloudFile =
                   await FileUploader.createCloudFile(
-                    client: apiClient,
+                    ref: ref,
                     fileData: file,
                     onProgress: (progress, _) {
                       if (mounted) {
                         setState(() {
-                          _fileUploadProgress[messageId]?[idx] = progress;
+                          _fileUploadProgress[messageId]?[idx] =
+                              progress ?? 0.0;
                         });
                       }
                     },
@@ -306,7 +307,7 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
 
         // Navigate to chat if requested
         if (shouldNavigate == true && mounted) {
-          context.push('/sphere/chat/${chatRoom.id}');
+          context.push('/chat/${chatRoom.id}');
         }
       }
     } catch (e) {

lib/widgets/thought/function_calls_section.dart

@@ -30,9 +30,9 @@ class _FunctionCallsSectionState extends State<FunctionCallsSection> {
     if (widget.isStreaming) {
       return widget.streamingFunctionCalls.isNotEmpty;
     } else {
-      return widget.thought!.chunks.isNotEmpty &&
+      return widget.thought!.parts.isNotEmpty &&
-          widget.thought!.chunks.any(
+          widget.thought!.parts.any(
-            (chunk) => chunk.type == ThinkingChunkType.functionCall,
+            (part) => part.type == ThinkingMessagePartType.functionCall,
           );
     }
   }
@@ -115,13 +115,14 @@ class _FunctionCallsSectionState extends State<FunctionCallsSection> {
                         ),
                       ),
                     ] else ...[
-                      ...widget.thought!.chunks
+                      ...widget.thought!.parts
                           .where(
-                            (chunk) =>
+                            (part) =>
-                                chunk.type == ThinkingChunkType.functionCall,
+                                part.type ==
+                                ThinkingMessagePartType.functionCall,
                           )
                           .map(
-                            (chunk) => Container(
+                            (part) => Container(
                               width: double.infinity,
                               padding: const EdgeInsets.all(8),
                               margin: const EdgeInsets.only(bottom: 4),
@@ -138,7 +139,7 @@ class _FunctionCallsSectionState extends State<FunctionCallsSection> {
                               child: SelectableText(
                                 JsonEncoder.withIndent(
                                   '  ',
-                                ).convert(chunk.data),
+                                ).convert(part.functionCall?.toJson() ?? {}),
                                 style: GoogleFonts.robotoMono(
                                   fontSize: 11,
                                   color:

lib/widgets/thought/thought_content.dart

@@ -15,63 +15,104 @@ class ThoughtContent extends StatelessWidget {
   final String streamingText;
   final SnThinkingThought? thought;
 
+  bool get _isErrorMessage {
+    if (thought == null) return false;
+    // Check if this is an error thought by ID or content
+    if (thought!.id.startsWith('error-')) return true;
+    final textParts = thought!.parts
+        .where((p) => p.type == ThinkingMessagePartType.text)
+        .map((p) => p.text ?? '')
+        .join('');
+    return textParts.startsWith('Error:');
+  }
+
   @override
   Widget build(BuildContext context) {
     if (isStreaming) {
       // Streaming text with spinner
       if (streamingText.isNotEmpty) {
-        return Row(
+        final isStreamingError = streamingText.startsWith('Error:');
-          crossAxisAlignment: CrossAxisAlignment.start,
+        return Container(
-          children: [
+          padding: isStreamingError ? const EdgeInsets.all(8) : EdgeInsets.zero,
-            Expanded(
+          decoration:
-              child: MarkdownTextContent(
+              isStreamingError
-                isSelectable: true,
+                  ? BoxDecoration(
-                content: streamingText,
+                    border: Border.all(
-                extraBlockSyntaxList: [ProposalBlockSyntax()],
+                      color: Theme.of(context).colorScheme.error,
-                textStyle: Theme.of(context).textTheme.bodyMedium,
+                      width: 1,
-                extraGenerators: [
+                    ),
-                  ProposalGenerator(
+                    borderRadius: BorderRadius.circular(8),
-                    backgroundColor:
+                  )
-                        Theme.of(context).colorScheme.secondaryContainer,
+                  : null,
-                    foregroundColor:
+          child: MarkdownTextContent(
-                        Theme.of(context).colorScheme.onSecondaryContainer,
+            isSelectable: true,
-                    borderColor: Theme.of(context).colorScheme.outline,
+            content: streamingText,
-                  ),
+            extraBlockSyntaxList: [ProposalBlockSyntax()],
-                ],
+            textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              ),
+              color:
+                  isStreamingError ? Theme.of(context).colorScheme.error : null,
             ),
-            const SizedBox(width: 8),
+            extraGenerators: [
-            SizedBox(
+              ProposalGenerator(
-              width: 16,
+                backgroundColor:
-              height: 16,
+                    Theme.of(context).colorScheme.secondaryContainer,
-              child: CircularProgressIndicator(
+                foregroundColor:
-                strokeWidth: 2,
+                    Theme.of(context).colorScheme.onSecondaryContainer,
-                valueColor: AlwaysStoppedAnimation<Color>(
+                borderColor: Theme.of(context).colorScheme.outline,
-                  Theme.of(context).colorScheme.primary,
-                ),
               ),
-            ),
+            ],
-          ],
+          ),
         );
       }
       return const SizedBox.shrink();
     } else {
-      // Regular thought content
+      // Regular thought content - render parts
-      if (thought!.content != null && thought!.content!.isNotEmpty) {
+      if (thought!.parts.isNotEmpty) {
-        return MarkdownTextContent(
+        final textParts = thought!.parts
-          isSelectable: true,
+            .where((p) => p.type == ThinkingMessagePartType.text)
-          content: thought!.content!,
+            .map((p) => p.text ?? '')
-          extraBlockSyntaxList: [ProposalBlockSyntax()],
+            .join('');
-          textStyle: Theme.of(context).textTheme.bodyMedium,
+        if (textParts.isNotEmpty) {
-          extraGenerators: [
+          return Container(
-            ProposalGenerator(
+            padding:
-              backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+                _isErrorMessage
-              foregroundColor:
+                    ? const EdgeInsets.symmetric(horizontal: 12, vertical: 4)
-                  Theme.of(context).colorScheme.onSecondaryContainer,
+                    : EdgeInsets.zero,
-              borderColor: Theme.of(context).colorScheme.outline,
+            decoration:
+                _isErrorMessage
+                    ? BoxDecoration(
+                      color: Theme.of(
+                        context,
+                      ).colorScheme.error.withOpacity(0.1),
+                      border: Border.all(
+                        color: Theme.of(context).colorScheme.error,
+                        width: 1,
+                      ),
+                      borderRadius: BorderRadius.circular(8),
+                    )
+                    : null,
+            child: MarkdownTextContent(
+              isSelectable: true,
+              content: textParts,
+              extraBlockSyntaxList: [ProposalBlockSyntax()],
+              textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                color:
+                    _isErrorMessage
+                        ? Theme.of(context).colorScheme.error
+                        : null,
+              ),
+              extraGenerators: [
+                ProposalGenerator(
+                  backgroundColor:
+                      Theme.of(context).colorScheme.secondaryContainer,
+                  foregroundColor:
+                      Theme.of(context).colorScheme.onSecondaryContainer,
+                  borderColor: Theme.of(context).colorScheme.outline,
+                ),
+              ],
             ),
-          ],
+          );
-        );
+        }
       }
       return const SizedBox.shrink();
     }

lib/widgets/thought/thought_shared.dart

@@ -1,8 +1,14 @@
+import 'dart:convert';
+import 'dart:math' as math;
+import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/thought.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/posts/compose.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/post/compose_sheet.dart';
@@ -13,6 +19,475 @@ import 'package:island/widgets/thought/thought_content.dart';
 import 'package:island/widgets/thought/thought_header.dart';
 import 'package:island/widgets/thought/token_info.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:super_sliver_list/super_sliver_list.dart';
+
+class ThoughtChatState {
+  final ValueNotifier<String?> sequenceId;
+  final ValueNotifier<List<SnThinkingThought>> localThoughts;
+  final ValueNotifier<String?> currentTopic;
+  final TextEditingController messageController;
+  final ScrollController scrollController;
+  final ValueNotifier<bool> isStreaming;
+  final ValueNotifier<List<SnThinkingMessagePart>> streamingParts;
+  final ValueNotifier<List<String>> reasoningChunks;
+  final ListController listController;
+  final ValueNotifier<ValueNotifier<double>> bottomGradientNotifier;
+  final Future<void> Function() sendMessage;
+
+  ThoughtChatState({
+    required this.sequenceId,
+    required this.localThoughts,
+    required this.currentTopic,
+    required this.messageController,
+    required this.scrollController,
+    required this.isStreaming,
+    required this.streamingParts,
+    required this.reasoningChunks,
+    required this.listController,
+    required this.bottomGradientNotifier,
+    required this.sendMessage,
+  });
+}
+
+ThoughtChatState useThoughtChat(
+  WidgetRef ref, {
+  String? initialSequenceId,
+  List<SnThinkingThought>? initialThoughts,
+  String? initialTopic,
+  List<Map<String, dynamic>> attachedMessages = const [],
+  List<String> attachedPosts = const [],
+  VoidCallback? onSequenceIdChanged,
+}) {
+  final sequenceId = useState<String?>(initialSequenceId);
+  final localThoughts = useState<List<SnThinkingThought>>(
+    initialThoughts ?? [],
+  );
+  final currentTopic = useState<String?>(initialTopic ?? 'aiThought'.tr());
+
+  final messageController = useTextEditingController();
+  final scrollController = useScrollController();
+  final isStreaming = useState(false);
+  final streamingParts = useState<List<SnThinkingMessagePart>>([]);
+  final reasoningChunks = useState<List<String>>([]);
+
+  final listController = useMemoized(() => ListController(), []);
+
+  // Scroll animation notifiers
+  final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
+
+  // Scroll to bottom when thoughts change or streaming state changes
+  useEffect(() {
+    if (localThoughts.value.isNotEmpty || isStreaming.value) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        scrollController.animateTo(
+          0,
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.easeOut,
+        );
+      });
+    }
+    return null;
+  }, [localThoughts.value.length, isStreaming.value]);
+
+  // Add scroll listener for gradient animations
+  useEffect(() {
+    void onScroll() {
+      // Update gradient animations
+      final pixels = scrollController.position.pixels;
+
+      // Bottom gradient: appears when not at bottom (pixels > 0)
+      bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
+    }
+
+    scrollController.addListener(onScroll);
+    return () => scrollController.removeListener(onScroll);
+  }, [scrollController]);
+
+  Future<void> sendMessage() async {
+    if (messageController.text.trim().isEmpty) return;
+
+    final userMessage = messageController.text.trim();
+
+    // Add user message to local thoughts
+    final userInfo = ref.read(userInfoProvider);
+    final now = DateTime.now();
+    final userThought = SnThinkingThought(
+      id: 'user-${DateTime.now().millisecondsSinceEpoch}',
+      parts: [
+        SnThinkingMessagePart(
+          type: ThinkingMessagePartType.text,
+          text: userMessage,
+        ),
+      ],
+      files: [],
+      role: ThinkingThoughtRole.user,
+      sequenceId: sequenceId.value ?? '',
+      createdAt: now,
+      updatedAt: now,
+      sequence: SnThinkingSequence(
+        id: sequenceId.value ?? '',
+        accountId: userInfo.value!.id,
+        createdAt: now,
+        updatedAt: now,
+      ),
+    );
+    localThoughts.value = [userThought, ...localThoughts.value];
+
+    final request = StreamThinkingRequest(
+      userMessage: userMessage,
+      sequenceId: sequenceId.value,
+      accpetProposals: ['post_create'],
+      attachedMessages: attachedMessages,
+      attachedPosts: attachedPosts,
+    );
+
+    try {
+      isStreaming.value = true;
+      streamingParts.value = [];
+      reasoningChunks.value = [];
+
+      final apiClient = ref.read(apiClientProvider);
+      final response = await apiClient.post(
+        '/insight/thought',
+        data: request.toJson(),
+        options: Options(
+          responseType: ResponseType.stream,
+          sendTimeout: Duration(minutes: 1),
+          receiveTimeout: Duration(minutes: 1),
+        ),
+      );
+
+      final stream = response.data.stream;
+      final lineBuffer = StringBuffer();
+
+      stream.listen(
+        (data) {
+          final chunk = utf8.decode(data);
+          lineBuffer.write(chunk);
+          final lines = lineBuffer.toString().split('\n');
+          lineBuffer.clear();
+          lineBuffer.write(lines.last); // keep incomplete line
+
+          for (final line in lines.sublist(0, lines.length - 1)) {
+            if (line.trim().isEmpty) continue;
+            try {
+              if (line.startsWith('data: ')) {
+                final jsonStr = line.substring(6);
+                final event = jsonDecode(jsonStr);
+                final type = event['type'];
+                final eventData = event['data'];
+                if (type == 'text') {
+                  if (streamingParts.value.isNotEmpty &&
+                      streamingParts.value.last.type ==
+                          ThinkingMessagePartType.text) {
+                    final last = streamingParts.value.last;
+                    final newParts = [...streamingParts.value];
+                    newParts[newParts.length - 1] = last.copyWith(
+                      text: (last.text ?? '') + eventData,
+                    );
+                    streamingParts.value = newParts;
+                  } else {
+                    streamingParts.value = [
+                      ...streamingParts.value,
+                      SnThinkingMessagePart(
+                        type: ThinkingMessagePartType.text,
+                        text: eventData,
+                      ),
+                    ];
+                  }
+                } else if (type == 'function_call') {
+                  streamingParts.value = [
+                    ...streamingParts.value,
+                    SnThinkingMessagePart(
+                      type: ThinkingMessagePartType.functionCall,
+                      functionCall: SnFunctionCall.fromJson(eventData),
+                    ),
+                  ];
+                } else if (type == 'function_result') {
+                  streamingParts.value = [
+                    ...streamingParts.value,
+                    SnThinkingMessagePart(
+                      type: ThinkingMessagePartType.functionResult,
+                      functionResult: SnFunctionResult.fromJson(eventData),
+                    ),
+                  ];
+                } else if (type == 'reasoning') {
+                  reasoningChunks.value = [...reasoningChunks.value, eventData];
+                }
+              } else if (line.startsWith('topic: ')) {
+                final jsonStr = line.substring(7);
+                final event = jsonDecode(jsonStr);
+                currentTopic.value = event['data'];
+              } else if (line.startsWith('thought: ')) {
+                final jsonStr = line.substring(9);
+                final event = jsonDecode(jsonStr);
+                final aiThought = SnThinkingThought.fromJson(event['data']);
+                localThoughts.value = [aiThought, ...localThoughts.value];
+                if (sequenceId.value == null &&
+                    aiThought.sequenceId.isNotEmpty) {
+                  sequenceId.value = aiThought.sequenceId;
+                  onSequenceIdChanged?.call();
+                }
+                isStreaming.value = false;
+              }
+            } catch (e) {
+              // Ignore parsing errors for individual events
+            }
+          }
+        },
+        onDone: () {
+          if (isStreaming.value) {
+            isStreaming.value = false;
+            // Add error thought to the list for incomplete response
+            final now = DateTime.now();
+            final errorThought = SnThinkingThought(
+              id: 'error-${DateTime.now().millisecondsSinceEpoch}',
+              parts: [
+                SnThinkingMessagePart(
+                  type: ThinkingMessagePartType.text,
+                  text: 'Error: ${'thoughtParseError'.tr()}',
+                ),
+              ],
+              files: [],
+              role: ThinkingThoughtRole.assistant,
+              sequenceId: sequenceId.value ?? '',
+              createdAt: now,
+              updatedAt: now,
+              sequence: SnThinkingSequence(
+                id: sequenceId.value ?? '',
+                accountId: '',
+                createdAt: now,
+                updatedAt: now,
+              ),
+            );
+            localThoughts.value = [errorThought, ...localThoughts.value];
+          }
+        },
+        onError: (error) {
+          isStreaming.value = false;
+
+          // Add error thought to the list
+          final now = DateTime.now();
+          final errorMessage =
+              error is DioException && error.response?.data is ResponseBody
+                  ? 'toughtParseError'.tr()
+                  : error.toString();
+          final errorThought = SnThinkingThought(
+            id: 'error-${DateTime.now().millisecondsSinceEpoch}',
+            parts: [
+              SnThinkingMessagePart(
+                type: ThinkingMessagePartType.text,
+                text: 'Error: $errorMessage',
+              ),
+            ],
+            files: [],
+            role: ThinkingThoughtRole.assistant,
+            sequenceId: sequenceId.value ?? '',
+            createdAt: now,
+            updatedAt: now,
+            sequence: SnThinkingSequence(
+              id: sequenceId.value ?? '',
+              accountId: '',
+              createdAt: now,
+              updatedAt: now,
+            ),
+          );
+          localThoughts.value = [errorThought, ...localThoughts.value];
+        },
+      );
+
+      messageController.clear();
+      FocusManager.instance.primaryFocus?.unfocus();
+    } catch (error) {
+      isStreaming.value = false;
+
+      // Add error thought to the list for initial request errors
+      final now = DateTime.now();
+      final userInfo = ref.read(userInfoProvider);
+      final errorMessage = error.toString();
+      final errorThought = SnThinkingThought(
+        id: 'error-${DateTime.now().millisecondsSinceEpoch}',
+        parts: [
+          SnThinkingMessagePart(
+            type: ThinkingMessagePartType.text,
+            text: 'Error: $errorMessage',
+          ),
+        ],
+        files: [],
+        role: ThinkingThoughtRole.assistant,
+        sequenceId: sequenceId.value ?? '',
+        createdAt: now,
+        updatedAt: now,
+        sequence: SnThinkingSequence(
+          id: sequenceId.value ?? '',
+          accountId: userInfo.value!.id,
+          createdAt: now,
+          updatedAt: now,
+        ),
+      );
+      localThoughts.value = [errorThought, ...localThoughts.value];
+    }
+  }
+
+  return ThoughtChatState(
+    sequenceId: sequenceId,
+    localThoughts: localThoughts,
+    currentTopic: currentTopic,
+    messageController: messageController,
+    scrollController: scrollController,
+    isStreaming: isStreaming,
+    streamingParts: streamingParts,
+    reasoningChunks: reasoningChunks,
+    listController: listController,
+    bottomGradientNotifier: bottomGradientNotifier,
+    sendMessage: sendMessage,
+  );
+}
+
+class ThoughtChatInterface extends HookConsumerWidget {
+  final List<SnThinkingThought>? initialThoughts;
+  final String? initialTopic;
+  final List<Map<String, dynamic>> attachedMessages;
+  final List<String> attachedPosts;
+
+  const ThoughtChatInterface({
+    super.key,
+    this.initialThoughts,
+    this.initialTopic,
+    this.attachedMessages = const [],
+    this.attachedPosts = const [],
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final chatState = useThoughtChat(
+      ref,
+      initialThoughts: initialThoughts,
+      initialTopic: initialTopic,
+      attachedMessages: attachedMessages,
+      attachedPosts: attachedPosts,
+    );
+
+    return Stack(
+      children: [
+        // Thoughts list
+        Center(
+          child: Container(
+            constraints: BoxConstraints(maxWidth: 640),
+            child: Column(
+              children: [
+                Expanded(
+                  child: SuperListView.builder(
+                    listController: chatState.listController,
+                    controller: chatState.scrollController,
+                    padding: EdgeInsets.only(
+                      top: 16,
+                      bottom:
+                          MediaQuery.of(context).padding.bottom +
+                          80, // Leave space for thought input
+                    ),
+                    reverse: true,
+                    itemCount:
+                        chatState.localThoughts.value.length +
+                        (chatState.isStreaming.value ? 1 : 0),
+                    itemBuilder: (context, index) {
+                      if (chatState.isStreaming.value && index == 0) {
+                        final streamingText = chatState.streamingParts.value
+                            .where(
+                              (p) => p.type == ThinkingMessagePartType.text,
+                            )
+                            .map((p) => p.text ?? '')
+                            .join('');
+                        final streamingFunctionCalls =
+                            chatState.streamingParts.value
+                                .where(
+                                  (p) =>
+                                      p.type ==
+                                      ThinkingMessagePartType.functionCall,
+                                )
+                                .map(
+                                  (p) => JsonEncoder.withIndent(
+                                    '  ',
+                                  ).convert(p.functionCall?.toJson() ?? {}),
+                                )
+                                .toList();
+                        return ThoughtItem(
+                          isStreaming: true,
+                          streamingText: streamingText,
+                          reasoningChunks: chatState.reasoningChunks.value,
+                          streamingFunctionCalls: streamingFunctionCalls,
+                        );
+                      }
+                      final thoughtIndex =
+                          chatState.isStreaming.value ? index - 1 : index;
+                      final thought =
+                          chatState.localThoughts.value[thoughtIndex];
+                      return ThoughtItem(
+                        thought: thought,
+                        thoughtIndex: thoughtIndex,
+                      );
+                    },
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+        // Bottom gradient - appears when scrolling towards newer thoughts (behind thought input)
+        AnimatedBuilder(
+          animation: chatState.bottomGradientNotifier.value,
+          builder:
+              (context, child) => Positioned(
+                left: 0,
+                right: 0,
+                bottom: 0,
+                child: Opacity(
+                  opacity: chatState.bottomGradientNotifier.value.value,
+                  child: Container(
+                    height: math.min(
+                      MediaQuery.of(context).size.height * 0.1,
+                      128,
+                    ),
+                    decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                        begin: Alignment.bottomCenter,
+                        end: Alignment.topCenter,
+                        colors: [
+                          Theme.of(
+                            context,
+                          ).colorScheme.surfaceContainer.withOpacity(0.8),
+                          Theme.of(
+                            context,
+                          ).colorScheme.surfaceContainer.withOpacity(0.0),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+        ),
+        // Thought Input positioned above gradient (higher z-index)
+        Positioned(
+          left: 0,
+          right: 0,
+          bottom: 0, // At the very bottom, above gradient
+          child: Center(
+            child: Container(
+              constraints: BoxConstraints(maxWidth: 640),
+              child: ThoughtInput(
+                messageController: chatState.messageController,
+                isStreaming: chatState.isStreaming.value,
+                onSend: chatState.sendMessage,
+                attachedMessages: attachedMessages,
+                attachedPosts: attachedPosts,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
 
 List<Map<String, String>> _extractProposals(String content) {
   final proposalRegex = RegExp(
@@ -211,8 +686,13 @@ class ThoughtItem extends StatelessWidget {
         (!isStreaming && thought!.role == ThinkingThoughtRole.assistant);
 
     final List<Map<String, String>> proposals =
-        !isStreaming && thought!.content != null
+        !isStreaming
-            ? _extractProposals(thought!.content!)
+            ? _extractProposals(
+              thought!.parts
+                  .where((p) => p.type == ThinkingMessagePartType.text)
+                  .map((p) => p.text ?? '')
+                  .join(''),
+            )
             : [];
 
     return Container(
@@ -239,10 +719,27 @@ class ThoughtItem extends StatelessWidget {
               spacing: 8,
               children: [
                 // Main content
-                ThoughtContent(
+                Row(
-                  isStreaming: isStreaming,
+                  mainAxisSize: MainAxisSize.min,
-                  streamingText: streamingText,
+                  crossAxisAlignment: CrossAxisAlignment.end,
-                  thought: thought,
+                  children: [
+                    Flexible(
+                      child: ThoughtContent(
+                        isStreaming: isStreaming,
+                        streamingText: streamingText,
+                        thought: thought,
+                      ),
+                    ),
+                    if (isStreaming && isAI)
+                      SizedBox(
+                        height: 20,
+                        width: 20,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2.5,
+                          padding: const EdgeInsets.all(4),
+                        ),
+                      ),
+                  ],
                 ),
 
                 // Reasoning chunks (streaming only)
@@ -251,10 +748,10 @@ class ThoughtItem extends StatelessWidget {
 
                 // Function calls
                 if (streamingFunctionCalls.isNotEmpty ||
-                    (thought?.chunks.isNotEmpty ?? false) &&
+                    (thought?.parts.isNotEmpty ?? false) &&
-                        thought!.chunks.any(
+                        thought!.parts.any(
-                          (chunk) =>
+                          (part) =>
-                              chunk.type == ThinkingChunkType.functionCall,
+                              part.type == ThinkingMessagePartType.functionCall,
                         ))
                   FunctionCallsSection(
                     isStreaming: isStreaming,
@@ -263,7 +760,10 @@ class ThoughtItem extends StatelessWidget {
                   ),
 
                 // Token count and model name (for completed AI thoughts only)
-                if (!isStreaming && isAI && thought != null)
+                if (!isStreaming &&
+                    isAI &&
+                    thought != null &&
+                    !thought!.id.startsWith('error-'))
                   TokenInfo(thought: thought!),
 
                 // Proposals (for completed AI thoughts only)
@@ -272,8 +772,6 @@ class ThoughtItem extends StatelessWidget {
                     proposals: proposals,
                     onProposalAction: _handleProposalAction,
                   ),
-
-                if (isStreaming && isAI) LinearProgressIndicator(),
               ],
             ),
           ),

lib/widgets/upload_overlay.dart

@@ -0,0 +1,756 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/drive_task.dart';
+import 'package:island/pods/upload_tasks.dart';
+import 'package:island/services/responsive.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class UploadOverlay extends HookConsumerWidget {
+  const UploadOverlay({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final uploadTasks = ref.watch(uploadTasksProvider);
+    final activeTasks =
+        uploadTasks
+            .where(
+              (task) =>
+                  task.status == DriveTaskStatus.pending ||
+                  task.status == DriveTaskStatus.inProgress ||
+                  task.status == DriveTaskStatus.paused ||
+                  task.status == DriveTaskStatus.completed,
+            )
+            .toList()
+          ..sort((a, b) => b.createdAt.compareTo(a.createdAt)); // Newest first
+
+    final isVisible = activeTasks.isNotEmpty;
+    final slideController = useAnimationController(
+      duration: const Duration(milliseconds: 300),
+    );
+    final slideAnimation = Tween<Offset>(
+      begin: const Offset(0, 1), // Start from below the screen
+      end: Offset.zero, // End at normal position
+    ).animate(CurvedAnimation(parent: slideController, curve: Curves.easeOut));
+
+    // Animate when visibility changes
+    useEffect(() {
+      if (isVisible) {
+        slideController.forward();
+      } else {
+        slideController.reverse();
+      }
+      return null;
+    }, [isVisible]);
+
+    if (!isVisible && slideController.status == AnimationStatus.dismissed) {
+      // If not visible and animation is complete (back to start), don't show anything
+      return const SizedBox.shrink();
+    }
+
+    final isDesktop = isWideScreen(context);
+
+    return Positioned(
+      bottom: 0,
+      left: isDesktop ? null : 0,
+      right: isDesktop ? 24 : 0,
+      child: SlideTransition(
+        position: slideAnimation,
+        child: _UploadOverlayContent(
+          activeTasks: activeTasks,
+        ).padding(bottom: 16 + MediaQuery.of(context).padding.bottom),
+      ),
+    );
+  }
+}
+
+class _UploadOverlayContent extends HookConsumerWidget {
+  final List<DriveTask> activeTasks;
+
+  const _UploadOverlayContent({required this.activeTasks});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isExpanded = useState(false);
+    final animationController = useAnimationController(
+      duration: const Duration(milliseconds: 200),
+      initialValue: 0.0,
+    );
+    final heightAnimation = useAnimation(
+      Tween<double>(begin: 60, end: 400).animate(
+        CurvedAnimation(parent: animationController, curve: Curves.easeInOut),
+      ),
+    );
+    final opacityAnimation = useAnimation(
+      CurvedAnimation(parent: animationController, curve: Curves.easeInOut),
+    );
+
+    useEffect(() {
+      if (isExpanded.value) {
+        animationController.forward();
+      } else {
+        animationController.reverse();
+      }
+      return null;
+    }, [isExpanded.value]);
+
+    final isMobile = MediaQuery.of(context).size.width < 600;
+
+    return Padding(
+      padding: EdgeInsets.only(
+        bottom: isMobile ? 16 : 24,
+        left: isMobile ? 16 : 0,
+        right: isMobile ? 16 : 24,
+      ),
+      child: GestureDetector(
+        onTap: () => isExpanded.value = !isExpanded.value,
+        child: AnimatedBuilder(
+          animation: animationController,
+          builder: (context, child) {
+            return Material(
+              elevation: 8 + (opacityAnimation * 4),
+              borderRadius: BorderRadius.circular(12),
+              color: Theme.of(context).colorScheme.surfaceContainer,
+              child: AnimatedContainer(
+                duration: const Duration(milliseconds: 200),
+                curve: Curves.easeInOut,
+                width: isMobile ? MediaQuery.of(context).size.width - 32 : 320,
+                height: heightAnimation,
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(12),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      // Collapsed Header
+                      Container(
+                        height: 60,
+                        padding: const EdgeInsets.symmetric(horizontal: 16),
+                        child: Row(
+                          children: [
+                            // Upload icon with animation
+                            AnimatedSwitcher(
+                              duration: const Duration(milliseconds: 150),
+                              transitionBuilder: (child, animation) {
+                                return FadeTransition(
+                                  opacity: animation,
+                                  child: child,
+                                );
+                              },
+                              child: Icon(
+                                key: ValueKey(isExpanded.value),
+                                isExpanded.value
+                                    ? Symbols.list_rounded
+                                    : _getOverallStatusIcon(activeTasks),
+                                size: 24,
+                                color: Theme.of(context).colorScheme.primary,
+                              ),
+                            ),
+                            const SizedBox(width: 12),
+
+                            // Title and count
+                            Expanded(
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    isExpanded.value
+                                        ? 'uploadTasks'.tr()
+                                        : _getOverallStatusText(activeTasks),
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .titleSmall
+                                        ?.copyWith(fontWeight: FontWeight.w600),
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                  if (!isExpanded.value &&
+                                      activeTasks.isNotEmpty)
+                                    Text(
+                                      _getOverallProgressText(activeTasks),
+                                      style: Theme.of(
+                                        context,
+                                      ).textTheme.bodySmall?.copyWith(
+                                        color:
+                                            Theme.of(
+                                              context,
+                                            ).colorScheme.onSurfaceVariant,
+                                      ),
+                                    ),
+                                ],
+                              ),
+                            ),
+
+                            // Progress indicator (collapsed)
+                            if (!isExpanded.value)
+                              SizedBox(
+                                width: 32,
+                                height: 32,
+                                child: CircularProgressIndicator(
+                                  value: _getOverallProgress(activeTasks),
+                                  strokeWidth: 3,
+                                  backgroundColor:
+                                      Theme.of(
+                                        context,
+                                      ).colorScheme.surfaceContainerHighest,
+                                ),
+                              ),
+
+                            // Expand/collapse button
+                            IconButton(
+                              icon: AnimatedRotation(
+                                turns: opacityAnimation * 0.5,
+                                duration: const Duration(milliseconds: 200),
+                                child: Icon(
+                                  isExpanded.value
+                                      ? Symbols.expand_more
+                                      : Symbols.chevron_right,
+                                  size: 20,
+                                ),
+                              ),
+                              onPressed:
+                                  () => isExpanded.value = !isExpanded.value,
+                              padding: EdgeInsets.zero,
+                              constraints: const BoxConstraints(),
+                            ),
+                          ],
+                        ),
+                      ),
+
+                      // Expanded content
+                      if (isExpanded.value)
+                        Expanded(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              border: Border(
+                                top: BorderSide(
+                                  color: Theme.of(context).colorScheme.outline,
+                                  width:
+                                      1 /
+                                      MediaQuery.of(context).devicePixelRatio,
+                                ),
+                              ),
+                            ),
+                            child: CustomScrollView(
+                              slivers: [
+                                // Clear completed tasks button
+                                if (_hasCompletedTasks(activeTasks))
+                                  SliverToBoxAdapter(
+                                    child: ListTile(
+                                      dense: true,
+                                      title: const Text('Clear Completed'),
+                                      leading: Icon(
+                                        Symbols.clear_all,
+                                        size: 18,
+                                        color:
+                                            Theme.of(
+                                              context,
+                                            ).colorScheme.onSurfaceVariant,
+                                      ),
+                                      onTap: () {
+                                        ref
+                                            .read(uploadTasksProvider.notifier)
+                                            .clearCompletedTasks();
+                                      },
+                                      tileColor:
+                                          Theme.of(
+                                            context,
+                                          ).colorScheme.surfaceContainerHighest,
+                                    ),
+                                  ),
+
+                                // Task list
+                                SliverList(
+                                  delegate: SliverChildBuilderDelegate((
+                                    context,
+                                    index,
+                                  ) {
+                                    final task = activeTasks[index];
+                                    return AnimatedOpacity(
+                                      opacity: opacityAnimation,
+                                      duration: const Duration(
+                                        milliseconds: 150,
+                                      ),
+                                      child: UploadTaskTile(task: task),
+                                    );
+                                  }, childCount: activeTasks.length),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                    ],
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  double _getOverallProgress(List<DriveTask> tasks) {
+    if (tasks.isEmpty) return 0.0;
+    final totalProgress = tasks.fold<double>(
+      0.0,
+      (sum, task) =>
+          sum +
+          (task.status == DriveTaskStatus.inProgress
+              ? task.progress
+              : task.status == DriveTaskStatus.completed
+              ? 1
+              : 0),
+    );
+    return totalProgress / tasks.length;
+  }
+
+  String _getOverallProgressText(List<DriveTask> tasks) {
+    final overallProgress = _getOverallProgress(tasks);
+    return '${(overallProgress * 100).toStringAsFixed(0)}%';
+  }
+
+  IconData _getOverallStatusIcon(List<DriveTask> tasks) {
+    if (tasks.isEmpty) return Symbols.upload;
+
+    final hasInProgress = tasks.any(
+      (task) => task.status == DriveTaskStatus.inProgress,
+    );
+    final hasPending = tasks.any(
+      (task) => task.status == DriveTaskStatus.pending,
+    );
+    final hasPaused = tasks.any(
+      (task) => task.status == DriveTaskStatus.paused,
+    );
+    final hasFailed = tasks.any(
+      (task) =>
+          task.status == DriveTaskStatus.failed ||
+          task.status == DriveTaskStatus.cancelled ||
+          task.status == DriveTaskStatus.expired,
+    );
+    final hasCompleted = tasks.any(
+      (task) => task.status == DriveTaskStatus.completed,
+    );
+
+    // Priority order: in progress > pending > paused > failed > completed
+    if (hasInProgress) {
+      return Symbols.upload;
+    } else if (hasPending) {
+      return Symbols.schedule;
+    } else if (hasPaused) {
+      return Symbols.pause_circle;
+    } else if (hasFailed) {
+      return Symbols.error;
+    } else if (hasCompleted) {
+      return Symbols.check_circle;
+    } else {
+      return Symbols.upload;
+    }
+  }
+
+  String _getOverallStatusText(List<DriveTask> tasks) {
+    if (tasks.isEmpty) return '0 tasks';
+
+    final hasInProgress = tasks.any(
+      (task) => task.status == DriveTaskStatus.inProgress,
+    );
+    final hasPending = tasks.any(
+      (task) => task.status == DriveTaskStatus.pending,
+    );
+    final hasPaused = tasks.any(
+      (task) => task.status == DriveTaskStatus.paused,
+    );
+    final hasFailed = tasks.any(
+      (task) =>
+          task.status == DriveTaskStatus.failed ||
+          task.status == DriveTaskStatus.cancelled ||
+          task.status == DriveTaskStatus.expired,
+    );
+    final hasCompleted = tasks.any(
+      (task) => task.status == DriveTaskStatus.completed,
+    );
+
+    // Priority order: in progress > pending > paused > failed > completed
+    if (hasInProgress) {
+      return '${tasks.length} ${'uploading'.tr()}';
+    } else if (hasPending) {
+      return '${tasks.length} ${'pending'.tr()}';
+    } else if (hasPaused) {
+      return '${tasks.length} ${'paused'.tr()}';
+    } else if (hasFailed) {
+      return '${tasks.length} ${'failed'.tr()}';
+    } else if (hasCompleted) {
+      return '${tasks.length} ${'completed'.tr()}';
+    } else {
+      return '${tasks.length} ${'tasks'.tr()}';
+    }
+  }
+
+  bool _hasCompletedTasks(List<DriveTask> tasks) {
+    return tasks.any(
+      (task) =>
+          task.status == DriveTaskStatus.completed ||
+          task.status == DriveTaskStatus.failed ||
+          task.status == DriveTaskStatus.cancelled ||
+          task.status == DriveTaskStatus.expired,
+    );
+  }
+}
+
+class UploadTaskTile extends StatefulWidget {
+  final DriveTask task;
+
+  const UploadTaskTile({super.key, required this.task});
+
+  @override
+  State<UploadTaskTile> createState() => _UploadTaskTileState();
+}
+
+class _UploadTaskTileState extends State<UploadTaskTile>
+    with TickerProviderStateMixin {
+  late AnimationController _rotationController;
+  late Animation<double> _rotationAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _rotationController = AnimationController(
+      duration: const Duration(milliseconds: 200),
+      vsync: this,
+    );
+    _rotationAnimation = Tween<double>(begin: 0.0, end: 0.5).animate(
+      CurvedAnimation(parent: _rotationController, curve: Curves.easeInOut),
+    );
+  }
+
+  @override
+  void dispose() {
+    _rotationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ExpansionTile(
+      leading: _buildStatusIcon(context),
+      title: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            widget.task.fileName.isEmpty
+                ? 'untitled'.tr()
+                : widget.task.fileName,
+            style: Theme.of(
+              context,
+            ).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+          const SizedBox(height: 2),
+          Text(
+            _formatFileSize(widget.task.fileSize),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+        ],
+      ),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            width: 32,
+            height: 32,
+            child: Padding(
+              padding: const EdgeInsets.all(2),
+              child: CircularProgressIndicator(
+                value: widget.task.progress,
+                strokeWidth: 2.5,
+                backgroundColor:
+                    Theme.of(context).colorScheme.surfaceContainerHighest,
+              ),
+            ),
+          ),
+          const Gap(4),
+          AnimatedBuilder(
+            animation: _rotationAnimation,
+            builder: (context, child) {
+              return Transform.rotate(
+                angle: _rotationAnimation.value * math.pi,
+                child: Icon(
+                  Symbols.expand_more,
+                  size: 20,
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+      tilePadding: const EdgeInsets.symmetric(horizontal: 16),
+      onExpansionChanged: (expanded) {
+        if (expanded) {
+          _rotationController.forward();
+        } else {
+          _rotationController.reverse();
+        }
+      },
+      children: [
+        Padding(
+          padding: const EdgeInsets.fromLTRB(12, 4, 12, 12),
+          child: _buildExpandedDetails(context),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildStatusIcon(BuildContext context) {
+    IconData icon;
+    Color color;
+
+    switch (widget.task.status) {
+      case DriveTaskStatus.pending:
+        icon = Symbols.schedule;
+        color = Theme.of(context).colorScheme.secondary;
+        break;
+      case DriveTaskStatus.inProgress:
+        icon = Symbols.upload;
+        color = Theme.of(context).colorScheme.primary;
+        break;
+      case DriveTaskStatus.paused:
+        icon = Symbols.pause_circle;
+        color = Theme.of(context).colorScheme.tertiary;
+        break;
+      case DriveTaskStatus.completed:
+        icon = Symbols.check_circle;
+        color = Colors.green;
+        break;
+      case DriveTaskStatus.failed:
+        icon = Symbols.error;
+        color = Theme.of(context).colorScheme.error;
+        break;
+      case DriveTaskStatus.cancelled:
+        icon = Symbols.cancel;
+        color = Theme.of(context).colorScheme.error;
+        break;
+      case DriveTaskStatus.expired:
+        icon = Symbols.timer_off;
+        color = Theme.of(context).colorScheme.error;
+        break;
+    }
+
+    return Icon(icon, size: 24, color: color);
+  }
+
+  Widget _buildExpandedDetails(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(8),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(6),
+      ),
+      child: switch (widget.task.type) {
+        'FileUpload' => _buildFileUploadDetails(context),
+        _ => _buildGenericTaskDetails(context),
+      },
+    );
+  }
+
+  Widget _buildFileUploadDetails(BuildContext context) {
+    final transmissionProgress = widget.task.transmissionProgress ?? 0.0;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Server Processing Progress
+        Text(
+          widget.task.statusMessage ?? 'Processing',
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: Theme.of(context).colorScheme.primary,
+          ),
+        ),
+        const SizedBox(height: 2),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              '${(widget.task.progress * 100).toStringAsFixed(1)}%',
+              style: Theme.of(
+                context,
+              ).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600),
+            ),
+            Text(
+              '${widget.task.uploadedChunks}/${widget.task.totalChunks} chunks',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        LinearProgressIndicator(
+          value: widget.task.progress,
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          valueColor: AlwaysStoppedAnimation<Color>(
+            Theme.of(context).colorScheme.primary,
+          ),
+        ),
+
+        const SizedBox(height: 8),
+
+        // File Transmission Progress
+        Text(
+          'File Transmission',
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: Theme.of(context).colorScheme.secondary,
+          ),
+        ),
+        const SizedBox(height: 2),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              '${(transmissionProgress * 100).toStringAsFixed(1)}%',
+              style: Theme.of(
+                context,
+              ).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600),
+            ),
+            Text(
+              '${_formatFileSize((transmissionProgress * widget.task.fileSize).toInt())} / ${_formatFileSize(widget.task.fileSize)}',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        LinearProgressIndicator(
+          value: transmissionProgress,
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          valueColor: AlwaysStoppedAnimation<Color>(
+            Theme.of(context).colorScheme.secondary,
+          ),
+        ),
+
+        const SizedBox(height: 4),
+
+        // Speed and ETA
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              _formatBytesPerSecond(widget.task),
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+            ),
+            if (widget.task.status == DriveTaskStatus.inProgress)
+              Text(
+                'ETA: ${_formatDuration(widget.task.estimatedTimeRemaining)}',
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+              ),
+          ],
+        ),
+
+        // Error message if failed
+        if (widget.task.errorMessage != null) ...[
+          const SizedBox(height: 4),
+          Text(
+            widget.task.errorMessage!,
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Theme.of(context).colorScheme.error,
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget _buildGenericTaskDetails(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Generic task progress
+        Text(
+          'Progress',
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: Theme.of(context).colorScheme.primary,
+          ),
+        ),
+        const SizedBox(height: 2),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              '${(widget.task.progress * 100).toStringAsFixed(1)}%',
+              style: Theme.of(
+                context,
+              ).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600),
+            ),
+            Text(
+              widget.task.status.name,
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        LinearProgressIndicator(
+          value: widget.task.progress,
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          valueColor: AlwaysStoppedAnimation<Color>(
+            Theme.of(context).colorScheme.primary,
+          ),
+        ),
+
+        // Error message if failed
+        if (widget.task.errorMessage != null) ...[
+          const SizedBox(height: 4),
+          Text(
+            widget.task.errorMessage!,
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Theme.of(context).colorScheme.error,
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+
+  String _formatFileSize(int bytes) {
+    if (bytes >= 1073741824) {
+      return '${(bytes / 1073741824).toStringAsFixed(1)} GB';
+    } else if (bytes >= 1048576) {
+      return '${(bytes / 1048576).toStringAsFixed(1)} MB';
+    } else if (bytes >= 1024) {
+      return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    } else {
+      return '$bytes bytes';
+    }
+  }
+
+  String _formatBytesPerSecond(DriveTask task) {
+    if (task.uploadedBytes == 0) return '0 B/s';
+
+    final elapsedSeconds = DateTime.now().difference(task.createdAt).inSeconds;
+    if (elapsedSeconds == 0) return '0 B/s';
+
+    final bytesPerSecond = task.uploadedBytes / elapsedSeconds;
+    return '${_formatFileSize(bytesPerSecond.toInt())}/s';
+  }
+
+  String _formatDuration(Duration duration) {
+    if (duration.inHours > 0) {
+      return '${duration.inHours}h ${duration.inMinutes.remainder(60)}m';
+    } else if (duration.inMinutes > 0) {
+      return '${duration.inMinutes}m ${duration.inSeconds.remainder(60)}s';
+    } else {
+      return '${duration.inSeconds}s';
+    }
+  }
+}

lib/widgets/usage_overview.dart

@@ -0,0 +1,197 @@
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class UsageOverviewWidget extends StatelessWidget {
+  final Map<String, dynamic>? usage;
+  final Map<String, dynamic>? quota;
+
+  const UsageOverviewWidget({
+    super.key,
+    required this.usage,
+    required this.quota,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (usage == null) return const SizedBox.shrink();
+    final nonNullUsage = usage!;
+    return Column(
+      children: [
+        Column(
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: _buildStatCard(
+                    'All Uploads',
+                    '${((nonNullUsage['total_usage_bytes'] as num) / (1024 * 1024 * 1024)).toStringAsFixed(3)} GiB',
+                  ),
+                ),
+                Expanded(
+                  child: _buildStatCard(
+                    'All Files',
+                    '${nonNullUsage['total_file_count']}',
+                  ),
+                ),
+              ],
+            ),
+            Row(
+              children: [
+                Expanded(
+                  child: _buildStatCard(
+                    'Quota',
+                    '${nonNullUsage['total_quota']} MiB',
+                  ),
+                ),
+                Expanded(
+                  child: _buildStatCard(
+                    'Used Quota',
+                    '${((nonNullUsage['used_quota'] as num) / (nonNullUsage['total_quota'] as num) * 100).toStringAsFixed(2)}%',
+                    progress:
+                        (nonNullUsage['used_quota'] as num) /
+                        (nonNullUsage['total_quota'] as num),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ).padding(horizontal: 8),
+        const Gap(8),
+        Row(
+          children: [
+            Expanded(
+              child: Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Column(
+                    children: [
+                      const Text('Pool Usage'),
+                      SizedBox(
+                        height: 200,
+                        child: PieChart(_buildPoolChartData(nonNullUsage)),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            Expanded(
+              child: Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Column(
+                    children: [
+                      const Text('Verbose Quota'),
+                      SizedBox(
+                        height: 200,
+                        child: PieChart(_buildQuotaChartData(quota)),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ).padding(horizontal: 8),
+      ],
+    );
+  }
+
+  PieChartData _buildPoolChartData(Map<String, dynamic> usage) {
+    final pools = usage['pool_usages'] as List<dynamic>;
+    final colors = [
+      Colors.blue,
+      Colors.green,
+      Colors.orange,
+      Colors.red,
+      Colors.purple,
+    ];
+    return PieChartData(
+      sections:
+          pools.asMap().entries.map((entry) {
+            final pool = entry.value as Map<String, dynamic>;
+            final title = pool['pool_name'] as String;
+            final truncatedTitle =
+                title.length > 8 ? '${title.substring(0, 8)}...' : title;
+            return PieChartSectionData(
+              value: (pool['usage_bytes'] as num).toDouble(),
+              title: truncatedTitle,
+              color: colors[entry.key % colors.length],
+              radius: 60,
+              titleStyle: const TextStyle(
+                fontSize: 12,
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+              ),
+            );
+          }).toList(),
+    );
+  }
+
+  PieChartData _buildQuotaChartData(Map<String, dynamic>? quota) {
+    if (quota == null) return PieChartData(sections: []);
+    return PieChartData(
+      sections: [
+        PieChartSectionData(
+          value: (quota['based_quota'] as num).toDouble(),
+          title: 'Base',
+          color: Colors.green,
+          radius: 60,
+          titleStyle: const TextStyle(
+            fontSize: 12,
+            color: Colors.white,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        PieChartSectionData(
+          value: (quota['extra_quota'] as num).toDouble(),
+          title: 'Extra',
+          color: Colors.orange,
+          radius: 60,
+          titleStyle: const TextStyle(
+            fontSize: 12,
+            color: Colors.white,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildStatCard(String label, String value, {double? progress}) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Text(label, style: const TextStyle(fontSize: 14)),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  value,
+                  style: const TextStyle(
+                    fontSize: 24,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                if (progress != null) ...[
+                  const SizedBox(height: 8),
+                  SizedBox(
+                    width: 28,
+                    height: 28,
+                    child: CircularProgressIndicator(value: progress),
+                  ),
+                ],
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

linux/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,7 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <desktop_drop/desktop_drop_plugin.h>
 #include <file_saver/file_saver_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_platform_alert/flutter_platform_alert_plugin.h>
@@ -29,6 +30,9 @@
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) desktop_drop_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopDropPlugin");
+  desktop_drop_plugin_register_with_registrar(desktop_drop_registrar);
   g_autoptr(FlPluginRegistrar) file_saver_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSaverPlugin");
   file_saver_plugin_register_with_registrar(file_saver_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  desktop_drop
   file_saver
   file_selector_linux
   flutter_platform_alert

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,6 +6,7 @@ import FlutterMacOS
 import Foundation
 
 import connectivity_plus
+import desktop_drop
 import device_info_plus
 import file_picker
 import file_saver
@@ -48,6 +49,7 @@ import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin"))

macos/Podfile.lock

@@ -3,6 +3,8 @@ PODS:
     - FlutterMacOS
   - croppy (0.0.1):
     - FlutterMacOS
+  - desktop_drop (0.0.1):
+    - FlutterMacOS
   - device_info_plus (0.0.1):
     - FlutterMacOS
   - file_picker (0.0.1):
@@ -19,19 +21,19 @@ PODS:
   - Firebase/Messaging (12.4.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 12.4.0)
-  - firebase_analytics (12.0.3):
+  - firebase_analytics (12.0.4):
     - firebase_core
     - FirebaseAnalytics (= 12.4.0)
     - FlutterMacOS
-  - firebase_core (4.2.0):
+  - firebase_core (4.2.1):
     - Firebase/CoreOnly (~> 12.4.0)
     - FlutterMacOS
-  - firebase_crashlytics (5.0.3):
+  - firebase_crashlytics (5.0.4):
     - Firebase/CoreOnly (~> 12.4.0)
     - Firebase/Crashlytics (~> 12.4.0)
     - firebase_core
     - FlutterMacOS
-  - firebase_messaging (16.0.3):
+  - firebase_messaging (16.0.4):
     - Firebase/CoreOnly (~> 12.4.0)
     - Firebase/Messaging (~> 12.4.0)
     - firebase_core
@@ -258,6 +260,7 @@ PODS:
 DEPENDENCIES:
   - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
   - croppy (from `Flutter/ephemeral/.symlinks/plugins/croppy/macos`)
+  - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
   - file_saver (from `Flutter/ephemeral/.symlinks/plugins/file_saver/macos`)
@@ -327,6 +330,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
   croppy:
     :path: Flutter/ephemeral/.symlinks/plugins/croppy/macos
+  desktop_drop:
+    :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
   device_info_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   file_picker:
@@ -411,15 +416,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
   croppy: d9bfc8c02f3cd1851f669a421df298a474b78f43
+  desktop_drop: 10a3e6a7fa9dbe350541f2574092fecfa345a07b
   device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
   file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
   file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
   Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
-  firebase_analytics: d876586269c1d8d2b3dcac085bc2d97c62abc9df
+  firebase_analytics: 09241c4796c1c42a02349ef8bf30025f5b640f0e
-  firebase_core: d81d1a44df95699ce074ae63d8cb43e9df21e142
+  firebase_core: e054894ab56033ef9bcbe2d9eac9395e5306e2fc
-  firebase_crashlytics: 723622cc39a9fa7320585424f5864c5699893ce1
+  firebase_crashlytics: c2438b5f5bdcacf59d0eaee5852c6b0ab09dab77
-  firebase_messaging: 31f412ae5a54e02d1c46d467969f7ad92c4b81ec
+  firebase_messaging: 373ac3a56e5aa37bb9aff4127f700aa5973c1168
   FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
   FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
   FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018

pubspec.lock

@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d"
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.1"
   build_resolvers:
     dependency: transitive
     description:
@@ -282,7 +282,7 @@ packages:
     source: hosted
     version: "4.1.0"
   convert:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: convert
       sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
@@ -393,6 +393,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  desktop_drop:
+    dependency: "direct main"
+    description:
+      name: desktop_drop
+      sha256: e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -557,10 +565,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f
+      sha256: f8f4ea435f791ab1f817b4e338ed958cb3d04ba43d6736ffc39958d950754967
       url: "https://pub.dev"
     source: hosted
-    version: "10.3.3"
+    version: "10.3.6"
   file_saver:
     dependency: "direct main"
     description:
@@ -589,10 +597,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_platform_interface
-      sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b
+      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.7.0"
   file_selector_windows:
     dependency: transitive
     description:
@@ -1067,6 +1075,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  flutter_staggered_grid_view:
+    dependency: "direct main"
+    description:
+      name: flutter_staggered_grid_view
+      sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -1185,10 +1201,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: d8f590a69729f719177ea68eb1e598295e8dbc41bbc247fed78b2c8a25660d7c
+      sha256: c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104
       url: "https://pub.dev"
     source: hosted
-    version: "16.3.0"
+    version: "17.0.0"
   google_fonts:
     dependency: "direct main"
     description:
@@ -1257,10 +1273,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.6.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -1289,10 +1305,10 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041"
+      sha256: "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   image_picker_android:
     dependency: "direct main"
     description:
@@ -1633,10 +1649,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -2551,18 +2567,18 @@ packages:
     dependency: transitive
     description:
       name: syncfusion_flutter_core
-      sha256: "825670efc828e18e14ff310cbcf6de91c8ff73b55c75ae6868a2b3cd87e88b6c"
+      sha256: "8118f13264d1401a7085d12a0aaeac1ebd5cd939046b8c565d195879646daad6"
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_flutter_pdf:
     dependency: transitive
     description:
       name: syncfusion_flutter_pdf
-      sha256: "50fc39ba628167949e89374488de67cc788646d6c0dce2a9fd047dbeecb841c2"
+      sha256: "34d8b658e9fa7b18c4c16b4a775dc3f634933c4367e5f1ef4854f80cdd22c3ff"
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_flutter_pdfviewer:
     dependency: "direct main"
     description:
@@ -2575,50 +2591,50 @@ packages:
     dependency: transitive
     description:
       name: syncfusion_flutter_signaturepad
-      sha256: "6e60af61cec5ee7436b01ecb3fd944602aed42887789a67a27314678ad04d38a"
+      sha256: ef891418bee7c79470ff1b6290f7745df8c1b2adf4df6b81ab9cd69ef900c4e8
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_pdfviewer_linux:
     dependency: transitive
     description:
       name: syncfusion_pdfviewer_linux
-      sha256: fea25c996ed8850504c80c8fe7541aa3dce3d5159af0e92519d13e10a9509601
+      sha256: ec4efb4cdd34462f40b7dafcb5094780a15c988691f28bdec141ea2a01f145bb
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_pdfviewer_macos:
     dependency: transitive
     description:
       name: syncfusion_pdfviewer_macos
-      sha256: "389326ef84ad9d14858d4f5f14da36267faa894134c38080ae30d55d2e3f4ce9"
+      sha256: "15d4e7d5a5a705b7861bdf7e5758d371973a03fda33a21068dc934569b8fc363"
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_pdfviewer_platform_interface:
     dependency: transitive
     description:
       name: syncfusion_pdfviewer_platform_interface
-      sha256: "2c3098dc644965feee66f4bf726ef433a51eecc16ccea71e052ba19897f3c2c5"
+      sha256: d2b9d4631693503340d5eaef6f42446d6d74f290dca9764e65f5b55b0b4043cf
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_pdfviewer_web:
     dependency: transitive
     description:
       name: syncfusion_pdfviewer_web
-      sha256: db5b91493aefb2e9faeb6425ea4f3c5f8eb7907a29ffca2e33564987a9c1c1f4
+      sha256: "073384338eb9a6370e3ec7b9fbad973b6d0312c027698392c09409e156644807"
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   syncfusion_pdfviewer_windows:
     dependency: transitive
     description:
       name: syncfusion_pdfviewer_windows
-      sha256: d2e4d64e5cd96ea678b1ff66588897ce59e17e2685c1153995af53d91327a143
+      sha256: de6254b5b939c17b32498d895aaf272748035fd20a9790b4ee7e8afe915ef233
       url: "https://pub.dev"
     source: hosted
-    version: "31.2.5"
+    version: "31.2.10"
   synchronized:
     dependency: transitive
     description:
@@ -2687,10 +2703,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.7"
   timezone:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -38,7 +38,7 @@ dependencies:
   cupertino_icons: ^1.0.8
   flutter_hooks: ^0.21.3+1
   hooks_riverpod: ^2.6.1
-  go_router: ^16.3.0
+  go_router: ^17.0.0
   styled_widget: ^0.4.1
   shared_preferences: ^2.5.3
   flutter_riverpod: ^2.6.1
@@ -72,8 +72,8 @@ dependencies:
   tus_client_dart:
     git: https://github.com/LittleSheep2Code/tus_client.git
   cross_file: ^0.3.5
-  image_picker: ^1.2.0
+  image_picker: ^1.2.1
-  file_picker: ^10.3.3
+  file_picker: ^10.3.6
   riverpod_annotation: ^2.6.1
   image_picker_platform_interface: ^2.11.1
   image_picker_android: ^0.8.13+7
@@ -110,6 +110,7 @@ dependencies:
   record: ^6.1.2
   qr_flutter: ^4.1.0
   flutter_otp_text_field: ^1.5.1+1
+  flutter_staggered_grid_view: ^0.7.0
 
   flutter_popup_card: ^0.0.6
   timezone: ^0.10.1
@@ -165,6 +166,8 @@ dependencies:
   dio_smart_retry: ^7.0.1
   flutter_expandable_fab: ^2.5.2
   event_bus: ^2.0.1
+  convert: ^3.1.2
+  desktop_drop: ^0.7.0
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -8,6 +8,7 @@
 
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <dart_ipc/dart_ipc_plugin_c_api.h>
+#include <desktop_drop/desktop_drop_plugin.h>
 #include <file_saver/file_saver_plugin.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
@@ -42,6 +43,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   DartIpcPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DartIpcPluginCApi"));
+  DesktopDropPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("DesktopDropPlugin"));
   FileSaverPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSaverPlugin"));
   FileSelectorWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
   dart_ipc
+  desktop_drop
   file_saver
   file_selector_windows
   firebase_core