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

{rpr_cli-0.3.8 → rpr_cli-0.3.11}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.3.8
-Requires-Dist: typer>=0.24.1
+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
@@ -70,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
@@ -87,6 +88,19 @@ source and experiments to remain in rename scope. Binary contents, VCS data, and
 symlink targets are never changed. The outer workspace directory keeps its
 existing name.
 
+After applying the rename, RPR synchronizes Node and Python dependencies and
+runs uncached Nx build, Rust-engine build, and typecheck targets with the Nx
+daemon disabled. This verifies the renamed project graph and commands without
+deleting the existing Nx cache. Pass `--skip-verify` to omit these checks; a
+dry run previews them without executing anything. If verification fails, the
+rename remains applied and RPR prints the command to retry.
+
+The success output includes a guarded command for optionally renaming the outer
+workspace directory. Git remotes and hosted repository names are never changed.
+When a hosted repository still matches the old project name, rename it through
+the hosting provider if desired and then update its local URL with
+`git remote set-url`. Local and remote branch names are unaffected.
+
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
@@ -111,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.
 
@@ -271,9 +287,11 @@ No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OI
 Release flow:
 
 ```bash
-# update src/rpr/__init__.py and rpr-parser/Cargo.toml to the same version
-git commit -am "Release 0.3.8"
-git tag v0.3.8
+rpr version bump patch             # updates Python, Cargo.toml, and Cargo.lock
+# Or repair/set an explicit version: rpr version set 0.3.9
+git add src/rpr/__init__.py rpr-parser/Cargo.toml rpr-parser/Cargo.lock
+git commit -m "Release 0.3.9"
+git tag v0.3.9
 git push origin main --tags
 ```
 

{rpr_cli-0.3.8 → rpr_cli-0.3.11}/README.md

@@ -53,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
@@ -70,6 +71,19 @@ source and experiments to remain in rename scope. Binary contents, VCS data, and
 symlink targets are never changed. The outer workspace directory keeps its
 existing name.
 
+After applying the rename, RPR synchronizes Node and Python dependencies and
+runs uncached Nx build, Rust-engine build, and typecheck targets with the Nx
+daemon disabled. This verifies the renamed project graph and commands without
+deleting the existing Nx cache. Pass `--skip-verify` to omit these checks; a
+dry run previews them without executing anything. If verification fails, the
+rename remains applied and RPR prints the command to retry.
+
+The success output includes a guarded command for optionally renaming the outer
+workspace directory. Git remotes and hosted repository names are never changed.
+When a hosted repository still matches the old project name, rename it through
+the hosting provider if desired and then update its local URL with
+`git remote set-url`. Local and remote branch names are unaffected.
+
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
@@ -94,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.
 
@@ -254,9 +270,11 @@ No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OI
 Release flow:
 
 ```bash
-# update src/rpr/__init__.py and rpr-parser/Cargo.toml to the same version
-git commit -am "Release 0.3.8"
-git tag v0.3.8
+rpr version bump patch             # updates Python, Cargo.toml, and Cargo.lock
+# Or repair/set an explicit version: rpr version set 0.3.9
+git add src/rpr/__init__.py rpr-parser/Cargo.toml rpr-parser/Cargo.lock
+git commit -m "Release 0.3.9"
+git tag v0.3.9
 git push origin main --tags
 ```
 

{rpr_cli-0.3.8 → 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.8 → rpr_cli-0.3.11}/rpr-parser/Cargo.lock

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

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

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

{rpr_cli-0.3.8 → rpr_cli-0.3.11}/rpr-parser/src/rename.rs

