quickscale-cli 0.83.0__tar.gz → 0.85.0__tar.gz

quickscale_cli-0.85.0/PKG-INFO

@@ -0,0 +1,43 @@
+Metadata-Version: 2.4
+Name: quickscale-cli
+Version: 0.85.0
+Summary: Command-line interface for QuickScale Django project generator
+License-Expression: Apache-2.0
+Keywords: django,cli,project-generator,saas
+Author: Experto AI
+Author-email: victor@experto.ai
+Requires-Python: >=3.13,<3.15
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 6.0
+Requires-Dist: click (>=8.3.1,<9.0.0)
+Requires-Dist: quickscale-core (>=0.85.0,<0.86.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
+Description-Content-Type: text/markdown
+
+# quickscale-cli
+
+Command-line interface for the [QuickScale](https://github.com/Experto-AI/quickscale) Django project generator.
+
+## Installation
+
+```bash
+pip install quickscale-cli
+```
+
+Or install the full bundle:
+
+```bash
+pip install quickscale
+```
+
+## Documentation
+
+See the [main repository README](../README.md) and [docs/](../docs/) for full documentation.
+

quickscale_cli-0.85.0/README.md

@@ -0,0 +1,19 @@
+# quickscale-cli
+
+Command-line interface for the [QuickScale](https://github.com/Experto-AI/quickscale) Django project generator.
+
+## Installation
+
+```bash
+pip install quickscale-cli
+```
+
+Or install the full bundle:
+
+```bash
+pip install quickscale
+```
+
+## Documentation
+
+See the [main repository README](../README.md) and [docs/](../docs/) for full documentation.

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "quickscale-cli"
-version = "0.83.0"
+version = "0.85.0"
 description = "Command-line interface for QuickScale Django project generator"
-requires-python = ">=3.12,<3.14"
+requires-python = ">=3.13,<3.15"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [{name = "Experto AI", email = "victor@experto.ai"}]
@@ -11,6 +11,7 @@ classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "Framework :: Django",
     "Framework :: Django :: 6.0",
@@ -29,9 +30,9 @@ quickscale = "quickscale_cli.main:cli"
 packages = [{include = "quickscale_cli", from = "src"}]
 
 [tool.poetry.dependencies]
-python = ">=3.12,<3.14"
+python = ">=3.13,<3.15"
 click = "^8.3.1"
-quickscale-core = "^0.83.0"
+quickscale-core = "^0.85.0"
 
 [tool.poetry.group.dev.dependencies]
 # Dev dependencies centralized in root pyproject.toml

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/_version.py

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

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/backups_contract.py

@@ -10,6 +10,7 @@ from collections.abc import Mapping
 import re
 from typing import Any
 
+from quickscale_cli.billing_contract import normalize_billing_module_options
 from quickscale_cli.analytics_contract import normalize_analytics_module_options
 from quickscale_cli.auth_contract import normalize_auth_module_options
 from quickscale_cli.crm_contract import normalize_crm_module_options
@@ -116,6 +117,8 @@ def sanitize_module_options(
         return normalize_auth_module_options(options)
     if module_name == "backups":
         return normalize_backups_module_options(options)
+    if module_name == "billing":
+        return normalize_billing_module_options(options)
     if module_name == "crm":
         return normalize_crm_module_options(options)
     if module_name == "notifications":

quickscale_cli-0.85.0/src/quickscale_cli/billing_contract.py

@@ -0,0 +1,183 @@
+"""Shared billing-module configuration helpers."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+import re
+from typing import Any
+
+DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR = "STRIPE_PUBLISHABLE_KEY"
+DEFAULT_BILLING_SECRET_KEY_ENV_VAR = "STRIPE_SECRET_KEY"
+DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR = "QUICKSCALE_BILLING_WEBHOOK_SECRET"
+DEFAULT_BILLING_CURRENCY = "usd"
+
+BILLING_ENV_VAR_OPTION_NAMES = (
+    "publishable_key_env_var",
+    "secret_key_env_var",
+    "webhook_secret_env_var",
+)
+BILLING_MODULE_OPTION_KEYS = frozenset(
+    {
+        "enabled",
+        *BILLING_ENV_VAR_OPTION_NAMES,
+        "billing_currency",
+    }
+)
+BILLING_SUPPORTED_CURRENCIES = (
+    "aud",
+    "brl",
+    "cad",
+    "chf",
+    "czk",
+    "dkk",
+    "eur",
+    "gbp",
+    "hkd",
+    "huf",
+    "inr",
+    "jpy",
+    "mxn",
+    "myr",
+    "nok",
+    "nzd",
+    "php",
+    "pln",
+    "ron",
+    "sek",
+    "sgd",
+    "thb",
+    "try",
+    "usd",
+    "zar",
+)
+
+_BILLING_ENV_VAR_NAME_PATTERN = re.compile(r"^[A-Z][A-Z0-9_]*$")
+
+
+def default_billing_module_options() -> dict[str, Any]:
+    """Return the default planner/apply contract for billing."""
+    return {
+        "enabled": True,
+        "publishable_key_env_var": DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR,
+        "secret_key_env_var": DEFAULT_BILLING_SECRET_KEY_ENV_VAR,
+        "webhook_secret_env_var": DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR,
+        "billing_currency": DEFAULT_BILLING_CURRENCY,
+    }
+
+
+def normalize_billing_module_options(
+    options: Mapping[str, Any] | None,
+) -> dict[str, Any]:
+    """Return billing options with normalized env-var and currency values."""
+    normalized = dict(options or {})
+
+    for option_name in BILLING_ENV_VAR_OPTION_NAMES:
+        if option_name in normalized:
+            normalized[option_name] = str(normalized[option_name]).strip()
+
+    if "billing_currency" in normalized:
+        normalized["billing_currency"] = (
+            str(normalized["billing_currency"]).strip().lower()
+        )
+
+    return normalized
+
+
+def resolve_billing_module_options(
+    options: Mapping[str, Any] | None,
+) -> dict[str, Any]:
+    """Merge billing options with defaults and normalized overrides."""
+    resolved = default_billing_module_options()
+    resolved.update(normalize_billing_module_options(options))
+    for option_name in BILLING_ENV_VAR_OPTION_NAMES:
+        resolved[option_name] = str(resolved[option_name]).strip()
+    resolved["billing_currency"] = str(resolved["billing_currency"]).strip().lower()
+    return resolved
+
+
+def validate_billing_env_var_reference(option_name: str, value: Any) -> str | None:
+    """Validate a billing env-var reference field."""
+    candidate = str(value).strip()
+    if not candidate:
+        return None
+
+    qualified_option = f"modules.billing.{option_name}"
+    if not _BILLING_ENV_VAR_NAME_PATTERN.fullmatch(candidate):
+        return (
+            f"{qualified_option} must be an environment variable name matching "
+            "^[A-Z][A-Z0-9_]*$"
+        )
+    return None
+
+
+def validate_billing_currency(value: Any) -> str | None:
+    """Validate the configured billing currency code."""
+    candidate = str(value).strip().lower()
+    if not candidate:
+        return "modules.billing.billing_currency cannot be blank"
+
+    if candidate not in BILLING_SUPPORTED_CURRENCIES:
+        return (
+            "modules.billing.billing_currency must be one of the supported "
+            "QuickScale billing currency codes: "
+            + ", ".join(BILLING_SUPPORTED_CURRENCIES)
+        )
+    return None
+
+
+def validate_billing_module_options(options: Mapping[str, Any] | None) -> list[str]:
+    """Return validation issues for billing module options."""
+    resolved = resolve_billing_module_options(options)
+    issues: list[str] = []
+
+    if not isinstance(resolved.get("enabled", True), bool):
+        issues.append("modules.billing.enabled must be a boolean")
+
+    for option_name in BILLING_ENV_VAR_OPTION_NAMES:
+        issue = validate_billing_env_var_reference(
+            option_name,
+            resolved.get(option_name, ""),
+        )
+        if issue:
+            issues.append(issue)
+
+    currency_issue = validate_billing_currency(resolved.get("billing_currency", ""))
+    if currency_issue:
+        issues.append(currency_issue)
+
+    return issues
+
+
+def billing_production_targeted(options: Mapping[str, Any] | None) -> bool:
+    """Return whether billing is configured for live runtime ownership."""
+    resolved = resolve_billing_module_options(options)
+    if not bool(resolved.get("enabled", True)):
+        return False
+
+    if validate_billing_currency(resolved.get("billing_currency", "")):
+        return False
+
+    for option_name in BILLING_ENV_VAR_OPTION_NAMES:
+        candidate = str(resolved.get(option_name, "")).strip()
+        if not candidate or validate_billing_env_var_reference(option_name, candidate):
+            return False
+
+    return True
+
+
+__all__ = [
+    "BILLING_ENV_VAR_OPTION_NAMES",
+    "BILLING_MODULE_OPTION_KEYS",
+    "BILLING_SUPPORTED_CURRENCIES",
+    "DEFAULT_BILLING_CURRENCY",
+    "DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR",
+    "DEFAULT_BILLING_SECRET_KEY_ENV_VAR",
+    "DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR",
+    "billing_production_targeted",
+    "default_billing_module_options",
+    "normalize_billing_module_options",
+    "resolve_billing_module_options",
+    "validate_billing_currency",
+    "validate_billing_env_var_reference",
+    "validate_billing_module_options",
+]

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/apply_command.py

@@ -21,6 +21,7 @@ from quickscale_cli.analytics_contract import (
     resolve_analytics_module_options,
     validate_analytics_module_options,
 )
+from quickscale_cli.billing_contract import validate_billing_module_options
 from quickscale_cli.backups_contract import (
     BACKUPS_REMOTE_ACCESS_KEY_ID_ENV_VAR_OPTION,
     BACKUPS_REMOTE_SECRET_ACCESS_KEY_ENV_VAR_OPTION,
@@ -470,13 +471,13 @@ def _start_docker(
 
 
 def _abort_for_not_ready_modules(module_names: list[str], *, source: str) -> None:
-    """Abort apply when placeholder modules appear in config or applied state."""
+    """Abort apply when non-public-ready modules appear in config or applied state."""
     not_ready = find_not_ready_modules(module_names)
     if not not_ready:
         return
 
     click.secho(
-        f"\n❌ {source} references placeholder modules that are not ready:",
+        f"\n❌ {source} references modules that are not public-ready:",
         fg="red",
         err=True,
         bold=True,
@@ -720,6 +721,45 @@ def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
 
 def _validate_module_prerequisites(qs_config: QuickScaleConfig) -> None:
     """Validate actionable module-specific prerequisites before apply proceeds."""
+    billing_config = qs_config.modules.get("billing")
+    if billing_config is not None:
+        billing_issues = validate_billing_module_options(billing_config.options or {})
+        if billing_issues:
+            click.secho(
+                "\n❌ Billing module configuration is incomplete for apply:",
+                fg="red",
+                err=True,
+            )
+            for issue in billing_issues:
+                click.echo(f"  • {issue}", err=True)
+            click.echo(
+                "\n💡 Re-run 'quickscale plan --reconfigure --configure-modules' or "
+                "edit quickscale.yml to correct the billing option values. "
+                "Billing apply requires valid env-var references and a supported "
+                "currency code.",
+                err=True,
+            )
+            raise click.Abort()
+
+        if "auth" not in qs_config.modules:
+            click.secho(
+                "\n❌ Billing requires the auth module before apply can continue:",
+                fg="red",
+                err=True,
+            )
+            click.echo(
+                "  • Add 'auth' under modules in quickscale.yml before applying billing.",
+                err=True,
+            )
+            click.echo(
+                "\n💡 Billing relies on the QuickScale auth login flow and "
+                "AUTH_USER_MODEL. Re-run 'quickscale plan --reconfigure "
+                "--configure-modules' or edit quickscale.yml to add auth, then "
+                "re-run 'quickscale apply'.",
+                err=True,
+            )
+            raise click.Abort()
+
     _abort_for_not_ready_modules(
         list(qs_config.modules.keys()), source="quickscale.yml"
     )

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/development_commands.py

@@ -10,6 +10,7 @@ import click
 
 from quickscale_cli.schema.config_schema import QuickScaleConfig
 from quickscale_cli.utils.docker_utils import (
+    DockerComposePluginRequiredError,
     get_docker_compose_command,
     get_port_from_env,
     is_docker_running,
@@ -74,8 +75,32 @@ def _show_port_conflict_error(port: int | str) -> None:
     )
 
 
+def _show_compose_v2_required_error() -> None:
+    """Display a user-friendly error when Docker Compose v2 is unavailable."""
+    click.secho(
+        "❌ Error: Docker Compose v2 plugin is required",
+        fg="red",
+        err=True,
+    )
+    click.echo(
+        "💡 Tip: Install or update Docker so the 'docker compose' command is "
+        "available. QuickScale keeps the generated 'docker-compose.yml' file "
+        "name, but the CLI uses the Docker Compose v2 plugin.",
+        err=True,
+    )
+
+
+def _require_docker_compose_command() -> list[str]:
+    """Return the Docker Compose v2 command or exit with remediation text."""
+    try:
+        return get_docker_compose_command()
+    except DockerComposePluginRequiredError:
+        _show_compose_v2_required_error()
+        sys.exit(1)
+
+
 def _run_docker_compose_up(compose_cmd: list, build: bool, no_cache: bool) -> None:
-    """Execute docker-compose up with appropriate flags."""
+    """Execute docker compose up with appropriate flags."""
     if build or no_cache:
         cmd = compose_cmd + ["--progress", "plain", "up", "-d"]
     else:
@@ -101,7 +126,7 @@ def _run_docker_compose_up(compose_cmd: list, build: bool, no_cache: bool) -> No
 
 
 def _handle_up_error(error: subprocess.CalledProcessError) -> None:
-    """Handle docker-compose up errors with user-friendly messages."""
+    """Handle docker compose up errors with user-friendly messages."""
     error_output = error.stderr if error.stderr else ""
     stdout_output = error.stdout if error.stdout else ""
     full_output = error_output + stdout_output
@@ -122,7 +147,7 @@ def _handle_up_error(error: subprocess.CalledProcessError) -> None:
         click.echo(
             f"\n💡 To resolve this issue, try one of the following:\n"
             f"   1. Stop existing containers: quickscale down\n"
-            f"   2. Remove orphaned containers: docker-compose down --remove-orphans\n"
+            f"   2. Remove orphaned containers: docker compose down --remove-orphans\n"
             f"   3. Find and kill the process: lsof -ti:{conflict_port} | xargs kill -9\n"
             f"   4. Find process details: sudo lsof -i:{conflict_port}\n"
             f"   5. Or use: sudo fuser -k {conflict_port}/tcp",
@@ -272,14 +297,14 @@ def up(build: bool, no_cache: bool) -> None:
         )
         click.secho("   quickscale down && quickscale up --build\n", fg="cyan")
 
-    # Check if required port is available BEFORE calling docker-compose
+    # Check if required port is available BEFORE calling docker compose.
     port = get_port_from_env()
     if not is_port_available(port):
         _show_port_conflict_error(port)
         sys.exit(1)
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         _run_docker_compose_up(compose_cmd, should_build, no_cache)
 
         # Update build timestamp if build was performed
@@ -326,7 +351,7 @@ def down(volumes: bool) -> None:
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["down", "--remove-orphans"]
 
         if volumes:
@@ -468,7 +493,7 @@ def logs(service: str | None, follow: bool, tail: str | None, timestamps: bool)
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["logs"]
 
         if follow:
@@ -503,7 +528,7 @@ def ps() -> None:
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["ps"]
         subprocess.run(cmd, check=True)
 

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/module_commands.py

@@ -208,8 +208,12 @@ def _sync_state_module_version(project_path: Path, module: str, version: str) ->
     state_manager.save(state)
 
 
-def _validate_module_readiness(module: str) -> bool:
-    """Reject placeholder modules from embed/apply flows."""
+def _validate_module_readiness(
+    module: str,
+    *,
+    execution_mode: ModuleExecutionMode = STANDALONE_MODULE_EXECUTION_MODE,
+) -> bool:
+    """Reject non-public modules from standalone embed/update flows."""
     readiness_reason = get_module_readiness_reason(module)
     if readiness_reason is None:
         return True
@@ -416,7 +420,10 @@ def embed_module(
         if not _validate_module_not_exists(project_path, module):
             return False
 
-        if not _validate_module_readiness(module):
+        if not _validate_module_readiness(
+            module,
+            execution_mode=execution_mode,
+        ):
             return False
 
         branch = f"splits/{module}-module"

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/module_config.py

@@ -21,6 +21,11 @@ from quickscale_cli.analytics_contract import (
     resolve_analytics_module_options,
     validate_analytics_module_options,
 )
+from quickscale_cli.billing_contract import (
+    default_billing_module_options,
+    resolve_billing_module_options,
+    validate_billing_module_options,
+)
 from quickscale_cli.auth_contract import (
     default_auth_module_options,
     resolve_auth_module_options,
@@ -1722,6 +1727,116 @@ def apply_analytics_configuration(
     )
 
 
+# ============================================================================
+# BILLING MODULE CONFIGURATION
+# ============================================================================
+
+
+def get_default_billing_config() -> dict[str, Any]:
+    """Return default configuration for the billing module."""
+    return default_billing_module_options()
+
+
+def _raise_for_invalid_billing_config(config: Mapping[str, Any]) -> None:
+    """Abort with actionable messaging when billing config is invalid."""
+    issues = validate_billing_module_options(config)
+    if not issues:
+        return
+
+    click.secho("\n❌ Invalid billing module configuration:", fg="red", err=True)
+    for issue in issues:
+        click.echo(f"  • {issue}", err=True)
+    raise click.Abort()
+
+
+def configure_billing_module(
+    non_interactive: bool = False,
+    existing_config: Mapping[str, Any] | None = None,
+) -> dict[str, Any]:
+    """Configure billing module settings interactively or with defaults."""
+    defaults = resolve_billing_module_options(existing_config)
+
+    if non_interactive:
+        click.echo("\n⚙️  Using default billing module configuration...")
+        click.echo("  • Runtime: " + ("Enabled" if defaults["enabled"] else "Disabled"))
+        click.echo(
+            "  • Publishable key env var: " + str(defaults["publishable_key_env_var"])
+        )
+        click.echo("  • Secret key env var: " + str(defaults["secret_key_env_var"]))
+        click.echo(
+            "  • Webhook secret env var: " + str(defaults["webhook_secret_env_var"])
+        )
+        click.echo("  • Billing currency: " + str(defaults["billing_currency"]))
+        _raise_for_invalid_billing_config(defaults)
+        return defaults
+
+    click.echo("\n⚙️  Configuring billing module...")
+    click.echo(
+        "Billing is public-ready in quickscale plan, quickscale.yml, and "
+        "quickscale apply flows. These settings configure the managed Stripe "
+        "runtime, while quickscale apply still requires auth before billing "
+        "can be enabled.\n"
+    )
+
+    config = resolve_billing_module_options(
+        {
+            "enabled": click.confirm(
+                "Enable the billing runtime?",
+                default=bool(defaults["enabled"]),
+            ),
+            "publishable_key_env_var": click.prompt(
+                "Stripe publishable key environment variable",
+                default=str(defaults["publishable_key_env_var"]),
+                show_default=True,
+            ).strip(),
+            "secret_key_env_var": click.prompt(
+                "Stripe secret key environment variable",
+                default=str(defaults["secret_key_env_var"]),
+                show_default=True,
+            ).strip(),
+            "webhook_secret_env_var": click.prompt(
+                "Stripe webhook secret environment variable",
+                default=str(defaults["webhook_secret_env_var"]),
+                show_default=True,
+            ).strip(),
+            "billing_currency": click.prompt(
+                "Billing currency (ISO 4217)",
+                default=str(defaults["billing_currency"]),
+                show_default=True,
+            ).strip(),
+        }
+    )
+
+    _raise_for_invalid_billing_config(config)
+    return config
+
+
+def apply_billing_configuration(
+    project_path: Path,
+    config: dict[str, Any],
+    *,
+    execution_mode: ModuleExecutionMode = STANDALONE_MODULE_EXECUTION_MODE,
+) -> None:
+    """Apply billing module configuration via managed wiring files."""
+    resolved = resolve_billing_module_options(config)
+    _raise_for_invalid_billing_config(resolved)
+    _regenerate_wiring_for_execution_mode(
+        project_path,
+        "billing",
+        resolved,
+        execution_mode=execution_mode,
+    )
+
+    click.echo("\n📋 Configuration applied:")
+    click.echo("  • Runtime: " + ("Enabled" if resolved["enabled"] else "Disabled"))
+    click.echo(
+        "  • Publishable key env var: " + str(resolved["publishable_key_env_var"])
+    )
+    click.echo("  • Secret key env var: " + str(resolved["secret_key_env_var"]))
+    click.echo("  • Webhook secret env var: " + str(resolved["webhook_secret_env_var"]))
+    click.echo("  • Billing currency: " + str(resolved["billing_currency"]))
+
+
 # ============================================================================
 # SOCIAL MODULE CONFIGURATION
 # ============================================================================
@@ -1870,6 +1985,7 @@ MODULE_CONFIGURATORS = {
     "forms": (configure_forms_module, apply_forms_configuration),
     "storage": (configure_storage_module, apply_storage_configuration),
     "backups": (configure_backups_module, apply_backups_configuration),
+    "billing": (configure_billing_module, apply_billing_configuration),
     "notifications": (
         configure_notifications_module,
         apply_notifications_configuration,

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/plan_command.py

@@ -52,7 +52,12 @@ def _get_module_choices(
 def _format_module_choice(entry: ModuleCatalogEntry) -> str:
     """Format a catalog entry for interactive display."""
     if not entry.ready:
-        return f"{entry.name} - {entry.description} (placeholder, not ready)"
+        if entry.name == "billing":
+            return (
+                f"{entry.name} - {entry.description} "
+                "(internal packaged Phase 1 foundation, not public-ready)"
+            )
+        return f"{entry.name} - {entry.description} (placeholder, not public-ready)"
     if entry.experimental:
         return f"{entry.name} - {entry.description} (experimental)"
     return f"{entry.name} - {entry.description}"
@@ -171,7 +176,7 @@ def _select_modules(*, include_experimental: bool = False) -> list[str]:
 
     if include_experimental and any(not entry.ready for entry in available_modules):
         click.echo(
-            "\n  Placeholder modules are shown for visibility only and cannot be selected"
+            "\n  Non-public modules are shown for visibility only and cannot be selected"
         )
 
     click.echo(
@@ -1051,7 +1056,7 @@ def _save_config_with_validation(yaml_content: str, output_path: Path) -> None:
 @click.option(
     "--include-experimental",
     is_flag=True,
-    help="Show placeholder module directories (billing, teams) in the picker",
+    help="Show non-public module inventory entries (currently teams) in the picker",
 )
 @click.option(
     "--configure-modules",

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/commands/status_command.py

@@ -120,13 +120,13 @@ def _load_module_manifests(
 
 
 def _abort_for_not_ready_modules(module_names: list[str], *, source: str) -> None:
-    """Abort status when placeholder modules appear in config or applied state."""
+    """Abort status when non-public-ready modules appear in config or applied state."""
     not_ready = find_not_ready_modules(module_names)
     if not not_ready:
         return
 
     click.secho(
-        f"\n❌ Unsupported placeholder module state detected in {source}:",
+        f"\n❌ Unsupported non-public-ready module state detected in {source}:",
         fg="red",
         err=True,
         bold=True,
@@ -136,11 +136,17 @@ def _abort_for_not_ready_modules(module_names: list[str], *, source: str) -> Non
         if reason is not None:
             click.echo(f"  • {reason}", err=True)
 
-    click.echo(
-        "\n💡 Billing and teams remain placeholder directories and cannot "
-        "participate in public QuickScale plan/apply/status workflows yet.",
-        err=True,
+    guidance = (
+        "\n💡 Resolve the non-public-ready module state above before running "
+        "'quickscale status' again."
     )
+    if "teams" in not_ready:
+        guidance += (
+            " Teams remains placeholder inventory and cannot participate in "
+            "public QuickScale workflows yet."
+        )
+
+    click.echo(guidance, err=True)
     raise click.Abort()
 
 

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/module_catalog.py

@@ -67,9 +67,8 @@ MODULE_CATALOG: tuple[ModuleCatalogEntry, ...] = (
     ),
     ModuleCatalogEntry(
         name="billing",
-        description="Stripe integration",
-        ready=False,
-        experimental=True,
+        description="Stripe integration with credits-first pricing and dashboard routes",
+        ready=True,
     ),
     ModuleCatalogEntry(
         name="teams",
@@ -114,13 +113,16 @@ def find_not_ready_modules(module_names: Iterable[str]) -> list[str]:
 
 
 def get_module_readiness_reason(module_name: str) -> str | None:
-    """Return an actionable readiness error for placeholder modules."""
+    """Return an actionable readiness error for non-public-ready modules."""
     entry = get_module_entry(module_name)
     if entry is None or entry.ready:
         return None
 
+    module_display_name = module_name.replace("_", " ").title()
     return (
-        f"Module '{module_name}' is a placeholder and is not a valid shipped-module "
-        "selection yet. Billing and teams remain discoverable in docs and module "
-        "inventory only until they ship."
+        f"Module '{module_name}' remains placeholder inventory only and is not a "
+        "public-ready QuickScale module yet. "
+        f"{module_display_name} remains excluded from public quickscale plan, "
+        "quickscale.yml, quickscale apply, and quickscale status workflows until "
+        "it ships."
     )

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/schema/config_schema.py

@@ -11,6 +11,12 @@ from typing import Any
 
 import yaml
 
+from quickscale_cli.billing_contract import (
+    BILLING_ENV_VAR_OPTION_NAMES,
+    BILLING_MODULE_OPTION_KEYS,
+    validate_billing_currency,
+    validate_billing_env_var_reference,
+)
 from quickscale_cli.auth_contract import (
     AUTH_AUTHENTICATION_METHOD_OPTION,
     AUTH_AUTHENTICATION_METHOD_VALUES,
@@ -239,6 +245,67 @@ def _validate_auth_module_options(
             )
 
 
+def _validate_billing_module_options(
+    module_options: dict[str, Any],
+    yaml_content: str,
+) -> None:
+    """Validate billing config keys and value shapes before readiness gating."""
+    billing_option_keys = set(BILLING_MODULE_OPTION_KEYS)
+
+    for option_name in module_options:
+        if option_name not in billing_option_keys:
+            line = _find_line_number(yaml_content, option_name)
+            suggestion = _suggest_similar_key(option_name, billing_option_keys)
+            suggestion_text = (
+                f"Use modules.billing.{suggestion} instead."
+                if suggestion
+                else "Supported keys: "
+                + ", ".join(
+                    f"modules.billing.{key}" for key in sorted(billing_option_keys)
+                )
+            )
+            raise ConfigValidationError(
+                f"Unknown key '{option_name}' in modules.billing section",
+                line=line,
+                suggestion=suggestion_text,
+            )
+
+    if "enabled" in module_options and not isinstance(module_options["enabled"], bool):
+        raise ConfigValidationError(
+            "'modules.billing.enabled' must be a boolean (true/false)",
+            line=_find_line_number(yaml_content, "enabled"),
+        )
+
+    for option_name in BILLING_ENV_VAR_OPTION_NAMES:
+        if option_name not in module_options:
+            continue
+
+        issue = validate_billing_env_var_reference(
+            option_name,
+            module_options[option_name],
+        )
+        if issue:
+            raise ConfigValidationError(
+                issue,
+                line=_find_line_number(yaml_content, option_name),
+                suggestion=(
+                    "Use uppercase environment-variable names such as "
+                    "STRIPE_SECRET_KEY."
+                ),
+            )
+
+    if "billing_currency" in module_options:
+        currency_issue = validate_billing_currency(
+            module_options["billing_currency"],
+        )
+        if currency_issue:
+            raise ConfigValidationError(
+                currency_issue,
+                line=_find_line_number(yaml_content, "billing_currency"),
+                suggestion="Use a supported ISO 4217 code such as usd or eur.",
+            )
+
+
 def _validate_version(data: dict, yaml_content: str) -> None:
     """Validate the version field."""
     if "version" not in data:
@@ -426,18 +493,6 @@ def _validate_modules_section(data: dict, yaml_content: str) -> dict[str, Module
                 or f"Available modules: {', '.join(sorted(AVAILABLE_MODULES))}",
             )
 
-        readiness_reason = get_module_readiness_reason(module_name)
-        if readiness_reason is not None:
-            line = _find_line_number(yaml_content, module_name)
-            raise ConfigValidationError(
-                readiness_reason,
-                line=line,
-                suggestion=(
-                    "Remove it from quickscale.yml and choose a shipped module: "
-                    + ", ".join(sorted(READY_MODULES))
-                ),
-            )
-
         if module_options is None:
             module_options = {}
         elif not isinstance(module_options, dict):
@@ -449,6 +504,20 @@ def _validate_modules_section(data: dict, yaml_content: str) -> dict[str, Module
 
         if module_name == "auth":
             _validate_auth_module_options(module_options, yaml_content)
+        if module_name == "billing":
+            _validate_billing_module_options(module_options, yaml_content)
+
+        readiness_reason = get_module_readiness_reason(module_name)
+        if readiness_reason is not None:
+            line = _find_line_number(yaml_content, module_name)
+            raise ConfigValidationError(
+                readiness_reason,
+                line=line,
+                suggestion=(
+                    "Remove it from quickscale.yml and choose a shipped module: "
+                    + ", ".join(sorted(READY_MODULES))
+                ),
+            )
 
         modules[module_name] = ModuleConfig(name=module_name, options=module_options)
 

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/utils/dependency_utils.py

@@ -42,13 +42,13 @@ class DependencyStatus(NamedTuple):
 
 
 def check_python_version() -> DependencyStatus:
-    """Check Python version (3.14+ required)."""
+    """Check Python version (3.13+ required)."""
     import sys
 
     version = (
         f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
     )
-    meets_requirement = sys.version_info >= (3, 14)
+    meets_requirement = sys.version_info >= (3, 13)
 
     return DependencyStatus(
         name="Python",
@@ -151,7 +151,7 @@ def check_git_installed() -> DependencyStatus:
 
 
 def check_docker_installed() -> DependencyStatus:
-    """Check if Docker and Docker Compose are installed."""
+    """Check if Docker and the Docker Compose v2 plugin are installed."""
 
     if _should_skip_dependency_checks():
         return _skipped_dependency(
@@ -176,45 +176,28 @@ def check_docker_installed() -> DependencyStatus:
             parts = version_str.split()
             version = parts[2].rstrip(",") if len(parts) >= 3 else None
 
-            # Also check for Docker Compose (either v2 plugin or v1 standalone)
-            compose_available = False
+            # Docker-backed workflows require the Compose v2 plugin.
             try:
-                # Try docker compose v2 (plugin)
                 subprocess.run(
                     ["docker", "compose", "version"],
                     capture_output=True,
                     check=True,
                     timeout=2,
                 )
-                compose_available = True
             except (
                 subprocess.SubprocessError,
                 FileNotFoundError,
                 subprocess.TimeoutExpired,
             ):
-                # Try docker-compose v1 (standalone)
-                try:
-                    subprocess.run(
-                        ["docker-compose", "--version"],
-                        capture_output=True,
-                        check=True,
-                        timeout=2,
-                    )
-                    compose_available = True
-                except (
-                    subprocess.SubprocessError,
-                    FileNotFoundError,
-                    subprocess.TimeoutExpired,
-                ):
-                    pass
-
-            if not compose_available:
                 return DependencyStatus(
                     name="Docker",
                     installed=False,
                     version=version,
                     required=False,
-                    purpose="Containerized development (quickscale up/down) - Docker Compose not found",
+                    purpose=(
+                        "Containerized development (quickscale up/down) - "
+                        "Docker Compose v2 plugin not found"
+                    ),
                 )
 
             return DependencyStatus(

{quickscale_cli-0.83.0 → quickscale_cli-0.85.0}/src/quickscale_cli/utils/docker_utils.py

@@ -7,6 +7,10 @@ import time
 from pathlib import Path
 
 
+class DockerComposePluginRequiredError(RuntimeError):
+    """Raised when the Docker Compose v2 plugin is unavailable."""
+
+
 def is_interactive() -> bool:
     """Check if running in an interactive terminal (has TTY)."""
     return sys.stdout.isatty() and sys.stdin.isatty()
@@ -32,24 +36,22 @@ def find_docker_compose() -> Path | None:
 
 
 def get_docker_compose_command() -> list[str]:
-    """Get the appropriate docker compose command.
-
-    Tries 'docker compose' (v2 plugin) first, falls back to 'docker-compose' (v1 standalone).
-    Both are fully supported.
-    """
-    # Try docker compose first (v2 plugin)
+    """Get the Docker Compose v2 command."""
     try:
         subprocess.run(
             ["docker", "compose", "version"], capture_output=True, check=True, timeout=2
         )
-        return ["docker", "compose"]
     except (
         subprocess.SubprocessError,
         FileNotFoundError,
         subprocess.TimeoutExpired,
-    ):
-        # Fall back to docker-compose (v1 standalone)
-        return ["docker-compose"]
+    ) as error:
+        raise DockerComposePluginRequiredError(
+            "Docker Compose v2 is required. Install or update Docker so the "
+            "'docker compose' command is available."
+        ) from error
+
+    return ["docker", "compose"]
 
 
 def get_container_status(container_name: str) -> str | None:

quickscale_cli-0.83.0/PKG-INFO

@@ -1,61 +0,0 @@
-Metadata-Version: 2.4
-Name: quickscale-cli
-Version: 0.83.0
-Summary: Command-line interface for QuickScale Django project generator
-License-Expression: Apache-2.0
-Keywords: django,cli,project-generator,saas
-Author: Experto AI
-Author-email: victor@experto.ai
-Requires-Python: >=3.12,<3.14
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.14
-Classifier: Framework :: Django
-Classifier: Framework :: Django :: 6.0
-Requires-Dist: click (>=8.3.1,<9.0.0)
-Requires-Dist: quickscale-core (>=0.83.0,<0.84.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
-Description-Content-Type: text/markdown
-
-# quickscale-cli
-
-Command-line interface package for QuickScale.
-
-This package exposes the `quickscale` command used to plan, apply, inspect, recover, and operate generated projects.
-
-## Command groups
-
-- Project lifecycle: `plan`, `apply`, `status`, `remove`
-- Disaster recovery & promotion: `dr capture`, `dr plan`, `dr execute`, `dr report`
-- Local development: `up`, `down`, `ps`, `logs`, `shell`, `manage`
-- Deployment: `deploy`
-- Module workflows: `update`, `push`
-
-## Relationship to other packages
-
-- `quickscale-cli` is the command surface
-- `quickscale-core` contains the underlying scaffolding and template logic
-- `quickscale` installs both together for convenience
-
-## Install
-
-Usually installed via the meta-package:
-
-```bash
-pip install quickscale
-```
-
-Standalone package installs can use this package's published metadata and dependency constraints.
-
-## Documentation
-
-- Repository overview: [QuickScale README](https://github.com/Experto-AI/quickscale/blob/main/README.md)
-- Start guide: [START_HERE.md](https://github.com/Experto-AI/quickscale/blob/main/START_HERE.md)
-- Technical decisions: [docs/technical/decisions.md](https://github.com/Experto-AI/quickscale/blob/main/docs/technical/decisions.md)
-- CLI source entrypoint: [src/quickscale_cli/main.py](https://github.com/Experto-AI/quickscale/blob/main/quickscale_cli/src/quickscale_cli/main.py)
-
-This README is package-local context only. Root documentation remains authoritative for repo-wide policy and scope.
-

quickscale_cli-0.83.0/README.md

@@ -1,38 +0,0 @@
-# quickscale-cli
-
-Command-line interface package for QuickScale.
-
-This package exposes the `quickscale` command used to plan, apply, inspect, recover, and operate generated projects.
-
-## Command groups
-
-- Project lifecycle: `plan`, `apply`, `status`, `remove`
-- Disaster recovery & promotion: `dr capture`, `dr plan`, `dr execute`, `dr report`
-- Local development: `up`, `down`, `ps`, `logs`, `shell`, `manage`
-- Deployment: `deploy`
-- Module workflows: `update`, `push`
-
-## Relationship to other packages
-
-- `quickscale-cli` is the command surface
-- `quickscale-core` contains the underlying scaffolding and template logic
-- `quickscale` installs both together for convenience
-
-## Install
-
-Usually installed via the meta-package:
-
-```bash
-pip install quickscale
-```
-
-Standalone package installs can use this package's published metadata and dependency constraints.
-
-## Documentation
-
-- Repository overview: [QuickScale README](https://github.com/Experto-AI/quickscale/blob/main/README.md)
-- Start guide: [START_HERE.md](https://github.com/Experto-AI/quickscale/blob/main/START_HERE.md)
-- Technical decisions: [docs/technical/decisions.md](https://github.com/Experto-AI/quickscale/blob/main/docs/technical/decisions.md)
-- CLI source entrypoint: [src/quickscale_cli/main.py](https://github.com/Experto-AI/quickscale/blob/main/quickscale_cli/src/quickscale_cli/main.py)
-
-This README is package-local context only. Root documentation remains authoritative for repo-wide policy and scope.