kasy-cli 1.36.1 → 1.37.0

package/lib/scaffold/CHANGELOG.json

@@ -1,4 +1,18 @@
 {
+  "1.37.0": {
+    "modules": {
+      "components": {
+        "pt": "Sidebar e abas mais responsivas: a sidebar ganhou um modo de colapso mais consistente (vira rail fino conforme a largura) e teve a busca não usada removida pra ficar mais enxuta; as abas (KasyTabs) agora se medem e se adaptam melhor em telas estreitas, sem cortar nem espremer.",
+        "en": "More responsive sidebar and tabs: the sidebar got a more consistent collapse mode (turns into a thin rail by width) and had its unused search removed for a leaner component; tabs (KasyTabs) now measure and adapt better on narrow screens, without clipping or squeezing.",
+        "es": "Sidebar y pestañas más responsivas: la sidebar tiene un modo de colapso más consistente (se vuelve un rail fino según el ancho) y se le quitó la búsqueda sin uso para un componente más limpio; las pestañas (KasyTabs) ahora se miden y adaptan mejor en pantallas estrechas, sin recortar ni apretar."
+      },
+      "web": {
+        "pt": "Web mais redonda: login social na web agora trata o fluxo por redirecionamento (redirect), útil quando o popup é bloqueado pelo navegador; e o Firebase Hosting foi ajustado pra publicar o build/web sem descartar arquivos ocultos necessários, deixando o deploy do site mais previsível.",
+        "en": "Smoother web: social login on web now handles the redirect flow, useful when the browser blocks the popup; and Firebase Hosting was tuned to publish build/web without dropping needed hidden files, making the site deploy more predictable.",
+        "es": "Web más pulida: el inicio de sesión social en web ahora maneja el flujo por redirección (redirect), útil cuando el navegador bloquea el popup; y Firebase Hosting se ajustó para publicar build/web sin descartar archivos ocultos necesarios, dejando el deploy del sitio más predecible."
+      }
+    }
+  },
   "1.36.1": {
     "modules": {
       "onboarding": {

package/lib/scaffold/backends/api/pubspec.yaml.tpl

@@ -53,7 +53,7 @@ dependencies:
   json_annotation: ^4.9.0
   local_auth: ^3.0.1
   logger: ^2.6.2
-  lucide_icons_flutter: ^3.1.10
+  lucide_icons_flutter: ^3.1.14
   mixpanel_flutter: ^2.5.0
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0

package/lib/scaffold/backends/patch-base-hashes.json

@@ -11,7 +11,7 @@
   "api/lib/features/ai_chat/api/ai_chat_message_entity.dart": "5aca4fdb5b1c38df04c9d377c6e6eeb6930ef85b2a32689fe6403e7cc7645373",
   "api/lib/features/ai_chat/providers/ai_chat_notifier.dart": "f16ea3f3266e63a5591ceff9bc1900845f0b96e9bbbc5463ec6ab894f878eae3",
   "api/lib/features/authentication/api/authentication_api_interface.dart": "ef9219237babd73e4b3ac148a24ebbbdf39ab98166d21f578c359074b528e5da",
-  "api/lib/features/authentication/api/authentication_api.dart": "8b460722bb3bee7eee015f34aaa39c1c97cb264df1024b2855060dac232c620a",
+  "api/lib/features/authentication/api/authentication_api.dart": "4ee563f9fd81b9738b71928edc146846e6226fb3b8a6974cf1dc3f3cd8813d4d",
   "api/lib/features/authentication/repositories/authentication_repository.dart": "8e98ca0d39df3aac1dab159e6bdfe8d2bbb8e43931459984eb4ecfb676698ca2",
   "api/lib/features/feedbacks/api/entities/feature_request_entity.dart": "e72c683c7321bf1f3c19fc1c6d54c6964bd99970e87c9ff31d8918efa93f0090",
   "api/lib/features/feedbacks/api/entities/feature_vote_entity.dart": "a13ccfc493d8f5277beffc8e28f77ec322ab0c0a56358c3669353206b7c6756b",
@@ -42,7 +42,7 @@
   "supabase/lib/features/ai_chat/api/ai_chat_conversation_entity.dart": "1c4e4223e802d7fe8e93d9e7a09fcc6be81a41792d722e8b7e697837cde4737f",
   "supabase/lib/features/ai_chat/api/ai_chat_message_entity.dart": "5aca4fdb5b1c38df04c9d377c6e6eeb6930ef85b2a32689fe6403e7cc7645373",
   "supabase/lib/features/ai_chat/providers/ai_chat_notifier.dart": "f16ea3f3266e63a5591ceff9bc1900845f0b96e9bbbc5463ec6ab894f878eae3",
-  "supabase/lib/features/authentication/api/authentication_api.dart": "8b460722bb3bee7eee015f34aaa39c1c97cb264df1024b2855060dac232c620a",
+  "supabase/lib/features/authentication/api/authentication_api.dart": "4ee563f9fd81b9738b71928edc146846e6226fb3b8a6974cf1dc3f3cd8813d4d",
   "supabase/lib/features/authentication/repositories/authentication_repository.dart": "8e98ca0d39df3aac1dab159e6bdfe8d2bbb8e43931459984eb4ecfb676698ca2",
   "supabase/lib/features/feedbacks/api/entities/feature_request_entity.dart": "e72c683c7321bf1f3c19fc1c6d54c6964bd99970e87c9ff31d8918efa93f0090",
   "supabase/lib/features/feedbacks/api/entities/feature_vote_entity.dart": "a13ccfc493d8f5277beffc8e28f77ec322ab0c0a56358c3669353206b7c6756b",

package/lib/scaffold/backends/supabase/patch/lib/features/authentication/api/authentication_api.dart

@@ -67,6 +67,9 @@ class SupabaseAuthenticationApi implements AuthenticationApi {
   /// — the caller stays in its loading state until the browser leaves.
   /// See [isMobileWebBrowser].
   Future<Credentials> _googleSignInWithRedirectWeb() async {
+    // Flag the login so startup lands on Home, not the stale tab URL the
+    // redirect returns to (linking is a no-op on Supabase, so only login here).
+    markWebRedirectLogin();
     await fb_auth.FirebaseAuth.instance.signInWithRedirect(
       fb_auth.GoogleAuthProvider(),
     );

package/lib/scaffold/backends/supabase/pubspec.yaml.tpl

@@ -60,7 +60,7 @@ dependencies:
   json_annotation: ^4.9.0
   local_auth: ^3.0.1
   logger: ^2.6.2
-  lucide_icons_flutter: ^3.1.10
+  lucide_icons_flutter: ^3.1.14
   mixpanel_flutter: ^2.5.0
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0

package/lib/scaffold/shared/generator-utils.js

@@ -975,6 +975,8 @@ async function writeMainDart(projectDir, backend, modules, packageName, options
     lines.push(`import 'package:${pkg}/firebase_options_dev.dart' as firebase_dev;`);
   }
   lines.push(`import 'package:${pkg}/i18n/translations.g.dart';`);
+  lines.push(`import 'package:${pkg}/features/authentication/api/auth_web_support.dart'`);
+  lines.push(`    if (dart.library.js_interop) 'package:${pkg}/features/authentication/api/auth_web_support_web.dart';`);
   lines.push(`import 'package:${pkg}/features/authentication/api/authentication_api.dart';`);
   lines.push(`import 'package:${pkg}/features/notifications/api/local_notifier.dart';`);
   if (withFirebase) {
@@ -1063,6 +1065,12 @@ async function writeMainDart(projectDir, backend, modules, packageName, options
     lines.push('');
   }
 
+  lines.push(`  // Web: if we just returned from a social-login redirect, reset the address`);
+  lines.push(`  // bar to '/' BEFORE the router reads the initial URL, so the app boots on Home`);
+  lines.push(`  // instead of the stale tab URL (e.g. /settings) the redirect returned to.`);
+  lines.push(`  resetUrlAfterRedirectLogin();`);
+  lines.push('');
+
   if (withSentry) {
     lines.push(`  // initialize sentry for error reporting in production only`);
     lines.push(`  // run the app with Sentry for production environment`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.36.1",
+  "version": "1.37.0",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"

package/templates/firebase/.firebase/hosting.YnVpbGQvd2Vi.cache

@@ -1,9 +1,12 @@
 stripe_success.html,1781195415353,677b2fb430839866f32a33a751aae85b4c4819123be820f3f5b2f689b8eed00e
 manifest.json,1779810782774,1b929ac7267ff738d05646106a0fac3591082b6f365051928a62518af30b3fd5
 local_notifications.js,1772398909034,0b44b177c4b8a705ad1b0e3d7532537aad7b230e9472f93c820742b7548797b8
+index.html,1781388256310,bb8142eb84e9e44049957c3edf86006e1ae5f194c397a8326ce505b68fdf58f4
+flutter_bootstrap.js,1781388256056,25f49550b20f234b84194d9e067725abdc33590343251086f6c7d147325dfb41
 flutter.js,1777393608000,b42e549a02f5c1428b0ad85dbdc663d400a6d2db10cb8aefcc0fddd592fd6ceb
 firebase-messaging-sw.js,1772484605561,dba3c939f7c240e62f63d06408d5f70e45f1168d00df98726e6a7a20cbd3b0df
 favicon.png,1779810782545,c967afd3c3d4dd165ef2e5cf3f203c3982dfff6a95881859ed163d9c38d75512
+.last_build_id,1781388166126,fb2a0536078d7023bcc9d41eb14cc00d74532f9465fac7aa9b88dae42e4a249c
 splash/img/light-4x.png,1780546027751,abf0e55345e532a4645fe14b01c2948b07c78df50cc6da23648837dfb6271c74
 splash/img/light-3x.png,1780546027699,5f02c94032cb7053807ce89603b109f14ea2740eaa3145dc76c924cbe1d534a9
 splash/img/light-2x.png,1780546027647,3c073b9da154ac8be530f8beefa3579246f223acd819e856a2db000fdabcb67e
@@ -31,16 +34,8 @@ canvaskit/canvaskit.js,1777393746000,df5aa63d90b0491908ad19d64fd18f29db1dc416548
 canvaskit/chromium/canvaskit.wasm,1777393830000,44d29356b9e2c903751a8aa583716275e165d1fb56eea46963c95c7c43f7ca34
 canvaskit/chromium/canvaskit.js.symbols,1777393830000,60722421e56edacbeb674cc3ef0f6152969067e74b51a960c80cd36e75b75a54
 canvaskit/chromium/canvaskit.js,1777393830000,10ea3badcf26e29aba851699c03e09bc35fea65cdc440a035bac263d6d02d665
+assets/.env,1781370223435,777e85eb4de226724b28db8664404d0b73ae37f63fd66c955ac90c89cd491e7e
 assets/packages/mixpanel_flutter/assets/mixpanel.js,1779806094332,1915455df317dd1a9f42c6f3ea5bbe3ee357614f89d994f157a2e821f37956c3
-assets/packages/lucide_icons_flutter/assets/lucide.ttf,1779806149220,bfca5b519d438d7194550cbc60a4e7c10f53a36ac96d48c7e17503a45b6b7b0b
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w600.ttf,1779806149210,cf2218879264e413687602c192e43b86000404ff85e2bca933d9a67020299ed4
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w500.ttf,1779806149217,587ce31612aa88e6c019210a18625531557eda111f5f8e838a298277efc9e308
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w400.ttf,1779806149212,644f7ccdf1b74bdb898210c4171327a25d7476690c7ade2d3082dd473bc24fe1
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w300.ttf,1779806149214,5dd834d2d84e5a1524e027fa21d87c6e8aaaf6421f201be2ec61e57c0b7bce72
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w200.ttf,1779806149208,d929819511975bf5030c0f359e8c16d21ad14b20ac24d5f2ff238462114b1d9b
-assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w100.ttf,1779806149216,1e9e6ea39a38b874c40242d02533adac9dd3d09c8119dae55458e65c6c3c16e6
-assets/packages/cupertino_icons/assets/CupertinoIcons.ttf,1779806141382,010d647b6cab4e1a9b4398957353f43589903ce8dc760d05d894944b664e29bd
-assets/fonts/MaterialIcons-Regular.otf,1662569016000,3a631b0761788d7cf2a71e8732a5b31288d6e7aa996c671c70d53a251bbd3848
 assets/assets/images/splash_logo_light_android12.png,1779867497377,da2caee4f16230230dbb04d84913f0a9df2eae6bcb8f9d1ce83ed556cee6d094
 assets/assets/images/splash_logo_light.png,1779867497286,643a1f45d6ef9458c4c0eed9f4889cc2adbdf1db616913215be66673a05a0066
 assets/assets/images/splash_logo_dark_android12.png,1779867497464,b237d9f9035d419525a10b32889c30d44c706d62990b30bdc6bef911fe9352d6
@@ -58,16 +53,23 @@ assets/assets/icons/google_play_games.png,1772398653083,533c1d87d7be8690ab173ef4
 assets/assets/icons/google.png,1772398653083,f423e7e7be1e06008d45617d07f095f04da7fdcab9a56523f9e0633828e464e0
 assets/assets/icons/facebook.png,1772398653083,79ac67e449c1db63319d43329ca91f682b4e0bc6a0883b0dfb2a849e13ae6eb6
 assets/assets/icons/apple.png,1772398653083,2a737d8801ca81452b2978bb2e1ac72136acf1a4c338f2de2f77b65e9f6de1fa
-version.json,1781384419657,1c93a56a819f36903677817066dbda0bae5785563a39d3a0a486246cf67107ac
-flutter_service_worker.js,1781384420789,baeeaf9f4b8e6f40d3b0549429ceb70ca01f120db6a7ef2f60d5809233dc2205
-assets/FontManifest.json,1781384419796,4d84ab517c27984d36f9a3c8be6f2a72788c0c3985c1d5874297fef0a53407ca
-assets/AssetManifest.bin,1781384419795,78bccb08a36307a400711a1d7e6868bd5f89a24e63439fb5b6747660323e4475
-assets/AssetManifest.bin.json,1781384419795,50a11b51c3fc4cbed1b5ec3a4f466c6a6b75c481d08d4782c8191f99bdbdba9c
-assets/shaders/stretch_effect.frag,1781384419911,1a7d4ac2be40cf0a459dfb390ef08bcd740f37913ffdee8de3c2ea836a18410e
-assets/shaders/ink_sparkle.frag,1781384419911,1c8e222328206d1e06754f76fb53947aad38d62180aafad5298a3c6f510b173d
-index.html,1781384363218,bb8142eb84e9e44049957c3edf86006e1ae5f194c397a8326ce505b68fdf58f4
-flutter_bootstrap.js,1781384363207,c9fd7e9f06eccf37ccbe2a39e88047779c1a67c67fe18febf6971479b7d6b64c
-main.dart.js_1.part.js,1781384401644,7be2ce26bfb76e0142df09977ff2bbb058e5bee8c33d1ebf6c49aff2158d94d0
-main.dart.js_3.part.js,1781384401652,6f1d83d415ac91cc4ca02b7ccefeae40d609713c7609b636502b68501dd44a38
-assets/NOTICES,1781384419796,a18efc42c5ed99b56481537d0f229ddd3add671c548a893aaf8766f30c854158
-main.dart.js,1781384402163,46f09db6091efb87263aad9c85327da8097b61c8c528564b1f7359829aef790b
+version.json,1781388383201,55f3aab1f3d71610bf791902e59e92cd77db8963f8290193f573c4172fa6fd32
+flutter_service_worker.js,1781388386040,baeeaf9f4b8e6f40d3b0549429ceb70ca01f120db6a7ef2f60d5809233dc2205
+assets/AssetManifest.bin,1781388383326,78bccb08a36307a400711a1d7e6868bd5f89a24e63439fb5b6747660323e4475
+assets/AssetManifest.bin.json,1781388383326,50a11b51c3fc4cbed1b5ec3a4f466c6a6b75c481d08d4782c8191f99bdbdba9c
+assets/FontManifest.json,1781388383326,4d84ab517c27984d36f9a3c8be6f2a72788c0c3985c1d5874297fef0a53407ca
+assets/shaders/ink_sparkle.frag,1781388383423,1c8e222328206d1e06754f76fb53947aad38d62180aafad5298a3c6f510b173d
+assets/shaders/stretch_effect.frag,1781388383423,1a7d4ac2be40cf0a459dfb390ef08bcd740f37913ffdee8de3c2ea836a18410e
+assets/packages/cupertino_icons/assets/CupertinoIcons.ttf,1781388385468,12bc6bf55aad4657f62747b6c1c9b5c120a594ed3540db21729b6db3c847340d
+assets/fonts/MaterialIcons-Regular.otf,1781388385471,89da9939a222284d9e14e9757b4dbdb75965434cb84b0f2969495153f3a018c9
+main.dart.js_3.part.js,1781388360492,6f52d11c8e140736cd046ce6b541ad8d8bf20e6ef709f39d8ef4eb3dddbece8b
+main.dart.js_1.part.js,1781388360481,42136799a40b5acb14b5acf0a8cef39bbef13b4dc99ce808a7bc8a1f8cdd8b09
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w300.ttf,1781388385457,aebf5e4f6b1e6de1e61a866f813aa5b08efb4cdd108cc2831d40aad71398c88f
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w400.ttf,1781388385463,edcd01ee13f6ec2285fd18863c0ce0efb0876b290fb427ad5c052f753b3210c8
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w600.ttf,1781388385468,008f1e974c9ff4e8d40d16221226e0d34d2298a7feb2bdea8c134a9333929c9c
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w100.ttf,1781388385446,c16d95412fe2600bda1f53c2b8dc4bd82496f60f7c5a6ecfa180b0f866128712
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w500.ttf,1781388385464,3f68f958d0fa13077968a6767339c38ede8705bcadd0382078db6ec4bac96fa0
+assets/packages/lucide_icons_flutter/assets/lucide.ttf,1781388385448,9b000e47cddf9ada4a6b85fc9577fef7ed2ee261c9279e9a44e4753da28f83d3
+assets/packages/lucide_icons_flutter/assets/build_font/LucideVariable-w200.ttf,1781388385451,1f798186cfc3e2fcd54b15aa7b8695bc7c29b781c5058029a8d80ecdfa615904
+assets/NOTICES,1781388383326,a18efc42c5ed99b56481537d0f229ddd3add671c548a893aaf8766f30c854158
+main.dart.js,1781388361400,b625f1b346dc2f1475ee99ebb1d698654e74183d737c91e1bbac020869096a84

package/templates/firebase/firebase.json

@@ -1,7 +1,7 @@
 {
   "hosting": {
     "public": "build/web",
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "ignore": ["firebase.json", "**/node_modules/**"],
     "rewrites": [
       { "source": "**", "destination": "/index.html" }
     ],

package/templates/firebase/lib/components/kasy_sidebar.dart

@@ -192,6 +192,22 @@ const _NavItem _kHelpItem = _NavItem(
 /// Controls which edge receives the content-facing hairline + shadow nudge.
 enum KasySidebarSide { left, right }
 
+/// How the rail picks its initial width — the standard SaaS sidebar presets.
+enum KasySidebarCollapseMode {
+  /// Adapts to the viewport: wide on desktop, auto-collapses to a thin icon
+  /// rail on tablet and mobile. The toggle overrides it on any breakpoint. This
+  /// is the default and what a typical app navigation uses.
+  responsive,
+
+  /// Starts wide on every breakpoint (the "pinned" sidebar); the user collapses
+  /// it to the thin rail via the toggle. Stays wide on mobile too.
+  expanded,
+
+  /// Starts as the thin icon rail (with hover tooltips); the user expands it via
+  /// the toggle.
+  collapsed,
+}
+
 /// A SaaS-style sidebar modelled on the HeroUI Figma kit: brand logo + panel
 /// toggle, a workspace selector, a segmented control, a navigable list with an
 /// active pill, and a pinned ⌘K search row. Collapses to an icon rail (with
@@ -203,9 +219,8 @@ class KasySidebar extends StatefulWidget {
     super.key,
     this.onSettingsTap,
     this.onLogout,
-    this.initiallyCollapsed = false,
+    this.collapseMode = KasySidebarCollapseMode.responsive,
     this.isDrawer = false,
-    this.showSearch = false,
     this.side = KasySidebarSide.left,
     this.routes,
     this.onTapItem,
@@ -250,19 +265,15 @@ class KasySidebar extends StatefulWidget {
   /// (confirm dialog + sign-out). When null, the Logout row does nothing real.
   final VoidCallback? onLogout;
 
-  /// Whether the sidebar starts in the narrow (icon-only) mode.
-  final bool initiallyCollapsed;
+  /// How the rail picks its initial width (responsive / pinned-expanded /
+  /// collapsed). See [KasySidebarCollapseMode].
+  final KasySidebarCollapseMode collapseMode;
 
   /// Present the rail as a slide-in drawer (the mobile pattern): it always opens
   /// wide and hides the collapse toggle, regardless of viewport width. Use when
   /// opening the sidebar from an app-bar menu button on a phone.
   final bool isDrawer;
 
-  /// Whether to pin a ⌘K search row above the footer in connected mode. Opt-in
-  /// (off by default) so the live app navigation stays lean; flip it on when the
-  /// sidebar should double as a command/search entry point.
-  final bool showSearch;
-
   /// The screen edge this sidebar is anchored to.
   final KasySidebarSide side;
 
@@ -302,14 +313,6 @@ class _KasySidebarState extends State<KasySidebar> {
   /// Viewport width below which the sidebar auto-collapses (tablet breakpoint).
   static const double _kBreakpoint = 1024.0;
 
-  /// Below this (mobile), the rail hides its collapse toggle: on a phone the
-  /// thin-vs-wide choice is a fixed pre-configuration (set via [isDrawer] for a
-  /// wide drawer, or the collapsed default for a thin rail), not a live toggle.
-  /// Width does NOT force wide here — a collapsed config stays thin on mobile.
-  static const double _kMobileBreakpoint = 768.0;
-
-  bool _isMobile(BuildContext context) =>
-      MediaQuery.sizeOf(context).width < _kMobileBreakpoint;
 
   /// True when wired to Bart's navigation (real, tappable screens).
   bool get _connected =>
@@ -321,7 +324,11 @@ class _KasySidebarState extends State<KasySidebar> {
   @override
   void initState() {
     super.initState();
-    _collapsePreference = widget.initiallyCollapsed ? true : null;
+    _collapsePreference = switch (widget.collapseMode) {
+      KasySidebarCollapseMode.responsive => null,
+      KasySidebarCollapseMode.expanded => false,
+      KasySidebarCollapseMode.collapsed => true,
+    };
     // Connected mode follows Bart's currentItem (empty highlight here); the
     // showcase defaults to the active layer from the Figma reference.
     _activeItemId = _connected ? '' : 'object2';
@@ -577,15 +584,6 @@ class _KasySidebarState extends State<KasySidebar> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                if (widget.showSearch)
-                  _buildItemRow(
-                    c,
-                    icon: KasyIcons.search,
-                    label: 'Search',
-                    isActive: false,
-                    onTap: () {},
-                    trailing: [_buildKbd(c)],
-                  ),
                 _buildNavItem(context, _kHelpItem, c),
                 _buildItemRow(
                   c,
@@ -619,9 +617,10 @@ class _KasySidebarState extends State<KasySidebar> {
         MediaQuery.sizeOf(context).width >= _kBreakpoint
             ? _kTopBandHeight
             : kasyAppBarBodyTopOverlap(context);
-    // No collapse toggle on a drawer (always wide) or on mobile (the thin/wide
-    // choice is a fixed pre-configuration there, not a live toggle).
-    final bool showToggle = !widget.isDrawer && !_isMobile(context);
+    // The collapse toggle is available on every breakpoint so any config can be
+    // switched thin↔wide — except a drawer, which is a dismissible overlay you
+    // close whole rather than collapse in place.
+    final bool showToggle = !widget.isDrawer;
     final bool anchoredLeft = widget.side == KasySidebarSide.left;
     // Brand wordmark — same artwork as the splash screen.
     final Widget logo = Image.asset(

package/templates/firebase/lib/components/kasy_tabs.dart

@@ -125,6 +125,14 @@ class _KasyTabsState extends State<KasyTabs> {
   // Whether we have a valid measurement yet.
   bool _measured = false;
 
+  // Last layout width seen. The pill/underline geometry is measured from the
+  // laid-out tab boxes, so it must be recomputed whenever the bar's own width
+  // changes — e.g. when a collapsing sidebar animates the tabs open, the first
+  // measure happens at the narrow start width and would otherwise stay stuck in
+  // the corner until the next selection. Re-measuring per resize lets the
+  // indicator track the animation smoothly.
+  double? _lastLayoutWidth;
+
   @override
   void initState() {
     super.initState();
@@ -241,9 +249,23 @@ class _KasyTabsState extends State<KasyTabs> {
   Widget build(BuildContext context) {
     if (widget.items.isEmpty) return const SizedBox.shrink();
 
-    return widget.variant == KasyTabsVariant.primary
-        ? _buildPrimary(context)
-        : _buildSecondary(context);
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final double width = constraints.maxWidth;
+        // Re-measure on every width change (e.g. a sidebar animating open) so
+        // the indicator follows instead of sticking at its first-frame spot.
+        if (_lastLayoutWidth == null ||
+            (_lastLayoutWidth! - width).abs() > 0.5) {
+          _lastLayoutWidth = width;
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (mounted) _measure();
+          });
+        }
+        return widget.variant == KasyTabsVariant.primary
+            ? _buildPrimary(context)
+            : _buildSecondary(context);
+      },
+    );
   }
 
   // ── Primary (pill indicator) ───────────────────────────────────────────────

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

@@ -10,3 +10,16 @@
 /// Non-web stub: always false. The real implementation lives in
 /// `auth_web_support_web.dart` and is selected via conditional import on web.
 bool isMobileWebBrowser() => false;
+
+/// Marks that a full-page redirect *sign-in* (not provider linking) is starting.
+/// Persisted across the redirect's page reload so [resetUrlAfterRedirectLogin]
+/// can tell, at startup, that we returned from a login (and must land on Home)
+/// rather than from a link (which stays on the originating screen, e.g. Settings).
+/// Non-web stub: no-op.
+void markWebRedirectLogin() {}
+
+/// If we just returned from a redirect sign-in (see [markWebRedirectLogin]),
+/// clear the marker and reset the address bar to `/` so the app boots on Home
+/// instead of whatever stale tab URL the redirect returned to. MUST run before
+/// the router reads the initial URL. Non-web stub: no-op.
+void resetUrlAfterRedirectLogin() {}

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

@@ -23,3 +23,20 @@ bool isMobileWebBrowser() {
   // iPadOS 13+ masquerades as desktop Safari but still exposes touch points.
   return ua.contains('macintosh') && web.window.navigator.maxTouchPoints > 1;
 }
+
+/// localStorage key flagging that a redirect *sign-in* is in flight. localStorage
+/// (not in-memory) because the redirect reloads the whole page.
+const String _redirectLoginKey = 'kasy_redirect_login';
+
+void markWebRedirectLogin() {
+  web.window.localStorage.setItem(_redirectLoginKey, '1');
+}
+
+void resetUrlAfterRedirectLogin() {
+  if (web.window.localStorage.getItem(_redirectLoginKey) == null) return;
+  web.window.localStorage.removeItem(_redirectLoginKey);
+  // Absolute path: land on Home, dropping the stale tab path (e.g. /settings)
+  // the redirect returned to. replaceState (not pushState) so no bogus history
+  // entry is left behind.
+  web.window.history.replaceState(null, '', '/');
+}

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

@@ -209,6 +209,9 @@ class FirebaseAuthenticationApi implements AuthenticationApi {
   /// we sign in. The linked/signed-in user is materialised at startup by
   /// [getRedirectResult].
   Future<Credentials> _signInWithRedirectWeb(AuthProvider provider) async {
+    // Flag the login so startup lands on Home, not the stale tab URL the
+    // redirect returns to (linking does NOT flag — it stays put, e.g. Settings).
+    markWebRedirectLogin();
     final current = _auth.currentUser;
     if (current != null && current.isAnonymous) {
       await current.linkWithRedirect(provider);

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

@@ -5,6 +5,7 @@ import 'package:flutter/material.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/bottom_menu/web_url.dart';
 import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
@@ -41,6 +42,14 @@ class SigninPage extends ConsumerWidget {
         body: SizedBox.shrink(),
       );
     }
+    // Web: the sign-in screen is reached via the router redirect (e.g. after a
+    // logout), where Bart may have left a stale tab path in the address bar
+    // (it writes tab URLs directly via pushState). Pin the URL to '/signin' so
+    // it matches the screen actually shown. No-op on native.
+    if (kIsWeb) {
+      WidgetsBinding.instance
+          .addPostFrameCallback((_) => syncBrowserUrl('/signin'));
+    }
     final state = ref.watch(signinStateProvider);
     final isSending = state is SigninStateSending;
     final showBack = shouldShowAuthBackButton(context);
@@ -238,9 +247,9 @@ class _SignupPrompt extends StatelessWidget {
   }
 }
 
-/// "Continue as guest" — creates the anonymous account on demand and lets the
-/// router redirect carry the user into the app. Shown only on native in
-/// anonymous mode (see the build condition in [SigninPage]).
+/// "Continue as guest" — creates the anonymous account on demand and navigates
+/// into the app. Shown only on native in anonymous mode (see the build
+/// condition in [SigninPage]).
 class _GuestContinueButton extends ConsumerStatefulWidget {
   const _GuestContinueButton();
 
@@ -256,8 +265,13 @@ class _GuestContinueButtonState extends ConsumerState<_GuestContinueButton> {
     setState(() => _loading = true);
     try {
       await ref.read(userStateNotifierProvider.notifier).continueAsGuest();
-      // Success: the router redirect navigates to home reactively — nothing
-      // else to do here. The widget is disposed as we leave the page.
+      if (!mounted) return;
+      // Navigate explicitly: the user is now an anonymous guest (has an id but
+      // is NOT an AuthenticatedUserData), and the router redirect intentionally
+      // only bounces *authenticated* users off the auth routes — so a guest can
+      // still open sign-in to upgrade. That means it won't carry us home on its
+      // own here; we do it ourselves.
+      context.go('/');
     } catch (_) {
       if (!mounted) return;
       setState(() => _loading = false);

package/templates/firebase/lib/features/home/home_components_preview_registry.dart

@@ -559,16 +559,16 @@ ComponentPreviewDefinition? getComponentPreviewDefinition(
             builder: _buildSidebarAppNav,
           ),
           ComponentPreviewVariant(
-            label: 'With search',
-            builder: _buildSidebarWithSearch,
+            label: 'Mobile drawer',
+            builder: _buildSidebarMobileDrawer,
           ),
           ComponentPreviewVariant(
             label: 'Collapsed rail',
             builder: _buildSidebarCollapsed,
           ),
           ComponentPreviewVariant(
-            label: 'Mobile drawer',
-            builder: _buildSidebarMobileDrawer,
+            label: 'Pinned (always wide)',
+            builder: _buildSidebarPinned,
           ),
           ComponentPreviewVariant(
             label: 'Workspace showcase',
@@ -629,56 +629,70 @@ ComponentPreviewDefinition? getComponentPreviewDefinition(
 // Sidebar — interactive preview
 // ─────────────────────────────────────────────────────────────────────────────
 
-// The live Home configuration (real pages, highlight-only nav). The default
-// preview — what actually ships in the app.
-Widget _buildSidebarAppNav(BuildContext context) => const _SidebarPreview();
+// The live Home configuration (real pages, highlight-only nav). The default —
+// adapts to the breakpoint, which is what actually ships in the app.
+Widget _buildSidebarAppNav(BuildContext context) => const _SidebarPreview(
+      caption: 'The default app navigation, wired to the live Home pages. '
+          'Adapts to the breakpoint: wide on desktop, a thin icon rail on '
+          'tablet and mobile — the toggle expands it on any screen.',
+    );
 
-// Same Home config plus the opt-in ⌘K search row pinned above the footer.
-Widget _buildSidebarWithSearch(BuildContext context) =>
-    const _SidebarPreview(showSearch: true);
+// The mobile pattern: always opens wide as a slide-in drawer, no collapse
+// toggle (the sheet you open from an app-bar menu button on a phone).
+Widget _buildSidebarMobileDrawer(BuildContext context) => const _SidebarPreview(
+      isDrawer: true,
+      caption: 'The phone pattern: always opens wide as a slide-in drawer, with '
+          'the collapse toggle hidden. This is what an app-bar menu button opens.',
+    );
 
-// Home config starting as the narrow icon rail (tooltips on hover).
-Widget _buildSidebarCollapsed(BuildContext context) =>
-    const _SidebarPreview(initiallyCollapsed: true);
+// Starts as the narrow icon rail (tooltips on hover), at any breakpoint.
+Widget _buildSidebarCollapsed(BuildContext context) => const _SidebarPreview(
+      collapseMode: KasySidebarCollapseMode.collapsed,
+      caption: 'Starts collapsed to the thin icon rail (labels show as hover '
+          'tooltips). Expand it with the toggle on any breakpoint.',
+    );
 
-// The mobile pattern: always wide, collapse toggle hidden (isDrawer).
-Widget _buildSidebarMobileDrawer(BuildContext context) =>
-    const _SidebarPreview(isDrawer: true);
+// Pinned wide on every breakpoint; the user collapses it themselves.
+Widget _buildSidebarPinned(BuildContext context) => const _SidebarPreview(
+      collapseMode: KasySidebarCollapseMode.expanded,
+      caption: 'Pinned wide on every breakpoint instead of auto-collapsing; the '
+          'user narrows it with the toggle when they want the room.',
+    );
 
-// The rich SaaS showcase (workspace selector, KasyTabs segment, layers list).
-Widget _buildSidebarShowcase(BuildContext context) =>
-    const _SidebarPreview(showcase: true);
+// The rich SaaS showcase (workspace selector, KasyTabs segment, ⌘K search).
+Widget _buildSidebarShowcase(BuildContext context) => const _SidebarPreview(
+      showcase: true,
+      caption: 'The rich SaaS layout: workspace switcher, a KasyTabs segment '
+          '(Layers / Assets) and a pinned ⌘K search row.',
+    );
 
 /// Launches a [KasySidebar] as a full-height drawer (left + right buttons) so
-/// the full-bleed chrome can be inspected without crushing the preview card.
+/// the full-bleed chrome can be inspected without crushing the preview card. A
+/// short [caption] (Kasy typography) explains what each configuration is.
 /// Connected variants mirror the live Home; [showcase] swaps to the HeroUI
 /// workspace demo.
 class _SidebarPreview extends StatelessWidget {
   const _SidebarPreview({
+    required this.caption,
     this.showcase = false,
-    this.initiallyCollapsed = false,
+    this.collapseMode = KasySidebarCollapseMode.responsive,
     this.isDrawer = false,
-    this.showSearch = false,
   });
 
+  final String caption;
   final bool showcase;
-  final bool initiallyCollapsed;
+  final KasySidebarCollapseMode collapseMode;
   final bool isDrawer;
-  final bool showSearch;
 
   Widget _sidebar({required bool fromEnd}) {
     final KasySidebarSide side =
         fromEnd ? KasySidebarSide.right : KasySidebarSide.left;
     if (showcase) {
-      return KasySidebar(
-        initiallyCollapsed: initiallyCollapsed,
-        side: side,
-      );
+      return KasySidebar(collapseMode: collapseMode, side: side);
     }
     return _DemoSidebar(
       isDrawer: isDrawer,
-      initiallyCollapsed: initiallyCollapsed,
-      showSearch: showSearch,
+      collapseMode: collapseMode,
       side: side,
     );
   }
@@ -696,6 +710,17 @@ class _SidebarPreview extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
+          child: Text(
+            caption,
+            textAlign: TextAlign.center,
+            style: context.textTheme.bodySmall?.copyWith(
+              color: context.colors.muted,
+            ),
+          ),
+        ),
+        const SizedBox(height: KasySpacing.md),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
           child: _previewIntrinsicLaunch(
@@ -728,14 +753,12 @@ class _SidebarPreview extends StatelessWidget {
 class _DemoSidebar extends StatefulWidget {
   const _DemoSidebar({
     this.isDrawer = false,
-    this.initiallyCollapsed = false,
-    this.showSearch = false,
+    this.collapseMode = KasySidebarCollapseMode.responsive,
     this.side = KasySidebarSide.left,
   });
 
   final bool isDrawer;
-  final bool initiallyCollapsed;
-  final bool showSearch;
+  final KasySidebarCollapseMode collapseMode;
   final KasySidebarSide side;
 
   @override
@@ -783,8 +806,7 @@ class _DemoSidebarState extends State<_DemoSidebar> {
       currentItem: _current,
       onTapItem: (i) => _current.value = i, // highlight only
       isDrawer: widget.isDrawer,
-      initiallyCollapsed: widget.initiallyCollapsed,
-      showSearch: widget.showSearch,
+      collapseMode: widget.collapseMode,
       side: widget.side,
     );
   }

package/templates/firebase/lib/features/settings/settings_page.dart

@@ -155,7 +155,6 @@ class SettingsPage extends ConsumerWidget {
                       isAdmin: user.isAdmin,
                       isPhone: isPhone,
                     ),
-                    const SizedBox(height: KasySpacing.xl),
                   ],
                 );
               }

package/templates/firebase/lib/main.dart

@@ -24,6 +24,8 @@ import 'package:kasy_kit/core/web_device_preview/web_device_preview.dart';
 import 'package:kasy_kit/core/web_viewport_scale.dart';
 import 'package:kasy_kit/core/widgets/focus_visibility.dart';
 import 'package:kasy_kit/environments.dart';
+import 'package:kasy_kit/features/authentication/api/auth_web_support.dart'
+    if (dart.library.js_interop) 'package:kasy_kit/features/authentication/api/auth_web_support_web.dart';
 import 'package:kasy_kit/features/authentication/api/authentication_api.dart';
 import 'package:kasy_kit/features/notifications/api/local_notifier.dart';
 import 'package:kasy_kit/features/notifications/repositories/background_notification_handler.dart';
@@ -88,6 +90,11 @@ void main() async {
   // MUST be registered at the top-level BEFORE runApp().
   FirebaseMessaging.onBackgroundMessage(onBackgroundMessage);
 
+  // Web: if we just returned from a social-login redirect, reset the address bar
+  // to '/' BEFORE the router reads the initial URL, so the app boots on Home
+  // instead of the stale tab URL (e.g. /settings) the redirect returned to.
+  resetUrlAfterRedirectLogin();
+
   // initialize sentry for error reporting in production only
   if (env is DevEnvironment) {
     run(sharedPrefs);

package/templates/firebase/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+53
+version: 1.0.0+57
 
 environment:
   sdk: ^3.11.0
@@ -73,7 +73,7 @@ dependencies:
   json_annotation: ^4.9.0
   local_auth: ^3.0.1
   logger: ^2.6.2
-  lucide_icons_flutter: ^3.1.10
+  lucide_icons_flutter: ^3.1.14
   mixpanel_flutter: ^2.5.0
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0