ChatECNU 0.2.0__tar.gz → 0.2.2__tar.gz

chatecnu-0.2.2/MANIFEST.in

@@ -0,0 +1 @@
+include src/chatecnu/bin/linux-x86_64/auth_client

chatecnu-0.2.2/PKG-INFO

@@ -0,0 +1,113 @@
+Metadata-Version: 2.4
+Name: ChatECNU
+Version: 0.2.2
+Summary: ChatArch ECNU campus portal automation CLI
+Author-email: ChatArch <1073853456@qq.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/ChatArch/ChatECNU
+Project-URL: Repository, https://github.com/ChatArch/ChatECNU
+Project-URL: Documentation, https://arch.gh.wzhecnu.cn/ChatECNU/
+Keywords: chatecnu,chatarch,ecnu,campus,portal
+Classifier: Programming Language :: Python :: 3
+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.0
+Requires-Dist: chatenv<0.3.0,>=0.2.4
+Requires-Dist: ChatNet<0.3.0,>=0.2.0
+Requires-Dist: requests>=2.0
+Requires-Dist: pycryptodome>=3.0
+Provides-Extra: captcha
+Requires-Dist: ddddocr; extra == "captcha"
+Requires-Dist: numpy; extra == "captcha"
+Requires-Dist: pillow; extra == "captcha"
+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<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
+
+# ChatECNU
+
+ChatECNU 是 ECNU 门户与校园网联网工具包。安装包名仍是 `ChatECNU`，日常命令主推 `ecnu`。
+
+## 文档入口
+
+| 任务 | 链接 |
+| --- | --- |
+| 安装和最小验证 | https://arch.gh.wzhecnu.cn/ChatECNU/quickstart/ |
+| 命令树 | https://arch.gh.wzhecnu.cn/ChatECNU/cli-tree/ |
+| ChatEnv 变量 | https://arch.gh.wzhecnu.cn/ChatECNU/chatenv/ |
+| ECNU 使用 | https://arch.gh.wzhecnu.cn/ChatECNU/ecnu/ |
+
+## 安装
+
+```bash
+pip install ChatECNU
+```
+
+如需验证码识别能力：
+
+```bash
+pip install "ChatECNU[captcha]"
+```
+
+## 命令结构
+
+ChatECNU 的命令面可用 `ecnu --tree` 从当前 Click 注册表直接回读：
+
+```text
+ecnu
+├── --help  # Show this message and exit.
+├── --version  # Show the installed ChatECNU version.
+├── --tree  # Print this registered command tree and exit.
+├── --env ENV-PROFILE  # ChatEnv 配置名。
+├── home  # ECNU 门户。
+│   ├── info [--json]  # 门户首页摘要。
+│   ├── login [--username USERNAME] [--password PASSWORD] [--sms-code SMS-CODE] [--json] [--interactive]  # 登录门户。
+│   ├── logout [--json]  # 退出门户会话。
+│   ├── status [--json]  # 门户会话状态。
+│   └── user [--json]  # 门户用户信息。
+├── net  # 校园网联网。
+│   ├── check [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--json]  # 检查在线状态。
+│   ├── ensure-login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 离线时登录。
+│   ├── login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 登录。
+│   └── logout [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--json] [--interactive]  # 退出校园网。
+└── visitor  # 访客账号。
+    ├── create [--remark REMARK] [--dry-run] [--json] [--interactive]  # 创建访客账号。
+    ├── default [--password1 PASSWORD1] [--password2 PASSWORD2] [--remark REMARK] [--json] [--interactive]  # 维护默认访客账号。
+    ├── delete [--id VISITOR-ID] [--dry-run] [--json] [--interactive]  # 删除访客账号。
+    ├── get [--id VISITOR-ID] [--account ACCOUNT] [--json]  # 查询访客账号。
+    ├── list [--json]  # 列出访客账号。
+    └── update [--id VISITOR-ID] [--remark REMARK] [--password PASSWORD] [--dry-run] [--json] [--interactive]  # 更新访客备注和密码。
+```
+
+门户命令统一放在 `home` 下：
+
+```bash
+ecnu home login -i
+ecnu home info
+ecnu home status
+ecnu home user
+ecnu home logout
+```
+
+校园网联网统一放在 `net` 下：
+
+```bash
+ecnu net check --json
+ecnu net login -I --allow-argv-password
+ecnu net logout -I
+ecnu net ensure-login -I --allow-argv-password
+```
+
+ChatECNU 的 PyPI wheel/sdist 内置 Linux x86_64 `auth_client`，默认 `ecnu net ...` 会优先使用该内置二进制；如需覆盖，可用 `--auth-client` 或 `ECNU_AUTH_CLIENT` 指定路径。账号密码使用同一组 `ECNU_USERNAME` / `ECNU_PASSWORD`。`net check` 会显示当前 `online/account/username`；`net logout` 未提供用户名时会先从 `auth_client check` 的 `Username=...` 自动提取。
+
+敏感值（密码、Cookie、短信码、会话）不要打印或提交。

