rpr-cli 0.1.20__tar.gz → 0.1.22__tar.gz

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.1.20
+Version: 0.1.22
 Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
 License-Expression: MIT
 License-File: LICENSE

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/Sample-dot-github/instructions/all.instructions.md

@@ -24,14 +24,14 @@ This project uses an NX + UV monorepo with a domain-driven design approach. Appl
 
 ## Layout
 
-| Path                            | Purpose                                                                  |
-| ------------------------------- | ------------------------------------------------------------------------ |
-| `apps/{name}-web`               | Thin frontend application shell                                          |
-| `apps/{name}-api`               | FastAPI application                                                      |
-| `packages/node/{name}-ui`       | Reusable UI package with components, hooks, services, and state          |
-| `packages/node/sb`              | Storybook package                                                        |
-| `packages/python/domain`        | Python domain package containing the `src/{name_underscore}_domain` code |
-| `packages/python/{name}-engine` | Rust engine package exposed to Python                                    |
+| Path                                       | Purpose                                                                  |
+| ------------------------------------------ | ------------------------------------------------------------------------ |
+| `apps/{name_kebab}-web`                    | Thin frontend application shell                                          |
+| `apps/{name_underscore}_api`               | FastAPI application                                                      |
+| `packages/node/{name_kebab}-ui`            | Reusable UI package with components, hooks, services, and state          |
+| `packages/node/sb`                         | Storybook package                                                        |
+| `packages/python/domain`                   | Python domain package containing the `src/{name_underscore}_domain` code |
+| `packages/python/{name_underscore}_engine` | Rust engine package exposed to Python                                    |
 
 ## Instructions, Templates, and Scaffolds
 

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/Sample-dot-github/instructions/frontend.instructions.md

@@ -11,7 +11,7 @@ Use React for UI composition, TanStack Query for server-state workflows, TanStac
 
 - Use functional components.
 - Extract reusable behavior into hooks instead of duplicating component logic.
-- Import the generated shared UI package through the app-scoped package name `@{name}/ui`, such as `@testapp/ui`, not `@repo/{name}-ui`.
+- Import the generated shared UI package through the app-scoped package name `@{name_kebab}/ui`, such as `@testapp/ui`, not `@repo/{name_kebab}-ui`.
 - Prefer a shared base API service at `src/services/base/api.service.ts` when the UI package needs centralized fetch behavior.
 - Prefer a shared `useStateNavigation` hook at `src/hooks/useStateNavigation.ts` when UI state should persist in the URL.
 - Reuse existing components, hooks, and service patterns before introducing a new abstraction.

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/Sample-dot-github/instructions/rust-engine.instructions.md

@@ -1,5 +1,5 @@
 ---
-applyTo: "packages/python/*-engine/**"
+applyTo: "packages/python/*_engine/**"
 description: "Rust + PyO3 engine build, lint, and Python bindings"
 ---
 
@@ -9,9 +9,9 @@ Use Rust for performance-sensitive code that needs a Python-facing API. This pac
 
 ## Structure
 
-- Package root: `packages/python/{name}-engine`
-- Rust source: `packages/python/{name}-engine/src/lib.rs`
-- Python build metadata: `packages/python/{name}-engine/pyproject.toml`
+- Package root: `packages/python/{name_underscore}_engine`
+- Rust source: `packages/python/{name_underscore}_engine/src/lib.rs`
+- Python build metadata: `packages/python/{name_underscore}_engine/pyproject.toml`
 - Type stubs: keep a `.pyi` file next to the package root for editor support
 
 ## Build and Tooling

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/Sample-dot-github/instructions/setup-guide.instructions.md

@@ -24,18 +24,17 @@ Use this guidance when validating or changing the monorepo setup against the RPR
 ## Naming And Layout
 
 - Use kebab-case for project roots and Nx project names.
-- Keep the frontend app at `apps/{name}-web`.
-- Keep the FastAPI app at `apps/{name}-api`.
-- Keep the reusable React library at `packages/node/{name}-ui`.
+- Keep the frontend app at `apps/{name_kebab}-web`.
+- Keep the FastAPI app at `apps/{name_underscore}_api`.
+- Keep the reusable React library at `packages/node/{name_kebab}-ui`.
 - Keep the dedicated Storybook host at `packages/node/sb`.
 - Keep the Python domain package at `packages/python/domain`.
 - Keep the domain import package at `packages/python/domain/src/{name_underscore}_domain` so imports read as `from {name_underscore}_domain ...`.
-- Keep optional Rust engine packages at `packages/python/{name}-engine` unless the product contract changes.
+- Keep optional Rust engine packages at `packages/python/{name_underscore}_engine` unless the product contract changes.
 
 ## Python Naming Rule
 
-- Use kebab-case for filesystem roots such as `apps/{name}-api`.
-- Use snake_case for the import package inside `src/`, for example `apps/{name}-api/src/{name}_api`.
+- Use snake_case for Python filesystem roots and import packages, for example `apps/{name_underscore}_api/src/{name_underscore}_api`.
 - Apply the same rule to the domain package: keep the root directory `packages/python/domain`, but keep the import package at `src/{name_underscore}_domain`.
 - Keep the Python package name in `pyproject.toml` kebab-case.
 - Add a `tests/` directory for generated Python apps and libraries.
@@ -45,8 +44,8 @@ Use this guidance when validating or changing the monorepo setup against the RPR
 - Generate React app and library projects in a way that preserves the expected Nx command surface.
 - The web app should expose at least `serve`, `build`, `lint`, `test`, and `typecheck` when those capabilities exist in the generated project.
 - The UI library should expose at least `build`, `lint`, `test`, and `typecheck`.
-- Use app-scoped Node package names: `packages/node/{name}-ui` publishes as `@{name}/ui`, `apps/{name}-web` publishes as `@{name}/web`, and Storybook publishes as `@{name}/sb`.
-- Import the shared UI package through `@{name}/ui`, for example `import { AppThemeProvider } from "@testapp/ui"` for a `TestApp` workspace.
+- Use app-scoped Node package names: `packages/node/{name_kebab}-ui` publishes as `@{name_kebab}/ui`, `apps/{name_kebab}-web` publishes as `@{name_kebab}/web`, and Storybook publishes as `@{name_kebab}/sb`.
+- Import the shared UI package through `@{name_kebab}/ui`, for example `import { AppThemeProvider } from "@testapp/ui"` for a `TestApp` workspace.
 - Link local Node workspace packages with relative `file:` dependency specs instead of `workspace:*`, because npm must be able to install the generated workspace without unsupported protocol errors.
 - Keep Storybook as a dedicated host project at `packages/node/sb`; do not silently repurpose the UI library as the Storybook project.
 
@@ -84,7 +83,7 @@ npx nx run domain:migrate -- downgrade -1
 - Project roots and import package names follow the kebab-case and snake_case rules.
 - Python projects have both `src/` and `tests/`.
 - The domain import package remains `src/{name_underscore}_domain`.
-- Node imports use app-scoped package names such as `@{name}/ui`, not stale `@repo/*` aliases.
+- Node imports use app-scoped package names such as `@{name_kebab}/ui`, not stale `@repo/*` aliases.
 - Storybook remains hosted in `packages/node/sb`.
 - Workspace members and workspace dependency sources are complete.
 - Generated instructions, checks, and scaffolds refer to the current contract rather than stale paths.

{rpr_cli-0.1.20/src/rpr/scaffolds → rpr_cli-0.1.22/Sample-dot-github}/instructions/tooling-setup.instructions.md

@@ -1,5 +1,5 @@
 ---
-applyTo: "pyproject.toml,nx.json,.pre-commit-config.yaml,package.json,apps/*/project.json,packages/**/project.json,apps/*/eslint.config.mjs,packages/**/eslint.config.mjs,packages/python/*-engine/Cargo.toml"
+applyTo: "pyproject.toml,nx.json,.pre-commit-config.yaml,package.json,apps/*/project.json,packages/**/project.json,apps/*/eslint.config.mjs,packages/**/eslint.config.mjs,packages/python/*_engine/Cargo.toml"
 description: "Use when setting up or modifying Ruff, TypeScript linting, ESLint, Prettier, cargo fmt, Clippy, or pre-commit in an RPR workspace"
 ---
 

