oasr 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

config/__init__.py

@@ -12,6 +12,7 @@ else:
 import tomli_w
 
 from config.defaults import DEFAULT_CONFIG
+from config.env import load_env_config, merge_configs
 from config.schema import validate_config
 
 OASR_DIR = Path.home() / ".oasr"
@@ -40,19 +41,27 @@ def ensure_skills_dir() -> Path:
     return ensure_oasr_dir()
 
 
-def load_config(config_path: Path | None = None) -> dict[str, Any]:
-    """Load configuration from TOML file.
+def load_config(config_path: Path | None = None, cli_overrides: dict[str, Any] | None = None) -> dict[str, Any]:
+    """Load configuration from multiple sources with precedence.
+
+    Precedence order (highest to lowest):
+        1. cli_overrides - explicit CLI flags
+        2. Environment variables (OASR_*)
+        3. Config file (~/.oasr/config.toml)
+        4. Built-in defaults
 
     Args:
         config_path: Override config file path. Defaults to ~/.oasr/config.toml.
+        cli_overrides: Optional CLI flag overrides (highest precedence)
 
     Returns:
-        Configuration dictionary with defaults applied.
+        Merged configuration dictionary with all sources applied.
     """
     path = config_path or CONFIG_FILE
+    cli_overrides = cli_overrides or {}
 
     # Deep copy defaults
-    config = {
+    defaults = {
         "validation": DEFAULT_CONFIG["validation"].copy(),
         "adapter": DEFAULT_CONFIG["adapter"].copy(),
         "agent": DEFAULT_CONFIG["agent"].copy(),
@@ -60,22 +69,22 @@ def load_config(config_path: Path | None = None) -> dict[str, Any]:
         "profiles": {k: v.copy() for k, v in DEFAULT_CONFIG["profiles"].items()},
     }
 
+    # Load config file
+    file_config = {}
     if path.exists():
         with open(path, "rb") as f:
-            loaded = tomllib.load(f)
-
-        if "validation" in loaded:
-            config["validation"].update(loaded["validation"])
-        if "adapter" in loaded:
-            config["adapter"].update(loaded["adapter"])
-        if "agent" in loaded:
-            config["agent"].update(loaded["agent"])
-        if "oasr" in loaded:
-            config["oasr"].update(loaded["oasr"])
-        if "profiles" in loaded:
-            # Merge user profiles with defaults (user profiles take precedence)
-            for profile_name, profile_data in loaded["profiles"].items():
-                config["profiles"][profile_name] = profile_data
+            file_config = tomllib.load(f)
+
+    # Load environment variables
+    env_config = load_env_config()
+
+    # Merge all sources with precedence
+    config = merge_configs(
+        cli_overrides=cli_overrides,
+        env_config=env_config,
+        file_config=file_config,
+        defaults=defaults,
+    )
 
     return config
 

config/env.py

@@ -0,0 +1,248 @@
+"""Environment variable configuration support.
+
+This module provides functionality to load OASR configuration from environment
+variables, following the pattern: OASR_<SECTION>_<KEY>
+
+Precedence order:
+    1. CLI flags (highest)
+    2. Environment variables
+    3. Config file
+    4. Built-in defaults (lowest)
+
+Environment variable naming:
+    - Prefix: OASR_
+    - Format: OASR_<SECTION>_<KEY> (uppercase, underscore-separated)
+    - Examples:
+        OASR_AGENT=codex             → agent.default = "codex"
+        OASR_PROFILE=dev             → oasr.default_profile = "dev"
+        OASR_VALIDATION_STRICT=true  → validation.strict = true
+
+Type handling:
+    - Strings: as-is
+    - Booleans: true/false, 1/0, yes/no, on/off (case-insensitive)
+    - Integers: parsed with int()
+    - Lists: comma-separated values
+"""
+
+import os
+from typing import Any
+
+# Mapping of environment variable names to config paths
+ENV_VAR_MAP = {
+    "OASR_AGENT": ("agent", "default"),
+    "OASR_PROFILE": ("oasr", "default_profile"),
+    "OASR_VALIDATION_STRICT": ("validation", "strict"),
+    "OASR_VALIDATION_MAX_LINES": ("validation", "reference_max_lines"),
+    "OASR_ADAPTER_TARGETS": ("adapter", "default_targets"),
+}
+
+
+def parse_bool(value: str) -> bool:
+    """Parse boolean from string.
+
+    Args:
+        value: String value to parse
+
+    Returns:
+        Boolean value
+
+    Raises:
+        ValueError: If value cannot be parsed as boolean
+    """
+    value_lower = value.lower()
+    if value_lower in ("true", "1", "yes", "on"):
+        return True
+    if value_lower in ("false", "0", "no", "off"):
+        return False
+    raise ValueError(f"Cannot parse '{value}' as boolean")
+
+
+def parse_int(value: str) -> int:
+    """Parse integer from string.
+
+    Args:
+        value: String value to parse
+
+    Returns:
+        Integer value
+
+    Raises:
+        ValueError: If value cannot be parsed as integer
+    """
+    return int(value)
+
+
+def parse_list(value: str) -> list[str]:
+    """Parse list from comma-separated string.
+
+    Args:
+        value: Comma-separated string
+
+    Returns:
+        List of strings (trimmed)
+    """
+    return [item.strip() for item in value.split(",") if item.strip()]
+
+
+def parse_value(value: str, expected_type: type) -> Any:
+    """Parse environment variable value based on expected type.
+
+    Args:
+        value: String value from environment
+        expected_type: Expected Python type
+
+    Returns:
+        Parsed value of appropriate type
+
+    Raises:
+        ValueError: If value cannot be parsed to expected type
+    """
+    if expected_type is bool:
+        return parse_bool(value)
+    elif expected_type is int:
+        return parse_int(value)
+    elif expected_type is list:
+        return parse_list(value)
+    else:
+        return value  # String, return as-is
+
+
+def load_env_config() -> dict[str, dict[str, Any]]:
+    """Load configuration from environment variables.
+
+    Reads all OASR_* environment variables and converts them to a nested
+    dictionary structure matching the config file format.
+
+    Returns:
+        Nested dictionary with config values from environment variables
+        Example: {"agent": {"default": "codex"}, "oasr": {"default_profile": "safe"}}
+
+    Notes:
+        - Only processes variables defined in ENV_VAR_MAP
+        - Silently skips variables with invalid values (logs warning)
+        - Returns empty sections if no relevant env vars set
+    """
+    config = {}
+
+    for env_var, (section, key) in ENV_VAR_MAP.items():
+        value = os.getenv(env_var)
+        if value is None:
+            continue
+
+        # Determine expected type based on key
+        # This is a heuristic - we infer type from key name
+        expected_type = str  # Default
+        if key == "strict":
+            expected_type = bool
+        elif key == "reference_max_lines":
+            expected_type = int
+        elif key == "default_targets":
+            expected_type = list
+
+        try:
+            parsed_value = parse_value(value, expected_type)
+
+            # Create section if it doesn't exist
+            if section not in config:
+                config[section] = {}
+
+            config[section][key] = parsed_value
+
+        except (ValueError, TypeError) as e:
+            # Log warning but continue (fail-safe)
+            import sys
+
+            print(
+                f"⚠ Warning: Invalid value for {env_var}='{value}': {e}. Skipping.",
+                file=sys.stderr,
+            )
+            continue
+
+    return config
+
+
+def merge_configs(
+    cli_overrides: dict[str, Any],
+    env_config: dict[str, dict[str, Any]],
+    file_config: dict[str, dict[str, Any]],
+    defaults: dict[str, dict[str, Any]],
+) -> dict[str, dict[str, Any]]:
+    """Merge configurations from multiple sources with correct precedence.
+
+    Precedence order (highest to lowest):
+        1. cli_overrides - explicit CLI flags
+        2. env_config - environment variables
+        3. file_config - config file values
+        4. defaults - built-in defaults
+
+    Args:
+        cli_overrides: Values explicitly set via CLI flags
+        env_config: Values from environment variables
+        file_config: Values from config file
+        defaults: Built-in default values
+
+    Returns:
+        Merged configuration dictionary
+
+    Notes:
+        - CLI overrides take precedence over everything
+        - Environment variables override config file
+        - Config file overrides defaults
+        - Sections are merged independently
+    """
+    result = {}
+
+    # Get all sections from all sources
+    all_sections = set()
+    for config in [defaults, file_config, env_config, cli_overrides]:
+        all_sections.update(config.keys())
+
+    # Merge each section with precedence
+    for section in all_sections:
+        result[section] = {}
+
+        # Start with defaults
+        if section in defaults:
+            result[section].update(defaults[section])
+
+        # Override with file config
+        if section in file_config:
+            result[section].update(file_config[section])
+
+        # Override with env config
+        if section in env_config:
+            result[section].update(env_config[section])
+
+        # Override with CLI (if present)
+        if section in cli_overrides:
+            result[section].update(cli_overrides[section])
+
+    return result
+
+
+def get_config_source(
+    section: str,
+    key: str,
+    cli_overrides: dict[str, Any],
+    env_config: dict[str, dict[str, Any]],
+    file_config: dict[str, dict[str, Any]],
+) -> str:
+    """Determine the source of a config value.
+
+    Args:
+        section: Config section name
+        key: Config key name
+        cli_overrides: CLI flag overrides
+        env_config: Environment variable config
+        file_config: Config file values
+
+    Returns:
+        Source string: "cli flag", "env var", "config file", or "default"
+    """
+    if section in cli_overrides and key in cli_overrides[section]:
+        return "cli flag"
+    if section in env_config and key in env_config.get(section, {}):
+        return "env var"
+    if section in file_config and key in file_config.get(section, {}):
+        return "config file"
+    return "default"

config/schema.py

@@ -5,6 +5,44 @@ from typing import Any
 VALID_AGENTS = {"codex", "copilot", "claude", "opencode"}
 
 
+def validate_agent(agent: str | None) -> tuple[bool, str | None]:
+    """Validate agent configuration value.
+
+    Args:
+        agent: Agent name to validate
+
+    Returns:
+        Tuple of (is_valid, error_message)
+    """
+    if agent is None:
+        return (True, None)
+
+    if agent not in VALID_AGENTS:
+        sorted_agents = ", ".join(sorted(VALID_AGENTS))
+        return (False, f"Invalid agent '{agent}'. Valid agents: {sorted_agents}")
+
+    return (True, None)
+
+
+def validate_profile_reference(profile_name: str, config: dict[str, Any]) -> tuple[bool, str | None]:
+    """Validate that a profile reference exists in config.
+
+    Args:
+        profile_name: Profile name to validate
+        config: Full config dictionary
+
+    Returns:
+        Tuple of (is_valid, error_message)
+    """
+    profiles = config.get("profiles", {})
+
+    if profile_name not in profiles:
+        available = ", ".join(sorted(profiles.keys()))
+        return (False, f"Profile '{profile_name}' not found. Available profiles: {available}")
+
+    return (True, None)
+
+
 def validate_config(config: dict[str, Any]) -> None:
     """Validate configuration dictionary.
 