chatecnu-0.2.2/README.md

@@ -0,0 +1,77 @@
+# ChatECNU
+
+ChatECNU 是 ECNU 门户与校园网联网工具包。安装包名仍是 `ChatECNU`，日常命令主推 `ecnu`。
+
+## 文档入口
+
+| 任务 | 链接 |
+| --- | --- |
+| 安装和最小验证 | https://arch.gh.wzhecnu.cn/ChatECNU/quickstart/ |
+| 命令树 | https://arch.gh.wzhecnu.cn/ChatECNU/cli-tree/ |
+| ChatEnv 变量 | https://arch.gh.wzhecnu.cn/ChatECNU/chatenv/ |
+| ECNU 使用 | https://arch.gh.wzhecnu.cn/ChatECNU/ecnu/ |
+
+## 安装
+
+```bash
+pip install ChatECNU
+```
+
+如需验证码识别能力：
+
+```bash
+pip install "ChatECNU[captcha]"
+```
+
+## 命令结构
+
+ChatECNU 的命令面可用 `ecnu --tree` 从当前 Click 注册表直接回读：
+
+```text
+ecnu
+├── --help  # Show this message and exit.
+├── --version  # Show the installed ChatECNU version.
+├── --tree  # Print this registered command tree and exit.
+├── --env ENV-PROFILE  # ChatEnv 配置名。
+├── home  # ECNU 门户。
+│   ├── info [--json]  # 门户首页摘要。
+│   ├── login [--username USERNAME] [--password PASSWORD] [--sms-code SMS-CODE] [--json] [--interactive]  # 登录门户。
+│   ├── logout [--json]  # 退出门户会话。
+│   ├── status [--json]  # 门户会话状态。
+│   └── user [--json]  # 门户用户信息。
+├── net  # 校园网联网。
+│   ├── check [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--json]  # 检查在线状态。
+│   ├── ensure-login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 离线时登录。
+│   ├── login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 登录。
+│   └── logout [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--json] [--interactive]  # 退出校园网。
+└── visitor  # 访客账号。
+    ├── create [--remark REMARK] [--dry-run] [--json] [--interactive]  # 创建访客账号。
+    ├── default [--password1 PASSWORD1] [--password2 PASSWORD2] [--remark REMARK] [--json] [--interactive]  # 维护默认访客账号。
+    ├── delete [--id VISITOR-ID] [--dry-run] [--json] [--interactive]  # 删除访客账号。
+    ├── get [--id VISITOR-ID] [--account ACCOUNT] [--json]  # 查询访客账号。
+    ├── list [--json]  # 列出访客账号。
+    └── update [--id VISITOR-ID] [--remark REMARK] [--password PASSWORD] [--dry-run] [--json] [--interactive]  # 更新访客备注和密码。
+```
+
+门户命令统一放在 `home` 下：
+
+```bash
+ecnu home login -i
+ecnu home info
+ecnu home status
+ecnu home user
+ecnu home logout
+```
+
+校园网联网统一放在 `net` 下：
+
+```bash
+ecnu net check --json
+ecnu net login -I --allow-argv-password
+ecnu net logout -I
+ecnu net ensure-login -I --allow-argv-password
+```
+
+ChatECNU 的 PyPI wheel/sdist 内置 Linux x86_64 `auth_client`，默认 `ecnu net ...` 会优先使用该内置二进制；如需覆盖，可用 `--auth-client` 或 `ECNU_AUTH_CLIENT` 指定路径。账号密码使用同一组 `ECNU_USERNAME` / `ECNU_PASSWORD`。`net check` 会显示当前 `online/account/username`；`net logout` 未提供用户名时会先从 `auth_client check` 的 `Username=...` 自动提取。
+
+敏感值（密码、Cookie、短信码、会话）不要打印或提交。

