proxyctl 0.3.0__tar.gz → 0.3.1__tar.gz

{proxyctl-0.3.0 → proxyctl-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyctl
-Version: 0.3.0
+Version: 0.3.1
 Summary: Proxy configuration lifecycle management for macOS and Linux
 Project-URL: Homepage, https://github.com/crhan/proxyctl
 Project-URL: Issues, https://github.com/crhan/proxyctl/issues

{proxyctl-0.3.0 → proxyctl-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "proxyctl"
-version = "0.3.0"
+version = "0.3.1"
 description = "Proxy configuration lifecycle management for macOS and Linux"
 readme = "README.md"
 requires-python = ">=3.10"

{proxyctl-0.3.0 → proxyctl-0.3.1}/src/proxyctl/__init__.py

@@ -1,3 +1,3 @@
 """proxyctl — Proxy configuration lifecycle management."""
 
-__version__ = "0.2.2"
+__version__ = "0.3.1"

{proxyctl-0.3.0 → proxyctl-0.3.1}/src/proxyctl/cli.py

@@ -1361,7 +1361,16 @@ def _read_log_lines(path: str, tail_n: int | None) -> list:
 
 # ── 帮助 ──────────────────────────────────────────────────────────────────────
 
-VERSION = "0.3.0"
+def _read_version() -> str:
+    """单一事实来源：pyproject.toml 的 [project] version。"""
+    try:
+        from importlib.metadata import version
+        return version("proxyctl")
+    except Exception:
+        return "unknown"
+
+
+VERSION = _read_version()
 
 
 # Help 输出按 group 分块的顺序（避免依赖 dict 插入顺序变化）

{proxyctl-0.3.0 → proxyctl-0.3.1}/src/proxyctl/core/plugin.py

@@ -148,6 +148,20 @@ class Plugin:
         return []
 
 
+# ── 内部工具 ─────────────────────────────────────────────────────────────────
+
+def _apply_color_policy(modname: str) -> None:
+    """插件模块加载后立刻调用：若当前是关色态，把模块自定义的 RED/GREEN/...
+    常量抹空。解决用户插件（如 sb_private.py）在 cli.main() 的 set_no_color
+    之后加载，导致硬编码 ANSI 字面量泄漏到管道输出的问题。"""
+    try:
+        from proxyctl import _io
+        _io.maybe_disable_module_colors(modname)
+    except Exception:
+        # 插件加载链路不应被色彩策略阻断
+        pass
+
+
 # ── Registry ─────────────────────────────────────────────────────────────────
 
 class PluginRegistry:
@@ -171,7 +185,9 @@ class PluginRegistry:
             if modname.startswith("_"):
                 continue
             try:
-                mod = importlib.import_module(f"proxyctl.builtin_plugins.{modname}")
+                full_name = f"proxyctl.builtin_plugins.{modname}"
+                mod = importlib.import_module(full_name)
+                _apply_color_policy(full_name)
                 self._discover_in_module(mod, config, source=f"builtin/{modname}")
             except Exception as e:
                 self.errors.append((f"builtin/{modname}", _fmt_err(e)))
@@ -192,6 +208,7 @@ class PluginRegistry:
                 mod = importlib.util.module_from_spec(spec)
                 sys.modules[mod_name] = mod
                 spec.loader.exec_module(mod)
+                _apply_color_policy(mod_name)
                 self._discover_in_module(mod, config, source=f"user/{fname}")
             except Exception as e:
                 self.errors.append((f"user/{fname}", _fmt_err(e)))