chatenv 0.1.2__tar.gz → 0.2.0__tar.gz

{chatenv-0.1.2/src/chatenv.egg-info → chatenv-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatenv
-Version: 0.1.2
+Version: 0.2.0
 Summary: ChatArch typed environment profile manager
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -10,7 +10,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: chatstyle>=0.1.0
+Requires-Dist: chatstyle<0.2.0,>=0.1.0
 Requires-Dist: click>=8.0
 Requires-Dist: python-dotenv>=1.0
 Provides-Extra: dev
@@ -48,7 +48,7 @@ ChatArch typed env/profile runtime.
 
 </div>
 
-ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它只提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；具体变量由 ChatTool、ChatDNS 等项目自己定义并注册。
+ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；同时内置少量跨工具共享 schema（当前为 OpenAI / Feishu）。工具私有变量仍由 ChatTool、ChatDNS 等项目自己定义并注册。
 
 当前设计保持减法：只使用一个根变量 `CHATARCH_HOME`，只管理 env/profile 文件，不额外创建 config/cache/data/state。
 
@@ -115,12 +115,13 @@ export CHATARCH_AUTO_PROMPT=false
 
 ## Paste
 
-`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key。
+`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。
 
 ```bash
 chatenv paste
 chatenv paste --stdin --profile work
 chatenv paste --value "EXAMPLE_API_KEY='sk-xxx'" --yes
+chatenv paste --value "EXAMPLE_MODEL='gpt example' EXAMPLE_API_KEY='sk-xxx'" --yes
 ```
 
 写入前会输出识别概要：识别到哪些类型、哪些 key、未知 key 被忽略。

{chatenv-0.1.2 → chatenv-0.2.0}/README.md

@@ -21,7 +21,7 @@ ChatArch typed env/profile runtime.
 
 </div>
 
-ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它只提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；具体变量由 ChatTool、ChatDNS 等项目自己定义并注册。
+ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；同时内置少量跨工具共享 schema（当前为 OpenAI / Feishu）。工具私有变量仍由 ChatTool、ChatDNS 等项目自己定义并注册。
 
 当前设计保持减法：只使用一个根变量 `CHATARCH_HOME`，只管理 env/profile 文件，不额外创建 config/cache/data/state。
 
@@ -88,12 +88,13 @@ export CHATARCH_AUTO_PROMPT=false
 
 ## Paste
 
-`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key。
+`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。
 
 ```bash
 chatenv paste
 chatenv paste --stdin --profile work
 chatenv paste --value "EXAMPLE_API_KEY='sk-xxx'" --yes
+chatenv paste --value "EXAMPLE_MODEL='gpt example' EXAMPLE_API_KEY='sk-xxx'" --yes
 ```
 
 写入前会输出识别概要：识别到哪些类型、哪些 key、未知 key 被忽略。

{chatenv-0.1.2 → chatenv-0.2.0}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 authors = [{name = "rexwzh", email = "1073853456@qq.com"}]
 keywords = ["chatenv", "chatarch", "env"]
 dependencies = [
-    "chatstyle>=0.1.0",
+    "chatstyle>=0.1.0,<0.2.0",
     "click>=8.0",
     "python-dotenv>=1.0",
 ]

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv/__init__.py

@@ -3,6 +3,7 @@
 from .fields import BaseEnvConfig, EnvField
 from .paths import ChatArchPaths, get_paths
 from .store import EnvStore
+from .configs import FeishuConfig, OpenAIConfig
 from .discovery import get_provider_configs, get_provider_errors, load_config_providers
 
 __all__ = [
@@ -10,6 +11,8 @@ __all__ = [
     "ChatArchPaths",
     "EnvField",
     "EnvStore",
+    "FeishuConfig",
+    "OpenAIConfig",
     "get_provider_configs",
     "get_provider_errors",
     "get_paths",
@@ -17,4 +20,4 @@ __all__ = [
     "__version__",
 ]
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv/cli.py

@@ -515,14 +515,14 @@ def set_env(ctx: click.Context, key_value: str | None, interactive: bool | None)
         click.echo("Error: Invalid format. Use KEY=VALUE", err=True)
         return
     key, value = key_value.split("=", 1)
-    _load_all(ctx)
     match = BaseEnvConfig.find_field(key.strip())
     if match is None:
         click.echo(f"Error: Key '{key.strip()}' not found", err=True)
         return
-    config_cls, _ = match
-    BaseEnvConfig.set(key.strip(), value.strip())
-    _write_active(ctx, config_cls)
+    config_cls, field = match
+    existing_values = _store(ctx).load_active(config_cls)
+    existing_values[field.env_key] = value.strip()
+    _store(ctx).save_active(config_cls, existing_values)
     click.echo(f"Set {key.strip()}={value.strip()}")
 
 
@@ -699,12 +699,15 @@ def paste_env(ctx: click.Context, value: str | None, read_stdin: bool, profile:
         interactive,
     )
 
-    _load_all(ctx)
-    _apply_values(result.grouped)
     store = _store(ctx)
     click.echo("Written values:")
     for config_cls, values in result.grouped.items():
-        target = store.save_profile(config_cls, profile_name) if profile_name else store.save_active(config_cls)
+        if profile_name:
+            target = store.save_profile(config_cls, profile_name, values)
+        else:
+            existing_values = store.load_active(config_cls)
+            existing_values.update(values)
+            target = store.save_active(config_cls, existing_values)
         click.echo(f"- {config_cls.get_storage_name()}: {target}")
         for field, _ in iter_fields_for_values(config_cls, values):
             click.echo(f"  - {field.env_key}")

chatenv-0.2.0/src/chatenv/configs.py

@@ -0,0 +1,103 @@
+"""Built-in shared ChatArch env schemas.
+
+Only broadly shared configuration schemas live here. Package-specific schemas
+should stay in their owning package and register through ``chatenv.configs``
+entry points.
+"""
+
+from __future__ import annotations
+
+from .fields import BaseEnvConfig, EnvField
+
+
+class OpenAIConfig(BaseEnvConfig):
+    """Shared OpenAI-compatible model provider configuration."""
+
+    _title = "OpenAI Configuration"
+    _aliases = ["oai", "openai"]
+    _storage_dir = "OpenAI"
+    _order = 10
+
+    OPENAI_API_BASE = EnvField(
+        "OPENAI_API_BASE",
+        desc="The base URL of the API, usually with suffix /v1.",
+    )
+    OPENAI_API_KEY = EnvField(
+        "OPENAI_API_KEY",
+        desc="OpenAI-compatible API key",
+        is_sensitive=True,
+    )
+    OPENAI_API_MODEL = EnvField(
+        "OPENAI_API_MODEL",
+        default="gpt-5.5",
+        desc="Default model name",
+    )
+    OPENAI_ACCESS_TOKEN = EnvField(
+        "OPENAI_ACCESS_TOKEN",
+        desc="OpenAI OAuth access token for OAuth-backed capabilities.",
+        is_sensitive=True,
+    )
+    OPENAI_REFRESH_TOKEN = EnvField(
+        "OPENAI_REFRESH_TOKEN",
+        desc="OpenAI OAuth refresh token for OAuth-backed capabilities.",
+        is_sensitive=True,
+    )
+    OPENAI_OAUTH_BASE_URL = EnvField(
+        "OPENAI_OAUTH_BASE_URL",
+        default="https://auth.openai.com",
+        desc="OpenAI OAuth auth server base URL used to refresh access tokens.",
+    )
+    OPENAI_ACCESS_TOKEN_EXPIRES_AT = EnvField(
+        "OPENAI_ACCESS_TOKEN_EXPIRES_AT",
+        desc="UTC ISO timestamp when the OpenAI OAuth access token expires.",
+    )
+    OPENAI_IMAGE_MODEL = EnvField(
+        "OPENAI_IMAGE_MODEL",
+        default="gpt-image-2-medium",
+        desc="Default OpenAI image model preset.",
+    )
+
+
+class FeishuConfig(BaseEnvConfig):
+    """Shared Feishu/Lark app and bot configuration."""
+
+    _title = "Feishu Configuration"
+    _aliases = ["feishu", "lark"]
+    _storage_dir = "Feishu"
+    _order = 20
+
+    FEISHU_APP_ID = EnvField(
+        "FEISHU_APP_ID",
+        desc="Feishu/Lark app ID from the developer console.",
+    )
+    FEISHU_APP_SECRET = EnvField(
+        "FEISHU_APP_SECRET",
+        desc="Feishu/Lark app secret.",
+        is_sensitive=True,
+    )
+    FEISHU_API_BASE = EnvField(
+        "FEISHU_API_BASE",
+        default="https://open.feishu.cn",
+        desc="Feishu/Lark API base URL. Use https://open.larksuite.com for Lark.",
+    )
+    FEISHU_DEFAULT_RECEIVER_ID = EnvField(
+        "FEISHU_DEFAULT_RECEIVER_ID",
+        desc="Default user receive_id for Feishu/Lark sends.",
+    )
+    FEISHU_DEFAULT_CHAT_ID = EnvField(
+        "FEISHU_DEFAULT_CHAT_ID",
+        desc="Default chat_id for Feishu/Lark chat sends.",
+    )
+    FEISHU_ENCRYPT_KEY = EnvField(
+        "FEISHU_ENCRYPT_KEY",
+        desc="Feishu/Lark event encrypt key.",
+        is_sensitive=True,
+    )
+    FEISHU_VERIFY_TOKEN = EnvField(
+        "FEISHU_VERIFY_TOKEN",
+        desc="Feishu/Lark event verification token.",
+        is_sensitive=True,
+    )
+
+
+__all__ = ["OpenAIConfig", "FeishuConfig"]

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv/fields.py

@@ -38,14 +38,27 @@ class BaseEnvConfig:
     """Base class for typed env/profile schemas."""
 
     _registry: ClassVar[list[type["BaseEnvConfig"]]] = []
+    _registry_keys: ClassVar[dict[str, type["BaseEnvConfig"]]] = {}
     _title: ClassVar[str] = "Configuration"
     _aliases: ClassVar[list[str]] = []
     _storage_dir: ClassVar[str | None] = None
 
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
-        if cls not in BaseEnvConfig._registry:
-            BaseEnvConfig._registry.append(cls)
+        if cls in BaseEnvConfig._registry:
+            return
+        registry_key = cls.get_registry_key()
+        existing = BaseEnvConfig._registry_keys.get(registry_key)
+        if existing is not None:
+            setattr(cls, "_duplicate_of", existing)
+            return
+        BaseEnvConfig._registry.append(cls)
+        BaseEnvConfig._registry_keys[registry_key] = cls
+
+    @classmethod
+    def get_registry_key(cls) -> str:
+        """Return the logical registry key used for duplicate detection."""
+        return cls.get_storage_name().strip().lower()
 
     @classmethod
     def get_fields(cls) -> dict[str, EnvField]:

chatenv-0.2.0/src/chatenv/paste.py

@@ -0,0 +1,136 @@
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass, field
+
+from .fields import BaseEnvConfig, EnvField
+
+_ENV_ASSIGN_RE = re.compile(r"(?:^|[^A-Za-z0-9_])(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=")
+_SPACED_ENV_ASSIGN_RE = re.compile(r"(?:^|\s)(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=")
+
+
+@dataclass
+class PasteResult:
+    grouped: dict[type[BaseEnvConfig], dict[str, str]] = field(default_factory=dict)
+    unknown: list[str] = field(default_factory=list)
+
+    @property
+    def recognized_count(self) -> int:
+        return sum(len(values) for values in self.grouped.values())
+
+
+def unquote_pasted_value(raw_value: str) -> str:
+    value = raw_value.strip()
+    if not value:
+        return ""
+    quote = value[0]
+    if quote in ("'", '"'):
+        chars: list[str] = []
+        escaped = False
+        for char in value[1:]:
+            if escaped:
+                chars.append(char)
+                escaped = False
+                continue
+            if quote == '"' and char == "\\":
+                escaped = True
+                continue
+            if char == quote:
+                return "".join(chars)
+            chars.append(char)
+        return "".join(chars)
+    if " #" in value:
+        value = value.split(" #", 1)[0].rstrip()
+    return value
+
+
+def _comment_index(value: str) -> int | None:
+    index = value.find(" #")
+    return index if index >= 0 else None
+
+
+def _quoted_value_end(line: str, value_start: int, quote: str) -> int:
+    escaped = False
+    for index in range(value_start + 1, len(line)):
+        char = line[index]
+        if escaped:
+            escaped = False
+            continue
+        if quote == '"' and char == "\\":
+            escaped = True
+            continue
+        if char == quote:
+            return index + 1
+    return len(line)
+
+
+def _next_assignment_match(line: str, start: int):
+    return _SPACED_ENV_ASSIGN_RE.search(line, start)
+
+
+def _parse_value_and_next_position(line: str, value_start: int) -> tuple[str, int]:
+    stripped_start = value_start
+    while stripped_start < len(line) and line[stripped_start].isspace():
+        stripped_start += 1
+
+    if stripped_start >= len(line):
+        return "", len(line)
+
+    quote = line[stripped_start]
+    if quote in ("'", '"'):
+        value_end = _quoted_value_end(line, stripped_start, quote)
+        next_match = _next_assignment_match(line, value_end)
+        if next_match is None:
+            next_pos = len(line)
+        else:
+            between = line[value_end:next_match.start()]
+            next_pos = len(line) if _comment_index(between) is not None else next_match.start()
+        return unquote_pasted_value(line[value_start:value_end]), next_pos
+
+    next_match = _next_assignment_match(line, value_start)
+    if next_match is None:
+        return unquote_pasted_value(line[value_start:]), len(line)
+
+    segment = line[value_start:next_match.start()]
+    comment = _comment_index(segment)
+    if comment is not None:
+        return unquote_pasted_value(segment[:comment]), len(line)
+    return unquote_pasted_value(segment), next_match.start()
+
+
+def iter_pasted_assignments(line: str):
+    position = 0
+    while True:
+        match = _ENV_ASSIGN_RE.search(line, position)
+        if match is None:
+            break
+        key = match.group(1)
+        value, position = _parse_value_and_next_position(line, match.end())
+        yield key, value
+        if position >= len(line):
+            break
+
+
+def extract_pasted_assignment(line: str) -> tuple[str, str] | None:
+    return next(iter_pasted_assignments(line), None)
+
+
+def parse_pasted_env_text(text: str) -> PasteResult:
+    result = PasteResult()
+    for line in text.splitlines():
+        for key, value in iter_pasted_assignments(line):
+            match = BaseEnvConfig.find_field(key)
+            if match is None:
+                result.unknown.append(key)
+                continue
+            config_cls, field = match
+            result.grouped.setdefault(config_cls, {})[field.env_key] = value
+    return result
+
+
+def iter_fields_for_values(config_cls: type[BaseEnvConfig], values: dict[str, str]):
+    fields_by_key: dict[str, EnvField] = {field.env_key: field for field in config_cls.get_fields().values()}
+    for key, value in values.items():
+        field = fields_by_key.get(key)
+        if field is not None:
+            yield field, value

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv/store.py

@@ -66,14 +66,39 @@ class EnvStore:
         target.unlink()
         return target
 
+    def _render_explicit_env_file(
+        self,
+        config_cls: type[BaseEnvConfig],
+        values: dict[str, Any],
+    ) -> str:
+        lines = [f"# Description: Env file for {config_cls._title}.", ""]
+        fields_by_key = {field.env_key: field for field in config_cls.get_fields().values()}
+        written: set[str] = set()
+        for field in config_cls.get_fields().values():
+            if field.env_key not in values:
+                continue
+            if field.desc:
+                lines.append(f"# {field.desc}")
+            lines.append(f"{field.env_key}='{values[field.env_key]}'")
+            lines.append("")
+            written.add(field.env_key)
+        for key, value in values.items():
+            if key in written or key in fields_by_key:
+                continue
+            lines.append(f"{key}='{value}'")
+            lines.append("")
+        return "\n".join(lines)
+
     def _save(
         self,
         config_cls: type[BaseEnvConfig],
         target_path: Path,
         values: dict[str, Any] | None = None,
     ) -> Path:
-        if values is not None:
-            config_cls.load_from_sources(env_values=values)
         target_path.parent.mkdir(parents=True, exist_ok=True)
-        target_path.write_text(config_cls.render_env_file(), encoding="utf-8")
+        if values is None:
+            content = config_cls.render_env_file()
+        else:
+            content = self._render_explicit_env_file(config_cls, values)
+        target_path.write_text(content, encoding="utf-8")
         return target_path

{chatenv-0.1.2 → chatenv-0.2.0/src/chatenv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatenv
-Version: 0.1.2
+Version: 0.2.0
 Summary: ChatArch typed environment profile manager
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -10,7 +10,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: chatstyle>=0.1.0
+Requires-Dist: chatstyle<0.2.0,>=0.1.0
 Requires-Dist: click>=8.0
 Requires-Dist: python-dotenv>=1.0
 Provides-Extra: dev
@@ -48,7 +48,7 @@ ChatArch typed env/profile runtime.
 
 </div>
 
-ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它只提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；具体变量由 ChatTool、ChatDNS 等项目自己定义并注册。
+ChatEnv 是 ChatArch / chatxxx 系列项目共用的 typed env/profile 底层包。它提供字段描述、配置基类、registry、路径、profile 文件读写、mask 和 paste 解析等通用能力；同时内置少量跨工具共享 schema（当前为 OpenAI / Feishu）。工具私有变量仍由 ChatTool、ChatDNS 等项目自己定义并注册。
 
 当前设计保持减法：只使用一个根变量 `CHATARCH_HOME`，只管理 env/profile 文件，不额外创建 config/cache/data/state。
 
@@ -115,12 +115,13 @@ export CHATARCH_AUTO_PROMPT=false
 
 ## Paste
 
-`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key。
+`paste` 是跨设备复制密钥的核心入口。输入不要求是严格 dotenv 文件，会从终端日志、shell prompt、复制文本里提取已注册 key；同一行里用空格分隔的多个 `KEY='VALUE'` 片段也会被逐个识别。
 
 ```bash
 chatenv paste
 chatenv paste --stdin --profile work
 chatenv paste --value "EXAMPLE_API_KEY='sk-xxx'" --yes
+chatenv paste --value "EXAMPLE_MODEL='gpt example' EXAMPLE_API_KEY='sk-xxx'" --yes
 ```
 
 写入前会输出识别概要：识别到哪些类型、哪些 key、未知 key 被忽略。

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 src/chatenv/__init__.py
 src/chatenv/cli.py
+src/chatenv/configs.py
 src/chatenv/discovery.py
 src/chatenv/fields.py
 src/chatenv/paste.py

{chatenv-0.1.2 → chatenv-0.2.0}/src/chatenv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-chatstyle>=0.1.0
+chatstyle<0.2.0,>=0.1.0
 click>=8.0
 python-dotenv>=1.0
 

{chatenv-0.1.2 → chatenv-0.2.0}/tests/test_chatenv_core.py

@@ -1,8 +1,11 @@
+from pathlib import Path
 from types import SimpleNamespace
 
 from click.testing import CliRunner
+import chatenv.discovery as discovery_module
 import chatenv.cli as cli_module
 from chatenv.cli import cli
+from chatenv.configs import FeishuConfig, OpenAIConfig
 from chatenv.fields import BaseEnvConfig, EnvField
 from chatenv.paste import parse_pasted_env_text
 from chatenv.paths import get_paths
@@ -18,6 +21,129 @@ class UnitConfig(BaseEnvConfig):
     UNIT_VALUE = EnvField("UNIT_VALUE", default="default")
 
 
+class RoundTripConfig(BaseEnvConfig):
+    _title = "RoundTrip Configuration"
+    _aliases = ["roundtrip"]
+    _storage_dir = "RoundTrip"
+
+    ROUNDTRIP_VALUE = EnvField("ROUNDTRIP_VALUE")
+    ROUNDTRIP_URL = EnvField("ROUNDTRIP_URL")
+
+
+def test_builtin_shared_openai_and_feishu_configs_are_registered():
+    assert BaseEnvConfig.get_config_by_alias("openai") is OpenAIConfig
+    assert BaseEnvConfig.get_config_by_alias("oai") is OpenAIConfig
+    assert BaseEnvConfig.get_config_by_alias("feishu") is FeishuConfig
+    assert BaseEnvConfig.get_config_by_alias("lark") is FeishuConfig
+
+    assert OpenAIConfig.get_storage_name() == "OpenAI"
+    assert FeishuConfig.get_storage_name() == "Feishu"
+    assert "OPENAI_API_KEY" in [field.env_key for field in OpenAIConfig.get_fields().values()]
+    assert "FEISHU_APP_SECRET" in [field.env_key for field in FeishuConfig.get_fields().values()]
+
+
+def test_duplicate_logical_config_registration_is_skipped():
+    registry_before = list(BaseEnvConfig._registry)
+
+    class DuplicateOpenAIConfig(BaseEnvConfig):
+        _title = "Duplicate OpenAI Configuration"
+        _aliases = ["duplicate-openai"]
+        _storage_dir = "OpenAI"
+
+        DUPLICATE_OPENAI_KEY = EnvField("DUPLICATE_OPENAI_KEY")
+
+    assert DuplicateOpenAIConfig not in BaseEnvConfig._registry
+    assert getattr(DuplicateOpenAIConfig, "_duplicate_of") is OpenAIConfig
+    assert BaseEnvConfig.get_config_by_alias("openai") is OpenAIConfig
+    assert BaseEnvConfig.find_field("DUPLICATE_OPENAI_KEY") is None
+    assert BaseEnvConfig._registry == registry_before
+
+
+def test_duplicate_provider_config_does_not_pollute_registry(monkeypatch):
+    registry_before = list(BaseEnvConfig._registry)
+    provider_configs_before = discovery_module.get_provider_configs()
+
+    class FakeEntryPoint:
+        name = "legacy-chattool"
+        value = "legacy_chattool.config"
+
+        def load(self):
+            class LegacyFeishuConfig(BaseEnvConfig):
+                _title = "Legacy Feishu Configuration"
+                _aliases = ["legacy-feishu"]
+                _storage_dir = "Feishu"
+
+                LEGACY_FEISHU_ONLY = EnvField("LEGACY_FEISHU_ONLY")
+
+            return LegacyFeishuConfig
+
+    monkeypatch.setattr(discovery_module, "_iter_entry_points", lambda: [FakeEntryPoint()])
+
+    results = discovery_module.load_config_providers(force=True)
+
+    assert len(results) == 1
+    assert results[0].loaded is True
+    assert results[0].configs == ()
+    assert BaseEnvConfig._registry == registry_before
+    assert BaseEnvConfig.get_config_by_alias("feishu") is FeishuConfig
+    assert BaseEnvConfig.find_field("LEGACY_FEISHU_ONLY") is None
+
+    discovery_module._provider_configs.clear()
+    discovery_module._provider_configs.update(provider_configs_before)
+
+
+def test_chatarch_internal_dependencies_have_upper_bounds():
+    pyproject_text = (Path(__file__).resolve().parents[1] / "pyproject.toml").read_text(
+        encoding="utf-8"
+    )
+
+    assert '"chatstyle>=0.1.0,<0.2.0"' in pyproject_text
+    assert '"chatstyle>=0.1.0"' not in pyproject_text
+
+
+def test_cli_set_only_writes_the_requested_key(monkeypatch, tmp_path):
+    monkeypatch.setenv("OPENAI_API_KEY", "system-secret")
+    runner = CliRunner()
+    home = tmp_path / "arch"
+
+    result = runner.invoke(
+        cli,
+        ["--home", str(home), "set", "OPENAI_API_BASE=https://example.invalid/v1"],
+    )
+
+    assert result.exit_code == 0, result.output
+    env_text = (home / "envs" / "OpenAI" / ".env").read_text(encoding="utf-8")
+    assert "OPENAI_API_BASE='https://example.invalid/v1'" in env_text
+    assert "OPENAI_API_KEY" not in env_text
+
+
+def test_cli_paste_active_merges_file_values_without_system_env(monkeypatch, tmp_path):
+    monkeypatch.setenv("OPENAI_API_KEY", "system-secret")
+    runner = CliRunner()
+    home = tmp_path / "arch"
+    openai_active = home / "envs" / "OpenAI" / ".env"
+    openai_active.parent.mkdir(parents=True)
+    openai_active.write_text("OPENAI_API_BASE='https://old.example/v1'\n", encoding="utf-8")
+
+    result = runner.invoke(
+        cli,
+        [
+            "--home",
+            str(home),
+            "paste",
+            "--value",
+            "OPENAI_API_MODEL='gpt-test'",
+            "--yes",
+        ],
+    )
+
+    assert result.exit_code == 0, result.output
+    env_text = openai_active.read_text(encoding="utf-8")
+    assert "OPENAI_API_BASE='https://old.example/v1'" in env_text
+    assert "OPENAI_API_MODEL='gpt-test'" in env_text
+    assert "OPENAI_API_KEY" not in env_text
+
+
 def test_paths_only_use_chatarch_home(monkeypatch, tmp_path):
     monkeypatch.setenv("CHATARCH_HOME", str(tmp_path / "arch"))
     paths = get_paths()
@@ -65,6 +191,66 @@ def test_paste_parser_extracts_from_loose_terminal_text():
     assert result.unknown == ["UNKNOWN_KEY"]
 
 
+def test_paste_parser_extracts_multiple_assignments_on_one_spaced_line():
+    text = "UNIT_VALUE='hello world' UNIT_KEY='sk with spaces' UNKNOWN_KEY=nope"
+
+    result = parse_pasted_env_text(text)
+
+    assert result.grouped[UnitConfig]["UNIT_VALUE"] == "hello world"
+    assert result.grouped[UnitConfig]["UNIT_KEY"] == "sk with spaces"
+    assert result.unknown == ["UNKNOWN_KEY"]
+
+
+def test_paste_parser_keeps_url_query_params_before_spaced_assignment():
+    text = "UNIT_VALUE=https://api.example.test/v1?x=1 UNIT_KEY='secret'"
+
+    result = parse_pasted_env_text(text)
+
+    assert result.grouped[UnitConfig]["UNIT_VALUE"] == "https://api.example.test/v1?x=1"
+    assert result.grouped[UnitConfig]["UNIT_KEY"] == "secret"
+    assert result.unknown == []
+
+
+def test_paste_parser_keeps_empty_value_before_spaced_assignment():
+    text = "UNIT_VALUE= UNIT_KEY='secret'"
+
+    result = parse_pasted_env_text(text)
+
+    assert result.grouped[UnitConfig]["UNIT_VALUE"] == ""
+    assert result.grouped[UnitConfig]["UNIT_KEY"] == "secret"
+
+
+def test_paste_parser_stops_at_inline_comment_before_later_assignment():
+    text = "UNIT_VALUE='hello world' # comment UNIT_KEY='secret'"
+
+    result = parse_pasted_env_text(text)
+
+    assert result.grouped[UnitConfig]["UNIT_VALUE"] == "hello world"
+    assert "UNIT_KEY" not in result.grouped[UnitConfig]
+
+
+def test_paste_parser_accepts_export_prefix_on_same_line_assignments():
+    text = "export UNIT_VALUE='hello world' UNIT_KEY='secret'"
+
+    result = parse_pasted_env_text(text)
+
+    assert result.grouped[UnitConfig]["UNIT_VALUE"] == "hello world"
+    assert result.grouped[UnitConfig]["UNIT_KEY"] == "secret"
+
+
+def test_cli_paste_accepts_space_separated_assignments(tmp_path):
+    runner = CliRunner()
+    home = tmp_path / "arch"
+    value = "UNIT_VALUE='from spaced paste' UNIT_KEY='sk with spaces'"
+
+    result = runner.invoke(cli, ["--home", str(home), "paste", "--value", value, "--yes"])
+
+    assert result.exit_code == 0, result.output
+    env_text = (home / "envs" / "Unit" / ".env").read_text(encoding="utf-8")
+    assert "UNIT_VALUE='from spaced paste'" in env_text
+    assert "UNIT_KEY='sk with spaces'" in env_text
+
+
 def test_cli_paste_active_and_cat(tmp_path):
     runner = CliRunner()
     home = tmp_path / "arch"
@@ -82,6 +268,55 @@ def test_cli_paste_active_and_cat(tmp_path):
     assert "abcdefghijklmnopqrstuvwxyz" not in cat.output
 
 
+def test_cli_cat_output_with_blank_lines_can_be_pasted_to_profile(tmp_path):
+    runner = CliRunner()
+    source_home = tmp_path / "source"
+    target_home = tmp_path / "target"
+    value = "\n".join(
+        [
+            "UNIT_VALUE='hello world with spaces'",
+            "UNIT_KEY='unit dummy value with spaces'",
+            "ROUNDTRIP_VALUE='roundtrip value with spaces'",
+            "ROUNDTRIP_URL=https://api.example.test/v1?x=1",
+        ]
+    )
+    seed = runner.invoke(
+        cli,
+        ["--home", str(source_home), "paste", "--value", value, "--yes"],
+    )
+    assert seed.exit_code == 0, seed.output
+
+    cat = runner.invoke(cli, ["--home", str(source_home), "cat", "--no-mask"])
+    assert cat.exit_code == 0, cat.output
+    assert "\n\n# RoundTrip\n" in cat.output
+
+    imported = runner.invoke(
+        cli,
+        [
+            "--home",
+            str(target_home),
+            "paste",
+            "--value",
+            cat.output,
+            "--profile",
+            "copy",
+            "--yes",
+        ],
+    )
+    assert imported.exit_code == 0, imported.output
+
+    unit_copy = (target_home / "envs" / "Unit" / "copy.env").read_text(
+        encoding="utf-8"
+    )
+    roundtrip_copy = (target_home / "envs" / "RoundTrip" / "copy.env").read_text(
+        encoding="utf-8"
+    )
+    assert "UNIT_VALUE='hello world with spaces'" in unit_copy
+    assert "UNIT_KEY='unit dummy value with spaces'" in unit_copy
+    assert "ROUNDTRIP_VALUE='roundtrip value with spaces'" in roundtrip_copy
+    assert "ROUNDTRIP_URL='https://api.example.test/v1?x=1'" in roundtrip_copy
+
+
 def test_cli_delete_profile_requires_confirmation(tmp_path):
     runner = CliRunner()
     home = tmp_path / "arch"

{chatenv-0.1.2 → chatenv-0.2.0}/tests/test_version.py

@@ -2,4 +2,4 @@ from chatenv import __version__
 
 
 def test_version_present():
-    assert __version__ == "0.1.2"
+    assert __version__ == "0.2.0"

chatenv-0.1.2/src/chatenv/paste.py

@@ -1,75 +0,0 @@
-from __future__ import annotations
-
-import re
-from dataclasses import dataclass, field
-
-from .fields import BaseEnvConfig, EnvField
-
-_ENV_ASSIGN_RE = re.compile(r"(?:^|[^A-Za-z0-9_])(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=")
-
-
-@dataclass
-class PasteResult:
-    grouped: dict[type[BaseEnvConfig], dict[str, str]] = field(default_factory=dict)
-    unknown: list[str] = field(default_factory=list)
-
-    @property
-    def recognized_count(self) -> int:
-        return sum(len(values) for values in self.grouped.values())
-
-
-def unquote_pasted_value(raw_value: str) -> str:
-    value = raw_value.strip()
-    if not value:
-        return ""
-    quote = value[0]
-    if quote in ("'", '"'):
-        chars: list[str] = []
-        escaped = False
-        for char in value[1:]:
-            if escaped:
-                chars.append(char)
-                escaped = False
-                continue
-            if quote == '"' and char == "\\":
-                escaped = True
-                continue
-            if char == quote:
-                return "".join(chars)
-            chars.append(char)
-        return "".join(chars)
-    if " #" in value:
-        value = value.split(" #", 1)[0].rstrip()
-    return value
-
-
-def extract_pasted_assignment(line: str) -> tuple[str, str] | None:
-    match = _ENV_ASSIGN_RE.search(line)
-    if match is None:
-        return None
-    key = match.group(1)
-    return key, unquote_pasted_value(line[match.end():])
-
-
-def parse_pasted_env_text(text: str) -> PasteResult:
-    result = PasteResult()
-    for line in text.splitlines():
-        parsed = extract_pasted_assignment(line)
-        if parsed is None:
-            continue
-        key, value = parsed
-        match = BaseEnvConfig.find_field(key)
-        if match is None:
-            result.unknown.append(key)
-            continue
-        config_cls, field = match
-        result.grouped.setdefault(config_cls, {})[field.env_key] = value
-    return result
-
-
-def iter_fields_for_values(config_cls: type[BaseEnvConfig], values: dict[str, str]):
-    fields_by_key: dict[str, EnvField] = {field.env_key: field for field in config_cls.get_fields().values()}
-    for key, value in values.items():
-        field = fields_by_key.get(key)
-        if field is not None:
-            yield field, value