kasy-cli 1.23.0 → 1.24.0

package/bin/kasy.js

@@ -463,9 +463,15 @@ function buildProgram(language) {
           if (p[p.length - 1] === 'lib') p = p.slice(0, -1);
           prefix = p.join(path.sep) || null;
         }
-        const args = ['install', '-g', 'kasy-cli@latest'];
-        if (prefix) args.push('--prefix', prefix);
-        const result = spawnSync('npm', args, { stdio: 'inherit', shell: true });
+        // Build a single, pre-quoted command string. Passing a quoted string
+        // (instead of an args array) with shell:true keeps a prefix that contains
+        // spaces intact — e.g. C:\Users\John Silva\.kasy — which the array form
+        // splits into a broken path (npm reads "Silva\.kasy" as a second package).
+        // It also avoids Node's DEP0190 arg-concatenation warning.
+        const quote = (s) => `"${s}"`;
+        let cmd = 'npm install -g kasy-cli@latest';
+        if (prefix) cmd += ` --prefix ${quote(prefix)}`;
+        const result = spawnSync(cmd, { stdio: 'inherit', shell: true });
         if (result.status === 0) {
           const after = readVersion();
           let msg;
@@ -486,9 +492,25 @@ function buildProgram(language) {
       .description(t('cli.command.uninstall.description'))
       .action(() => {
         const { spawnSync } = require('node:child_process');
+        const path = require('node:path');
         printCompactHeader(t);
         console.log(kleur.cyan(t('cli.command.uninstall.running')) + '\n');
-        const result = spawnSync('npm', ['uninstall', '-g', 'kasy-cli'], { stdio: 'inherit', shell: true });
+        // Remove from the SAME prefix the CLI was installed into (~/.kasy), the
+        // way `kasy upgrade` derives it — otherwise npm targets its default global
+        // prefix and leaves the real copy in place. Quote it so a path with
+        // spaces (C:\Users\John Silva\.kasy) survives shell:true.
+        const segs = __dirname.split(path.sep);
+        const nm = segs.lastIndexOf('node_modules');
+        let prefix = null;
+        if (nm > 0) {
+          let p = segs.slice(0, nm);
+          if (p[p.length - 1] === 'lib') p = p.slice(0, -1);
+          prefix = p.join(path.sep) || null;
+        }
+        const quote = (s) => `"${s}"`;
+        let cmd = 'npm uninstall -g kasy-cli';
+        if (prefix) cmd += ` --prefix ${quote(prefix)}`;
+        const result = spawnSync(cmd, { stdio: 'inherit', shell: true });
         if (result.status === 0) {
           console.log('\n' + kleur.green('✓ ' + t('cli.command.uninstall.done')) + '\n');
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.23.0",
+  "version": "1.24.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/lib/components/kasy_sidebar.dart

@@ -746,6 +746,7 @@ class _KasySidebarState extends State<KasySidebar> {
         hoverColor: c.activeBg,
         pressColor: c.textActive,
         focusable: true,
+        focusGapColor: c.bg,
         onTap: widget.onProfileTap ?? () {},
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
@@ -877,6 +878,7 @@ class _KasySidebarState extends State<KasySidebar> {
         hoverColor: c.activeBg,
         pressColor: c.textActive,
         focusable: true,
+        focusGapColor: c.bg,
         onTap: onTap,
         child: Container(
           constraints: const BoxConstraints(minHeight: _kItemMinH),
@@ -947,6 +949,7 @@ class _KasySidebarState extends State<KasySidebar> {
           hoverColor: c.activeBg,
           pressColor: c.textActive,
           focusable: true,
+          focusGapColor: c.bg,
           onTap: () => _activateItem(item.id),
           child: Container(
             constraints: const BoxConstraints(minHeight: _kItemMinH),

package/templates/firebase/lib/core/bottom_menu/bottom_menu.dart

@@ -152,20 +152,27 @@ class BottomMenu extends StatelessWidget {
   }
 }
 
-/// Owns the sidebar's keyboard [FocusScope] and keeps the initial Tab focus
-/// anchored on the sidebar — on every screen, like Stripe/Linear.
+/// Keeps the initial keyboard Tab focus anchored on the sidebar — on every
+/// screen, like Stripe/Linear.
 ///
 /// Why this exists: Bart renders each page inside a nested [Navigator]
 /// (see bart's nested_navigator.dart), which has its OWN FocusScope and claims
 /// the primary focus the moment a route mounts. A plain `autofocus` on a sidebar
 /// item loses that race — the Navigator overwrites it in the same frame.
 ///
-/// The fix is a post-frame callback (runs AFTER the Navigator has claimed focus)
-/// that hands focus back to this sidebar scope. We focus the SCOPE, not a
-/// specific item, so the very first Tab lands on the first item (no item is
-/// skipped). It re-runs whenever [currentItem] changes (a tab navigation) so a
-/// fresh screen also starts at the sidebar. The ring still only paints during
-/// keyboard navigation, so this is invisible to mouse/touch users.
+/// The fix is a tiny non-traversable [Focus] anchor inside the sidebar. A
+/// post-frame callback (runs AFTER the Navigator has claimed focus) moves focus
+/// to that anchor, pulling the primary focus out of the Navigator's scope and
+/// back onto the sidebar. Because the anchor sets `skipTraversal: true`, it is
+/// skipped by Tab, so the very first Tab lands on the first real sidebar item
+/// and then flows on to the header and content — nothing is trapped. (A
+/// [FocusScope] would have worked for the anchoring, but it adds a traversal
+/// boundary that wraps Tab back to the sidebar's start instead of moving on to
+/// the content, which is the opposite of what we want.)
+///
+/// It re-anchors whenever [currentItem] changes (a tab navigation) so a fresh
+/// screen also starts at the sidebar. The ring still only paints during keyboard
+/// navigation, so this is invisible to mouse/touch users.
 class _FocusableSidebar extends StatefulWidget {
   final Widget child;
   final ValueNotifier<int> currentItem;
@@ -177,7 +184,10 @@ class _FocusableSidebar extends StatefulWidget {
 }
 
 class _FocusableSidebarState extends State<_FocusableSidebar> {
-  final FocusScopeNode _scope = FocusScopeNode(debugLabel: 'sidebarScope');
+  final FocusNode _anchor = FocusNode(
+    debugLabel: 'sidebarFocusAnchor',
+    skipTraversal: true,
+  );
 
   @override
   void initState() {
@@ -199,26 +209,28 @@ class _FocusableSidebarState extends State<_FocusableSidebar> {
   // which claims focus for its own scope while the route is mounting.
   void _anchorFocus() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      // Only seize focus when nothing inside the sidebar already holds it, so a
-      // keyboard user mid-navigation in the sidebar isn't yanked back to start.
-      if (_scope.hasFocus) return;
-      _scope.requestFocus();
+      if (mounted) _anchor.requestFocus();
     });
   }
 
   @override
   void dispose() {
     widget.currentItem.removeListener(_anchorFocus);
-    _scope.dispose();
+    _anchor.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    return FocusScope(
-      node: _scope,
-      child: FocusTraversalGroup(child: widget.child),
+    return FocusTraversalGroup(
+      // The anchor is a zero-size sibling so it never affects the sidebar's
+      // layout; it exists only to hold the initial keyboard focus (see above).
+      child: Stack(
+        children: [
+          widget.child,
+          Focus(focusNode: _anchor, child: const SizedBox.shrink()),
+        ],
+      ),
     );
   }
 }

package/templates/firebase/lib/core/widgets/kasy_focus_ring.dart

@@ -27,12 +27,20 @@ class KasyFocusRing extends StatefulWidget {
   /// When false the ring never takes focus or paints (disabled controls).
   final bool enabled;
 
+  /// Colour of the hair-line gap between the control and the ring. Defaults to
+  /// [KasyColors.background] (correct on full-page backgrounds). Pass the actual
+  /// surface colour the control sits on (e.g. the sidebar/header `surface`) so
+  /// the gap blends in instead of painting a visible halo — this matters in dark
+  /// mode, where `background` is darker than `surface`.
+  final Color? gapColor;
+
   const KasyFocusRing({
     super.key,
     required this.child,
     required this.borderRadius,
     this.onActivate,
     this.enabled = true,
+    this.gapColor,
   });
 
   @override
@@ -57,7 +65,7 @@ class _KasyFocusRingState extends State<KasyFocusRing> {
     // A hair-line gap in the canvas colour lifts the ring just off the control
     // so it reads as a crisp outline (same focus language as KasyTextField) and
     // stays visible even on primary-coloured buttons (e.g. the chat send orb).
-    final Color gapColor = context.colors.background;
+    final Color gapColor = widget.gapColor ?? context.colors.background;
     final VoidCallback? onActivate = widget.onActivate;
 
     return FocusableActionDetector(

package/templates/firebase/lib/core/widgets/kasy_hover.dart

@@ -50,6 +50,7 @@ class KasyHover extends ConsumerStatefulWidget {
     this.hoverColor,
     this.pressColor,
     this.focusable = false,
+    this.focusGapColor,
   });
 
   final Widget child;
@@ -112,6 +113,12 @@ class KasyHover extends ConsumerStatefulWidget {
   /// call sites stay plain, non-focusable rows.
   final bool focusable;
 
+  /// Gap colour forwarded to the focus ring (only used when [focusable]). Pass
+  /// the surface colour the row sits on so the keyboard ring's hair-line gap
+  /// blends in instead of showing a darker halo (notably in dark mode). When
+  /// null the ring falls back to [KasyColors.background].
+  final Color? focusGapColor;
+
   @override
   ConsumerState<KasyHover> createState() => _KasyHoverState();
 }
@@ -209,6 +216,7 @@ class _KasyHoverState extends ConsumerState<KasyHover> {
         ? KasyFocusRing(
             borderRadius: widget.borderRadius,
             onActivate: widget.onTap,
+            gapColor: widget.focusGapColor,
             child: content,
           )
         : content;