@@ -158,16 +158,27 @@ impl Replacer {
         let mut position = 0;
         let mut replacements = 0;
         while position < text.len() {
-            if let Some(token) = self.match_new(text, position) {
-                output.push_str(token);
-                position += token.len();
-                continue;
-            }
-            if let Some((old, new)) = self.match_old(text, position) {
-                output.push_str(new);
-                position += old.len();
-                replacements += 1;
-                continue;
+            let new_match = self.match_new(text, position);
+            let old_match = self.match_old(text, position);
+            match (old_match, new_match) {
+                (Some((old, new)), Some(existing)) if old.len() > existing.len() => {
+                    output.push_str(new);
+                    position += old.len();
+                    replacements += 1;
+                    continue;
+                }
+                (_, Some(existing)) => {
+                    output.push_str(existing);
+                    position += existing.len();
+                    continue;
+                }
+                (Some((old, new)), None) => {
+                    output.push_str(new);
+                    position += old.len();
+                    replacements += 1;
+                    continue;
+                }
+                (None, None) => {}
             }
             let ch = text[position..]
                 .chars()
@@ -182,12 +193,16 @@ impl Replacer {
     fn has_stale_reference(&self, text: &str) -> bool {
         let mut position = 0;
         while position < text.len() {
-            if let Some(token) = self.match_new(text, position) {
-                position += token.len();
-                continue;
-            }
-            if self.match_old(text, position).is_some() {
-                return true;
+            let new_match = self.match_new(text, position);
+            let old_match = self.match_old(text, position);
+            match (old_match, new_match) {
+                (Some((old, _)), Some(existing)) if old.len() > existing.len() => return true,
+                (_, Some(existing)) => {
+                    position += existing.len();
+                    continue;
+                }
+                (Some(_), None) => return true,
+                (None, None) => {}
             }
             position += text[position..].chars().next().unwrap().len_utf8();
         }
@@ -288,6 +303,7 @@ pub fn plan(root: PathBuf, new_name: String) -> Result<NativeRenamePlan, String>
     validate_new_name(&old_name, &new_name)?;
     let replacer = Replacer::new(build_replacements(&old_name, &new_name, variables));
     let (entries, mut skipped) = walk_workspace(&root)?;
+    validate_unicode_paths(&root, &entries, &skipped)?;
     let files: Vec<_> = entries
         .iter()
         .filter(|entry| entry.is_file())
@@ -653,11 +669,37 @@ fn build_path_moves(
 fn rename_relative_path(path: &Path, replacer: &Replacer) -> PathBuf {
     let mut output = PathBuf::new();
     for component in path.components() {
-        output.push(replacer.replace(&component.as_os_str().to_string_lossy()).0);
+        let component = component
+            .as_os_str()
+            .to_str()
+            .expect("workspace paths were validated as Unicode");
+        output.push(replacer.replace(component).0);
     }
     output
 }
 
+fn validate_unicode_paths(
+    root: &Path,
+    entries: &[PathBuf],
+    skipped: &[SkippedPath],
+) -> Result<(), String> {
+    for entry in entries.iter().chain(skipped.iter().map(|item| &item.path)) {
+        let relative = entry
+            .strip_prefix(root)
+            .expect("walked path is beneath root");
+        if relative
+            .components()
+            .any(|component| component.as_os_str().to_str().is_none())
+        {
+            return Err(format!(
+                "Workspace path is not valid Unicode and cannot be renamed safely: {:?}",
+                entry.as_os_str()
+            ));
+        }
+    }
+    Ok(())
+}
+
 fn update_config(text: &str, new_name: &str) -> Result<(String, usize), String> {
     let mut config: Value = serde_yaml::from_str(text)
         .map_err(|error| format!("Renamed .rpr.yaml would be invalid: {error}"))?;
@@ -1005,6 +1047,28 @@ mod tests {
         assert_eq!(count, 1);
     }
 
+    #[test]
+    fn longest_token_wins_for_shortening_and_expansion() {
+        let shortening = Replacer::new(HashMap::from([
+            ("foo-bar".into(), "foo".into()),
+            ("foo_bar".into(), "foo".into()),
+            ("FooBar".into(), "Foo".into()),
+        ]));
+        let (output, count) =
+            shortening.replace("nx serve foo-bar-web; from foo_bar_domain import FooBarService");
+        assert_eq!(
+            output,
+            "nx serve foo-web; from foo_domain import FooService"
+        );
+        assert_eq!(count, 3);
+        assert!(!shortening.has_stale_reference(&output));
+
+        let expansion = Replacer::new(HashMap::from([("foo".into(), "foo-bar".into())]));
+        let (output, count) = expansion.replace("foo foo-bar");
+        assert_eq!(output, "foo-bar foo-bar");
+        assert_eq!(count, 1);
+    }
+
     #[test]
     fn bootstrap_defaults_cover_named_virtual_environments() {
         let temp = tempfile::tempdir().unwrap();
@@ -1046,6 +1110,40 @@ mod tests {
             .contains("new_app_domain"));
     }
 
+    #[test]
+    fn shortening_rename_updates_nested_paths_and_references() {
+        let temp = workspace();
+        let plan = plan(temp.path().to_path_buf(), "my".into()).unwrap();
+
+        apply(&plan).unwrap();
+
+        let renamed = temp
+            .path()
+            .join("packages/python/my_domain/src/my_domain/main.py");
+        assert!(renamed.is_file());
+        assert!(fs::read_to_string(renamed).unwrap().contains("my_domain"));
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn non_unicode_workspace_path_aborts_planning() {
+        use std::ffi::OsString;
+        use std::os::unix::ffi::OsStringExt;
+
+        let temp = workspace();
+        let invalid = temp
+            .path()
+            .join(OsString::from_vec(b"my-app-\xff.txt".to_vec()));
+        write(&invalid, b"my-app\n");
+
+        let error = plan(temp.path().to_path_buf(), "new-app".into())
+            .err()
+            .expect("non-Unicode path should fail planning");
+
+        assert!(error.contains("not valid Unicode"));
+        assert!(temp.path().join("packages/python/my_app_domain").is_dir());
+    }
+
     #[test]
     fn ignored_virtual_environment_is_never_planned_or_validated() {
         let temp = workspace();

rpr_cli-0.3.11/src/rpr/__init__.py

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

{rpr_cli-0.3.8 → 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.8 → 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.8 → 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.8 → 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.8 → 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.8 → 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