rpr_cli-0.1.22/src/rpr/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.22"

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/src/rpr/checks/instructions.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 
 from rpr.checks.base import CheckResult
-from rpr.generators.base import SyncConfig, interpolate
+from rpr.generators.base import interpolate
 from rpr.templates.registry import TEMPLATES
 
 
@@ -25,6 +25,23 @@ def check_instructions(
         )
     )
 
+    # GitHub / VS Code workspace instructions
+    github_instructions = project_dir / ".github" / "instructions"
+    github_ok = github_instructions.exists() and any(
+        github_instructions.glob("*.instructions.md")
+    )
+    results.append(
+        CheckResult(
+            group="AI Instructions & Templates",
+            area="GitHub workspace instructions",
+            status=github_ok,
+            path=str(github_instructions)
+            if github_ok
+            else ".github/instructions/*.instructions.md missing",
+            suggestion="rpr sync rules --target github",
+        )
+    )
+
     # Copilot instructions
     copilot_file = project_dir / ".github" / "copilot-instructions.md"
     results.append(
@@ -52,7 +69,7 @@ def check_instructions(
     )
 
     # Templates (only if domain package exists for Python, or UI library for JS)
-    has_domain = any(project_dir.glob("packages/python/domain"))
+    has_domain = any(project_dir.glob("packages/python/*_domain"))
     has_ui = any(project_dir.glob("packages/node/*-ui"))
 
     template_ids = [

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/src/rpr/checks/packages.py

@@ -8,39 +8,41 @@ from rpr.checks.base import CheckResult
 from rpr.dependencies import (
     DOMAIN_RUNTIME_DEPENDENCIES,
     MATURIN_SPEC,
-    ROOT_STORYBOOK_DEV_DEPENDENCIES,
-    STORYBOOK_DEV_DEPENDENCIES,
-    UI_LIBRARY_DEPENDENCIES,
-    UI_LIBRARY_DEV_DEPENDENCIES,
-    WEB_APP_DEV_DEPENDENCIES,
     api_runtime_dependencies,
     dependency_names,
-    mapping_dependency_names,
-    storybook_package_dependencies,
-    web_app_dependencies,
+    node_project_name,
+    npm_package_name,
+    python_project_name,
 )
 
 
 def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckResult]:
     results: list[CheckResult] = []
     name = variables.get("name", "<name>")
-    name_underscore = variables.get("name_underscore", name.replace("-", "_"))
+    name_underscore = variables.get("name_underscore", name.replace("-", "_")).lower()
+    domain_name = python_project_name(name, "domain")
+    api_name = python_project_name(name, "api")
+    ui_name = node_project_name(name, "ui")
+    web_name = node_project_name(name, "web")
 
     pyproject = project_dir / "pyproject.toml"
     workspace_members: set[str] = set()
     if pyproject.exists():
         try:
             data = tomllib.loads(pyproject.read_text())
-            members = data.get("tool", {}).get("uv", {}).get("workspace", {}).get(
-                "members", []
+            members = (
+                data.get("tool", {})
+                .get("uv", {})
+                .get("workspace", {})
+                .get("members", [])
             )
             if isinstance(members, list):
                 workspace_members = set(members)
-        except (OSError, tomllib.TOMLDecodeError):
+        except OSError, tomllib.TOMLDecodeError:
             workspace_members = set()
 
     # Domain package
-    domain_dir = project_dir / "packages" / "python" / "domain"
+    domain_dir = project_dir / "packages" / "python" / domain_name
     results.append(
         CheckResult(
             group="Generated Packages & Apps",
@@ -48,7 +50,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             status=domain_dir.exists(),
             path=str(domain_dir)
             if domain_dir.exists()
-            else "packages/python/domain/ missing",
+            else f"packages/python/{domain_name}/ missing",
             suggestion=f"rpr generate domain {name}",
         )
     )
@@ -57,7 +59,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             _check_python_layout(
                 area="Domain layout",
                 project_dir=domain_dir,
-                src_package=domain_dir / "src" / f"{name_underscore}_domain",
+                src_package=domain_dir / "src" / domain_name,
                 suggestion=f"rpr generate domain {name}",
             )
         )
@@ -73,7 +75,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             _check_project_name(
                 area="Domain project name",
                 project_json=domain_dir / "project.json",
-                expected_name="domain",
+                expected_name=domain_name,
                 suggestion=f"rpr generate domain {name}",
             )
         )
