feat(cli): enhance file copying functionality with status reporting and improved user prompts

Author: dakixr

src/htpy_uikit/cli.py

@@ -4,6 +4,8 @@
 import shutil
 import sys
 import tomllib
+from collections import Counter
+from enum import Enum
 from pathlib import Path
 from typing import Iterable
 from typing import Sequence
@@ -94,17 +96,34 @@ def _resolve_dependencies(entry_files: Sequence[Path]) -> list[Path]:
     return internals + components
 
 
-def _copy_file(src: Path, dest_dir: Path, force: bool) -> Path:
+class CopyStatus(Enum):
+    COPIED = "copied"
+    SKIPPED_UNCHANGED = "skipped_unchanged"
+    SKIPPED_USER = "skipped_user"
+
+
+def _copy_file(
+    src: Path,
+    dest_dir: Path,
+    force: bool,
+    dest_name: str | None = None,
+) -> tuple[Path, CopyStatus]:
     dest_dir.mkdir(parents=True, exist_ok=True)
-    dest = dest_dir / src.name
-    if dest.exists() and not force:
-        overwrite = questionary.confirm(f"{dest} exists. Overwrite?", default=False).ask()
-        if not overwrite:
-            click.echo(f"Skipped {dest}")
-            return dest
+    name = dest_name or src.name
+    dest = dest_dir / name
+    if dest.exists():
+        src_bytes = src.read_bytes()
+        dest_bytes = dest.read_bytes()
+        if dest_bytes == src_bytes:
+            return dest, CopyStatus.SKIPPED_UNCHANGED
+        if not force:
+            overwrite = questionary.confirm(f"{dest} exists. Overwrite?", default=False).ask()
+            if not overwrite:
+                click.echo(f"Skipped {dest}")
+                return dest, CopyStatus.SKIPPED_USER
     shutil.copy2(src, dest)
     click.echo(f"Copied {src.name} -> {dest}")
-    return dest
+    return dest, CopyStatus.COPIED
 
 
 def _find_pyproject(start: Path | None = None) -> Path | None:
@@ -252,8 +271,27 @@ def add_cmd(components: tuple[str, ...], dest: Path | None, select_all: bool, fo
     init_py = dest / "__init__.py"
     if not init_py.exists():
         _write_text(init_py, "")
+    status_counts: Counter[CopyStatus] = Counter()
     for src in files:
-        _copy_file(src, dest, force=force)
+        _, status = _copy_file(src, dest, force=force)
+        status_counts[status] += 1
+
+    copied = status_counts[CopyStatus.COPIED]
+    if copied:
+        suffix = "s" if copied != 1 else ""
+        click.echo(f"\nCopied {copied} file{suffix}.")
+
+    summaries: list[str] = []
+    unchanged = status_counts[CopyStatus.SKIPPED_UNCHANGED]
+    if unchanged:
+        suffix = "s" if unchanged != 1 else ""
+        summaries.append(f"{unchanged} file{suffix} already up-to-date")
+    skipped = status_counts[CopyStatus.SKIPPED_USER]
+    if skipped:
+        suffix = "s" if skipped != 1 else ""
+        summaries.append(f"{skipped} file{suffix} overwrite declined")
+    if summaries:
+        click.echo(f"Skipped {'; '.join(summaries)}")
 
     click.echo("\nDone. Remember to run your Tailwind build.")
 
@@ -295,13 +333,14 @@ def add_theme_cmd(theme: str | None, dest: Path | None, force: bool) -> None:
     if dest is None:
         dest = default_dest
 
-    if dest.exists() and not force:
-        if not questionary.confirm(f"{dest} exists. Overwrite?", default=False).ask():
-            click.echo("Skipped theme.")
-            return
-    content = _read_text(src)
-    _write_text(dest, content)
-    click.echo(f"Copied {src.name} -> {dest}")
+    _, status = _copy_file(
+        src,
+        dest.parent,
+        force=force,
+        dest_name=dest.name,
+    )
+    if status != CopyStatus.COPIED:
+        return
 
 
 @cli.command("themes")

src/htpy_uikit/components/badge.py

@@ -29,12 +29,12 @@ def _compute_badge_classes(variant: BadgeVariant, extra: str | None = None) -> s
         var = "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90"
     elif variant == "destructive":
         var = (
-            "border-transparent bg-destructive text-destructive-foreground [a&]:hover:bg-destructive/90 "
-            "focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60"
+            "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 "
+            "focus-visible:ring-destructive/20"
         )
     elif variant == "outline":
         var = (
-            "bg-background dark:bg-input/30 border border-border text-foreground "
+            "bg-background border border-border text-foreground "
             "[a&]:hover:bg-accent [a&]:hover:text-accent-foreground"
         )
     else:
@@ -215,7 +215,7 @@ def badge_link(
         "inline-flex items-center justify-center rounded-full border px-2 py-0.5 text-xs font-medium h-6 "
         "whitespace-nowrap shrink-0 gap-1 [&>svg]:size-3 [&>svg]:pointer-events-none transition-[color,box-shadow] overflow-hidden"
     )
-    outline = "bg-background dark:bg-input/30 border border-border text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground"
+    outline = "bg-background border border-border text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground"
     classes = f"{base} {outline}"
     if class_:
         classes = f"{classes} {class_}"

src/htpy_uikit/components/button.py

@@ -47,7 +47,7 @@ def button_component(
         "inline-flex items-center justify-center whitespace-nowrap text-sm font-medium transition-all "
         "disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 "
         "shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 "
-        "focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 "
+        "focus-visible:ring-[3px] aria-invalid:ring-destructive/20 "
         "aria-invalid:border-destructive cursor-pointer rounded-md gap-2 h-9 px-4 has-[>svg]:px-3"
     )
 
@@ -61,14 +61,14 @@ def button_component(
         # Use white text on destructive buttons to match reference (strong contrast)
         "destructive": (
             "bg-destructive text-white shadow-xs focus-visible:ring-destructive/20 "
-            "dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 hover:bg-destructive/90 dark:hover:bg-destructive/50"
+            "hover:bg-destructive/90"
         ),
-        "outline": "border bg-background shadow-xs dark:bg-input/30 dark:border-input hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+        "outline": "border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground",
         "ghost": "hover:bg-accent hover:text-accent-foreground",
         "link": "text-primary underline-offset-4 hover:underline",
         "danger": (
             "bg-destructive text-white shadow-xs focus-visible:ring-destructive/20 "
-            "dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 hover:bg-destructive/90 dark:hover:bg-destructive/50"
+            "hover:bg-destructive/90"
         ),
     }
     # All variants should be handled in the dictionary

src/htpy_uikit/components/checkbox.py

@@ -45,10 +45,10 @@ def checkbox_component(
     # Base classes – Tailwind utilities matching Basecoat checkbox styles
     # Checked indicator using :after pseudo-element with mask icon
     base_classes = (
-        "appearance-none cursor-pointer border-input dark:bg-input/30 checked:bg-primary dark:checked:bg-primary "
-        "checked:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 "
-        "dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border "
-        "shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 "
+        "appearance-none cursor-pointer border-input bg-card checked:bg-primary checked:border-primary "
+        "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 aria-invalid:border-destructive "
+        "size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] "
+        "disabled:cursor-not-allowed disabled:opacity-50 "
         "checked:after:content-[''] checked:after:block checked:after:size-3.5 checked:after:bg-primary-foreground "
         "checked:after:mask-[image:var(--check-icon)] checked:after:mask-size-[0.875rem] checked:after:mask-no-repeat checked:after:mask-center"
     )
@@ -158,10 +158,10 @@ def checkbox_card_component(
     # Base input classes (same as reference "input" class)
     # Position the checkbox absolutely so it appears inside the card area
     input_classes = (
-        "peer absolute left-4 top-4 z-20 appearance-none border-input dark:bg-input/30 checked:bg-primary dark:checked:bg-primary "
-        "checked:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 "
-        "dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border "
-        "shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 "
+        "peer absolute left-4 top-4 z-20 appearance-none border-input bg-card checked:bg-primary checked:border-primary "
+        "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 aria-invalid:border-destructive "
+        "size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] "
+        "disabled:cursor-not-allowed disabled:opacity-50 "
         "checked:after:content-[''] checked:after:block checked:after:size-3.5 checked:after:bg-primary-foreground "
         "checked:after:mask-[image:var(--check-icon)] checked:after:mask-size-[0.875rem] checked:after:mask-no-repeat checked:after:mask-center"
     )
@@ -196,13 +196,13 @@ def checkbox_card_component(
     # Determine card-inner classes to color full card area on checked state and hover effects
     if card_color == "blue":
         classes_card_checked = "peer-checked:bg-blue-700/30 peer-checked:border-blue-700/60"
-        classes_card_hover = "peer-not-checked:hover:bg-blue-50 peer-not-checked:hover:border-blue-200 dark:peer-not-checked:hover:bg-blue-950/20 dark:peer-not-checked:hover:border-blue-800/40"
+        classes_card_hover = "peer-not-checked:hover:bg-blue-50 peer-not-checked:hover:border-blue-200"
     elif card_color == "green":
         classes_card_checked = "peer-checked:bg-green-700/30 peer-checked:border-green-700/60"
-        classes_card_hover = "peer-not-checked:hover:bg-green-50 peer-not-checked:hover:border-green-200 dark:peer-not-checked:hover:bg-green-950/20 dark:peer-not-checked:hover:border-green-800/40"
+        classes_card_hover = "peer-not-checked:hover:bg-green-50 peer-not-checked:hover:border-green-200"
     elif card_color == "red":
         classes_card_checked = "peer-checked:bg-red-700/30 peer-checked:border-red-700/60"
-        classes_card_hover = "peer-not-checked:hover:bg-red-50 peer-not-checked:hover:border-red-200 dark:peer-not-checked:hover:bg-red-950/20 dark:peer-not-checked:hover:border-red-800/40"
+        classes_card_hover = "peer-not-checked:hover:bg-red-50 peer-not-checked:hover:border-red-200"
     else:
         assert_never(card_color)
 

src/htpy_uikit/components/combobox.py

@@ -292,7 +292,7 @@ def combobox(
                 if (enter) {{
                     // apply hover bg only when not selected
                     if (!el.classList.contains('bg-accent')) {{
-                        el.style.background = 'rgba(255,255,255,0.03)';
+                        el.style.background = 'var(--color-muted, rgba(255,255,255,0.03))';
                     }}
                 }} else {{
                     // remove hover bg; restore selected bg if needed

src/htpy_uikit/components/dialog.py

@@ -55,19 +55,18 @@ def dialog(
         div(
             **{"role": "dialog", "aria-modal": "true"},
             class_=(
-                "relative z-50 grid w-full max-w-lg gap-4 border border-gray-200 bg-white "
-                "p-6 shadow-lg duration-200 sm:rounded-lg dark:border-gray-800 dark:bg-gray-950"
+                "relative z-50 grid w-full max-w-lg gap-4 border border-border bg-card "
+                "p-6 shadow-lg duration-200 sm:rounded-lg"
             ),
         )[
             # Close button
             button(
-                class_=(
-                    "absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white "
-                    "transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 "
-                    "focus:ring-gray-400 focus:ring-offset-2 disabled:pointer-events-none "
-                    "data-[state=open]:bg-gray-100 dark:ring-offset-gray-950 dark:focus:ring-gray-800 "
-                    "dark:data-[state=open]:bg-gray-800"
-                ),
+            class_=(
+                "absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white "
+                "transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 "
+                "focus:ring-ring/50 focus:ring-offset-2 disabled:pointer-events-none "
+                "data-[state=open]:bg-muted/20"
+            ),
                 **{"data-state": "closed"},
             )[
                 svg(
@@ -82,7 +81,7 @@ def dialog(
             # Dialog header
             div(class_="flex flex-col space-y-1.5 text-center sm:text-left")[
                 h2(class_="text-lg font-semibold leading-none tracking-tight")[title or ""],
-                p(class_="text-sm text-gray-500 dark:text-gray-400")[description or ""],
+                p(class_="text-sm text-muted-foreground")[description or ""],
             ],
         ],
     ]
@@ -147,7 +146,7 @@ def dialog_description(children: Node, *, class_: Optional[str] = None, **attrs)
     Returns:
         Renderable: ``<p>`` node with muted styling.
     """
-    classes = "text-sm text-gray-500 dark:text-gray-400"
+    classes = "text-sm text-muted-foreground"
     attrs["class_"] = merge_classes(classes, class_)
 
     return p(**attrs)[children]
@@ -181,11 +180,10 @@ def dialog_close_button(*, class_: Optional[str] = None, **attrs) -> Renderable:
         Renderable: Close button renderable.
     """
     classes = (
-        "mt-2 inline-flex h-10 items-center justify-center rounded-md border border-gray-300 "
-        "bg-white px-4 py-2 text-sm font-medium ring-offset-white transition-colors hover:bg-gray-50 "
-        "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-400 focus-visible:ring-offset-2 "
-        "disabled:pointer-events-none disabled:opacity-50 dark:border-gray-700 dark:bg-gray-950 "
-        "dark:ring-offset-gray-950 dark:hover:bg-gray-800 dark:focus-visible:ring-gray-800 sm:mt-0"
+        "mt-2 inline-flex h-10 items-center justify-center rounded-md border border-border "
+        "bg-background px-4 py-2 text-sm font-medium ring-offset-white transition-colors hover:bg-muted/10 "
+        "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50 focus-visible:ring-offset-2 "
+        "disabled:pointer-events-none disabled:opacity-50 sm:mt-0"
     )
     attrs["class_"] = merge_classes(classes, class_)
 
@@ -207,8 +205,7 @@ def dialog_action_button(children: Node, *, class_: Optional[str] = None, **attr
         "inline-flex h-10 items-center justify-center rounded-md bg-blue-600 px-4 py-2 "
         "text-sm font-medium text-white transition-colors hover:bg-blue-700 focus-visible:outline-none "
         "focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 "
-        "disabled:pointer-events-none disabled:opacity-50 dark:bg-blue-600 dark:hover:bg-blue-700 "
-        "dark:focus-visible:ring-blue-300"
+        "disabled:pointer-events-none disabled:opacity-50"
     )
     attrs["class_"] = merge_classes(classes, class_)
 

src/htpy_uikit/components/input.py

@@ -52,14 +52,13 @@ def input_component(
 
     base_classes = (
         "appearance-none file:text-foreground placeholder:text-muted-foreground "
-        "selection:bg-primary selection:text-primary-foreground dark:bg-input/30 "
-        "border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent "
+        "selection:bg-primary selection:text-primary-foreground border-input "
+        "flex h-9 w-full min-w-0 rounded-md border bg-card "
         "px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none "
         "file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm "
-        "file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed "
+        "file:font-medium disabled:cursor-not-allowed "
         "disabled:opacity-50 md:text-sm focus-visible:border-ring focus-visible:ring-ring/50 "
-        "focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 "
-        "aria-invalid:border-destructive"
+        "focus-visible:ring-[3px] aria-invalid:ring-destructive/20 aria-invalid:border-destructive"
     )
 
     # Build class list

src/htpy_uikit/components/modal.py

@@ -42,7 +42,7 @@ def _modal_panel(
         "type": "button",
         "class_": (
             "cursor-pointer text-muted-foreground bg-transparent hover:text-foreground rounded-lg "
-            "text-sm w-8 h-8 ms-auto inline-flex justify-center items-center hover:bg-accent dark:hover:text-white"
+            "text-sm w-8 h-8 ms-auto inline-flex justify-center items-center hover:bg-accent hover:text-white"
         ),
     }
     if close_button_attrs:

src/htpy_uikit/components/pagination.py

@@ -19,13 +19,12 @@
     "inline-flex items-center justify-center whitespace-nowrap text-sm font-medium "
     "disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 shrink-0 "
     "outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] "
-    "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive "
+    "aria-invalid:ring-destructive/20 aria-invalid:border-destructive "
     "cursor-pointer rounded-md"
 )
 variant_ghost = "hover:bg-accent hover:text-accent-foreground"
 variant_outline = (
-    "border bg-background shadow-xs dark:bg-input/30 dark:border-input hover:bg-accent "
-    "hover:text-accent-foreground dark:hover:bg-accent/50"
+    "border bg-background shadow-xs border-input hover:bg-accent hover:text-accent-foreground"
 )
 size_text = {
     "sm": "gap-1.5 h-8 px-3 has-[>svg]:px-2.5 text-xs",
@@ -121,7 +120,7 @@ def build_url(page: int) -> str:
                 a(
                     class_=prev_classes,
                     href=prev_url if not is_disabled else None,
-                    **{"aria-label": "Previous page"},
+                    **{"aria-label": "Previous page", "hx-boost": "true"},
                 )[
                     icon_chevron_left(class_="size-4 shrink-0"),
                     span()[" Previous"],
@@ -136,6 +135,7 @@ def build_url(page: int) -> str:
                 a(
                     class_=classes_btn("ghost", icon=True, size_key=size),
                     href=build_url(1),
+                    **{"hx-boost": "true"},
                 )["1"]
             ]
         )
@@ -156,7 +156,7 @@ def build_url(page: int) -> str:
                 a(
                     class_=page_classes,
                     href="#" if is_current else build_url(page),
-                    **{"aria-current": "page" if is_current else None},
+                    **{"aria-current": "page" if is_current else None, "hx-boost": "true"},
                 )[str(page)]
             ]
         )
@@ -171,6 +171,7 @@ def build_url(page: int) -> str:
                 a(
                     class_=classes_btn("ghost", icon=True, size_key=size),
                     href=build_url(total_pages),
+                    **{"hx-boost": "true"},
                 )[str(total_pages)]
             ]
         )
@@ -189,7 +190,7 @@ def build_url(page: int) -> str:
                 a(
                     class_=next_classes,
                     href=next_url if not is_disabled else None,
-                    **{"aria-label": "Next page"},
+                    **{"aria-label": "Next page", "hx-boost": "true"},
                 )[
                     span()["Next "],
                     icon_chevron_right(class_="size-4 shrink-0"),