kasy-cli 1.21.8 → 1.22.0

package/templates/firebase/lib/features/ai_chat/ui/widgets/ai_conversation_tile.dart

@@ -0,0 +1,163 @@
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:kasy_kit/core/data/models/user.dart';
+import 'package:kasy_kit/core/states/user_state_notifier.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/features/ai_chat/api/ai_chat_conversation_entity.dart';
+import 'package:kasy_kit/features/ai_chat/ui/widgets/ai_chat_avatars.dart';
+import 'package:kasy_kit/i18n/translations.g.dart';
+
+/// A single row in the conversation list (Figma `mail` list item): avatar +
+/// title + last-message preview + timestamp. Avatar/title reflect the author
+/// of the most recent message — assistant (app identity) or the user.
+class AiConversationTile extends ConsumerStatefulWidget {
+  const AiConversationTile({
+    super.key,
+    required this.conversation,
+    required this.selected,
+    required this.onTap,
+    required this.onDelete,
+  });
+
+  final AiChatConversationEntity conversation;
+  final bool selected;
+  final VoidCallback onTap;
+  final VoidCallback onDelete;
+
+  @override
+  ConsumerState<AiConversationTile> createState() => _AiConversationTileState();
+}
+
+class _AiConversationTileState extends ConsumerState<AiConversationTile> {
+  bool _hovered = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final conversation = widget.conversation;
+    final bool fromUser = conversation.lastMessageRole == 'user';
+
+    final String title = fromUser
+        ? _userDisplayName(ref) ?? t.ai_chat.title
+        : t.ai_chat.title;
+    final Widget avatar = fromUser
+        ? const AiChatUserAvatar(diameter: 36)
+        : const AiChatAssistantAvatar(diameter: 36);
+    final String preview =
+        conversation.lastMessageContent ?? t.ai_chat.conversations_empty;
+
+    final Color titleColor = context.colors.onBackground;
+    final Color subtitleColor = context.colors.muted;
+
+    final Widget tile = Container(
+      padding: const EdgeInsets.all(KasySpacing.smd),
+      decoration: BoxDecoration(
+        color: widget.selected
+            ? context.colors.accentSoft
+            : (_hovered ? context.colors.surfaceNeutralSoft : null),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          avatar,
+          const SizedBox(width: KasySpacing.smd),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        title,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.bodyMedium?.copyWith(
+                          fontWeight: FontWeight.w600,
+                          color: titleColor,
+                        ),
+                      ),
+                    ),
+                    const SizedBox(width: KasySpacing.xs),
+                    _trailing(context, subtitleColor),
+                  ],
+                ),
+                const SizedBox(height: 2),
+                Text(
+                  preview,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    color: subtitleColor,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+
+    final Widget tappable = Semantics(
+      button: true,
+      selected: widget.selected,
+      label: title,
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: widget.onTap,
+        child: tile,
+      ),
+    );
+
+    // Hover reveals the delete affordance on pointer devices (web / desktop).
+    if (!kIsWeb) return tappable;
+    return MouseRegion(
+      onEnter: (_) => setState(() => _hovered = true),
+      onExit: (_) => setState(() => _hovered = false),
+      child: tappable,
+    );
+  }
+
+  /// On hover (desktop), shows a delete button; otherwise the timestamp.
+  Widget _trailing(BuildContext context, Color color) {
+    if (kIsWeb && _hovered) {
+      return SizedBox(
+        height: 16,
+        child: InkResponse(
+          onTap: widget.onDelete,
+          radius: 18,
+          child: Icon(KasyIcons.trash, size: 16, color: context.colors.error),
+        ),
+      );
+    }
+    return Text(
+      _formatTimestamp(context, widget.conversation.updatedAt),
+      style: context.textTheme.bodySmall?.copyWith(color: color),
+    );
+  }
+
+  String? _userDisplayName(WidgetRef ref) {
+    final user = ref.watch(userStateNotifierProvider).user;
+    if (user is! AuthenticatedUserData) return null;
+    final String? name = user.name?.trim();
+    if (name != null && name.isNotEmpty) return name;
+    final String local = user.email.split('@').first.trim();
+    return local.isNotEmpty ? local : null;
+  }
+
+  String _formatTimestamp(BuildContext context, DateTime time) {
+    final String locale = Localizations.localeOf(context).toString();
+    final DateTime now = DateTime.now();
+    final bool sameDay =
+        now.year == time.year && now.month == time.month && now.day == time.day;
+    if (sameDay) {
+      return DateFormat.jm(locale).format(time);
+    }
+    if (now.year == time.year) {
+      return DateFormat.MMMd(locale).format(time);
+    }
+    return DateFormat.yMd(locale).format(time);
+  }
+}

package/templates/firebase/lib/features/authentication/api/authentication_api.dart

@@ -9,6 +9,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:kasy_kit/core/data/entities/user_entity.dart';
 import 'package:kasy_kit/features/authentication/api/authentication_api_interface.dart';
+import 'package:kasy_kit/features/authentication/api/popup_dismiss_watcher.dart'
+    if (dart.library.js_interop) 'package:kasy_kit/features/authentication/api/popup_dismiss_watcher_web.dart';
 import 'package:kasy_kit/features/authentication/repositories/exceptions/authentication_exceptions.dart';
 import 'package:kasy_kit/google_auth_options.dart';
 import 'package:logger/logger.dart';
@@ -144,6 +146,37 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
     }
   }
 
+  /// Firebase Auth web error codes that mean the user dismissed the provider
+  /// popup (closed the window / cancelled the account chooser) — a user cancel,
+  /// not a real failure.
+  bool _isUserCancelledPopup(String code) =>
+      code == 'popup-closed-by-user' ||
+      code == 'cancelled-popup-request' ||
+      code == 'web-context-cancelled' ||
+      code == 'user-cancelled' ||
+      code == 'canceled';
+
+  /// Runs a Firebase web popup sign-in ([signInWithPopup] / [linkWithPopup])
+  /// alongside a window-refocus watcher. On web those futures never reject when
+  /// the user closes the popup manually, so without this the caller would hang
+  /// in a loading state forever. If the window refocuses (popup dismissed)
+  /// before the popup resolves, we surface a [UserCancelledSignInException].
+  Future<UserCredential> _popupOrCancel(
+    Future<UserCredential> Function() run,
+  ) async {
+    final watch = watchAuthPopupDismiss();
+    try {
+      final result = await Future.any<UserCredential?>([
+        run(),
+        watch.dismissed.then<UserCredential?>((_) => null),
+      ]);
+      if (result == null) throw const UserCancelledSignInException();
+      return result;
+    } finally {
+      watch.cancel();
+    }
+  }
+
   @override
   Future<Credentials> signinWithGoogle() async {
     if (kIsWeb) {
@@ -156,13 +189,15 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
       //   'login_hint': 'user@example.com'
       // });
       try {
-        final credentials = await _auth.signInWithPopup(googleProvider);
+        final credentials = await _popupOrCancel(
+          () => _auth.signInWithPopup(googleProvider),
+        );
         return Credentials(
           id: credentials.user!.uid,
           token: credentials.credential?.token.toString() ?? '',
         );
       } on FirebaseAuthException catch (e) {
-        if (e.code == 'popup-closed-by-user' || e.code == 'cancelled-popup-request') {
+        if (_isUserCancelledPopup(e.code)) {
           throw const UserCancelledSignInException();
         }
         rethrow;
@@ -198,15 +233,17 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
     if (kIsWeb) {
       final googleProvider = GoogleAuthProvider();
       try {
-        final userCredential = _auth.currentUser != null
-            ? await _auth.currentUser!.linkWithPopup(googleProvider)
-            : await _auth.signInWithPopup(googleProvider);
+        final userCredential = await _popupOrCancel(
+          () => _auth.currentUser != null
+              ? _auth.currentUser!.linkWithPopup(googleProvider)
+              : _auth.signInWithPopup(googleProvider),
+        );
         return Credentials(
           id: userCredential.user!.uid,
           token: userCredential.credential?.token.toString() ?? '',
         );
       } on FirebaseAuthException catch (e) {
-        if (e.code == 'popup-closed-by-user' || e.code == 'cancelled-popup-request') {
+        if (_isUserCancelledPopup(e.code)) {
           throw const UserCancelledSignInException();
         }
         if (e.code == 'credential-already-in-use') {
@@ -215,7 +252,9 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
           if (anonymousUser != null && anonymousUser.isAnonymous) {
             await anonymousUser.delete();
           }
-          final userCredential = await _auth.signInWithPopup(googleProvider);
+          final userCredential = await _popupOrCancel(
+            () => _auth.signInWithPopup(googleProvider),
+          );
           return Credentials(id: userCredential.user!.uid, token: userCredential.credential?.token.toString() ?? '');
         }
         rethrow;
@@ -243,7 +282,7 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
         final result = await _auth.signInWithCredential(credential);
         return Credentials(id: result.user!.uid, token: result.credential?.token.toString() ?? '');
       } on FirebaseAuthException catch (e) {
-        if (e.code == 'canceled' || e.code == 'popup-closed-by-user' || e.code == 'cancelled-popup-request') {
+        if (_isUserCancelledPopup(e.code)) {
           throw const UserCancelledSignInException();
         }
         rethrow;
@@ -286,7 +325,7 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
     appleProvider.addScope('email');
     try {
       final value = kIsWeb
-          ? await _auth.signInWithPopup(appleProvider)
+          ? await _popupOrCancel(() => _auth.signInWithPopup(appleProvider))
           : await _auth.signInWithProvider(appleProvider);
       return Credentials(
         id: value.user!.uid,
@@ -311,11 +350,11 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
       // No anonymous session — fall back to regular sign-in.
       try {
         final result = kIsWeb
-            ? await _auth.signInWithPopup(appleProvider)
+            ? await _popupOrCancel(() => _auth.signInWithPopup(appleProvider))
             : await _auth.signInWithProvider(appleProvider);
         return Credentials(id: result.user!.uid, token: result.credential?.token.toString() ?? '');
       } on FirebaseAuthException catch (e) {
-        if (e.code == 'canceled' || e.code == 'popup-closed-by-user' || e.code == 'cancelled-popup-request') {
+        if (_isUserCancelledPopup(e.code)) {
           throw const UserCancelledSignInException();
         }
         rethrow;
@@ -341,7 +380,7 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
           return Credentials(id: result.user!.uid, token: result.credential?.token.toString() ?? '');
         }
         final result = kIsWeb
-            ? await _auth.signInWithPopup(appleProvider)
+            ? await _popupOrCancel(() => _auth.signInWithPopup(appleProvider))
             : await _auth.signInWithProvider(appleProvider);
         return Credentials(id: result.user!.uid, token: result.credential?.token.toString() ?? '');
       }
@@ -365,7 +404,7 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
         final result = await _auth.signInWithCredential(credential);
         return Credentials(id: result.user!.uid, token: result.credential?.token.toString() ?? '');
       } on FirebaseAuthException catch (e) {
-        if (e.code == 'canceled' || e.code == 'popup-closed-by-user' || e.code == 'cancelled-popup-request') {
+        if (_isUserCancelledPopup(e.code)) {
           throw const UserCancelledSignInException();
         }
         rethrow;

package/templates/firebase/lib/features/authentication/api/popup_dismiss_watcher.dart

@@ -0,0 +1,12 @@
+import 'dart:async';
+
+/// Watches for the user dismissing a provider auth popup.
+///
+/// Native/non-web stub: there is no browser popup window to watch, so
+/// [PopupDismissWatch.dismissed] never completes and [PopupDismissWatch.cancel]
+/// is a no-op. The real implementation lives in `popup_dismiss_watcher_web.dart`
+/// and is selected via conditional import on web.
+typedef PopupDismissWatch = ({Future<void> dismissed, void Function() cancel});
+
+PopupDismissWatch watchAuthPopupDismiss() =>
+    (dismissed: Completer<void>().future, cancel: () {});

package/templates/firebase/lib/features/authentication/api/popup_dismiss_watcher_web.dart

@@ -0,0 +1,35 @@
+import 'dart:async';
+import 'dart:js_interop';
+
+import 'package:web/web.dart' as web;
+
+typedef PopupDismissWatch = ({Future<void> dismissed, void Function() cancel});
+
+/// Web implementation: Firebase's `signInWithPopup` / `linkWithPopup` never
+/// reject when the user closes the popup window manually, leaving the sign-in
+/// future pending forever. We detect that dismissal indirectly: when the popup
+/// closes, the main window regains focus.
+///
+/// [dismissed] completes ~1.2s after the main window refocuses (a debounce so a
+/// successful sign-in — which resolves its own future first — wins the race).
+/// Always call [cancel] once the sign-in settles to remove the listener.
+PopupDismissWatch watchAuthPopupDismiss() {
+  final completer = Completer<void>();
+  Timer? settle;
+
+  final handler = ((web.Event _) {
+    settle?.cancel();
+    settle = Timer(const Duration(milliseconds: 1200), () {
+      if (!completer.isCompleted) completer.complete();
+    });
+  }).toJS;
+
+  web.window.addEventListener('focus', handler);
+
+  void cancel() {
+    settle?.cancel();
+    web.window.removeEventListener('focus', handler);
+  }
+
+  return (dismissed: completer.future, cancel: cancel);
+}

package/templates/firebase/lib/features/authentication/ui/recover_password_page.dart

@@ -1,101 +1,141 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_scroll_behavior.dart';
+import 'package:kasy_kit/core/widgets/kasy_pressable_depth.dart';
+import 'package:kasy_kit/core/widgets/page_background.dart';
 import 'package:kasy_kit/features/authentication/providers/models/email.dart';
 import 'package:kasy_kit/features/authentication/providers/models/recover_state.dart';
 import 'package:kasy_kit/features/authentication/providers/recover_provider.dart';
+import 'package:kasy_kit/features/authentication/ui/widgets/auth_card_scaffold.dart';
 import 'package:kasy_kit/features/authentication/ui/widgets/recover_password_result.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 final _formKey = GlobalKey<FormState>();
 
+/// Reset-password screen. Mirrors the sign-in / sign-up layout: a centered
+/// card (logo, title, single email field, button) on a plain background, so it
+/// looks identical to those pages on web/desktop instead of a stretched mobile
+/// sub-page.
 class RecoverPasswordPage extends ConsumerWidget {
   const RecoverPasswordPage({super.key});
 
+  void _submit(BuildContext context, WidgetRef ref) {
+    if (!_formKey.currentState!.validate()) return;
+    FocusScope.of(context).unfocus();
+    ref.read(recoverStateProvider.notifier).send();
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(recoverStateProvider);
+    final bool isSending = state is RecoverStateSending;
+    final bool isSent = state is RecoverStateSent;
 
     return PopScope(
       canPop: context.canPop(),
       onPopInvokedWithResult: (didPop, _) {
-        if (!didPop) {
-          return;
-        }
+        if (!didPop) return;
         ref.invalidate(recoverStateProvider);
       },
-      child: AnnotatedRegion<SystemUiOverlayStyle>(
-          value: SystemUiOverlayStyle.dark,
-          child: KasyOverlayScaffold(
-            title: t.auth.recover.title,
-            appBarStyle: KasyAppBarStyle.subpageSimple,
-            onBack: () {
-              if (context.canPop()) {
-                context.pop();
-              }
-            },
-            slivers: [
-              switch (state) {
-                RecoverStateData() => SliverToBoxAdapter(
-                child: ScrollConfiguration(
-                  behavior: const KasyKitScrollBehavior(),
-                  child: Form(
-                    key: _formKey,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        const SizedBox(height: KasySpacing.lg),
-                        KasyTextField(
-                          key: const Key('email_input'),
-                          label: t.auth.recover.email_label,
-                          contentType: KasyTextFieldContentType.email,
-                          validator: (value) {
-                            try {
-                              state.email.validate();
-                            } on EmailException catch (_) {
-                              return t.auth.signin.email_invalid;
-                            }
-                            return null;
-                          },
-                          onChanged: (value) => ref
-                              .read(recoverStateProvider.notifier)
-                              .setEmail(value),
-                        ),
-                        const SizedBox(height: KasySpacing.lg),
-                        KasyButton(
-                          key: const Key('recover_button'),
-                          label: t.auth.recover.submit,
-                          onPressed: () {
-                            if (!_formKey.currentState!.validate()) return;
-                            ref.read(recoverStateProvider.notifier).send();
-                          },
-                          expand: true,
-                        ),
-                      ],
+      child: Scaffold(
+        resizeToAvoidBottomInset: false,
+        body: Stack(
+          children: [
+            if (isSent)
+              const Background(child: RecoverPasswordSent())
+            else
+              Form(
+                key: _formKey,
+                child: AuthCardScaffold(
+                  title: t.auth.recover.title,
+                  subtitle: t.auth.recover.subtitle,
+                  children: [
+                    KasyTextField(
+                      key: const Key('email_input'),
+                      label: t.auth.recover.email_label,
+                      contentType: KasyTextFieldContentType.email,
+                      textInputAction: TextInputAction.done,
+                      validator: (value) {
+                        try {
+                          state.email.validate();
+                        } on EmailException catch (_) {
+                          return t.auth.signin.email_invalid;
+                        }
+                        return null;
+                      },
+                      onChanged: (value) => ref
+                          .read(recoverStateProvider.notifier)
+                          .setEmail(value),
+                      onSubmitted:
+                          isSending ? null : (_) => _submit(context, ref),
                     ),
-                  ),
-                ),
-              ),
-                RecoverStateSending() => SliverFillRemaining(
-                  child: Center(
-                    child: CircularProgressIndicator.adaptive(
-                      valueColor: AlwaysStoppedAnimation<Color>(
-                        context.colors.primary,
-                      ),
+                    const SizedBox(height: KasySpacing.lg),
+                    KasyButton(
+                      key: const Key('recover_button'),
+                      label: t.auth.recover.submit,
+                      isLoading: isSending,
+                      onPressed:
+                          isSending ? null : () => _submit(context, ref),
+                      expand: true,
                     ),
-                  ),
-                ),
-                RecoverStateSent() => const SliverFillRemaining(
-                  child: RecoverPasswordSent(),
+                    const SizedBox(height: KasySpacing.md),
+                    const _BackToSigninPrompt(),
+                  ],
                 ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Text link back to sign‑in, styled like the "Don't have an account? Sign up"
+/// prompts. Replaces the old floating back orb so reaching login is one obvious
+/// tap right under the action.
+class _BackToSigninPrompt extends StatelessWidget {
+  const _BackToSigninPrompt();
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: FittedBox(
+        fit: BoxFit.scaleDown,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              t.auth.recover.remember,
+              style: context.textTheme.bodyMedium?.copyWith(
+                color: context.colors.onSurface.withValues(alpha: 0.62),
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            const SizedBox(width: 4),
+            KasyPressableDepth(
+              semanticLabel: t.auth.recover.signin_link,
+              onPressed: () {
+                if (context.canPop()) {
+                  context.pop();
+                } else {
+                  context.go('/signin');
+                }
               },
-            ],
-          ),
+              child: Text(
+                t.auth.recover.signin_link,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colors.onSurface,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+            ),
+          ],
         ),
+      ),
     );
   }
 }
+