rpr-cli 0.3.10__tar.gz → 0.3.11__tar.gz

rpr_cli-0.3.10/README.md → rpr_cli-0.3.11/PKG-INFO

@@ -1,3 +1,20 @@
+Metadata-Version: 2.4
+Name: rpr-cli
+Version: 0.3.11
+Requires-Dist: typer>=0.24.1,<0.26
+Requires-Dist: jinja2>=3.1.5
+Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: rich>=14.3.3
+Requires-Dist: pathspec>=1.0.4
+Requires-Dist: prompt-toolkit>=3.0.52
+Requires-Dist: tomlkit>=0.15.0
+Requires-Dist: packaging>=26.2
+License-File: LICENSE
+Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
+License-Expression: MIT
+Requires-Python: >=3.14
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+
 # RPR CLI
 
 React Python Rust monorepo scaffolding orchestrator.
@@ -53,6 +70,7 @@ cd my-app
 rpr generate domain my-app   # Add a Python domain package
 rpr generate api my-app      # Add a FastAPI application
 rpr generate ui my-app       # Add a React UI library and web app
+rpr generate web landing     # Add another web app; asks whether to depend on the UI library
 rpr generate engine my-app   # Add a Rust/PyO3 computation engine
 rpr generate storybook       # Add Storybook for UI component development
 rpr rename new-app           # Rename the workspace identity and references
@@ -107,14 +125,16 @@ Available scaffolds are:
 
 ### Dependency Placement
 
-RPR keeps dependencies close to the package that uses them.
+RPR keeps Python dependencies close to the package that uses them and Node dependencies at the workspace root.
 
 - Root Python tooling such as Ruff, pytest, pyright, pre-commit, and maturin lives in the root `pyproject.toml`.
 - Domain runtime dependencies such as `sqlmodel`, `asyncpg`, `pydantic-settings`, and optional `alembic` are added to `packages/python/domain/pyproject.toml`.
 - API runtime dependencies such as `fastapi`, `uvicorn`, and the workspace domain package are added to `apps/<name>-api/pyproject.toml`.
-- Node dependencies are written to the relevant package-level `package.json` files, and `npm install` runs from the root workspace.
+- Node dependencies are declared and installed only in the root `package.json`, so every app and package shares one version of each. Package-level `package.json` files carry metadata and workspace links such as `@my-app/ui`. Generators install only the dependencies the root does not already declare, so adding another app never bumps existing versions.
+
+`rpr generate web <name>` adds another web app (for example a landing page) at `apps/<name>-web`. When a UI library exists it asks whether to add the library as a dependency (`--link-ui` / `--no-link-ui` skip the prompt); linked apps get a starter page in the library's `src/pages/`, and unlinked apps are fully standalone. Each web app gets its own dev-server port (3000, 3001, ...), so `npx nx serve <name>-web` runs alongside the others. The generated workspace requires Node 24 LTS or newer.
 
-Python dependency changes are made with `uv` so they are tracked in `pyproject.toml`. Node dependency changes are made through npm workspace package metadata and root `npm install`.
+Python dependency changes are made with `uv` so they are tracked in `pyproject.toml`. Node dependency changes are made from the root with `npm install`.
 
 Update project-owned package manifests from upstream registries with `rpr update node` or `rpr update python`. Node updates target `package.json`; Python updates target `pyproject.toml` by default and fall back to `requirements.txt` when no `pyproject.toml` exists. Use `--file` to update a nested manifest, `--dry-run` to preview without changing files or running installers, and `--include-major` to opt into major-version updates.
 
@@ -278,3 +298,4 @@ git push origin main --tags
 The workflow in `.github/workflows/publish-pypi.yml` checks both version declarations against the
 tag, builds an sdist plus native wheels for Linux x86-64/AArch64, Windows x86-64, and macOS
 x86-64/Apple Silicon, then publishes all artifacts to PyPI.
+

rpr_cli-0.3.10/PKG-INFO → rpr_cli-0.3.11/README.md

@@ -1,20 +1,3 @@
-Metadata-Version: 2.4
-Name: rpr-cli
-Version: 0.3.10
-Requires-Dist: typer>=0.24.1
-Requires-Dist: jinja2>=3.1.5
-Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: rich>=14.3.3
-Requires-Dist: pathspec>=1.0.4
-Requires-Dist: prompt-toolkit>=3.0.52
-Requires-Dist: tomlkit>=0.15.0
-Requires-Dist: packaging>=26.2
-License-File: LICENSE
-Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
-License-Expression: MIT
-Requires-Python: >=3.14
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-
 # RPR CLI
 
 React Python Rust monorepo scaffolding orchestrator.
