py-wlcli 0.6.14__tar.gz → 0.7.0__tar.gz

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py_wlcli
-Version: 0.6.14
+Version: 0.7.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: click>=8.1.0
 Requires-Dist: tqdm>=4.66.0
@@ -116,8 +116,7 @@ pytest tests/ -v     # 指定文件（pytest 直跑）
 
 Click CLI（[src/wl_cli/cli_click.py](https://github.com/CharlieZi/wl-cli/blob/main/src/wl_cli/cli_click.py)
 经 `setup_commands()` 直接注册）→ 各命令实现（`commands/<group>/`）→ 业务逻辑；
-Rust 原生扩展（`rust/`、`src/wl_cli/lib/`）经 maturin 编译为 `wl_cli_native`；
-依赖注入容器集中管理共享服务（`infrastructure/dependency_injection.py`）。
+Rust 原生扩展（`rust/`、`src/wl_cli/lib/`）经 maturin 编译为 `wl_cli_native`。
 架构演进背景见 [Click 迁移设计](https://github.com/CharlieZi/wl-cli/blob/main/docs/superpowers/specs/2026-06-02-full-click-migration-design.md)。
 
 ## 许可证

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/README.md

@@ -84,8 +84,7 @@ pytest tests/ -v     # 指定文件（pytest 直跑）
 
 Click CLI（[src/wl_cli/cli_click.py](https://github.com/CharlieZi/wl-cli/blob/main/src/wl_cli/cli_click.py)
 经 `setup_commands()` 直接注册）→ 各命令实现（`commands/<group>/`）→ 业务逻辑；
-Rust 原生扩展（`rust/`、`src/wl_cli/lib/`）经 maturin 编译为 `wl_cli_native`；
-依赖注入容器集中管理共享服务（`infrastructure/dependency_injection.py`）。
+Rust 原生扩展（`rust/`、`src/wl_cli/lib/`）经 maturin 编译为 `wl_cli_native`。
 架构演进背景见 [Click 迁移设计](https://github.com/CharlieZi/wl-cli/blob/main/docs/superpowers/specs/2026-06-02-full-click-migration-design.md)。
 
 ## 许可证

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/pyproject.toml

@@ -89,11 +89,19 @@ target-version = "py310"
 
 [tool.ruff.format]
 preview = false
+# Vendored upstream assets are not this repo's code, so they must never redden
+# the format leg -- same 口径 as the existing codespell exclusion
+# (^src/wl_cli/vendors/ in .wl/.pre-commit-config.yaml). `lint` and `format`
+# keep separate exclude lists, so the pattern is written in both; the dual
+# assertion in tests/test_gate_lint_scope.py pins both legs so neither can be
+# silently widened. The glob needs `/**` (ruff matches file paths, so a bare
+# directory path matches nothing).
+exclude = [ "src/wl_cli/vendors/**",]
 
 [tool.ruff.lint]
 select = ["E", "W", "F", "I", "C4", "UP", "N", "B", "C90", "TCH"]
 ignore = ["E501", "B904", "E402", "F811", "S607", "N802", "N817"]
-exclude = [ ".git", ".ruff_cache", "__pycache__", "build", "dist", "*.egg-info", "uv.lock", "tmp",]
+exclude = [ ".git", ".ruff_cache", "__pycache__", "build", "dist", "*.egg-info", "uv.lock", "tmp", "src/wl_cli/vendors/**",]
 
 # F841 (unused local variable) is enabled for package code as a dead-code
 # backstop, but exempted in tests where unused locals are often scaffolding.

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/rust/Cargo.lock

@@ -126,7 +126,7 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "wl_cli_native"
-version = "0.6.14"
+version = "0.7.0"
 dependencies = [
  "pyo3",
 ]

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/rust/Cargo.toml

@@ -1,7 +1,7 @@
 
 [package]
 name = "wl_cli_native"
-version = "0.6.14"
+version = "0.7.0"
 edition = "2024"
 description = "wl_cli - Python项目"
 authors = ["WL Admin <wl.admin@example.com>"]

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/rust/deny.toml

@@ -12,3 +12,11 @@ allow = [
     "Apache-2.0 WITH LLVM-exception",
     "Unicode-3.0",
 ]
+
+# Source allow-list (issue #85): every crate in rust/Cargo.lock resolves from
+# the crates.io registry (there are no git dependencies), so allow exactly that
+# and nothing else. `cargo deny check sources` fails if a dependency is ever
+# pulled from an unexpected registry or git host.
+[sources]
+allow-registry = ["https://github.com/rust-lang/crates.io-index"]
+allow-git = []

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/__main__.py

@@ -16,7 +16,14 @@ def _setup_stdio_encoding() -> None:
     characters crash print(). This wraps stdout/stderr with explicit
     UTF-8 encoding so all output works regardless of terminal locale.
     """
-    if not sys.platform.startswith("win"):
+    # Imported here (with a script-execution fallback, matching the cli_click
+    # import below) so this module stays runnable as a plain script.
+    try:
+        from .utils import platform_adapter
+    except ImportError:  # pragma: no cover - direct script execution
+        from wl_cli.utils import platform_adapter  # type: ignore[no-redef]
+
+    if not platform_adapter.PlatformAdapter.is_windows():
         return
     # PYTHONIOENCODING also helps subprocess pipe encoding
     os.environ.setdefault("PYTHONIOENCODING", "utf-8")
@@ -105,8 +112,14 @@ except ImportError:
 
 
 def main() -> None:
-    """Main entry point for WL Commands."""
-    cli_main()
+    """Main entry point for WL Commands.
+
+    ``cli_click.main`` returns the process exit code (0 on success, 1 when a
+    command raises), so the entry point must hand that value to the
+    interpreter instead of discarding it. Without the ``SystemExit`` every
+    ``return 1`` path inside ``cli_click.main`` exited 0 (#186).
+    """
+    raise SystemExit(cli_main())
 
 
 # Alias for compatibility with tests

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/cli_click.py

@@ -36,21 +36,19 @@ def _register_click_command(
 ) -> None:
     """Register a Click command function with the wl group.
 
+    Aliases register the *same* Click object under a second name (Click keeps
+    the object's own ``name`` untouched), so an alias accepts exactly the
+    canonical command's options, arguments and subcommands. A zero-option
+    wrapper shell would reject every parameter an alias was given (#194).
+
     Args:
         name: Command name
         click_func: Click command function
         aliases: List of command aliases
     """
     wl.add_command(click_func, name=name)
-    if aliases:
-        for alias in aliases:
-
-            @click.command(name=alias, help=click_func.help or "")
-            @click.pass_context
-            def alias_func(ctx, *args, **kwargs):
-                return click_func(click.get_current_context().args, **kwargs)
-
-            wl.add_command(alias_func, name=alias)
+    for alias in aliases or ():
+        wl.add_command(click_func, name=alias)
 
 
 def setup_commands():

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/buildcommands/build_utils.py

@@ -23,28 +23,6 @@ def build_project_full() -> None:
     coordinator.build_project_full()
 
 
-def build_windows() -> None:
-    """Build the project on Windows."""
-    try:
-        coordinator = BuildCoordinator()
-        coordinator.build_windows()
-    except Exception as e:
-        from wl_cli.exceptions import CommandError
-
-        raise CommandError(f"Build failed: {e}")
-
-
-def build_unix() -> None:
-    """Build the project on Unix-like systems."""
-    try:
-        coordinator = BuildCoordinator()
-        coordinator.build_unix()
-    except Exception as e:
-        from wl_cli.exceptions import CommandError
-
-        raise CommandError(f"Build failed: {e}")
-
-
 def build_project() -> None:
     """Build the project based on the current platform."""
     try:
@@ -60,8 +38,6 @@ def build_project() -> None:
 __all__ = [
     "is_rust_enabled",
     "build_project_full",
-    "build_windows",
-    "build_unix",
     "build_project",
     "EnvironmentDetector",
     "StubsManager",

py_wlcli-0.7.0/src/wl_cli/commands/buildcommands/builders/coordinator.py

@@ -0,0 +1,122 @@
+"""Build coordination logic for different platforms and scenarios."""
+
+from ....exceptions import CommandError
+from ....utils.logging import (
+    log_error_pair,
+    log_info,
+    log_info_pair,
+)
+from ....utils.subprocess import run_command
+from .cleanup import CleanupManager
+from .environment import EnvironmentDetector
+from .rust_builder import RustBuilder
+from .stubs import StubsManager
+
+
+class BuildCoordinator:
+    """Coordinate build operations across different platforms and scenarios."""
+
+    def __init__(self):
+        self.environment_detector = EnvironmentDetector()
+        self.stubs_manager = StubsManager()
+        self.rust_builder = RustBuilder()
+        self.cleanup_manager = CleanupManager()
+
+    def build_project_full(self) -> None:
+        """Perform a full project build."""
+        rust_enabled = self.environment_detector.is_rust_enabled()
+
+        try:
+            if rust_enabled:
+                log_info_pair(
+                    "Using maturin build for full compilation...",
+                    "使用 maturin build 进行完整编译...",
+                )
+
+                python_executable, is_workspace = (
+                    self.environment_detector.resolve_python_executable()
+                )
+                self.stubs_manager.generate_and_copy_stubs()
+                self.rust_builder.build_full(python_executable)
+                self.cleanup_manager.cleanup_after_build(is_workspace)
+            else:
+                log_info_pair(
+                    "Pure Python project, using uv build to generate distribution packages...",
+                    "纯 Python 项目，使用 uv build 生成分发包...",
+                )
+                run_command(
+                    ["uv", "build"],
+                    capture_output=False,
+                )
+
+            log_info_pair(
+                "✓ Full build completed successfully",
+                "✓ 完整构建成功完成",
+            )
+
+            # List files in dist directory for verification
+            from pathlib import Path
+
+            dist_dir = Path("dist")
+            if dist_dir.exists():
+                dist_files = list(dist_dir.iterdir())
+                if dist_files:
+                    log_info_pair(
+                        "Generated distribution packages in dist directory:",
+                        "在 dist 目录中生成的分发包:",
+                    )
+                    for f in dist_files:
+                        log_info(f"  - {f.name}")
+                else:
+                    log_info_pair(
+                        "No distribution packages generated in dist directory",
+                        "在 dist 目录中没有生成分发包",
+                    )
+        except Exception as e:
+            log_error_pair(
+                f"Full build failed: {e}",
+                f"完整构建失败: {e}",
+            )
+            raise CommandError(f"Full build failed: {e}")
+
+    def build(self) -> None:
+        """Build the project in place, on any platform.
+
+        The former ``build_windows`` and ``build_unix`` bodies were
+        byte-identical, so the platform branch collapsed away.
+        """
+        rust_enabled = self.environment_detector.is_rust_enabled()
+
+        try:
+            if rust_enabled:
+                self.rust_builder.build_incremental()
+            else:
+                log_info_pair(
+                    "Pure Python project, using uv pip install -e . for installation...",
+                    "纯 Python 项目，使用 uv pip install -e . 进行安装...",
+                )
+                run_command(
+                    ["uv", "pip", "install", "--link-mode=copy", "-e", "."],
+                    capture_output=False,
+                )
+
+            log_info_pair(
+                "✓ Build completed successfully",
+                "✓ 构建成功完成",
+            )
+        except CommandError as e:
+            log_error_pair(
+                f"Build failed: {e}",
+                f"构建失败: {e}",
+            )
+            raise
+        except Exception as e:
+            log_error_pair(
+                f"Unexpected error during build: {e}",
+                f"构建过程中出现意外错误: {e}",
+            )
+            raise CommandError(f"Build failed: {e}")
+
+    def build_project(self) -> None:
+        """Build the project."""
+        self.build()

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/buildcommands/builders/environment.py

@@ -2,11 +2,11 @@
 
 import os
 import subprocess
-import sys
 from pathlib import Path
 
 from ....exceptions import CommandError
 from ....utils.logging import log_error, log_info
+from ....utils.platform_adapter import PlatformAdapter
 from ....utils.workspace_detector import WorkspaceDetector
 
 
@@ -76,6 +76,6 @@ class EnvironmentDetector:
             self._create_venv()
             venv_root = Path(".venv")
 
-        if sys.platform.startswith("win"):
+        if PlatformAdapter.is_windows():
             return str((venv_root / "Scripts" / "python.exe").resolve()), True
         return str((venv_root / "bin" / "python").resolve()), True

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/buildcommands/builders/rust_builder.py

@@ -2,7 +2,7 @@
 
 import subprocess
 
-from ....utils.logging import log_info
+from ....utils.logging import log_info, log_info_pair
 from ....utils.subprocess import run_command
 
 
@@ -21,8 +21,10 @@ class RustBuilder:
     @staticmethod
     def run_maturin_develop() -> None:
         """Run maturin develop for incremental builds."""
-        log_info("Using maturin develop to build and install editable package...")
-        log_info("使用 maturin develop 构建和安装可编辑包...", lang="zh")
+        log_info_pair(
+            "Using maturin develop to build and install editable package...",
+            "使用 maturin develop 构建和安装可编辑包...",
+        )
         # 使用maturin的原生增量编译功能
         run_command(["maturin", "develop", "--skip-install"], capture_output=False)
 

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/buildcommands/dist.py

@@ -3,7 +3,6 @@
 import os
 import shutil
 import subprocess
-import sys
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, cast
 
@@ -14,6 +13,7 @@ import click
 
 from ...exceptions import CommandError
 from ...utils.logging import log_error, log_info
+from ...utils.platform_adapter import PlatformAdapter
 from ...utils.uv_workspace import is_uv_workspace
 from ...utils.workspace_detector import WorkspaceDetectionError, WorkspaceDetector
 from .. import Command
@@ -139,7 +139,7 @@ class BuildDistCommand(Command):
             self._create_venv()
             venv_root = Path(".venv")
             created_venv = True
-        if sys.platform.startswith("win"):
+        if PlatformAdapter.is_windows():
             return str((venv_root / "Scripts" / "python.exe").resolve()), created_venv
         return str((venv_root / "bin" / "python").resolve()), created_venv
 

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/clean/build.py

@@ -17,15 +17,17 @@ from wl_cli.commands.clean.venv import (
     remove_auto_activation_scripts,
     remove_virtual_environments,
 )
-from wl_cli.utils.logging import log_info
+from wl_cli.utils.logging import log_info_pair
 
 
 def clean_build_artifacts(dry_run: bool = False, config: str | None = None) -> None:
     """Clean build artifacts and temporary files
     清理构建产物和临时文件
     """
-    log_info("Cleaning build artifacts and temporary files...", lang="en")
-    log_info("正在清理构建产物和临时文件...", lang="zh")
+    log_info_pair(
+        "Cleaning build artifacts and temporary files...",
+        "正在清理构建产物和临时文件...",
+    )
 
     # Remove build directories
     build_dirs = [
@@ -52,8 +54,11 @@ def clean_build_artifacts(dry_run: bool = False, config: str | None = None) -> N
 
     # Remove specific files
     files_to_remove = [
-        # Coverage files
+        # Coverage files — pytest-cov 的 `Central` 控制器总以 data_suffix 写
+        # `.coverage.<host>.<pid>.<rand>`，精确匹配 ".coverage" 删不掉这些残片，
+        # 需要一并按通配清掉。
         ".coverage",
+        ".coverage.*",
         "coverage.xml",
         # IDE and editor files
         ".DS_Store",
@@ -84,8 +89,10 @@ def clean_build_artifacts(dry_run: bool = False, config: str | None = None) -> N
     # Remove rust-analyzer directories
     remove_rust_analyzer_dirs(dry_run=dry_run)
 
-    log_info("Build artifacts and temporary files cleaning completed.", lang="en")
-    log_info("构建产物和临时文件清理完成。", lang="zh")
+    log_info_pair(
+        "Build artifacts and temporary files cleaning completed.",
+        "构建产物和临时文件清理完成。",
+    )
 
 
 def clean_venv_artifacts(dry_run: bool = False, config: str | None = None) -> None:
@@ -93,8 +100,7 @@ def clean_venv_artifacts(dry_run: bool = False, config: str | None = None) -> No
     Clean virtual environment artifacts
     清理虚拟环境产物
     """
-    log_info("Cleaning virtual environment...", lang="en")
-    log_info("正在清理虚拟环境...", lang="zh")
+    log_info_pair("Cleaning virtual environment...", "正在清理虚拟环境...")
 
     # Remove virtual environments
     remove_virtual_environments(dry_run=dry_run)
@@ -102,8 +108,7 @@ def clean_venv_artifacts(dry_run: bool = False, config: str | None = None) -> No
     # Remove auto-activation scripts
     remove_auto_activation_scripts(dry_run=dry_run)
 
-    log_info("Virtual environment cleaning completed.", lang="en")
-    log_info("虚拟环境清理完成。", lang="zh")
+    log_info_pair("Virtual environment cleaning completed.", "虚拟环境清理完成。")
 
 
 def clean_cache_artifacts(dry_run: bool = False, config: str | None = None) -> None:
@@ -111,8 +116,7 @@ def clean_cache_artifacts(dry_run: bool = False, config: str | None = None) -> N
     Clean cache directories
     清理缓存目录
     """
-    log_info("Cleaning cache directories...", lang="en")
-    log_info("正在清理缓存目录...", lang="zh")
+    log_info_pair("Cleaning cache directories...", "正在清理缓存目录...")
 
     # Remove cache directories
     cache_dirs = [
@@ -125,8 +129,7 @@ def clean_cache_artifacts(dry_run: bool = False, config: str | None = None) -> N
     # Remove pycache directories
     remove_pycache_dirs(dry_run=dry_run)
 
-    log_info("Cache directories cleaning completed.", lang="en")
-    log_info("缓存目录清理完成。", lang="zh")
+    log_info_pair("Cache directories cleaning completed.", "缓存目录清理完成。")
 
 
 def clean_logs_artifacts(dry_run: bool = False, config: str | None = None) -> None:
@@ -134,8 +137,7 @@ def clean_logs_artifacts(dry_run: bool = False, config: str | None = None) -> No
     Clean log files and directories
     清理日志文件和目录
     """
-    log_info("Cleaning log files and directories...", lang="en")
-    log_info("正在清理日志文件和目录...", lang="zh")
+    log_info_pair("Cleaning log files and directories...", "正在清理日志文件和目录...")
 
     # Remove log directories
     log_dirs = ["logs"]
@@ -144,5 +146,6 @@ def clean_logs_artifacts(dry_run: bool = False, config: str | None = None) -> No
     # Remove log files
     remove_log_files(dry_run=dry_run)
 
-    log_info("Log files and directories cleaning completed.", lang="en")
-    log_info("日志文件和目录清理完成。", lang="zh")
+    log_info_pair(
+        "Log files and directories cleaning completed.", "日志文件和目录清理完成。"
+    )

{py_wlcli-0.6.14 → py_wlcli-0.7.0}/src/wl_cli/commands/clean/clean.py

@@ -7,7 +7,7 @@ import sys
 import click
 
 from wl_cli.commands import Command, validate_command_args
-from wl_cli.utils.logging import log_info
+from wl_cli.utils.logging import log_info_pair
 
 from .clean_utils import (
     clean_all_artifacts,
@@ -111,13 +111,14 @@ class CleanCommand(Command):
         """Execute cleaning for a specific target."""
         # Use simple logging instead of structured logging for user-facing messages
         start_msg_en, start_msg_zh = self._get_messages(target, "start")
-        log_info(start_msg_en)
-        log_info(start_msg_zh, lang="zh")
+        log_info_pair(start_msg_en, start_msg_zh)
 
         # Log dry run mode
         if dry_run:
-            log_info("Dry run mode: No files will be deleted.")
-            log_info("Dry run模式：不会删除任何文件。", lang="zh")
+            log_info_pair(
+                "Dry run mode: No files will be deleted.",
+                "Dry run模式：不会删除任何文件。",
+            )
 
         # Get and execute the appropriate cleaning function
         cleaning_function = self._get_cleaning_function(target)
@@ -128,15 +129,14 @@ class CleanCommand(Command):
 
         # Log success message
         success_msg_en, success_msg_zh = self._get_messages(target, "success")
-        log_info(success_msg_en)
-        log_info(success_msg_zh, lang="zh")
+        log_info_pair(success_msg_en, success_msg_zh)
 
     def _execute_dead_code(
         self,
         dry_run: bool = False,
         scan_only: bool = False,
         json_output: bool = False,
-    ):
+    ) -> int:
         """Execute dead code detection and cleaning."""
         from .dead_code.dead_code_command import DeadCodeCommand
 
@@ -157,15 +157,19 @@ class CleanCommand(Command):
         scan_only: bool = False,
         json: bool = False,
         **kwargs,
-    ) -> None:
+    ) -> int:
         """
         Clean project artifacts and dead code.
         清理项目产物和死代码。
+
+        Returns the exit code; only the Click wrapper turns it into a
+        ``SystemExit`` (#166). ``dead-code`` passes the dead-code command's own
+        0/1 through; every other target reports 0 on success.
         """
         try:
             if clean_action == "dead-code":
                 # Execute dead code command
-                self._execute_dead_code(
+                return self._execute_dead_code(
                     dry_run=dry_run,
                     scan_only=scan_only,
                     json_output=json,
@@ -202,10 +206,12 @@ class CleanCommand(Command):
                     config=config,
                     parallel=parallel,
                 )
+            # Artifact targets (and the legacy target branch) report success;
+            # they do not forward a deeper command's status (#166 patch 4).
+            return 0
         except Exception as e:
-            log_info(f"Error cleaning project: {e}", lang="en")
-            log_info(f"错误：清理项目失败: {e}", lang="zh")
-            sys.exit(1)
+            log_info_pair(f"Error cleaning project: {e}", f"错误：清理项目失败: {e}")
+            return 1
 
 
 @click.command(name="clean")
@@ -266,7 +272,7 @@ def clean_command(
         "dead-code",
     ]:
         # Use as clean_action
-        cmd.execute(
+        exit_code = cmd.execute(
             clean_action=target_or_subcommand,
             dry_run=dry_run,
             scan_only=scan_only,
@@ -276,9 +282,13 @@ def clean_command(
         )
     else:
         # Use as target (legacy behavior)
-        cmd.execute(
+        exit_code = cmd.execute(
             target=target_or_subcommand,
             dry_run=dry_run,
             config=config,
             parallel=parallel,
         )
+
+    # The implementation returns a code; only this wrapper exits (#166).
+    if exit_code:
+        sys.exit(exit_code)