@@ -96,22 +98,22 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             CheckResult(
                 group="Generated Packages & Apps",
                 area="Domain workspace member",
-                status="packages/python/domain" in workspace_members,
-                path="packages/python/domain"
-                if "packages/python/domain" in workspace_members
-                else "packages/python/domain missing from [tool.uv.workspace].members",
+                status=f"packages/python/{domain_name}" in workspace_members,
+                path=f"packages/python/{domain_name}"
+                if f"packages/python/{domain_name}" in workspace_members
+                else f"packages/python/{domain_name} missing from [tool.uv.workspace].members",
                 suggestion=f"rpr generate domain {name}",
             )
         )
 
     # API app
-    api_dir = project_dir / "apps" / f"{name}-api"
+    api_dir = project_dir / "apps" / api_name
     results.append(
         CheckResult(
             group="Generated Packages & Apps",
             area="API app",
             status=api_dir.exists(),
-            path=str(api_dir) if api_dir.exists() else f"apps/{name}-api/ missing",
+            path=str(api_dir) if api_dir.exists() else f"apps/{api_name}/ missing",
             suggestion=f"rpr generate api {name}",
         )
     )
@@ -120,7 +122,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             _check_python_layout(
                 area="API layout",
                 project_dir=api_dir,
-                src_package=api_dir / "src" / f"{name_underscore}_api",
+                src_package=api_dir / "src" / api_name,
                 suggestion=f"rpr generate api {name}",
             )
         )
@@ -138,23 +140,23 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
                 pyproject=api_dir / "pyproject.toml",
                 required_dependencies=set(api_runtime_dependencies(name)),
                 suggestion=f"rpr generate api {name}",
-                required_sources={f"{name}-domain": {"workspace": True}},
+                required_sources={domain_name: {"workspace": True}},
             )
         )
         results.append(
             CheckResult(
                 group="Generated Packages & Apps",
                 area="API workspace member",
-                status=f"apps/{name}-api" in workspace_members,
-                path=f"apps/{name}-api"
-                if f"apps/{name}-api" in workspace_members
-                else f"apps/{name}-api missing from [tool.uv.workspace].members",
+                status=f"apps/{api_name}" in workspace_members,
+                path=f"apps/{api_name}"
+                if f"apps/{api_name}" in workspace_members
+                else f"apps/{api_name} missing from [tool.uv.workspace].members",
                 suggestion=f"rpr generate api {name}",
             )
         )
 
     # UI library