@@ -70,6 +53,7 @@ cd my-app
 rpr generate domain my-app   # Add a Python domain package
 rpr generate api my-app      # Add a FastAPI application
 rpr generate ui my-app       # Add a React UI library and web app
+rpr generate web landing     # Add another web app; asks whether to depend on the UI library
 rpr generate engine my-app   # Add a Rust/PyO3 computation engine
 rpr generate storybook       # Add Storybook for UI component development
 rpr rename new-app           # Rename the workspace identity and references
@@ -124,14 +108,16 @@ Available scaffolds are:
 
 ### Dependency Placement
 
-RPR keeps dependencies close to the package that uses them.
+RPR keeps Python dependencies close to the package that uses them and Node dependencies at the workspace root.
 
 - Root Python tooling such as Ruff, pytest, pyright, pre-commit, and maturin lives in the root `pyproject.toml`.
 - Domain runtime dependencies such as `sqlmodel`, `asyncpg`, `pydantic-settings`, and optional `alembic` are added to `packages/python/domain/pyproject.toml`.
 - API runtime dependencies such as `fastapi`, `uvicorn`, and the workspace domain package are added to `apps/<name>-api/pyproject.toml`.
-- Node dependencies are written to the relevant package-level `package.json` files, and `npm install` runs from the root workspace.
+- Node dependencies are declared and installed only in the root `package.json`, so every app and package shares one version of each. Package-level `package.json` files carry metadata and workspace links such as `@my-app/ui`. Generators install only the dependencies the root does not already declare, so adding another app never bumps existing versions.
+
+`rpr generate web <name>` adds another web app (for example a landing page) at `apps/<name>-web`. When a UI library exists it asks whether to add the library as a dependency (`--link-ui` / `--no-link-ui` skip the prompt); linked apps get a starter page in the library's `src/pages/`, and unlinked apps are fully standalone. Each web app gets its own dev-server port (3000, 3001, ...), so `npx nx serve <name>-web` runs alongside the others. The generated workspace requires Node 24 LTS or newer.
 
-Python dependency changes are made with `uv` so they are tracked in `pyproject.toml`. Node dependency changes are made through npm workspace package metadata and root `npm install`.
+Python dependency changes are made with `uv` so they are tracked in `pyproject.toml`. Node dependency changes are made from the root with `npm install`.
 
 Update project-owned package manifests from upstream registries with `rpr update node` or `rpr update python`. Node updates target `package.json`; Python updates target `pyproject.toml` by default and fall back to `requirements.txt` when no `pyproject.toml` exists. Use `--file` to update a nested manifest, `--dry-run` to preview without changing files or running installers, and `--include-major` to opt into major-version updates.
 
@@ -295,4 +281,3 @@ git push origin main --tags
 The workflow in `.github/workflows/publish-pypi.yml` checks both version declarations against the
 tag, builds an sdist plus native wheels for Linux x86-64/AArch64, Windows x86-64, and macOS
 x86-64/Apple Silicon, then publishes all artifacts to PyPI.
-

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/pyproject.toml

