chatenv 0.2.5__tar.gz → 0.2.7__tar.gz

{chatenv-0.2.5/src/chatenv.egg-info → chatenv-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatenv
-Version: 0.2.5
+Version: 0.2.7
 Summary: ChatArch typed environment profile manager
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -68,7 +68,8 @@ pip install -e .[dev]       # 仓库开发
 
 ```text
 CHATARCH_HOME=${CHATARCH_HOME:-~/.chatarch}
-$CHATARCH_HOME/envs/
+$CHATARCH_HOME/envs/      # stable typed env/profile files
+$CHATARCH_HOME/tokens/    # generated runtime tokens/sessions, parallel to env profiles
 ```
 
 实际布局由业务项目注册的 schema 决定，例如：
@@ -122,6 +123,17 @@ export CHATARCH_AUTO_PROMPT=false
 
 更多用法见 `docs/cli.md`。
 
+## Runtime tokens
+
+ChatEnv 区分 stable env/profile 和动态 runtime token：
+
+- `envs/<Service>/<profile>.env` 保存可长期维护的稳定配置，例如 base URL、账号、API key 或 refresh/login 所需输入；
+- `tokens/<Service>/<profile>.json` 保存由登录或刷新流程生成的 access token、session、cookie/CSRF 等运行态；
+- `chatenv token refresh SERVICE PROFILE` 会调用服务包通过 `chatenv.token_refreshers` 注册的刷新器，自动生成并更新 token-store；
+- 手工 JSON 写入只保留为显式 `chatenv token import ... --stdin/--file`，用于迁移、调试或外部刷新器交接，不应作为日常维护入口。
+
+ChatEnv 只负责路径、profile 校验、原子写入和 safe status/list/clear；具体登录、OAuth refresh、cookie 刷新等业务语义仍由 leaf package 负责。
+
 ## Paste
 
 `paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。

{chatenv-0.2.5 → chatenv-0.2.7}/README.md

@@ -38,7 +38,8 @@ pip install -e .[dev]       # 仓库开发
 
 ```text
 CHATARCH_HOME=${CHATARCH_HOME:-~/.chatarch}
-$CHATARCH_HOME/envs/
+$CHATARCH_HOME/envs/      # stable typed env/profile files
+$CHATARCH_HOME/tokens/    # generated runtime tokens/sessions, parallel to env profiles
 ```
 
 实际布局由业务项目注册的 schema 决定，例如：
@@ -92,6 +93,17 @@ export CHATARCH_AUTO_PROMPT=false
 
 更多用法见 `docs/cli.md`。
 
+## Runtime tokens
+
+ChatEnv 区分 stable env/profile 和动态 runtime token：
+
+- `envs/<Service>/<profile>.env` 保存可长期维护的稳定配置，例如 base URL、账号、API key 或 refresh/login 所需输入；
+- `tokens/<Service>/<profile>.json` 保存由登录或刷新流程生成的 access token、session、cookie/CSRF 等运行态；
+- `chatenv token refresh SERVICE PROFILE` 会调用服务包通过 `chatenv.token_refreshers` 注册的刷新器，自动生成并更新 token-store；
+- 手工 JSON 写入只保留为显式 `chatenv token import ... --stdin/--file`，用于迁移、调试或外部刷新器交接，不应作为日常维护入口。
+
+ChatEnv 只负责路径、profile 校验、原子写入和 safe status/list/clear；具体登录、OAuth refresh、cookie 刷新等业务语义仍由 leaf package 负责。
+
 ## Paste
 
 `paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。

{chatenv-0.2.5 → chatenv-0.2.7}/src/chatenv/__init__.py

@@ -3,6 +3,7 @@
 from .fields import BaseEnvConfig, EnvField
 from .paths import ChatArchPaths, get_paths
 from .store import EnvStore
+from .token_refreshers import TokenRefreshResult
 from .tokens import TokenStore
 from .configs import FeishuConfig, OpenAIConfig
 from .discovery import get_provider_configs, get_provider_errors, load_config_providers
@@ -14,6 +15,7 @@ __all__ = [
     "EnvStore",
     "FeishuConfig",
     "OpenAIConfig",
+    "TokenRefreshResult",
     "TokenStore",
     "get_provider_configs",
     "get_provider_errors",
@@ -22,4 +24,4 @@ __all__ = [
     "__version__",
 ]
 
-__version__ = "0.2.5"
+__version__ = "0.2.7"

{chatenv-0.2.5 → chatenv-0.2.7}/src/chatenv/cli.py

@@ -27,6 +27,7 @@ from .paste import iter_fields_for_values, parse_pasted_env_text
 from .paths import get_paths
 from .registry import resolve_config_types
 from .store import EnvStore
+from .token_refreshers import refresh_token as refresh_runtime_token
 from .tokens import TokenStore
 from .utils import mask_secret
 
@@ -129,7 +130,7 @@ class OrderedGroup(click.Group):
 
 
 class TokenCommandGroup(OrderedGroup):
-    command_order = ["status", "refresh", "list", "clear"]
+    command_order = ["status", "refresh", "import", "list", "clear"]
 
 
 def _format_metavar(name: str) -> str:
@@ -625,7 +626,7 @@ def _render_token_status(payload: dict[str, object]) -> None:
 
 def _read_token_values(*, read_stdin: bool, value_file: Path | None) -> dict[str, object]:
     if read_stdin == bool(value_file):
-        raise click.ClickException("token refresh requires exactly one of --stdin or --file.")
+        raise click.ClickException("token import requires exactly one of --stdin or --file.")
     text = sys.stdin.read() if read_stdin else value_file.read_text(encoding="utf-8")  # type: ignore[union-attr]
     try:
         payload = json.loads(text)
@@ -639,6 +640,29 @@ def _read_token_values(*, read_stdin: bool, value_file: Path | None) -> dict[str
 @token_group.command(name="refresh")
 @click.argument("service")
 @click.argument("profile", required=False, default="default")
+@click.option("--format", "output_format", type=click.Choice(["text", "json"]), default="text", show_default=True)
+@click.pass_context
+def token_refresh(ctx: click.Context, service: str, profile: str, output_format: str):
+    """Refresh SERVICE/PROFILE through a registered service refresh provider."""
+    try:
+        payload = refresh_runtime_token(
+            service,
+            profile,
+            home=ctx.obj["paths"].home_dir,
+            env_store=_store(ctx),
+            token_store=_token_store(ctx),
+        )
+    except ValueError as exc:
+        raise click.ClickException(str(exc)) from exc
+    if output_format == "json":
+        _echo_json(payload)
+    else:
+        _render_token_status(payload)
+
+
+@token_group.command(name="import")
+@click.argument("service")
+@click.argument("profile", required=False, default="default")
 @click.option("--stdin", "read_stdin", is_flag=True, help="Read token JSON object from stdin.")
 @click.option("--file", "value_file", type=click.Path(dir_okay=False, path_type=Path), help="Read token JSON object from a file.")
 @click.option("--token-type", default="runtime", show_default=True, help="Caller-defined token/session type.")
@@ -646,7 +670,7 @@ def _read_token_values(*, read_stdin: bool, value_file: Path | None) -> dict[str
 @click.option("--expires-at", default="", help="Optional caller-provided expiry timestamp.")
 @click.option("--format", "output_format", type=click.Choice(["text", "json"]), default="text", show_default=True)
 @click.pass_context
-def token_refresh(
+def token_import(
     ctx: click.Context,
     service: str,
     profile: str,
@@ -657,17 +681,20 @@ def token_refresh(
     expires_at: str,
     output_format: str,
 ):
-    """Write refreshed generic runtime token JSON for SERVICE/PROFILE."""
+    """Explicitly import externally refreshed runtime token JSON."""
     values = _read_token_values(read_stdin=read_stdin, value_file=value_file)
-    payload = _token_store(ctx).write(
-        service,
-        profile,
-        values=values,
-        token_type=token_type,
-        summary=_parse_summary(summary),
-        expires_at=expires_at,
-        source="refresh",
-    )
+    try:
+        payload = _token_store(ctx).write(
+            service,
+            profile,
+            values=values,
+            token_type=token_type,
+            summary=_parse_summary(summary),
+            expires_at=expires_at,
+            source="import",
+        )
+    except ValueError as exc:
+        raise click.ClickException(str(exc)) from exc
     if output_format == "json":
         _echo_json(payload)
     else:
@@ -681,7 +708,10 @@ def token_refresh(
 @click.pass_context
 def token_status(ctx: click.Context, service: str, profile: str, output_format: str):
     """Show safe runtime token metadata for SERVICE/PROFILE."""
-    payload = _token_store(ctx).status(service, profile)
+    try:
+        payload = _token_store(ctx).status(service, profile)
+    except ValueError as exc:
+        raise click.ClickException(str(exc)) from exc
     if output_format == "json":
         _echo_json(payload)
     else:
@@ -721,7 +751,10 @@ def token_list(ctx: click.Context, service: str | None, output_format: str):
 @click.pass_context
 def token_clear(ctx: click.Context, service: str, profile: str, execute: bool, output_format: str):
     """Clear a generic runtime token file for SERVICE/PROFILE."""
-    payload = _token_store(ctx).clear(service, profile, execute=execute)
+    try:
+        payload = _token_store(ctx).clear(service, profile, execute=execute)
+    except ValueError as exc:
+        raise click.ClickException(str(exc)) from exc
     if output_format == "json":
         _echo_json(payload)
     else:

chatenv-0.2.7/src/chatenv/token_refreshers.py

@@ -0,0 +1,146 @@
+"""Service-owned runtime token refresh hooks.
+
+ChatEnv owns token-store persistence and safe metadata rendering. Service
+packages own authentication semantics. A service can register a refresh
+provider through the ``chatenv.token_refreshers`` entry-point group; ChatEnv
+then invokes that provider for ``chatenv token refresh SERVICE PROFILE`` and
+writes the returned opaque runtime values into ``tokens/<Service>/<profile>.json``.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from importlib.metadata import EntryPoint, entry_points
+from pathlib import Path
+from typing import Any, Callable, Iterable, Mapping
+
+from .paths import get_paths
+from .store import EnvStore
+from .tokens import DEFAULT_TOKEN_TYPE, TokenStore, normalize_service_name, normalize_token_profile
+
+ENTRY_POINT_GROUP = "chatenv.token_refreshers"
+
+
+@dataclass(frozen=True)
+class TokenRefreshResult:
+    """Opaque values plus safe metadata returned by a service refresh hook."""
+
+    values: Mapping[str, Any]
+    token_type: str = DEFAULT_TOKEN_TYPE
+    summary: Mapping[str, Any] | None = None
+    expires_at: str | None = None
+
+
+_token_refreshers: dict[str, Callable[..., Any]] = {}
+_loaded = False
+
+
+def _iter_refresh_entry_points() -> Iterable[EntryPoint]:
+    eps = entry_points()
+    if hasattr(eps, "select"):
+        return eps.select(group=ENTRY_POINT_GROUP)
+    return eps.get(ENTRY_POINT_GROUP, [])
+
+
+def clear_token_refreshers() -> None:
+    """Clear the refresh-provider cache; intended for tests and reloads."""
+
+    global _loaded
+    _loaded = False
+    _token_refreshers.clear()
+
+
+def _provider_callable(obj: Any) -> Callable[..., Any]:
+    if callable(obj):
+        return obj
+    for attr in ("refresh_token", "refresh"):
+        candidate = getattr(obj, attr, None)
+        if callable(candidate):
+            return candidate
+    raise TypeError("token refresh provider must be callable or expose refresh_token()/refresh()")
+
+
+def load_token_refreshers(*, force: bool = False) -> dict[str, Callable[..., Any]]:
+    """Load service refresh hooks registered through entry points."""
+
+    global _loaded
+    if _loaded and not force:
+        return dict(_token_refreshers)
+    if force:
+        _token_refreshers.clear()
+    _loaded = True
+    for ep in _iter_refresh_entry_points():
+        service_name = normalize_service_name(ep.name)
+        provider = _provider_callable(ep.load())
+        _token_refreshers[service_name.lower()] = provider
+    return dict(_token_refreshers)
+
+
+def get_token_refresher(service: str, *, force: bool = False) -> Callable[..., Any] | None:
+    service_name = normalize_service_name(service)
+    return load_token_refreshers(force=force).get(service_name.lower())
+
+
+def _coerce_refresh_result(result: Any) -> TokenRefreshResult:
+    if isinstance(result, TokenRefreshResult):
+        return result
+    if isinstance(result, Mapping):
+        values = result.get("values")
+        if not isinstance(values, Mapping):
+            raise ValueError("token refresh provider result must include a non-empty values object")
+        return TokenRefreshResult(
+            values=values,
+            token_type=str(result.get("token_type") or DEFAULT_TOKEN_TYPE),
+            summary=result.get("summary") if isinstance(result.get("summary"), Mapping) else None,
+            expires_at=str(result.get("expires_at") or ""),
+        )
+    raise ValueError("token refresh provider must return TokenRefreshResult or a mapping")
+
+
+def refresh_token(
+    service: str,
+    profile: str | None = None,
+    *,
+    home: str | Path | None = None,
+    env_store: EnvStore | None = None,
+    token_store: TokenStore | None = None,
+) -> dict[str, Any]:
+    """Invoke the registered service refresh hook and persist its token values."""
+
+    service_name = normalize_service_name(service)
+    profile_name = normalize_token_profile(profile)
+    provider = get_token_refresher(service_name)
+    if provider is None:
+        raise ValueError(f"No token refresh provider registered for {service_name}")
+
+    paths = get_paths(home)
+    env_store = env_store or EnvStore(paths.envs_dir)
+    token_store = token_store or TokenStore(tokens_dir=paths.tokens_dir)
+    result = _coerce_refresh_result(
+        provider(
+            service=service_name,
+            profile=profile_name,
+            home=paths.home_dir,
+            env_store=env_store,
+            token_store=token_store,
+        )
+    )
+    return token_store.write(
+        service_name,
+        profile_name,
+        values=dict(result.values),
+        token_type=result.token_type or DEFAULT_TOKEN_TYPE,
+        summary=dict(result.summary or {}),
+        expires_at=result.expires_at or "",
+        source="refresh",
+    )
+
+
+__all__ = [
+    "ENTRY_POINT_GROUP",
+    "TokenRefreshResult",
+    "clear_token_refreshers",
+    "get_token_refresher",
+    "load_token_refreshers",
+    "refresh_token",
+]

{chatenv-0.2.5 → chatenv-0.2.7}/src/chatenv/tokens.py

@@ -36,12 +36,32 @@ def _safe_segment(value: str, *, default: str) -> str:
     return cleaned or default
 
 
+def _strict_token_profile_segment(value: str | None) -> str:
+    if value is None:
+        return DEFAULT_PROFILE
+    raw = str(value)
+    stripped = raw.strip()
+    if not stripped:
+        raise ValueError("token profile must not be empty")
+    if stripped != raw:
+        raise ValueError("token profile must not contain leading or trailing whitespace")
+    if stripped in {".", ".."}:
+        raise ValueError("token profile must not be '.' or '..'")
+    if "/" in stripped or "\\" in stripped:
+        raise ValueError("token profile must be a single path segment")
+    if re.search(r"[^A-Za-z0-9_.-]", stripped):
+        raise ValueError("token profile may contain only letters, numbers, dot, underscore, and hyphen")
+    if stripped.strip(".-") != stripped:
+        raise ValueError("token profile must not start or end with dot or hyphen")
+    return stripped
+
+
 def normalize_service_name(value: str) -> str:
     return _safe_segment(value, default="Service")
 
 
 def normalize_token_profile(value: str | None) -> str:
-    return _safe_segment(value or DEFAULT_PROFILE, default=DEFAULT_PROFILE)
+    return _strict_token_profile_segment(value)
 
 
 def _coerce_mapping(value: dict[str, Any] | None) -> dict[str, Any]:

{chatenv-0.2.5 → chatenv-0.2.7/src/chatenv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatenv
-Version: 0.2.5
+Version: 0.2.7
 Summary: ChatArch typed environment profile manager
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -68,7 +68,8 @@ pip install -e .[dev]       # 仓库开发
 
 ```text
 CHATARCH_HOME=${CHATARCH_HOME:-~/.chatarch}
-$CHATARCH_HOME/envs/
+$CHATARCH_HOME/envs/      # stable typed env/profile files
+$CHATARCH_HOME/tokens/    # generated runtime tokens/sessions, parallel to env profiles
 ```
 
 实际布局由业务项目注册的 schema 决定，例如：
@@ -122,6 +123,17 @@ export CHATARCH_AUTO_PROMPT=false
 
 更多用法见 `docs/cli.md`。
 
+## Runtime tokens
+
+ChatEnv 区分 stable env/profile 和动态 runtime token：
+
+- `envs/<Service>/<profile>.env` 保存可长期维护的稳定配置，例如 base URL、账号、API key 或 refresh/login 所需输入；
+- `tokens/<Service>/<profile>.json` 保存由登录或刷新流程生成的 access token、session、cookie/CSRF 等运行态；
+- `chatenv token refresh SERVICE PROFILE` 会调用服务包通过 `chatenv.token_refreshers` 注册的刷新器，自动生成并更新 token-store；
+- 手工 JSON 写入只保留为显式 `chatenv token import ... --stdin/--file`，用于迁移、调试或外部刷新器交接，不应作为日常维护入口。
+
+ChatEnv 只负责路径、profile 校验、原子写入和 safe status/list/clear；具体登录、OAuth refresh、cookie 刷新等业务语义仍由 leaf package 负责。
+
 ## Paste
 
 `paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。

{chatenv-0.2.5 → chatenv-0.2.7}/src/chatenv.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/chatenv/paths.py
 src/chatenv/registry.py
 src/chatenv/source_chain.py
 src/chatenv/store.py
+src/chatenv/token_refreshers.py
 src/chatenv/tokens.py
 src/chatenv/utils.py
 src/chatenv.egg-info/PKG-INFO

{chatenv-0.2.5 → chatenv-0.2.7}/tests/test_chatenv_core.py

@@ -2,6 +2,7 @@ import json
 from pathlib import Path
 from types import SimpleNamespace
 
+import pytest
 from click.testing import CliRunner
 import chatenv.discovery as discovery_module
 import chatenv.cli as cli_module
@@ -294,6 +295,147 @@ def test_token_store_list_and_clear_are_generic(tmp_path):
     assert store.status("PyPI", "RexWzh")["token_present"] is False
 
 
+def test_token_store_rejects_aliasing_profile_segments(tmp_path):
+    from chatenv.tokens import TokenStore, normalize_token_profile
+
+    store = TokenStore(home=tmp_path / "arch")
+    store.write("PyPI", "RexWzh", values={"session": "opaque-value"}, token_type="web_session")
+
+    invalid_profiles = [
+        "",
+        " ",
+        ".",
+        "..",
+        "../RexWzh",
+        "RexWzh/other",
+        "RexWzh\\other",
+        " RexWzh",
+        "RexWzh ",
+        ".RexWzh",
+        "RexWzh.",
+        "Rex Wzh",
+    ]
+    for profile in invalid_profiles:
+        with pytest.raises(ValueError):
+            normalize_token_profile(profile)
+        with pytest.raises(ValueError):
+            store.status("PyPI", profile)
+
+    assert store.status("PyPI", "RexWzh")["token_present"] is True
+    assert store.status("PyPI", None)["profile"] == "default"
+
+
+def test_token_cli_reports_invalid_profile_without_aliasing(tmp_path):
+    runner = CliRunner()
+    result = runner.invoke(
+        cli,
+        ["--home", str(tmp_path / "arch"), "token", "status", "PyPI", "../RexWzh", "--format", "json"],
+    )
+
+    assert result.exit_code != 0
+    assert "single path segment" in result.output
+    assert "Traceback" not in result.output
+
+
+def test_token_refresh_uses_registered_provider_not_manual_json(monkeypatch, tmp_path):
+    from chatenv import token_refreshers as refresh_module
+    from chatenv.token_refreshers import TokenRefreshResult
+    from chatenv.tokens import TokenStore
+
+    runner = CliRunner()
+    home = tmp_path / "arch"
+    calls = []
+
+    def refresh(**kwargs):
+        calls.append(kwargs)
+        assert kwargs["service"] == "PyPI"
+        assert kwargs["profile"] == "RexWzh"
+        assert kwargs["home"] == home
+        return TokenRefreshResult(
+            values={"session": "opaque-value"},
+            token_type="web_session",
+            summary={"username": "operator"},
+            expires_at="2026-08-11T23:00:00Z",
+        )
+
+    class FakeEntryPoint:
+        name = "PyPI"
+        value = "tests.fake:refresh"
+
+        def load(self):
+            return refresh
+
+    monkeypatch.setattr(refresh_module, "_iter_refresh_entry_points", lambda: [FakeEntryPoint()])
+    refresh_module.clear_token_refreshers()
+
+    result = runner.invoke(
+        cli,
+        ["--home", str(home), "token", "refresh", "PyPI", "RexWzh", "--format", "json"],
+    )
+
+    assert result.exit_code == 0, result.output
+    assert len(calls) == 1
+    payload = json.loads(result.output)
+    assert payload["service"] == "PyPI"
+    assert payload["profile"] == "RexWzh"
+    assert payload["token_type"] == "web_session"
+    assert payload["source"] == "refresh"
+    assert payload["summary"] == {"username": "operator"}
+    assert "opaque-value" not in result.output
+    assert TokenStore(home=home).read("PyPI", "RexWzh")["values"] == {"session": "opaque-value"}
+
+
+def test_token_refresh_without_provider_does_not_accept_manual_payload(monkeypatch, tmp_path):
+    from chatenv import token_refreshers as refresh_module
+
+    runner = CliRunner()
+    home = tmp_path / "arch"
+    monkeypatch.setattr(refresh_module, "_iter_refresh_entry_points", lambda: [])
+    refresh_module.clear_token_refreshers()
+
+    result = runner.invoke(
+        cli,
+        ["--home", str(home), "token", "refresh", "PyPI", "RexWzh", "--format", "json"],
+    )
+
+    assert result.exit_code != 0
+    assert "No token refresh provider registered for PyPI" in result.output
+    assert not (home / "tokens" / "PyPI" / "RexWzh.json").exists()
+
+
+def test_token_import_is_explicit_manual_json_path(tmp_path):
+    from chatenv.tokens import TokenStore
+
+    runner = CliRunner()
+    home = tmp_path / "arch"
+    result = runner.invoke(
+        cli,
+        [
+            "--home",
+            str(home),
+            "token",
+            "import",
+            "PyPI",
+            "RexWzh",
+            "--stdin",
+            "--token-type",
+            "web_session",
+            "--summary",
+            "username=operator",
+            "--format",
+            "json",
+        ],
+        input=json.dumps({"session": "opaque-value"}),
+    )
+
+    assert result.exit_code == 0, result.output
+    payload = json.loads(result.output)
+    assert payload["source"] == "import"
+    assert payload["summary"] == {"username": "operator"}
+    assert "opaque-value" not in result.output
+    assert TokenStore(home=home).read("PyPI", "RexWzh")["values"] == {"session": "opaque-value"}
+
+
 def test_store_profile_roundtrip(tmp_path):
     store = EnvStore(tmp_path / "envs")
     UnitConfig.load_from_sources(env_values={"UNIT_KEY": "secret", "UNIT_VALUE": "x"})
@@ -658,18 +800,18 @@ def test_cli_new_bad_type_shows_available_types_outside_interactive(tmp_path):
     assert "Unit (unit)" in result.output
 
 
-def test_cli_token_refresh_status_list_and_clear_hide_values(tmp_path):
+def test_cli_token_import_status_list_and_clear_hide_values(tmp_path):
     runner = CliRunner()
     home = tmp_path / "arch"
     token_json = json.dumps({"access_token": "opaque-value-a", "cookie": "opaque-value-b"})
 
-    refreshed = runner.invoke(
+    imported = runner.invoke(
         cli,
         [
             "--home",
             str(home),
             "token",
-            "refresh",
+            "import",
             "PyPI",
             "RexWzh",
             "--token-type",
@@ -685,11 +827,12 @@ def test_cli_token_refresh_status_list_and_clear_hide_values(tmp_path):
         input=token_json,
     )
 
-    assert refreshed.exit_code == 0, refreshed.output
-    assert '"token_present": true' in refreshed.output
-    assert '"token_file"' in refreshed.output
-    assert "opaque-value-a" not in refreshed.output
-    assert "opaque-value-b" not in refreshed.output
+    assert imported.exit_code == 0, imported.output
+    assert '"source": "import"' in imported.output
+    assert '"token_present": true' in imported.output
+    assert '"token_file"' in imported.output
+    assert "opaque-value-a" not in imported.output
+    assert "opaque-value-b" not in imported.output
     assert (home / "tokens" / "PyPI" / "RexWzh.json").exists()
 
     status = runner.invoke(

{chatenv-0.2.5 → chatenv-0.2.7}/tests/test_version.py

@@ -4,7 +4,7 @@ from click.testing import CliRunner
 
 
 def test_version_present():
-    assert __version__ == "0.2.5"
+    assert __version__ == "0.2.7"
 
 
 def test_cli_version_option():
@@ -36,8 +36,9 @@ def test_tree_option_renders_registered_command_surface():
     assert "├── list" in result.output
     assert "├── status" in result.output
     assert "├── token" in result.output
-    assert "│   ├── refresh" in result.output
     assert "│   ├── status" in result.output
+    assert "│   ├── refresh" in result.output
+    assert "│   ├── import" in result.output
     assert "│   ├── list" in result.output
     assert "│   └── clear" in result.output
     assert "├── cat [NAME]" in result.output