-    ui_dir = project_dir / "packages" / "node" / f"{name}-ui"
+    ui_dir = project_dir / "packages" / "node" / ui_name
     results.append(
         CheckResult(
             group="Generated Packages & Apps",
@@ -179,22 +181,19 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             _check_node_dependency_contract(
                 area="UI install metadata",
                 package_json=ui_dir / "package.json",
-                required_dependencies=mapping_dependency_names(UI_LIBRARY_DEPENDENCIES),
-                required_dev_dependencies=mapping_dependency_names(
-                    UI_LIBRARY_DEV_DEPENDENCIES
-                ),
+                expected_name=f"@{npm_package_name(name)}/ui",
                 suggestion=f"rpr generate ui {name}",
             )
         )
 
     # Web app
-    web_dir = project_dir / "apps" / f"{name}-web"
+    web_dir = project_dir / "apps" / web_name
     results.append(
         CheckResult(
             group="Generated Packages & Apps",
             area="Web app",
             status=web_dir.exists(),
-            path=str(web_dir) if web_dir.exists() else f"apps/{name}-web/ missing",
+            path=str(web_dir) if web_dir.exists() else f"apps/{web_name}/ missing",
             suggestion=f"rpr generate ui {name} --no-library",
         )
     )
@@ -209,14 +208,9 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
         )
         results.append(
             _check_node_dependency_contract(
-                area="Web install metadata",
+                area="Web package metadata",
                 package_json=web_dir / "package.json",
-                required_dependencies=mapping_dependency_names(
-                    web_app_dependencies(f"{name}-ui")
-                ),
-                required_dev_dependencies=mapping_dependency_names(
-                    WEB_APP_DEV_DEPENDENCIES
-                ),
+                expected_name=f"@{npm_package_name(name)}/web",
                 suggestion=f"rpr generate ui {name} --no-library",
             )
         )
@@ -251,30 +245,15 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
         )
         results.append(
             _check_node_dependency_contract(
-                area="Storybook host install metadata",
+                area="Storybook host package metadata",
                 package_json=sb_dir / "package.json",
-                required_dependencies=mapping_dependency_names(
-                    storybook_package_dependencies(f"{name}-ui")
-                ),
-                required_dev_dependencies=mapping_dependency_names(
-                    STORYBOOK_DEV_DEPENDENCIES
-                ),
-                suggestion="rpr generate storybook",
-            )
-        )
-        results.append(
-            _check_node_dependency_contract(
-                area="Storybook root install metadata",
-                package_json=project_dir / "package.json",
-                required_dev_dependencies=mapping_dependency_names(
-                    ROOT_STORYBOOK_DEV_DEPENDENCIES
-                ),
+                expected_name=f"@{npm_package_name(name)}/sb",
                 suggestion="rpr generate storybook",
             )
         )
 
     # Engine
-    engine_dir = next(project_dir.glob("packages/python/*-engine"), None)
+    engine_dir = next(project_dir.glob("packages/python/*_engine"), None)
     results.append(
         CheckResult(
             group="Generated Packages & Apps",
@@ -300,7 +279,7 @@ def _load_json(path: Path) -> dict[str, object] | None:
         return None
     try:
         data = json.loads(path.read_text())
-    except (OSError, json.JSONDecodeError):
+    except OSError, json.JSONDecodeError:
         return None
     return data if isinstance(data, dict) else None
 
@@ -310,7 +289,7 @@ def _load_toml(path: Path) -> dict[str, object] | None:
         return None
     try:
         data = tomllib.loads(path.read_text())
-    except (OSError, tomllib.TOMLDecodeError):
+    except OSError, tomllib.TOMLDecodeError:
         return None
     return data if isinstance(data, dict) else None
 
@@ -405,7 +384,9 @@ def _check_python_dependency_contract(
             suggestion=suggestion,
         )
 
-    project = data.get("project", {}) if isinstance(data.get("project", {}), dict) else {}
+    project = (
+        data.get("project", {}) if isinstance(data.get("project", {}), dict) else {}
+    )
     dependencies = project.get("dependencies", []) if isinstance(project, dict) else []
     dependency_set = set(dependencies) if isinstance(dependencies, list) else set()
     missing_dependencies = sorted(required_dependencies.difference(dependency_set))
@@ -434,9 +415,7 @@ def _check_python_dependency_contract(
         group="Generated Packages & Apps",
         area=area,
         status=status,
-        path=str(pyproject)
-        if status
-        else f"{pyproject} {'; '.join(details)}",
+        path=str(pyproject) if status else f"{pyproject} {'; '.join(details)}",
         suggestion=suggestion,
     )
 
@@ -446,6 +425,7 @@ def _check_node_dependency_contract(
     area: str,
     package_json: Path,
     suggestion: str,
+    expected_name: str | None = None,
     required_dependencies: set[str] | None = None,
     required_dev_dependencies: set[str] | None = None,
 ) -> CheckResult:
@@ -459,6 +439,15 @@ def _check_node_dependency_contract(
             suggestion=suggestion,
         )
 
+    if expected_name is not None and data.get("name") != expected_name:
+        return CheckResult(
+            group="Generated Packages & Apps",
+            area=area,
+            status=False,
+            path=f"{package_json} expected name '{expected_name}'",
+            suggestion=suggestion,
+        )
+
     dependencies = data.get("dependencies", {})
     dev_dependencies = data.get("devDependencies", {})
     dependency_keys = set(dependencies) if isinstance(dependencies, dict) else set()
@@ -486,9 +475,7 @@ def _check_node_dependency_contract(
         group="Generated Packages & Apps",
         area=area,
         status=status,
-        path=str(package_json)
-        if status
-        else f"{package_json} {'; '.join(details)}",
+        path=str(package_json) if status else f"{package_json} {'; '.join(details)}",
         suggestion=suggestion,
     )
 
@@ -498,7 +485,11 @@ def _check_domain_migration_scaffold(
 ) -> CheckResult:
     project_json = domain_dir / "project.json"
     project = _load_json(project_json) or {}
-    targets = project.get("targets", {}) if isinstance(project.get("targets", {}), dict) else {}
+    targets = (
+        project.get("targets", {})
+        if isinstance(project.get("targets", {}), dict)
+        else {}
+    )
     migrate_target = targets.get("migrate") if isinstance(targets, dict) else None
 
     alembic_ini = domain_dir / "alembic.ini"
@@ -521,16 +512,19 @@ def _check_domain_migration_scaffold(
             suggestion=f"rpr generate domain {name} --migrations",
         )
 
-    options = migrate_target.get("options", {}) if isinstance(migrate_target, dict) else {}
+    options = (
+        migrate_target.get("options", {}) if isinstance(migrate_target, dict) else {}
+    )
     command_ok = isinstance(options, dict) and options.get("command") == (
-        "uv run alembic -c packages/python/domain/alembic.ini"
+        f"uv run alembic -c packages/python/{name_underscore}_domain/alembic.ini"
     )
     cwd_ok = isinstance(options, dict) and options.get("cwd") == "."
     env_ok = False
     if env_py.exists():
         env_content = env_py.read_text()
         env_ok = (
-            f"from {name_underscore}_domain.config.settings import Settings" in env_content
+            f"from {name_underscore}_domain.config.settings import Settings"
+            in env_content
             and f"import {name_underscore}_domain.entities" in env_content
         )
 
@@ -559,9 +553,7 @@ def _check_domain_migration_scaffold(
     )
 
 
-def _check_engine_install_metadata(
-    *, engine_dir: Path, suggestion: str
-) -> CheckResult:
+def _check_engine_install_metadata(*, engine_dir: Path, suggestion: str) -> CheckResult:
     pyproject = engine_dir / "pyproject.toml"
     data = _load_toml(pyproject)
     if data is None:
@@ -574,7 +566,9 @@ def _check_engine_install_metadata(
         )
 
     build_system = data.get("build-system", {})
-    requires = build_system.get("requires", []) if isinstance(build_system, dict) else []
+    requires = (
+        build_system.get("requires", []) if isinstance(build_system, dict) else []
+    )
     requires_set = set(requires) if isinstance(requires, list) else set()
     status = MATURIN_SPEC in requires_set
     return CheckResult(

{rpr_cli-0.1.20 → rpr_cli-0.1.22}/src/rpr/commands/generate/api.py

@@ -10,6 +10,7 @@ from rich.console import Console
 from rpr.cli import generate_app
 from rpr.context import RunContext
 from rpr.dependencies import api_runtime_dependencies
+from rpr.dependencies import python_project_name
 from rpr.workspace import add_workspace_member
 
 console = Console()
@@ -29,11 +30,10 @@ def api(
         name = typer.prompt("App name")
 
     ctx = RunContext(dry_run=dry_run, project_dir=Path.cwd())
-    app_name = f"{name}-api"
-    app_name_underscore = app_name.replace("-", "_")
-    domain_underscore = f"{name}_domain".replace("-", "_")
+    app_name = python_project_name(name, "api")
+    domain_name = python_project_name(name, "domain")
     api_root = ctx.project_dir / "apps" / app_name
-    src_root = api_root / "src" / app_name_underscore
+    src_root = api_root / "src" / app_name
     tests_root = api_root / "tests"
 
     console.print(f"\n[bold]Generating FastAPI app:[/] {app_name}\n")
@@ -41,14 +41,14 @@ def api(
     ctx.ensure_dir(src_root / "routes")
     ctx.ensure_dir(tests_root)
 
-    _write_api_pyproject(ctx, api_root, name, app_name, app_name_underscore)
+    _write_api_pyproject(ctx, api_root, name, app_name, domain_name)
     _write_api_readme(ctx, api_root, name)
-    _write_api_project_json(ctx, api_root, app_name, app_name_underscore)
-    _write_main(ctx, src_root / "main.py", name, domain_underscore)
+    _write_api_project_json(ctx, api_root, app_name)
+    _write_main(ctx, src_root / "main.py", name, domain_name)
     _write_init_file(ctx, src_root / "__init__.py")
     _write_init_file(ctx, src_root / "routes" / "__init__.py")
     _write_health_route(ctx, src_root / "routes" / "health.py")
-    _write_health_test(ctx, tests_root / "test_health.py", app_name_underscore)
+    _write_health_test(ctx, tests_root / "test_health.py", app_name)
 
     add_workspace_member(ctx, f"apps/{app_name}")
     ctx.preview_dependencies(
@@ -58,7 +58,8 @@ def api(
     )
 
     if not dry_run:
-        ctx.run_command(["uv", "sync"], cwd=ctx.project_dir)
+        ctx.run_uv_command(["uv", "add", *api_runtime_dependencies(name)], cwd=api_root)
+        ctx.run_uv_command(["uv", "sync", "--all-packages"], cwd=ctx.project_dir)
 
     console.print(f"\n[bold green]Done![/] FastAPI app created at {api_root}")
     console.print(f"  Run with: npx nx serve {app_name}")
@@ -69,7 +70,7 @@ def _write_init_file(ctx: RunContext, path: Path) -> None:
 
 
 def _write_api_pyproject(
-    ctx: RunContext, api_root: Path, name: str, app_name: str, app_name_underscore: str
+    ctx: RunContext, api_root: Path, name: str, app_name: str, domain_name: str
 ) -> None:
     content = f"""[project]
 name = "{app_name}"
@@ -77,21 +78,17 @@ version = "0.1.0"
 description = "{name} API"
 readme = "README.md"
 requires-python = ">=3.12"
-dependencies = [
-    "{api_runtime_dependencies(name)[0]}",
-    "{api_runtime_dependencies(name)[1]}",
-    "{api_runtime_dependencies(name)[2]}",
-]
+dependencies = []
 
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/{app_name_underscore}"]
+packages = ["src/{app_name}"]
 
 [tool.uv.sources]
-{name}-domain = {{ workspace = true }}
+{domain_name} = {{ workspace = true }}
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
@@ -107,9 +104,7 @@ FastAPI application generated by RPR.
     ctx.write_file(api_root / "README.md", content)
 
 
-def _write_api_project_json(
-    ctx: RunContext, api_root: Path, app_name: str, app_name_underscore: str
-) -> None:
+def _write_api_project_json(ctx: RunContext, api_root: Path, app_name: str) -> None:
     project = {
         "name": app_name,
         "root": f"apps/{app_name}",
@@ -117,7 +112,7 @@ def _write_api_project_json(
             "serve": {
                 "executor": "nx:run-commands",
                 "options": {
-                    "command": f"uv run uvicorn {app_name_underscore}.main:app --reload --host 0.0.0.0 --port 8000",
+                    "command": f"uv run uvicorn {app_name}.main:app --reload --host 0.0.0.0 --port 8000",
                     "cwd": f"apps/{app_name}",
                 },
             },