@@ -6,7 +6,7 @@ readme = "README.md"
 license = "MIT"
 requires-python = ">=3.14"
 dependencies = [
-    "typer>=0.24.1",
+    "typer>=0.24.1,<0.26",
     "jinja2>=3.1.5",
     "pyyaml>=6.0.2",
     "rich>=14.3.3",
@@ -20,7 +20,7 @@ dependencies = [
 rpr = "rpr.cli:app"
 
 [dependency-groups]
-dev = ["pytest>=9.0.2", "maturin>=1.8.2"]
+dev = ["pytest>=9.0.2", "maturin>=1.12.6,<2.0", "ruff>=0.15"]
 
 [build-system]
 requires = ["maturin>=1.12.6,<2.0"]
@@ -35,3 +35,10 @@ include = [{ path = "LICENSE", format = "sdist" }]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
+
+[tool.ruff]
+# The scaffolds are templates (many are not valid Python/TS until rendered).
+extend-exclude = ["src/rpr/scaffolds", "rpr-parser/target"]
+
+[tool.ruff.lint]
+select = ["E4", "E7", "E9", "F"]

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/rpr-parser/Cargo.lock

@@ -1981,7 +1981,7 @@ dependencies = [
 
 [[package]]
 name = "rpr-parser"
-version = "0.3.10"
+version = "0.3.11"
 dependencies = [
  "dirs",
  "dotenvy",

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/rpr-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rpr-parser"
-version = "0.3.10"
+version = "0.3.11"
 edition = "2021"
 
 [lib]

rpr_cli-0.3.11/src/rpr/__init__.py

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

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/application/catalog.py

@@ -188,6 +188,23 @@ COMMAND_CATALOG: tuple[CommandDefinition, ...] = (
                     ),
                 ),
             ),
+            CommandDefinition(
+                name="web",
+                description="Generate a web app.",
+                action_id="generate.web",
+                arguments=(CommandArgument("name", "App name."),),
+                options=(
+                    CommandOption(
+                        "--ui-package",
+                        "Target UI package.",
+                        kind="value",
+                        value_name="PACKAGE",
+                    ),
+                    CommandOption(
+                        "--dry-run", "Preview changes without writing.", kind="flag"
+                    ),
+                ),
+            ),
             CommandDefinition(
                 name="engine",
                 description="Generate a Rust engine package.",
@@ -462,7 +479,7 @@ def usage_string(cmd: CommandDefinition) -> str:
 
     Group commands show pipe-separated child names::
 
-        /generate <domain|api|ui|engine|storybook>
+        /generate <domain|api|ui|web|engine|storybook>
 
     Leaf commands show arguments and options::
 

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/application/chat_service.py

@@ -26,7 +26,7 @@ from rpr.application.completer import (
 from rpr.application.prompt_service import PromptService
 from rpr.application.shell import CommandShellService, ShellPresenter
 from rpr.context import RunContext
-from rpr.ui.console import console, refresh_console
+from rpr.ui.console import refresh_console
 from rpr.ui.renderers import (
     render_approval_prompt,
     render_chat_hint,

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/application/checks.py

@@ -3,16 +3,20 @@ from __future__ import annotations
 from dataclasses import dataclass
 from pathlib import Path
 
+from rpr.checks.base import CheckResult
 from rpr.checks.instructions import check_instructions
 from rpr.checks.packages import check_packages
 from rpr.checks.workspace import check_workspace
 from rpr.generators.base import SyncConfig
 
 
+CHECK_GROUPS = ("workspace", "instructions", "packages")
+
+
 @dataclass(slots=True, frozen=True)
 class CheckReport:
     project_name: str
-    results: list[object]
+    results: list[CheckResult]
 
 
 def collect_check_report(project_dir: Path, group: str | None = None) -> CheckReport:
@@ -22,7 +26,7 @@ def collect_check_report(project_dir: Path, group: str | None = None) -> CheckRe
     variables = config.variables or {}
     project_name = variables.get("name", "(unknown)")
     requested_group = None if group is None else group.lower()
-    results: list[object] = []
+    results: list[CheckResult] = []
 
     if requested_group in {None, "workspace"}:
         results.extend(check_workspace(project_dir))
@@ -36,7 +40,7 @@ def collect_check_report(project_dir: Path, group: str | None = None) -> CheckRe
     return CheckReport(project_name=project_name, results=results)
 
 
-def serialize_check_results(results: list[object]) -> list[dict[str, object]]:
+def serialize_check_results(results: list[CheckResult]) -> list[dict[str, object]]:
     return [
         {
             "group": result.group,

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/application/prompt_service.py

@@ -12,7 +12,7 @@ from rpr.agent.session import ChatSession
 from rpr.application.conversation_service import (
     ConversationService,
     ConversationSummary,
-    InMemoryConversationRepository,
+    InMemoryConversationRepository,  # noqa: F401  (re-exported)
 )
 from rpr.ui.prompt_session import PromptSessionAdapter
 

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/application/shell.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import ClassVar, Protocol
 
+import click
 import typer
 
 from rpr.agent.bootstrap import ChatRuntimeBundle
@@ -287,6 +288,7 @@ class CommandShellService:
         self._active_presenter.info(f"Running /init for {project_name}.")
         exit_code = self._invoke_command(
             init_command.init,
+            typer.Context(click.Command("init")),
             project_name=project_name,
             dry_run=namespace.dry_run,
             python_version=namespace.python,
@@ -301,6 +303,9 @@ class CommandShellService:
         from rpr.commands.generate import engine as generate_engine_command
         from rpr.commands.generate import storybook as generate_storybook_command
         from rpr.commands.generate import ui as generate_ui_command
+        from rpr.commands.generate import web as generate_web_command
+        from rpr.dependencies import node_project_name, ui_package_name
+        from rpr.workspace import find_ui_packages
 
         parser = ShellArgumentParser(prog="/generate", add_help=False)
         subparsers = parser.add_subparsers(dest="target")
@@ -314,11 +319,21 @@ class CommandShellService:
         storybook_parser.add_argument("--dry-run", action="store_true")
         storybook_parser.add_argument("--ui-package")
 
+        web_parser = subparsers.add_parser("web", add_help=False)
+        web_parser.add_argument("name", nargs="?")
+        web_parser.add_argument("--dry-run", action="store_true")
+        web_parser.add_argument("--ui-package")
+        web_parser.add_argument(
+            "--link-ui", action=argparse.BooleanOptionalAction, default=None
+        )
+
         namespace = self._parse_args(parser, parsed.args)
         if namespace is None:
             return True
         if namespace.target is None:
-            raise ValueError("Usage: /generate <domain|api|ui|engine|storybook> ...")
+            raise ValueError(
+                "Usage: /generate <domain|api|ui|web|engine|storybook> ..."
+            )
 
         if namespace.target == "domain":
             name = namespace.name or await self._active_prompts.prompt("App name")
@@ -345,11 +360,43 @@ class CommandShellService:
             )
             return True
 
+        if namespace.target == "web":
+            name = namespace.name or await self._active_prompts.prompt("App name")
+            ui_package = namespace.ui_package
+            link_ui = namespace.link_ui
+            ui_packages = find_ui_packages(self._bundle.ctx.project_dir)
+            if ui_packages and not ui_package:
+                ui_package = ui_packages[0]
+                if len(ui_packages) > 1:
+                    self._active_presenter.table(
+                        "Web App Targets",
+                        ["Package"],
+                        [[package] for package in ui_packages],
+                    )
+                    ui_package = (
+                        await self._active_prompts.prompt(
+                            "UI package", default=ui_packages[0]
+                        )
+                    ).strip() or ui_packages[0]
+            if ui_package and link_ui is None:
+                answer = await self._active_prompts.prompt(
+                    f"Add {ui_package_name(ui_package)} as a dependency of "
+                    f"{node_project_name(name, 'web')}? (Y/n)",
+                    default="y",
+                )
+                link_ui = answer.strip().lower() not in {"n", "no"}
+            self._invoke_command(
+                generate_web_command.web,
+                name=name,
+                ui_package=ui_package,
+                link_ui=link_ui,
+                dry_run=namespace.dry_run,
+            )
+            return True
+
         ui_package = namespace.ui_package
         if not ui_package:
-            ui_packages = generate_storybook_command._find_ui_packages(
-                self._bundle.ctx.project_dir
-            )
+            ui_packages = find_ui_packages(self._bundle.ctx.project_dir)
             if len(ui_packages) == 1:
                 ui_package = ui_packages[0]
             elif len(ui_packages) > 1:
@@ -376,7 +423,7 @@ class CommandShellService:
 
         parser = ShellArgumentParser(prog="/sync", add_help=False)
         parser.add_argument("action", nargs="?", default="rules")
-        parser.add_argument("--target")
+        parser.add_argument("--target", action="append")
         parser.add_argument("--dry-run", action="store_true")
         namespace = self._parse_args(parser, parsed.args)
         if namespace is None:
@@ -385,7 +432,9 @@ class CommandShellService:
             raise ValueError("Usage: /sync [rules] [--target cursor] [--dry-run]")
 
         self._invoke_command(
-            sync_command.rules, target=namespace.target, dry_run=namespace.dry_run
+            sync_command.rules,
+            target=namespace.target or [],
+            dry_run=namespace.dry_run,
         )
         return True
 
@@ -395,6 +444,7 @@ class CommandShellService:
         parser = ShellArgumentParser(prog="/add", add_help=False)
         parser.add_argument("action", nargs="?", default="template")
         parser.add_argument("template_id", nargs="?")
+        parser.add_argument("template_name", nargs="?")
         parser.add_argument("--list", action="store_true")
         parser.add_argument("--force", action="store_true")
         parser.add_argument("--name")
@@ -405,16 +455,20 @@ class CommandShellService:
             return True
         if namespace.action != "template":
             raise ValueError(
-                "Usage: /add template <template-id> [--name app] [--force] [--dry-run]"
+                "Usage: /add template [node|python] <template-id> "
+                "[--name app] [--force] [--dry-run]"
             )
 
-        template_id = namespace.template_id
-        if template_id is None and not namespace.list:
-            template_id = await self._active_prompts.prompt("Template ID")
+        # `/add template [lang] <id>`: the command takes the language (or the id,
+        # when no language is given) as its first positional argument.
+        lang_or_template_id = namespace.template_id
+        if lang_or_template_id is None and not namespace.list:
+            lang_or_template_id = await self._active_prompts.prompt("Template ID")
 
         self._invoke_command(
             add_command.template,
-            template_id=template_id,
+            lang_or_template_id=lang_or_template_id,
+            template_id=namespace.template_name,
             list_templates=namespace.list,
             force=namespace.force,
             name=namespace.name,

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/checks/base.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import Path
 
 
 @dataclass

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/checks/packages.py

@@ -9,6 +9,7 @@ from rpr.dependencies import (
     DOMAIN_RUNTIME_DEPENDENCIES,
     MATURIN_SPEC,
     api_runtime_dependencies,
+    dependency_name,
     dependency_names,
     node_project_name,
     npm_package_name,
@@ -208,7 +209,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
             area="Web app",
             status=web_dir.exists(),
             path=str(web_dir) if web_dir.exists() else f"apps/{web_name}/ missing",
-            suggestion=f"rpr generate ui {name} --no-library",
+            suggestion=f"rpr generate web {name}",
         )
     )
     if web_dir.exists():
@@ -225,7 +226,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
                     "test",
                     "typecheck",
                 },
-                suggestion=f"rpr generate ui {name} --no-library",
+                suggestion=f"rpr generate web {name}",
             )
         )
         results.append(
@@ -233,7 +234,7 @@ def check_packages(project_dir: Path, variables: dict[str, str]) -> list[CheckRe
                 area="Web package metadata",
                 package_json=web_dir / "package.json",
                 expected_name=f"@{npm_package_name(name)}/web",
-                suggestion=f"rpr generate ui {name} --no-library",
+                suggestion=f"rpr generate web {name}",
             )
         )
 
@@ -425,8 +426,16 @@ def _check_python_dependency_contract(
         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))
+    dependency_set = (
+        {dependency_name(spec) for spec in dependencies if isinstance(spec, str)}
+        if isinstance(dependencies, list)
+        else set()
+    )
+    missing_dependencies = sorted(
+        {dependency_name(spec) for spec in required_dependencies}.difference(
+            dependency_set
+        )
+    )
 
     sources = (
         data.get("tool", {}).get("uv", {}).get("sources", {})

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/checks/workspace.py

@@ -5,6 +5,7 @@ import tomllib
 from pathlib import Path
 
 from rpr.checks.base import CheckResult
+from rpr.dependencies import dependency_name
 
 
 def check_workspace(project_dir: Path) -> list[CheckResult]:
@@ -93,7 +94,13 @@ def check_workspace(project_dir: Path) -> list[CheckResult]:
             "ruff",
             "maturin",
         }
-        dev_dependencies_ok = required.issubset(set(dev_dependencies))
+        dev_dependencies_ok = required.issubset(
+            {
+                dependency_name(spec)
+                for spec in dev_dependencies
+                if isinstance(spec, str)
+            }
+        )
 
     results.append(
         CheckResult(

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/cli.py

@@ -21,7 +21,7 @@ from rpr.commands import rename as _rename_mod  # noqa: E402, F401
 
 generate_app = typer.Typer(
     name="generate",
-    help="Scaffold apps and packages (api, ui, domain, engine, storybook).",
+    help="Scaffold apps and packages (api, ui, web, domain, engine, storybook).",
     no_args_is_help=True,
 )
 app.add_typer(generate_app, name="generate")
@@ -65,6 +65,7 @@ app.add_typer(add_app, name="add")
 from rpr.commands.generate import domain as _domain_mod  # noqa: E402, F401
 from rpr.commands.generate import api as _api_mod  # noqa: E402, F401
 from rpr.commands.generate import ui as _ui_mod  # noqa: E402, F401
+from rpr.commands.generate import web as _web_mod  # noqa: E402, F401
 from rpr.commands.generate import engine as _engine_mod  # noqa: E402, F401
 from rpr.commands.generate import storybook as _storybook_mod  # noqa: E402, F401
 from rpr.commands import sync as _sync_mod  # noqa: E402, F401

{rpr_cli-0.3.10 → rpr_cli-0.3.11}/src/rpr/commands/check.py

@@ -5,7 +5,11 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
-from rpr.application.checks import collect_check_report, serialize_check_results
+from rpr.application.checks import (
+    CHECK_GROUPS,
+    collect_check_report,
+    serialize_check_results,
+)
 from rpr.cli import app
 from rpr.ui.console import console
 from rpr.ui.renderers import render_heading, render_status_row
@@ -25,6 +29,11 @@ def check(
     ] = False,
 ) -> None:
     """Inspect the current project and report setup status."""
+    if group is not None and group.lower() not in CHECK_GROUPS:
+        raise typer.BadParameter(
+            f"Unknown group '{group}'. Choose from: {', '.join(CHECK_GROUPS)}.",
+            param_hint="--group",
+        )
     project_dir = Path.cwd()
     report = collect_check_report(project_dir, group=group)