{oasr-0.5.0.dist-info → oasr-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oasr
-Version: 0.5.0
+Version: 0.5.2
 Summary: CLI for managing agent skills across IDE integrations
 Project-URL: Homepage, https://github.com/jgodau/asr
 Project-URL: Repository, https://github.com/jgodau/asr
@@ -317,6 +317,26 @@ Remote skills are fetched on-demand during `adapter` and `use` operations. The r
 
 ---
 
+## Shell Completions
+
+OASR supports intelligent tab completion for Bash, Zsh, Fish, and PowerShell:
+
+```bash
+# Install for your current shell
+oasr completion install
+
+# Now try it:
+oasr <TAB>          # Complete commands
+oasr info <TAB>     # Complete skill names
+oasr exec --<TAB>   # Complete flags
+```
+
+Completions are **dynamic** — skill names, agents, and profiles are fetched live from your registry.
+
+See [`oasr completion --help`](docs/commands/COMPLETION.md) for details.
+
+---
+
 ## Documentation
 
 - **[Quickstart](docs/QUICKSTART.md)** — Installation and first steps

{oasr-0.5.0.dist-info → oasr-0.5.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 __init__.py,sha256=cYuwXNht5J2GDPEbHz57rmXRyWzaUgAaCXz8okR0rKE,84
 __main__.py,sha256=Due_Us-4KNlLZhf8MkmoP1hWS5qMWmpZvz2ZaCqPHT4,120
 adapter.py,sha256=WEpYkKDTb7We0zU9i6Z-r5ydtUdghNhxTZ5Eq58h4fU,10027
-cli.py,sha256=r5LsYxPe5-y1sqAg-IrII3J5Cf7Y2z3KyICkyaI0U-U,2672
+cli.py,sha256=LQg93XqUurMvcga2gV6sebv2RXGqfwDNvCN_UOLeTUc,2820
 discovery.py,sha256=WWF8SN2LH88mOUBJLavM7rvXcxi6uDQGpqRK20GysxA,3298
 manifest.py,sha256=feNCjkFWfhoVubevKjLtKoIEuzT1YGQn6wWgs9XM8_o,12229
 registry.py,sha256=zGutwVP39xaYqc3KDEXMWCV1tORYpqc5JISO8OaWP1Q,4470
@@ -27,9 +27,10 @@ commands/adapter.py,sha256=_68v3t-dRU0mszzL4udKs1bKennyg7RfBTaK2fDGTsE,3215
 commands/add.py,sha256=NJLQ-8-3zy7o6S9VLfL_wauP-Vz0oNGwN3nvtiwxNYM,15255
 commands/clean.py,sha256=RQBAfe6iCLsjMqUyVR55JdYX9MBqgrUuIrA8rFKs1J0,1102
 commands/clone.py,sha256=4APH34-yHjiXQIQwBnKOSEQ_sxV24_GKypcOJMfncvs,5912
-commands/config.py,sha256=PKuOX7CPRAy2j5NG1rhHYDFJT1XvZnOTF2qJW04v34Q,4940
+commands/completion.py,sha256=Y2KshaJ64vI1fcTR5z2KTJT7u9PPK_w8qMf5HK_q9ns,8570
+commands/config.py,sha256=4kzDEjVpwrmMPK_DPYePdQe2lGh_b8waYORZDHCDYZw,6976
 commands/diff.py,sha256=37JMjvfAEfvK7-4X5iFbD-IGkS8ae4YSY7ZDIZF5B9E,5766
-commands/exec.py,sha256=Su5IVQCUR2oKktFG4gCRA4A15-4-WTaCHpqRLONTnnY,8230
+commands/exec.py,sha256=zFmxxclpHQF39sqDpR5436XQiEYo334BGcQ5a8gbR9I,8711
 commands/find.py,sha256=zgqwUnaG5aLX6gJIU2ZeQzxsFh2s7oDNNtmV-e-62Jg,1663
 commands/help.py,sha256=5yhIpgGs1xPs2f39lg-ELE7D0tV_uUTjxQsgkWusIwo,1449
 commands/info.py,sha256=zywaUQsrvcPXcX8W49P7Jqnr90pX8nBPqnH1XcIs0Uk,4396
@@ -41,9 +42,15 @@ commands/sync.py,sha256=ZQoB5hBqrzvM6LUQVlKqHQVJib4dB5qe5M-pVG2vtGM,4946
 commands/update.py,sha256=bOWjdTNyeYg-hvXv5GfUzEtsTA7gU9JLM592GI9Oq68,11939
 commands/use.py,sha256=ggB28g2BDg3Lv3nF40wnDAJ7p0mo6C1pc1KgahvQYXM,1452
 commands/validate.py,sha256=Y8TLHxW4Z98onmzu-h-kDIET-48lVaIdQXOvuyBemLw,2361
-config/__init__.py,sha256=kll8gcMJX9qn3Y4WJCieFP4hUdioe_RXGqEU1zFjOPI,3473
+completions/__init__.py,sha256=cLGMHifEf91ElOIMSVffVWcifjGZ7oStb0Ot4ivLmmE,41
+completions/bash.sh,sha256=gqwuOqUDayPQ5_fHUtttJ_AK-Jef-vgSkUATbbtJBic,6169
+completions/fish.fish,sha256=LXUPp3Ad8aJ7j9m_xlX9Ej9H-3xLUhhMSzsB02oH8Vw,8042
+completions/powershell.ps1,sha256=dRtY-w8Hd3EmmJTtoDdkYzFN6tYiUtCeuu0pufUFsps,4210
+completions/zsh.sh,sha256=Pt-jfSHy8Q5kRtn314ejmP3_VCQGzcHAmK_buOKE4JI,6751
+config/__init__.py,sha256=glSjT1_y4aOfhZ8odrUWCGF1hBbY_huTjVp6suepHDY,3647
 config/defaults.py,sha256=JfCltQYoE7EqBYlxsNrSITLmwifTvRrJe5lqL0Ys7Cs,986
-config/schema.py,sha256=7nXgT4m_k04VZl3XJF_v8W4YMwSFGoCqQMLZAOdLuKk,3445
+config/env.py,sha256=WgnQXjhfvV7m1oxZCK9WdIX_rqLy_-BOSuPjbpjdI1c,7163
+config/schema.py,sha256=VlvmiYWjU2hExBJfME90Oyqp-H4OHcUs_hvvp54K9jA,4498
 policy/__init__.py,sha256=0sPJaruOyc9ioNyIcrTW72RgpaE64FgibS0h5mQELb8,1353
 policy/defaults.py,sha256=9GMQM2l2OKTmhXlKwyTfcICR5vD9qEvyvqaR5KrN7ZI,620
 policy/enforcement.py,sha256=djsosjjfdyr0SjnHF2kz4u3glvMNgd1CJztN6yZE-fM,2749
@@ -51,9 +58,9 @@ policy/profile.py,sha256=WDKaUagsWnBPGz5a_OOcxTsdZ66WjaIaR0R7ITVqy8g,6790
 skillcopy/__init__.py,sha256=YUglUkDzKfnCt4ar_DU33ksI9fGyn2UYbV7qn2c_BcU,2322
 skillcopy/local.py,sha256=QH6484dCenjg8pfNOyTRbQQBklEWhkkTnfQok5ssf_4,1049
 skillcopy/remote.py,sha256=83jRA2VfjtSDGO-YM1x3WGJjKvWzK1RmSTL7SdUOz8s,3155
-oasr-0.5.0.dist-info/METADATA,sha256=rSs47OQ6xzJsAGud17O43UTi0WF6ZLCKlE6_MK-ROaE,17924
-oasr-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-oasr-0.5.0.dist-info/entry_points.txt,sha256=VnMuOi6XYMbzAD2bP0X5uV1sQXjOqoDWJ33Lsxwq8u8,52
-oasr-0.5.0.dist-info/licenses/LICENSE,sha256=nQ1j9Ldb8FlJ-z7y2WuXPIlyfnYC7YPasjGdOBgcfP4,10561
-oasr-0.5.0.dist-info/licenses/NOTICE,sha256=EsfkCN0ZRDS0oj3ADvMKeKrAXaPlC8YfpSjvjGVv9jE,207
-oasr-0.5.0.dist-info/RECORD,,
+oasr-0.5.2.dist-info/METADATA,sha256=SQ26Gtaa3LH-7f5CSHfM1yLUzNmizhYEuWO9lqTqSVM,18413
+oasr-0.5.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+oasr-0.5.2.dist-info/entry_points.txt,sha256=VnMuOi6XYMbzAD2bP0X5uV1sQXjOqoDWJ33Lsxwq8u8,52
+oasr-0.5.2.dist-info/licenses/LICENSE,sha256=nQ1j9Ldb8FlJ-z7y2WuXPIlyfnYC7YPasjGdOBgcfP4,10561
+oasr-0.5.2.dist-info/licenses/NOTICE,sha256=EsfkCN0ZRDS0oj3ADvMKeKrAXaPlC8YfpSjvjGVv9jE,207
+oasr-0.5.2.dist-info/RECORD,,