{chatecnu-0.2.0 → chatecnu-0.2.2}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 dependencies = [
     "click>=8.0",
     "chatstyle>=0.1.0,<0.2.0",
-    "chatenv>=0.2.0,<0.3.0",
+    "chatenv>=0.2.4,<0.3.0",
     "ChatNet>=0.2.0,<0.3.0",
     "requests>=2.0",
     "pycryptodome>=3.0",
@@ -54,3 +54,6 @@ where = ["src"]
 
 [tool.setuptools]
 include-package-data = true
+
+[tool.setuptools.package-data]
+chatecnu = ["bin/linux-x86_64/auth_client"]

chatecnu-0.2.2/src/ChatECNU.egg-info/PKG-INFO

@@ -0,0 +1,113 @@
+Metadata-Version: 2.4
+Name: ChatECNU
+Version: 0.2.2
+Summary: ChatArch ECNU campus portal automation CLI
+Author-email: ChatArch <1073853456@qq.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/ChatArch/ChatECNU
+Project-URL: Repository, https://github.com/ChatArch/ChatECNU
+Project-URL: Documentation, https://arch.gh.wzhecnu.cn/ChatECNU/
+Keywords: chatecnu,chatarch,ecnu,campus,portal
+Classifier: Programming Language :: Python :: 3
+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.0
+Requires-Dist: chatenv<0.3.0,>=0.2.4
+Requires-Dist: ChatNet<0.3.0,>=0.2.0
+Requires-Dist: requests>=2.0
+Requires-Dist: pycryptodome>=3.0
+Provides-Extra: captcha
+Requires-Dist: ddddocr; extra == "captcha"
+Requires-Dist: numpy; extra == "captcha"
+Requires-Dist: pillow; extra == "captcha"
+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<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
+
+# ChatECNU
+
+ChatECNU 是 ECNU 门户与校园网联网工具包。安装包名仍是 `ChatECNU`，日常命令主推 `ecnu`。
+
+## 文档入口
+
+| 任务 | 链接 |
+| --- | --- |
+| 安装和最小验证 | https://arch.gh.wzhecnu.cn/ChatECNU/quickstart/ |
+| 命令树 | https://arch.gh.wzhecnu.cn/ChatECNU/cli-tree/ |
+| ChatEnv 变量 | https://arch.gh.wzhecnu.cn/ChatECNU/chatenv/ |
+| ECNU 使用 | https://arch.gh.wzhecnu.cn/ChatECNU/ecnu/ |
+
+## 安装
+
+```bash
+pip install ChatECNU
+```
+
+如需验证码识别能力：
+
+```bash
+pip install "ChatECNU[captcha]"
+```
+
+## 命令结构
+
+ChatECNU 的命令面可用 `ecnu --tree` 从当前 Click 注册表直接回读：
+
+```text
+ecnu
+├── --help  # Show this message and exit.
+├── --version  # Show the installed ChatECNU version.
+├── --tree  # Print this registered command tree and exit.
+├── --env ENV-PROFILE  # ChatEnv 配置名。
+├── home  # ECNU 门户。
+│   ├── info [--json]  # 门户首页摘要。
+│   ├── login [--username USERNAME] [--password PASSWORD] [--sms-code SMS-CODE] [--json] [--interactive]  # 登录门户。
+│   ├── logout [--json]  # 退出门户会话。
+│   ├── status [--json]  # 门户会话状态。
+│   └── user [--json]  # 门户用户信息。
+├── net  # 校园网联网。
+│   ├── check [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--json]  # 检查在线状态。
+│   ├── ensure-login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 离线时登录。
+│   ├── login [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--password PASSWORD] [--allow-argv-password] [--json] [--interactive]  # 登录。
+│   └── logout [--auth-client AUTH-CLIENT-PATH] [--setting-file SETTING-FILE] [--username USERNAME] [--json] [--interactive]  # 退出校园网。
+└── visitor  # 访客账号。
+    ├── create [--remark REMARK] [--dry-run] [--json] [--interactive]  # 创建访客账号。
+    ├── default [--password1 PASSWORD1] [--password2 PASSWORD2] [--remark REMARK] [--json] [--interactive]  # 维护默认访客账号。
+    ├── delete [--id VISITOR-ID] [--dry-run] [--json] [--interactive]  # 删除访客账号。
+    ├── get [--id VISITOR-ID] [--account ACCOUNT] [--json]  # 查询访客账号。
+    ├── list [--json]  # 列出访客账号。
+    └── update [--id VISITOR-ID] [--remark REMARK] [--password PASSWORD] [--dry-run] [--json] [--interactive]  # 更新访客备注和密码。
+```
+
+门户命令统一放在 `home` 下：
+
+```bash
+ecnu home login -i
+ecnu home info
+ecnu home status
+ecnu home user
+ecnu home logout
+```
+
+校园网联网统一放在 `net` 下：
+
+```bash
+ecnu net check --json
+ecnu net login -I --allow-argv-password
+ecnu net logout -I
+ecnu net ensure-login -I --allow-argv-password
+```
+
+ChatECNU 的 PyPI wheel/sdist 内置 Linux x86_64 `auth_client`，默认 `ecnu net ...` 会优先使用该内置二进制；如需覆盖，可用 `--auth-client` 或 `ECNU_AUTH_CLIENT` 指定路径。账号密码使用同一组 `ECNU_USERNAME` / `ECNU_PASSWORD`。`net check` 会显示当前 `online/account/username`；`net logout` 未提供用户名时会先从 `auth_client check` 的 `Username=...` 自动提取。
+
+敏感值（密码、Cookie、短信码、会话）不要打印或提交。

{chatecnu-0.2.0 → chatecnu-0.2.2}/src/ChatECNU.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.md
 pyproject.toml
 src/ChatECNU.egg-info/PKG-INFO
@@ -11,6 +12,7 @@ src/chatecnu/__init__.py
 src/chatecnu/cli.py
 src/chatecnu/config.py
 src/chatecnu/network_auth.py
+src/chatecnu/bin/linux-x86_64/auth_client
 src/chatecnu/ecnu/__init__.py
 src/chatecnu/ecnu/captcha.py
 src/chatecnu/ecnu/cli.py

{chatecnu-0.2.0 → chatecnu-0.2.2}/src/ChatECNU.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click>=8.0
 chatstyle<0.2.0,>=0.1.0
-chatenv<0.3.0,>=0.2.0
+chatenv<0.3.0,>=0.2.4
 ChatNet<0.3.0,>=0.2.0
 requests>=2.0
 pycryptodome>=3.0

{chatecnu-0.2.0 → chatecnu-0.2.2}/src/chatecnu/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{chatecnu-0.2.0 → chatecnu-0.2.2}/src/chatecnu/ecnu/cli.py

@@ -21,6 +21,7 @@ from chatecnu.network_auth import (
     NetworkAuthCredentials,
     NetworkAuthResult,
     redact_text,
+    resolve_auth_client_path,
 )
 from .portal import BASE_URL
 
@@ -80,8 +81,115 @@ VISITOR_DEFAULT_SCHEMA = CommandSchema(
 )
 
 
+def _format_metavar(name: str) -> str:
+    return name.replace("_", "-").upper()
+
+
+def _format_argument(param: click.Argument) -> str:
+    metavar = _format_metavar(param.name or "ARG")
+    if param.nargs == -1:
+        metavar = f"{metavar}..."
+    if not param.required:
+        return f"[{metavar}]"
+    return f"<{metavar}>"
+
+
+def _format_option(param: click.Option) -> str:
+    visible_opts = [opt for opt in param.opts if opt.startswith("--")]
+    visible_opts.extend(opt for opt in param.secondary_opts if opt.startswith("--"))
+    flag = visible_opts[0] if visible_opts else (param.opts[0] if param.opts else param.name or "OPTION")
+    if param.is_flag:
+        return f"[{flag}]"
+    return f"[{flag} {_format_metavar(param.name or 'VALUE')}]"
+
+
+def _command_signature(command: click.Command) -> str:
+    parts: list[str] = []
+    for param in command.params:
+        if getattr(param, "hidden", False):
+            continue
+        if isinstance(param, click.Argument):
+            parts.append(_format_argument(param))
+        elif isinstance(param, click.Option):
+            parts.append(_format_option(param))
+    return " ".join(parts)
+
+
+def _command_summary(command: click.Command) -> str:
+    return (command.short_help or command.help or "").strip().splitlines()[0]
+
+
+def _root_option_items(group: click.Group) -> list[tuple[str, str]]:
+    items = [
+        ("--help", "Show this message and exit."),
+        ("--version", "Show the installed ChatECNU version."),
+        ("--tree", "Print this registered command tree and exit."),
+    ]
+    for param in group.params:
+        if getattr(param, "hidden", False) or not isinstance(param, click.Option):
+            continue
+        if param.name in {"version", "tree"}:
+            continue
+        items.append((_format_option(param).strip("[]"), param.help or ""))
+    return items
+
+
+def _group_items(group: click.Group) -> list[tuple[str, str | click.Command]]:
+    items: list[tuple[str, str | click.Command]] = []
+    if group is cli:
+        items.extend(_root_option_items(group))
+    for name in group.list_commands(click.Context(group)):
+        command = group.get_command(click.Context(group), name)
+        if command is None or command.hidden:
+            continue
+        items.append((name, command))
+    return items
+
+
+def render_cli_tree(root: click.Group | None = None) -> str:
+    """Render the registered Click command tree for `ecnu --tree`."""
+    if root is None:
+        root = cli
+    lines = [root.name or "ecnu"]
+
+    def walk(items: list[tuple[str, str | click.Command]], prefix: str = "") -> None:
+        for index, (name, item) in enumerate(items):
+            last = index == len(items) - 1
+            branch = "└── " if last else "├── "
+            child_prefix = prefix + ("    " if last else "│   ")
+            if isinstance(item, str):
+                summary = f"  # {item}" if item else ""
+                lines.append(f"{prefix}{branch}{name}{summary}")
+                continue
+            signature = _command_signature(item)
+            label = f"{name} {signature}".strip()
+            lines.append(f"{prefix}{branch}{label}  # {_command_summary(item)}")
+            if isinstance(item, click.Group):
+                walk(_group_items(item), child_prefix)
+
+    walk(_group_items(root))
+    return "\n".join(lines)
+
+
+def _tree_callback(ctx: click.Context, param: click.Option, value: bool) -> None:
+    if not value or ctx.resilient_parsing:
+        return
+    if not isinstance(ctx.command, click.Group):
+        raise click.ClickException("--tree is only available on command groups")
+    click.echo(render_cli_tree(ctx.command))
+    ctx.exit()
+
+
 @click.group(name="ecnu")
 @click.version_option(__version__)
+@click.option(
+    "--tree",
+    is_flag=True,
+    is_eager=True,
+    expose_value=False,
+    callback=_tree_callback,
+    help="Print the registered CLI command tree and exit.",
+)
 @click.option(
     "--base-url",
     default=None,
@@ -436,16 +544,17 @@ def network_auth_logout(
     """退出校园网。"""
 
     prefer_loaded_chatenv = network_auth_prefers_loaded_chatenv(ctx)
-    resolved_username = resolve_network_auth_username(
-        username=username,
-        interactive=interactive,
+    resolved_username = username or resolve_ecnu_config_value(
+        "ECNU_USERNAME",
+        ECNUConfig.ECNU_USERNAME,
         prefer_loaded_chatenv=prefer_loaded_chatenv,
     )
-    result = make_network_auth_client(
+    client = make_network_auth_client(
         auth_client_path=auth_client_path,
         setting_file=setting_file,
         prefer_loaded_chatenv=prefer_loaded_chatenv,
-    ).logout(resolved_username)
+    )
+    result = client.logout(resolved_username) if resolved_username else client.logout_current()
     emit_network_auth_result(result, json_output=json_output)
 
 
@@ -688,11 +797,12 @@ def make_network_auth_client(
     allow_argv_password: bool = False,
     prefer_loaded_chatenv: bool = False,
 ) -> NetworkAuthClient:
-    resolved_auth_client = auth_client_path or resolve_ecnu_config_value(
+    configured_auth_client = auth_client_path or resolve_ecnu_config_value(
         "ECNU_AUTH_CLIENT",
         ECNUConfig.ECNU_AUTH_CLIENT,
         prefer_loaded_chatenv=prefer_loaded_chatenv,
-    ) or "auth_client"
+    )
+    resolved_auth_client = resolve_auth_client_path(configured_auth_client)
     resolved_setting_file = setting_file or resolve_ecnu_config_value(
         "ECNU_AUTH_SETTING_FILE",
         ECNUConfig.ECNU_AUTH_SETTING_FILE,
@@ -795,10 +905,24 @@ def redact_network_auth_payload(payload: dict[str, object], *, secret_values: tu
 
 def format_network_auth_result(result: NetworkAuthResult) -> str:
     if result.action == "ensure-login" and result.skipped:
-        return "Already online; skipped."
-    if result.success:
-        return "Login OK." if result.action in {"login", "ensure-login"} else "auth_client OK."
-    return "auth_client failed."
+        base = "Already online; skipped."
+    elif result.action == "logout" and result.skipped:
+        base = "Already offline; skipped."
+    elif result.success:
+        base = "Login OK." if result.action in {"login", "ensure-login"} else "auth_client OK."
+    else:
+        return "auth_client failed."
+
+    details: list[str] = []
+    if result.online is not None:
+        details.append(f"Online: {str(result.online).lower()}")
+    if result.account:
+        details.append(f"Account: {result.account}")
+    if result.username and result.username != result.account:
+        details.append(f"Username: {result.username}")
+    elif result.username and result.action == "check":
+        details.append(f"Username: {result.username}")
+    return " ".join([base, *details]) if details else base
 
 
 def make_client(ctx: click.Context) -> Any: