quickscale-cli 0.73.0__tar.gz → 0.74.2__tar.gz

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickscale-cli
-Version: 0.73.0
+Version: 0.74.2
 Summary: Command-line interface for QuickScale Django project generator
 License: Apache-2.0
 Keywords: django,cli,project-generator,saas
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=8.3.1,<9.0.0)
-Requires-Dist: quickscale-core (>=0.73.0,<0.74.0)
+Requires-Dist: quickscale-core (>=0.74.2,<0.75.0)
 Project-URL: Documentation, https://github.com/Experto-AI/quickscale/tree/main/docs
 Project-URL: Homepage, https://github.com/Experto-AI/quickscale
 Project-URL: Repository, https://github.com/Experto-AI/quickscale
@@ -25,6 +25,14 @@ Description-Content-Type: text/markdown
 
 # 🚀 QuickScale
 
+[![PyPI version](https://img.shields.io/pypi/v/quickscale.svg)](https://pypi.org/project/quickscale/)
+[![CI](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml/badge.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
+[![Coverage](https://img.shields.io/badge/coverage-90%25-green.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
+[![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Version](https://img.shields.io/badge/version-0.74.0-green.svg)](https://github.com/Experto-AI/quickscale/releases)
+[![Code style: Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+
 > **You are here**: **QuickScale README** (Project Overview)
 > **Related docs**: [Start Here](START_HERE.md) | [Glossary](GLOSSARY.md) | [Decisions](docs/technical/decisions.md) | [User Manual](docs/technical/user_manual.md)
 
@@ -93,10 +101,11 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 
 ### Development Flow
 1. `quickscale plan myapp` → Interactive configuration wizard
-2. `quickscale apply` → Generates production-ready Django project
-3. Add your custom Django apps and features
-4. Build your unique client application
-5. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
+2. `cd myapp` → Navigate to your project directory
+3. `quickscale apply` → Generates production-ready Django project
+4. Add your custom Django apps and features
+5. Build your unique client application
+6. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
 
 ℹ️ The [MVP Feature Matrix](./docs/technical/decisions.md#mvp-feature-matrix-authoritative) is the single source of truth for what's in or out.
 
@@ -104,6 +113,7 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 
 Running `quickscale plan myapp && quickscale apply` generates a **production-ready Django project** with:
 
+- ✅ **React + shadcn/ui** frontend (TypeScript, Vite, Tailwind CSS) — **NEW in v0.74.0**
 - ✅ **Docker** setup (development + production)
 - ✅ **PostgreSQL** configuration
 - ✅ **Environment-based** settings (dev/prod split)
@@ -115,6 +125,8 @@ Running `quickscale plan myapp && quickscale apply` generates a **production-rea
 - ✅ **Poetry** for dependency management
 - ✅ **One-Command Deployment**: Deploy to Railway with `quickscale deploy railway` - fully automated setup
 
+**Alternative**: Use `quickscale plan myapp --theme showcase_html` for pure HTML/CSS (simpler projects).
+
 **See the complete project structure:** [scaffolding.md - Generated Project Output](./docs/technical/scaffolding.md#5-generated-project-output)
 
 The generated project is **yours to own and modify** - no vendor lock-in, just Django best practices.
@@ -132,8 +144,148 @@ See [competitive_analysis.md](./docs/overview/competitive_analysis.md) for detai
 
 ---
 
+## Installation
+
+QuickScale can be installed in two ways:
+
+### Method 1: Install from PyPI (Recommended)
+
+**Quick install:**
+```bash
+pip install quickscale
+```
+
+**Or with Poetry:**
+```bash
+poetry add quickscale
+```
+
+**Then use directly:**
+```bash
+quickscale plan myapp
+cd myapp
+quickscale apply
+```
+
+### Method 2: Install from Source
+
+**For those who prefer building from source:**
+```bash
+git clone https://github.com/Experto-AI/quickscale.git
+cd quickscale
+./scripts/install_global.sh
+```
+
+**Then use directly:**
+```bash
+quickscale plan myapp
+cd myapp
+quickscale apply
+```
+
+**Both methods use the same command syntax:** `quickscale plan`, `quickscale apply`, etc.
+
+---
+
+### For Contributors
+
+If you want to contribute to QuickScale development, see the [Development Guide](./docs/technical/development.md) for setup instructions.
+
+---
+
+## 🚀 5-Minute Quickstart
+
+**Want to see QuickScale in action right now?** Here's the fastest path to a working Django SaaS:
+
+```bash
+# 1. Install QuickScale
+./scripts/install_global.sh
+
+# 2. Create your project configuration
+quickscale plan myapp
+# → Accept defaults: theme (showcase_html), no modules, Docker enabled
+
+# 3. Generate and enter the project
+cd myapp
+quickscale apply
+# → Docker services auto-start! (default: docker.start=true)
+
+# 4. Setup and verify
+quickscale manage migrate
+quickscale manage createsuperuser
+quickscale ps  # Check services are running
+
+# 5. Open http://localhost:8000
+```
+
+**That's it!** 🎉 You now have a production-ready Django SaaS running with Docker + PostgreSQL.
+
+**Note**: Services started automatically during `quickscale apply`. No need to run `quickscale up` manually!
+
+**Prefer native Python?** After step 3, run:
+```bash
+poetry install
+poetry run python manage.py migrate
+poetry run python manage.py runserver
+# Open http://localhost:8000
+```
+
+---
+
+## Understanding Docker Auto-Start
+
+**When does `quickscale apply` start Docker automatically?**
+
+✅ **Services auto-start** (no `quickscale up` needed):
+- First-time project generation
+- When `docker.start: true` in quickscale.yml (**default**)
+- When `--no-docker` flag is NOT used
+
+❌ **Manual start required** (`quickscale up` needed):
+- You set `docker.start: false` during `quickscale plan` wizard
+- After stopping services with `quickscale down`
+- When running `quickscale apply --no-docker`
+- Adding modules to existing project (incremental apply)
 
-## Quick Start
+**Example - No manual start needed:**
+```bash
+quickscale plan myapp  # Accept defaults (docker.start: true)
+cd myapp
+quickscale apply       # ← Docker services auto-start!
+
+# Already running - just check status:
+quickscale ps
+curl http://localhost:8000  # ✅ Works immediately
+```
+
+**Example - Manual start needed:**
+```bash
+quickscale plan myapp
+# During wizard, set: "Docker start? [Y/n]: n"
+cd myapp
+quickscale apply       # Services do NOT start
+
+# Must start manually:
+quickscale up
+```
+
+**Docker configuration options** in quickscale.yml:
+
+```yaml
+docker:
+  start: true   # Auto-start services during apply?
+  build: true   # Rebuild images? (slower but ensures latest)
+```
+
+- `start: true` + `build: true` → Full rebuild + start (slowest, most reliable)
+- `start: true` + `build: false` → Start with cached images (faster)
+- `start: false` → Manual control with `quickscale up`
+
+**Need more details?** See [Docker Workflows Guide](./docs/technical/docker_workflows.md) for comprehensive scenarios and troubleshooting.
+
+---
+
+## Full Documentation & Setup
 
 ```bash
 # Install QuickScale globally
@@ -142,11 +294,11 @@ See [competitive_analysis.md](./docs/overview/competitive_analysis.md) for detai
 # Create a configuration interactively
 quickscale plan myapp
 # → Select theme, modules, Docker options
-# → Generates quickscale.yml
+# → Generates quickscale.yml in myapp/ directory
 
-# Execute the configuration
-quickscale apply
+# Navigate to project and execute the configuration
 cd myapp
+quickscale apply
 ```
 
 **Choose your development workflow:**

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/README.md

@@ -1,5 +1,13 @@
 # 🚀 QuickScale
 
+[![PyPI version](https://img.shields.io/pypi/v/quickscale.svg)](https://pypi.org/project/quickscale/)
+[![CI](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml/badge.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
+[![Coverage](https://img.shields.io/badge/coverage-90%25-green.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
+[![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Version](https://img.shields.io/badge/version-0.74.0-green.svg)](https://github.com/Experto-AI/quickscale/releases)
+[![Code style: Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+
 > **You are here**: **QuickScale README** (Project Overview)
 > **Related docs**: [Start Here](START_HERE.md) | [Glossary](GLOSSARY.md) | [Decisions](docs/technical/decisions.md) | [User Manual](docs/technical/user_manual.md)
 
@@ -68,10 +76,11 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 
 ### Development Flow
 1. `quickscale plan myapp` → Interactive configuration wizard
-2. `quickscale apply` → Generates production-ready Django project
-3. Add your custom Django apps and features
-4. Build your unique client application
-5. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
+2. `cd myapp` → Navigate to your project directory
+3. `quickscale apply` → Generates production-ready Django project
+4. Add your custom Django apps and features
+5. Build your unique client application
+6. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
 
 ℹ️ The [MVP Feature Matrix](./docs/technical/decisions.md#mvp-feature-matrix-authoritative) is the single source of truth for what's in or out.
 
@@ -79,6 +88,7 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 
 Running `quickscale plan myapp && quickscale apply` generates a **production-ready Django project** with:
 
+- ✅ **React + shadcn/ui** frontend (TypeScript, Vite, Tailwind CSS) — **NEW in v0.74.0**
 - ✅ **Docker** setup (development + production)
 - ✅ **PostgreSQL** configuration
 - ✅ **Environment-based** settings (dev/prod split)
@@ -90,6 +100,8 @@ Running `quickscale plan myapp && quickscale apply` generates a **production-rea
 - ✅ **Poetry** for dependency management
 - ✅ **One-Command Deployment**: Deploy to Railway with `quickscale deploy railway` - fully automated setup
 
+**Alternative**: Use `quickscale plan myapp --theme showcase_html` for pure HTML/CSS (simpler projects).
+
 **See the complete project structure:** [scaffolding.md - Generated Project Output](./docs/technical/scaffolding.md#5-generated-project-output)
 
 The generated project is **yours to own and modify** - no vendor lock-in, just Django best practices.
@@ -107,8 +119,148 @@ See [competitive_analysis.md](./docs/overview/competitive_analysis.md) for detai
 
 ---
 
+## Installation
+
+QuickScale can be installed in two ways:
+
+### Method 1: Install from PyPI (Recommended)
+
+**Quick install:**
+```bash
+pip install quickscale
+```
+
+**Or with Poetry:**
+```bash
+poetry add quickscale
+```
+
+**Then use directly:**
+```bash
+quickscale plan myapp
+cd myapp
+quickscale apply
+```
+
+### Method 2: Install from Source
+
+**For those who prefer building from source:**
+```bash
+git clone https://github.com/Experto-AI/quickscale.git
+cd quickscale
+./scripts/install_global.sh
+```
+
+**Then use directly:**
+```bash
+quickscale plan myapp
+cd myapp
+quickscale apply
+```
+
+**Both methods use the same command syntax:** `quickscale plan`, `quickscale apply`, etc.
+
+---
+
+### For Contributors
+
+If you want to contribute to QuickScale development, see the [Development Guide](./docs/technical/development.md) for setup instructions.
+
+---
+
+## 🚀 5-Minute Quickstart
+
+**Want to see QuickScale in action right now?** Here's the fastest path to a working Django SaaS:
+
+```bash
+# 1. Install QuickScale
+./scripts/install_global.sh
+
+# 2. Create your project configuration
+quickscale plan myapp
+# → Accept defaults: theme (showcase_html), no modules, Docker enabled
+
+# 3. Generate and enter the project
+cd myapp
+quickscale apply
+# → Docker services auto-start! (default: docker.start=true)
+
+# 4. Setup and verify
+quickscale manage migrate
+quickscale manage createsuperuser
+quickscale ps  # Check services are running
+
+# 5. Open http://localhost:8000
+```
+
+**That's it!** 🎉 You now have a production-ready Django SaaS running with Docker + PostgreSQL.
+
+**Note**: Services started automatically during `quickscale apply`. No need to run `quickscale up` manually!
+
+**Prefer native Python?** After step 3, run:
+```bash
+poetry install
+poetry run python manage.py migrate
+poetry run python manage.py runserver
+# Open http://localhost:8000
+```
+
+---
+
+## Understanding Docker Auto-Start
+
+**When does `quickscale apply` start Docker automatically?**
+
+✅ **Services auto-start** (no `quickscale up` needed):
+- First-time project generation
+- When `docker.start: true` in quickscale.yml (**default**)
+- When `--no-docker` flag is NOT used
+
+❌ **Manual start required** (`quickscale up` needed):
+- You set `docker.start: false` during `quickscale plan` wizard
+- After stopping services with `quickscale down`
+- When running `quickscale apply --no-docker`
+- Adding modules to existing project (incremental apply)
 
-## Quick Start
+**Example - No manual start needed:**
+```bash
+quickscale plan myapp  # Accept defaults (docker.start: true)
+cd myapp
+quickscale apply       # ← Docker services auto-start!
+
+# Already running - just check status:
+quickscale ps
+curl http://localhost:8000  # ✅ Works immediately
+```
+
+**Example - Manual start needed:**
+```bash
+quickscale plan myapp
+# During wizard, set: "Docker start? [Y/n]: n"
+cd myapp
+quickscale apply       # Services do NOT start
+
+# Must start manually:
+quickscale up
+```
+
+**Docker configuration options** in quickscale.yml:
+
+```yaml
+docker:
+  start: true   # Auto-start services during apply?
+  build: true   # Rebuild images? (slower but ensures latest)
+```
+
+- `start: true` + `build: true` → Full rebuild + start (slowest, most reliable)
+- `start: true` + `build: false` → Start with cached images (faster)
+- `start: false` → Manual control with `quickscale up`
+
+**Need more details?** See [Docker Workflows Guide](./docs/technical/docker_workflows.md) for comprehensive scenarios and troubleshooting.
+
+---
+
+## Full Documentation & Setup
 
 ```bash
 # Install QuickScale globally
@@ -117,11 +269,11 @@ See [competitive_analysis.md](./docs/overview/competitive_analysis.md) for detai
 # Create a configuration interactively
 quickscale plan myapp
 # → Select theme, modules, Docker options
-# → Generates quickscale.yml
+# → Generates quickscale.yml in myapp/ directory
 
-# Execute the configuration
-quickscale apply
+# Navigate to project and execute the configuration
 cd myapp
+quickscale apply
 ```
 
 **Choose your development workflow:**

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quickscale-cli"
-version = "0.73.0"
+version = "0.74.2"
 description = "Command-line interface for QuickScale Django project generator"
 authors = ["Experto AI <victor@experto.ai>"]
 license = "Apache-2.0"
@@ -25,7 +25,7 @@ packages = [{include = "quickscale_cli", from = "src"}]
 [tool.poetry.dependencies]
 python = "^3.12"
 click = "^8.3.1"
-quickscale-core = "^0.73.0"
+quickscale-core = "^0.74.2"
 
 [tool.poetry.group.dev.dependencies]
 # Dev dependencies centralized in root pyproject.toml
@@ -49,6 +49,7 @@ addopts = [
     "--cov=quickscale_cli",
     "--cov-report=term-missing",
     "--cov-report=html",
+    "--cov-fail-under=90",
     "-m", "not e2e",  # Skip E2E tests by default (run with: pytest -m e2e)
 ]
 markers = [
@@ -57,6 +58,10 @@ markers = [
     "e2e: end-to-end tests",
 ]
 
+[tool.coverage.report]
+fail_under = 90
+# Per-file minimum target: 80% (enforced via code review)
+
 # Ruff and mypy configurations centralized in root ruff.toml and mypy.ini
 # Package-specific isort override
 [tool.ruff.lint.isort]

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/_version.py

@@ -1,2 +1,2 @@
 # Auto-generated by scripts/version_tool.sh
-__version__ = "0.73.0"
+__version__ = "0.74.2"

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/commands/apply_command.py

@@ -92,18 +92,21 @@ def _generate_project(config: QuickScaleConfig, output_path: Path) -> bool:
         click.echo(f"⏳ Generating project: {config.project.name}...")
 
         # Validate theme availability
-        if config.project.theme in ["showcase_htmx", "showcase_react"]:
+        if config.project.theme == "showcase_htmx":
             click.secho(
                 f"❌ Error: Theme '{config.project.theme}' is not yet implemented",
                 fg="red",
                 err=True,
             )
             click.echo(
-                f"\n💡 The '{config.project.theme}' theme is planned for a future release:",
+                "\n💡 The 'showcase_htmx' theme is planned for a future release:",
+                err=True,
+            )
+            click.echo("   - showcase_htmx: Coming in v0.78.0", err=True)
+            click.echo(
+                "   - Use 'showcase_react' (default) or 'showcase_html' instead",
                 err=True,
             )
-            click.echo("   - showcase_htmx: Coming in v0.70.0", err=True)
-            click.echo("   - showcase_react: Coming in v0.71.0", err=True)
             return False
 
         generator = ProjectGenerator(theme=config.project.theme)
@@ -197,18 +200,54 @@ def _run_migrations(project_path: Path) -> bool:
     )[0]
 
 
-def _start_docker(project_path: Path, build: bool = True) -> bool:
-    """Start Docker services using quickscale up"""
+def _start_docker(
+    project_path: Path, build: bool = True, verbose: bool = False
+) -> bool:
+    """Start Docker services using quickscale up
+
+    Args:
+        project_path: Path to the project directory
+        build: Whether to build images before starting
+        verbose: Whether to show Docker build output (useful for debugging)
+
+    Returns:
+        True if Docker started successfully, False otherwise
+    """
     cmd = ["quickscale", "up"]
     if build:
         cmd.append("--build")
 
-    success, _ = _run_command(
-        cmd,
-        project_path,
-        "Starting Docker services",
-    )
-    return success
+    if verbose:
+        # Show Docker build output for debugging
+        click.echo("⏳ Starting Docker services (showing build output)...")
+        click.echo("=" * 50)
+        try:
+            result = subprocess.run(
+                cmd,
+                cwd=project_path,
+                text=True,
+                check=False,
+            )
+            click.echo("=" * 50)
+            if result.returncode == 0:
+                click.secho("✅ Starting Docker services", fg="green")
+                return True
+            else:
+                click.secho("❌ Starting Docker services failed", fg="red")
+                return False
+        except FileNotFoundError:
+            click.secho(f"❌ Command not found: {cmd[0]}", fg="red", err=True)
+            return False
+        except Exception as e:
+            click.secho(f"❌ Unexpected error: {e}", fg="red", err=True)
+            return False
+    else:
+        success, _ = _run_command(
+            cmd,
+            project_path,
+            "Starting Docker services",
+        )
+        return success
 
 
 def _load_module_manifests(
@@ -646,7 +685,11 @@ def _prepare_apply_context(config_path: Path) -> ApplyContext:
 
 
 def _execute_apply_steps(
-    ctx: ApplyContext, force: bool, no_docker: bool, no_modules: bool
+    ctx: ApplyContext,
+    force: bool,
+    no_docker: bool,
+    no_modules: bool,
+    verbose_docker: bool = False,
 ) -> None:
     """Execute the apply steps after confirmation."""
     click.echo("\n" + "=" * 50)
@@ -685,7 +728,9 @@ def _execute_apply_steps(
 
     # Start Docker
     if not no_docker and ctx.qs_config.docker.start:
-        if not _start_docker(ctx.output_path, ctx.qs_config.docker.build):
+        if not _start_docker(
+            ctx.output_path, ctx.qs_config.docker.build, verbose_docker
+        ):
             click.secho("⚠️  Docker start failed, continuing...", fg="yellow")
 
     # Save state
@@ -724,7 +769,14 @@ def _execute_apply_steps(
     is_flag=True,
     help="Skip module embedding",
 )
-def apply(config: str, force: bool, no_docker: bool, no_modules: bool) -> None:
+@click.option(
+    "--verbose-docker",
+    is_flag=True,
+    help="Show Docker build output (useful for debugging build issues)",
+)
+def apply(
+    config: str, force: bool, no_docker: bool, no_modules: bool, verbose_docker: bool
+) -> None:
     """
     Execute project configuration from quickscale.yml.
 
@@ -737,6 +789,7 @@ def apply(config: str, force: bool, no_docker: bool, no_modules: bool) -> None:
       quickscale apply myapp/quickscale.yml  # Use specific config file
       quickscale apply --force            # Overwrite existing project
       quickscale apply --no-docker        # Skip Docker operations
+      quickscale apply --verbose-docker   # Show Docker build output
 
     \b
     Execution Order:
@@ -760,10 +813,23 @@ def apply(config: str, force: bool, no_docker: bool, no_modules: bool) -> None:
     # Check output directory
     _check_output_directory(ctx.output_path, ctx.existing_state, force)
 
+    # Ask about Docker build output visibility if Docker will be started
+    show_docker_output = verbose_docker
+    if (
+        not no_docker
+        and ctx.qs_config.docker.start
+        and ctx.qs_config.docker.build
+        and not verbose_docker
+    ):
+        show_docker_output = click.confirm(
+            "\n🐳 Show Docker build output? (useful for debugging build issues)",
+            default=False,
+        )
+
     # Confirm before proceeding
     if not click.confirm("\n❓ Proceed with apply?", default=True):
         click.echo("❌ Cancelled")
         raise click.Abort()
 
     # Execute apply steps
-    _execute_apply_steps(ctx, force, no_docker, no_modules)
+    _execute_apply_steps(ctx, force, no_docker, no_modules, show_docker_output)

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/commands/development_commands.py

@@ -17,6 +17,7 @@ from quickscale_cli.utils.docker_utils import (
     wait_for_port_release,
 )
 from quickscale_cli.utils.project_manager import (
+    get_project_config,
     get_web_container_name,
     is_in_quickscale_project,
 )
@@ -135,8 +136,14 @@ def up(build: bool, no_cache: bool) -> None:
     """Start Docker services for development."""
     _validate_project_and_docker()
 
+    # Load config to check for default build behavior
+    config = get_project_config()
+    should_build = build
+    if not build and config and config.docker:
+        should_build = config.docker.build
+
     # Check if dependencies changed and suggest rebuild
-    if not build and _dependencies_changed_since_last_build():
+    if not should_build and _dependencies_changed_since_last_build():
         click.secho(
             "⚠️  Warning: Dependencies may have changed since last Docker build",
             fg="yellow",
@@ -156,10 +163,10 @@ def up(build: bool, no_cache: bool) -> None:
 
     try:
         compose_cmd = get_docker_compose_command()
-        _run_docker_compose_up(compose_cmd, build, no_cache)
+        _run_docker_compose_up(compose_cmd, should_build, no_cache)
 
         # Update build timestamp if build was performed
-        if build:
+        if should_build:
             _update_last_build_timestamp()
 
     except subprocess.CalledProcessError as e:

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/commands/module_config.py

@@ -7,7 +7,7 @@ including interactive configuration prompts and settings application.
 import re
 import subprocess
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
 
 import click
 
@@ -688,6 +688,50 @@ def configure_crm_module(non_interactive: bool = False) -> dict[str, Any]:
     return config
 
 
+def _get_dependency_version(content: str, package: str) -> Optional[str]:
+    """Extract dependency version from pyproject.toml content."""
+    match = re.search(
+        rf'{package}\s*=\s*["\']([^"\']+)["\']',
+        content,
+    )
+    return match.group(1) if match else None
+
+
+def _update_pyproject_toml(
+    pyproject_path: Path,
+    content: str,
+    drf_ver: Optional[str],
+    filter_ver: Optional[str],
+) -> None:
+    """Update pyproject.toml with new dependencies."""
+    dependencies_pattern = r"(\[tool\.poetry\.dependencies\][^\[]*)"
+    match = re.search(dependencies_pattern, content, re.DOTALL)
+    if not match:
+        return
+
+    dependencies_section = match.group(1)
+    additions = ""
+    if drf_ver:
+        additions += f'\ndjangorestframework = "{drf_ver}"'
+    if filter_ver:
+        additions += f'\ndjango-filter = "{filter_ver}"'
+
+    updated_dependencies = re.sub(
+        r'(python = "[^"]*")',
+        rf"\1{additions}",
+        dependencies_section,
+    )
+    content = content.replace(dependencies_section, updated_dependencies)
+
+    with open(pyproject_path, "w") as f:
+        f.write(content)
+
+    if drf_ver:
+        click.secho("  ✅ Added djangorestframework to pyproject.toml", fg="green")
+    if filter_ver:
+        click.secho("  ✅ Added django-filter to pyproject.toml", fg="green")
+
+
 def _add_drf_and_filter_dependencies(project_path: Path, pyproject_path: Path) -> None:
     """Add djangorestframework and django-filter dependencies to project's pyproject.toml."""
     with open(pyproject_path) as f:
@@ -704,78 +748,91 @@ def _add_drf_and_filter_dependencies(project_path: Path, pyproject_path: Path) -
             err=True,
         )
         click.echo(f"Expected file: {crm_pyproject_path}", err=True)
-        click.echo(
-            "This indicates the CRM module was not embedded correctly.",
-            err=True,
-        )
         raise click.Abort()
 
     try:
         with open(crm_pyproject_path) as f:
             crm_pyproject_content = f.read()
 
-        # Extract djangorestframework version
         drf_version = None
         if "djangorestframework" not in pyproject_content:
-            drf_match = re.search(
-                r'djangorestframework\s*=\s*["\']([^"\']+)["\']',
-                crm_pyproject_content,
+            drf_version = _get_dependency_version(
+                crm_pyproject_content, "djangorestframework"
             )
-            if drf_match:
-                drf_version = drf_match.group(1)
 
-        # Extract django-filter version
         filter_version = None
         if "django-filter" not in pyproject_content:
-            filter_match = re.search(
-                r'django-filter\s*=\s*["\']([^"\']+)["\']',
-                crm_pyproject_content,
+            filter_version = _get_dependency_version(
+                crm_pyproject_content, "django-filter"
             )
-            if filter_match:
-                filter_version = filter_match.group(1)
 
-        # Add dependencies if needed
         if drf_version or filter_version:
-            dependencies_pattern = r"(\[tool\.poetry\.dependencies\][^\[]*)"
-            match = re.search(dependencies_pattern, pyproject_content, re.DOTALL)
-            if match:
-                dependencies_section = match.group(1)
-                additions = ""
-                if drf_version:
-                    additions += f'\ndjangorestframework = "{drf_version}"'
-                if filter_version:
-                    additions += f'\ndjango-filter = "{filter_version}"'
-
-                updated_dependencies = re.sub(
-                    r'(python = "[^"]*")',
-                    rf"\1{additions}",
-                    dependencies_section,
-                )
-                pyproject_content = pyproject_content.replace(
-                    dependencies_section, updated_dependencies
-                )
+            _update_pyproject_toml(
+                pyproject_path, pyproject_content, drf_version, filter_version
+            )
 
-                with open(pyproject_path, "w") as f:
-                    f.write(pyproject_content)
-
-                if drf_version:
-                    click.secho(
-                        "  ✅ Added djangorestframework to pyproject.toml", fg="green"
-                    )
-                if filter_version:
-                    click.secho(
-                        "  ✅ Added django-filter to pyproject.toml", fg="green"
-                    )
     except (FileNotFoundError, AttributeError) as e:
         click.secho(
             f"❌ Error: Failed to parse dependencies from CRM module: {e}",
             fg="red",
             err=True,
         )
-        click.echo(f"File: {crm_pyproject_path}", err=True)
         raise click.Abort()
 
 
+def _get_crm_settings_addition(config: dict[str, Any]) -> str:
+    """Generate settings addition for CRM module."""
+    addition = f"""
+# CRM Module Settings
+CRM_DEALS_PER_PAGE = {config["deals_per_page"]}
+CRM_CONTACTS_PER_PAGE = {config["contacts_per_page"]}
+CRM_ENABLE_API = {config["enable_api"]}
+"""
+    if config["enable_api"]:
+        addition += """
+# REST Framework Settings
+REST_FRAMEWORK = {
+    "DEFAULT_AUTHENTICATION_CLASSES": [
+        "rest_framework.authentication.SessionAuthentication",
+    ],
+    "DEFAULT_PERMISSION_CLASSES": [
+        "rest_framework.permissions.IsAuthenticated",
+    ],
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
+    "PAGE_SIZE": 25,
+    "DEFAULT_FILTER_BACKENDS": [
+        "django_filters.rest_framework.DjangoFilterBackend",
+        "rest_framework.filters.SearchFilter",
+        "rest_framework.filters.OrderingFilter",
+    ],
+}
+"""
+    return addition
+
+
+def _update_crm_urls(urls_path: Path) -> None:
+    """Add CRM URLs to project's urls.py."""
+    if not urls_path.exists():
+        return
+
+    with open(urls_path) as f:
+        urls_content = f.read()
+
+    if "quickscale_modules_crm" in urls_content:
+        return
+
+    if "urlpatterns = [" in urls_content:
+        urls_addition = '    path("crm/", include("quickscale_modules_crm.urls")),\n'
+        urls_content = urls_content.replace(
+            "urlpatterns = [", "urlpatterns = [\n" + urls_addition
+        )
+
+        with open(urls_path, "w") as f:
+            f.write(urls_content)
+
+        click.secho("  ✅ Updated urls.py with CRM URLs", fg="green")
+
+
 def apply_crm_configuration(project_path: Path, config: dict[str, Any]) -> None:
     """Apply CRM module configuration to project settings"""
     # QuickScale uses settings/base.py and project_name/urls.py structure
@@ -807,10 +864,7 @@ def apply_crm_configuration(project_path: Path, config: dict[str, Any]) -> None:
     required_apps = ["rest_framework", "django_filters", "quickscale_modules_crm"]
     new_apps = _filter_new_apps(settings_content, required_apps)
 
-    if not new_apps:
-        click.echo("ℹ️  All required apps already in INSTALLED_APPS")
-    else:
-        # Build the INSTALLED_APPS addition with only new apps
+    if new_apps:
         apps_list = ",\n    ".join([f'"{app}"' for app in new_apps])
         installed_apps_addition = f"""
 # QuickScale CRM Module - Added by quickscale embed
@@ -818,64 +872,20 @@ INSTALLED_APPS += [
     {apps_list},
 ]
 """
-        # Append INSTALLED_APPS to settings.py
         with open(settings_path, "a") as f:
             f.write("\n" + installed_apps_addition)
+    else:
+        click.echo("ℹ️  All required apps already in INSTALLED_APPS")
 
-    # Add CRM settings (always add these)
-    settings_addition = f"""
-# CRM Module Settings
-CRM_DEALS_PER_PAGE = {config["deals_per_page"]}
-CRM_CONTACTS_PER_PAGE = {config["contacts_per_page"]}
-CRM_ENABLE_API = {config["enable_api"]}
-"""
-
-    # Add REST Framework settings if enabling API
-    if config["enable_api"]:
-        settings_addition += """
-# REST Framework Settings
-REST_FRAMEWORK = {
-    "DEFAULT_AUTHENTICATION_CLASSES": [
-        "rest_framework.authentication.SessionAuthentication",
-    ],
-    "DEFAULT_PERMISSION_CLASSES": [
-        "rest_framework.permissions.IsAuthenticated",
-    ],
-    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
-    "PAGE_SIZE": 25,
-    "DEFAULT_FILTER_BACKENDS": [
-        "django_filters.rest_framework.DjangoFilterBackend",
-        "rest_framework.filters.SearchFilter",
-        "rest_framework.filters.OrderingFilter",
-    ],
-}
-"""
-
-    # Append settings to settings.py
+    # Add CRM settings and REST framework settings
+    settings_addition = _get_crm_settings_addition(config)
     with open(settings_path, "a") as f:
         f.write(settings_addition)
 
     click.secho("  ✅ Updated settings.py with CRM configuration", fg="green")
 
     # Update urls.py
-    if urls_path.exists():
-        with open(urls_path) as f:
-            urls_content = f.read()
-
-        if "quickscale_modules_crm" not in urls_content:
-            # Find urlpatterns and add CRM URLs
-            if "urlpatterns = [" in urls_content:
-                urls_addition = (
-                    '    path("crm/", include("quickscale_modules_crm.urls")),\n'
-                )
-                urls_content = urls_content.replace(
-                    "urlpatterns = [", "urlpatterns = [\n" + urls_addition
-                )
-
-                with open(urls_path, "w") as f:
-                    f.write(urls_content)
-
-                click.secho("  ✅ Updated urls.py with CRM URLs", fg="green")
+    _update_crm_urls(urls_path)
 
     # Show configuration summary
     click.echo("\n📋 Configuration applied:")

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/commands/plan_command.py

@@ -20,9 +20,9 @@ from quickscale_cli.schema.state_schema import QuickScaleState, StateManager
 
 # Available themes for selection
 AVAILABLE_THEMES = [
-    ("showcase_html", "Pure HTML + CSS (default, production-ready)"),
-    ("showcase_htmx", "HTMX + Alpine.js (coming in v0.70.0)"),
-    ("showcase_react", "React + TypeScript SPA (coming in v0.71.0)"),
+    ("showcase_react", "React + TypeScript + shadcn/ui (default, production-ready)"),
+    ("showcase_html", "Pure HTML + CSS (simpler alternative)"),
+    ("showcase_htmx", "HTMX + Alpine.js (coming in v0.78.0)"),
 ]
 
 # Available modules for selection
@@ -53,12 +53,12 @@ def _get_theme_by_name(name: str) -> str | None:
 
 def _confirm_unimplemented_theme(theme_id: str) -> bool:
     """Confirm use of unimplemented theme"""
-    if theme_id == "showcase_html":
+    if theme_id in ("showcase_html", "showcase_react"):
         return True
 
     click.secho(
         f"\n⚠️  Theme '{theme_id}' is not yet implemented. "
-        "It will be available in a future release.",
+        "It will be available in a future release (v0.78.0).",
         fg="yellow",
     )
     return click.confirm("Use this theme anyway?", default=False)
@@ -68,7 +68,7 @@ def _select_theme() -> str:
     """Interactive theme selection"""
     click.echo("\n🎨 Select a theme for your project:")
     for i, (tid, description) in enumerate(AVAILABLE_THEMES, start=1):
-        status = " ⚠️  not yet implemented" if tid != "showcase_html" else ""
+        status = " ⚠️  not yet implemented" if tid == "showcase_htmx" else ""
         click.echo(f"  {i}. {tid} - {description}{status}")
 
     while True:
@@ -611,15 +611,16 @@ def _validate_new_project_name(name: str | None) -> str:
         )
         raise click.Abort()
 
-    if not name.isidentifier():
+    package_name = name.replace("-", "_")
+    if not package_name.isidentifier():
         click.secho(
             f"\n❌ Error: '{name}' is not a valid project name",
             fg="red",
             err=True,
         )
         click.echo(
-            "   Project name must be a valid Python identifier "
-            "(letters, numbers, underscores, not starting with a number)",
+            "   Project name must check out as a valid Python identifier when hyphens are replaced with underscores "
+            "(letters, numbers, underscores, hyphens, not starting with a number)",
             err=True,
         )
         raise click.Abort()

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/schema/config_schema.py

@@ -159,12 +159,13 @@ def _validate_project_section(data: dict, yaml_content: str) -> tuple[str, str]:
             "'project.name' must be a non-empty string", line=line
         )
 
-    if not project_name.isidentifier():
+    package_name = project_name.replace("-", "_")
+    if not package_name.isidentifier():
         line = _find_line_number(yaml_content, "name")
         raise ConfigValidationError(
             f"Invalid project name '{project_name}'",
             line=line,
-            suggestion="Project name must be a valid Python identifier (letters, numbers, underscores, not starting with a number)",
+            suggestion="Project name must be a valid Python identifier (letters, numbers, underscores, hyphens, not starting with a number)",
         )
 
     theme = project_data.get("theme", "showcase_html")

{quickscale_cli-0.73.0 → quickscale_cli-0.74.2}/src/quickscale_cli/utils/project_manager.py

@@ -3,9 +3,21 @@
 from pathlib import Path
 from typing import Any
 
+from quickscale_cli.schema.config_schema import QuickScaleConfig, validate_config
 from .docker_utils import find_docker_compose, get_running_containers
 
 
+def get_project_config() -> QuickScaleConfig | None:
+    """Load and validate quickscale.yml from current directory if it exists."""
+    config_path = Path.cwd() / "quickscale.yml"
+    if not config_path.exists():
+        return None
+    try:
+        return validate_config(config_path.read_text())
+    except Exception:
+        return None
+
+
 def get_project_state() -> dict[str, Any]:
     """Get comprehensive project state including directory and containers."""
     try: