chatup 0.2.10__tar.gz → 0.2.12__tar.gz

{chatup-0.2.10/src/chatup.egg-info → chatup-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.10
+Version: 0.2.12
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -13,15 +13,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click>=8.0
-Requires-Dist: chatstyle<0.2.0,>=0.1.1
-Requires-Dist: chatenv<0.3.0,>=0.2.0
+Requires-Dist: click<9.0,>=8.0
+Requires-Dist: chatstyle<0.3.0,>=0.2.0
+Requires-Dist: chatenv<0.3.0,>=0.2.10
 Requires-Dist: colorama
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs<2.0,>=1.6; extra == "docs"
-Requires-Dist: mkdocs-material<10.0,>=9.5; extra == "docs"
-Requires-Dist: mkdocs-static-i18n<2.0,>=1.3; extra == "docs"
-Requires-Dist: mike<3.0,>=2.1; extra == "docs"
+Requires-Dist: mkdocs-material<9.7,>=9.5; extra == "docs"
+Requires-Dist: mkdocs-static-i18n<2.0,>=1.2; extra == "docs"
+Requires-Dist: mike<3.0,>=2.0; extra == "docs"
 Dynamic: license-file
 
 # ChatUp
@@ -47,6 +51,9 @@ ChatUp 是 ChatArch 的独立环境与工具安装 CLI。它承接原来 `chatto
 
 ```bash
 chatup --help
+chatup --version
+chatup --tree
+chatup --tree-brief
 chatup doctor
 chatup uv
 chatup chrome-for-testing install --channel stable -I
@@ -75,7 +82,7 @@ chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置。更完整的能力边界见 `docs/capability-map.md`。
+所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 
@@ -84,6 +91,9 @@ python -m pytest -q
 python -m build
 python -m twine check dist/*
 mkdocs build --strict
+chatup --version
+chatup --tree
+chatup --tree-brief
 ```
 
 更多使用说明见文档站的 [快速开始](https://arch.gh.wzhecnu.cn/ChatUp/quickstart/)、[命令参考](https://arch.gh.wzhecnu.cn/ChatUp/commands/) 和 [CLI 能力地图](https://arch.gh.wzhecnu.cn/ChatUp/capability-map/)。

{chatup-0.2.10 → chatup-0.2.12}/README.md

@@ -21,6 +21,9 @@ ChatUp 是 ChatArch 的独立环境与工具安装 CLI。它承接原来 `chatto
 
 ```bash
 chatup --help
+chatup --version
+chatup --tree
+chatup --tree-brief
 chatup doctor
 chatup uv
 chatup chrome-for-testing install --channel stable -I
@@ -49,7 +52,7 @@ chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置。更完整的能力边界见 `docs/capability-map.md`。
+所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 
@@ -58,6 +61,9 @@ python -m pytest -q
 python -m build
 python -m twine check dist/*
 mkdocs build --strict
+chatup --version
+chatup --tree
+chatup --tree-brief
 ```
 
 更多使用说明见文档站的 [快速开始](https://arch.gh.wzhecnu.cn/ChatUp/quickstart/)、[命令参考](https://arch.gh.wzhecnu.cn/ChatUp/commands/) 和 [CLI 能力地图](https://arch.gh.wzhecnu.cn/ChatUp/capability-map/)。

{chatup-0.2.10 → chatup-0.2.12}/pyproject.toml

@@ -10,9 +10,9 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
 dependencies = [
-    "click>=8.0",
-    "chatstyle>=0.1.1,<0.2.0",
-    "chatenv>=0.2.0,<0.3.0",
+    "click>=8.0,<9.0",
+    "chatstyle>=0.2.0,<0.3.0",
+    "chatenv>=0.2.10,<0.3.0",
     "colorama",
 ]
 authors = [{name = "rexwzh", email = "1073853456@qq.com"}]
@@ -28,11 +28,16 @@ Source = "https://github.com/ChatArch/ChatUp"
 Issues = "https://github.com/ChatArch/ChatUp/issues"
 
 [project.optional-dependencies]
+dev = [
+    "build",
+    "pytest",
+    "twine",
+]
 docs = [
     "mkdocs>=1.6,<2.0",
-    "mkdocs-material>=9.5,<10.0",
-    "mkdocs-static-i18n>=1.3,<2.0",
-    "mike>=2.1,<3.0",
+    "mkdocs-material>=9.5,<9.7",
+    "mkdocs-static-i18n>=1.2,<2.0",
+    "mike>=2.0,<3.0",
 ]
 
 [project.scripts]

{chatup-0.2.10 → chatup-0.2.12}/src/chatup/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.10"
+__version__ = "0.2.12"

chatup-0.2.12/src/chatup/cli.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+import click
+from chatstyle import add_tree_option
+
+from chatup import __version__
+from chatup.commands.chrome_for_testing import cli as chrome_for_testing_cli
+from chatup.commands.chromedriver import cli as chromedriver_cli
+from chatup.commands.playwright import cli as playwright_cli
+from chatup.setup.cli import register_setup_commands
+
+
+@click.group(
+    name="chatup",
+    context_settings={"help_option_names": ["-h", "--help"]},
+    invoke_without_command=True,
+    no_args_is_help=True,
+)
+@click.version_option(__version__, prog_name="chatup")
+@add_tree_option(renderer_options={"root_name": "chatup"})
+def main() -> None:
+    """ChatUp CLI for ChatArch bootstrap workflows."""
+
+
+@main.command(name="doctor")
+def doctor() -> None:
+    """Check that ChatUp is installed and callable."""
+    click.echo(f"chatup {__version__} ok")
+
+
+register_setup_commands(main)
+main.add_command(chrome_for_testing_cli)
+main.add_command(chromedriver_cli)
+main.add_command(playwright_cli)
+
+
+if __name__ == "__main__":
+    main()

{chatup-0.2.10 → chatup-0.2.12}/src/chatup/setup/elements.py

@@ -54,6 +54,14 @@ from chatup.setup.nginx import (
 )
 from chatup.setup.opencode import setup_opencode
 from chatup.setup.nodejs import setup_nodejs
+from chatup.setup.twikoo import (
+    DEFAULT_TWIKOO_BIND_ADDRESS,
+    DEFAULT_TWIKOO_INSTANCE,
+    DEFAULT_TWIKOO_PORT,
+    DEFAULT_TWIKOO_REPO,
+    DEFAULT_TWIKOO_VERSION,
+    setup_twikoo,
+)
 from chatup.setup.uv import DEFAULT_PYTHON_VERSION, DEFAULT_VENV_PATH, setup_uv
 from chatup.setup.workspace import setup_workspace
 from chatup.setup.zsh import setup_zsh
@@ -304,6 +312,41 @@ def mysql_setup(
     )
 
 
+def twikoo_setup(
+    version,
+    repo,
+    home,
+    name,
+    port,
+    bind_address,
+    install,
+    init,
+    service,
+    start,
+    smoke,
+    force,
+    log_level,
+):
+    result = setup_twikoo(
+        name=name,
+        version=version,
+        repo=repo,
+        home=home,
+        port=port,
+        bind_address=bind_address,
+        install=install,
+        init=init,
+        service=service,
+        start=start,
+        smoke=smoke,
+        force=force,
+        log_level=log_level,
+    )
+    service_info = result.get("service") if isinstance(result, dict) else None
+    if isinstance(service_info, dict) and service_info.get("unit"):
+        click.echo(service_info["unit"])
+
+
 def nginx_setup(
     template,
     output_file,
@@ -870,6 +913,66 @@ SETUP_COMMAND_ELEMENTS = (
             ),
         ),
     ),
+    SetupCommandElement(
+        name="twikoo",
+        help="Install and prepare a multi-instance Twikoo comment service runtime.",
+        callback=twikoo_setup,
+        options=(
+            LOG_LEVEL_OPTION,
+            SetupOptionElement(
+                param_decls=("--version",),
+                kwargs={"default": DEFAULT_TWIKOO_VERSION, "show_default": True},
+            ),
+            SetupOptionElement(
+                param_decls=("--repo",),
+                kwargs={"default": DEFAULT_TWIKOO_REPO, "show_default": True},
+            ),
+            SetupOptionElement(
+                param_decls=("--home",),
+                kwargs={
+                    "default": None,
+                    "type": click.Path(path_type=Path),
+                    "help": "Twikoo home. Defaults to ~/.chatarch/twikoo.",
+                },
+            ),
+            SetupOptionElement(
+                param_decls=("--name",),
+                kwargs={"default": DEFAULT_TWIKOO_INSTANCE, "show_default": True},
+            ),
+            SetupOptionElement(
+                param_decls=("--port",),
+                kwargs={"default": DEFAULT_TWIKOO_PORT, "show_default": True, "type": int},
+            ),
+            SetupOptionElement(
+                param_decls=("--bind-address",),
+                kwargs={"default": DEFAULT_TWIKOO_BIND_ADDRESS, "show_default": True},
+            ),
+            SetupOptionElement(
+                param_decls=("--install/--no-install",),
+                kwargs={"default": True, "show_default": True, "help": "Download the Twikoo release binary."},
+            ),
+            SetupOptionElement(
+                param_decls=("--init/--no-init",),
+                kwargs={"default": True, "show_default": True, "help": "Create instance directories, env file, and instance-local binary link."},
+            ),
+            SetupOptionElement(
+                param_decls=("--service/--no-service",),
+                kwargs={"default": True, "show_default": True, "help": "Install a user-level systemd service."},
+            ),
+            SetupOptionElement(
+                param_decls=("--start/--no-start",),
+                kwargs={"default": False, "show_default": True, "help": "Start the user-level Twikoo service."},
+            ),
+            SetupOptionElement(
+                param_decls=("--smoke/--no-smoke",),
+                kwargs={"default": False, "show_default": True, "help": "Run a local HTTP smoke test after starting."},
+            ),
+            SetupOptionElement(
+                param_decls=("--force", "-f"),
+                kwargs={"is_flag": True, "help": "Replace existing runtime/config/service where supported."},
+            ),
+        ),
+    ),
     SetupCommandElement(
         name="nginx",
         help="Prepare user-level NGINX under ChatArch home and render config templates.",

{chatup-0.2.10 → chatup-0.2.12}/src/chatup/setup/service_credentials.py

@@ -29,16 +29,19 @@ def load_chatenv_values(
 ) -> tuple[dict[str, str], str]:
     """Load service setup values without printing secrets.
 
-    Precedence is current environment > explicit env file/profile values.
     The env_ref option mirrors Cursor Agent's `-e/--env`: an existing path is
     parsed as a dotenv-style file; otherwise it is treated as a ChatEnv profile.
+    Explicit files/profiles are isolated from process-environment credentials;
+    the process environment is used only when no explicit source is selected.
     """
 
     values: dict[str, str] = {}
     source = "environment"
     store = EnvStore(get_paths().envs_dir)
+    explicit_source = False
 
     if env_ref:
+        explicit_source = True
         candidate = Path(env_ref).expanduser()
         if candidate.exists():
             values.update(parse_env_file(candidate))
@@ -48,14 +51,15 @@ def load_chatenv_values(
             source = f"ChatEnv profile {env_ref}"
 
     if env_profile:
+        explicit_source = True
         values.update(store.load_profile(config_cls, env_profile))
         source = f"ChatEnv profile {env_profile}"
 
-    for key in config_cls.get_fields():
-        env_value = os.getenv(key)
-        if env_value:
-            values[key] = env_value
-            source = "environment"
+    if not explicit_source:
+        for key in config_cls.get_fields():
+            env_value = os.getenv(key)
+            if env_value:
+                values[key] = env_value
     return values, source