config: move gog preset wiring under skills.gog

Remove bundles.gog and derive default gog capability provider wiring from [skills.gog] enabled=true. Add [skills.gog.capability_provider] for provider command/namespace/timeout overrides and exclude it from skill env injection. Update docs/specs and tests to reflect the new contract.

Co-Authored-By: GPT-5 Codex <codex@openai.com>

Author: dcramer

docs/src/content/docs/configuration/reference.mdx

@@ -265,23 +265,21 @@ enabled = true
 model = "mini"
 allow_chat_ids = ["12345"]  # Optional per-skill override
 PERPLEXITY_API_KEY = "..."
-```
-
-## Bundles (`[bundles.<name>]`)
 
-Use bundle toggles for packaged skill + provider presets.
+[skills.gog]
+enabled = true
 
-```toml
-[bundles.gog]
+[skills.gog.capability_provider]
 enabled = true
+namespace = "gog"
+command = ["gogcli", "bridge"]
+timeout_seconds = 30
 ```
 
-When enabled, Ash applies defaults for the bundled `gog` package:
-
-- `skills.gog.enabled = true`
-- `capabilities.providers.gog = { enabled = true, namespace = "gog", command = ["gogcli", "bridge"], timeout_seconds = 30 }`
-
-Explicit `[skills.gog]` and `[capabilities.providers.gog]` values override those defaults.
+When `skills.gog.enabled = true`, Ash applies default provider wiring for
+`capabilities.providers.gog` (namespace `gog`, command `["gogcli", "bridge"]`,
+timeout `30`) unless overridden explicitly. Use `skills.gog.capability_provider`
+to keep gog package settings under `[skills.gog]`.
 
 ## Capabilities (`[capabilities.providers.<name>]`)
 

docs/src/content/docs/systems/skills.mdx

@@ -227,7 +227,10 @@ allowed_tools:
 Provider runtime wiring is host-owned configuration, not skill metadata:
 
 ```toml
-[capabilities.providers.gog]
+[skills.gog]
+enabled = true
+
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]
@@ -240,25 +243,19 @@ Ash includes an opt-in bundled `gog` skill for dogfooding this contract.
 
 Enable it in `config.toml`:
 
-```toml
-[bundles.gog]
-enabled = true
-```
-
-This preset enables both the bundled `gog` skill and default
-`gogcli bridge` provider wiring. You can still override either section directly:
-
-```toml
 [skills.gog]
 enabled = true
 
-[capabilities.providers.gog]
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]
 timeout_seconds = 30
 ```
 
+When `skills.gog.enabled = true`, Ash auto-wires default
+`capabilities.providers.gog` settings unless overridden explicitly.
+
 ## Troubleshooting
 
 ### Skill does not appear

specs/capabilities.md

@@ -115,19 +115,19 @@ Capability providers are configured as external bridge commands so integrations
 like `gog` can live in a skill/external repo instead of Ash core code:
 
 ```toml
-[bundles.gog]
+[skills.gog]
 enabled = true
 
-[capabilities.providers.gog]
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]
 timeout_seconds = 30
 ```
 
-Bundle preset semantics:
-- `bundles.gog.enabled = true` applies default `skills.gog` + `capabilities.providers.gog` wiring.
-- Explicit provider config values override preset defaults.
+`skills.gog.enabled = true` applies default `capabilities.providers.gog` wiring.
+Optional `skills.gog.capability_provider` values override command/namespace/timeout.
+Explicit `[capabilities.providers.gog]` remains available for host-level overrides.
 
 The host invokes the bridge with JSON over stdin/stdout for `definitions`,
 `auth_begin`, `auth_complete`, and `invoke`.

specs/config.md

@@ -16,7 +16,7 @@ Files: src/ash/config/loader.py, src/ash/config/models.py, src/ash/config/paths.
 - Support named model configurations (`[models.<alias>]`)
 - Require a `default` model alias
 - Support per-skill model overrides (`[skills.<name>] model = "<alias>"`)
-- Support bundled integration presets (`[bundles.<name>]`)
+- Support packaged skill/provider wiring under skill config (`[skills.gog]`)
 - Generate config template programmatically (no static file)
 
 ### SHOULD
@@ -38,7 +38,6 @@ Files: src/ash/config/loader.py, src/ash/config/models.py, src/ash/config/paths.
 class AshConfig(BaseModel):
     models: dict[str, ModelConfig]  # Named model configurations
     skills: dict[str, dict[str, str]]  # Per-skill config (model overrides)
-    bundles: dict[str, dict[str, bool]]  # Bundled integration presets
     sandbox: SandboxConfig
     memory: MemoryConfig
     server: ServerConfig
@@ -87,9 +86,15 @@ allow_chat_ids = ["12345"]
 [skills.defaults]
 allow_chat_ids = ["12345"]
 
-[bundles.gog]
+[skills.gog]
 enabled = true
 
+[skills.gog.capability_provider]
+enabled = true
+namespace = "gog"
+command = ["gogcli", "bridge"]
+timeout_seconds = 30
+
 [skills.code-review]
 model = "sonnet"
 
@@ -106,12 +111,6 @@ allowed_users = ["123456789"]
 [brave_search]
 api_key = "..."  # or BRAVE_SEARCH_API_KEY env
 
-[capabilities.providers.gog]
-enabled = true
-namespace = "gog"
-command = ["gogcli", "bridge"]
-timeout_seconds = 30
-
 [embeddings]
 provider = "openai"
 model = "text-embedding-3-small"
@@ -132,11 +131,10 @@ Skill chat allowlist resolution:
 1. `[skills.<name>].allow_chat_ids` (per-skill override, when set)
 2. `[skills.defaults].allow_chat_ids` (global default)
 
-Bundled `gog` preset behavior:
-1. `[bundles.gog].enabled = true` applies defaults:
-   - `skills.gog.enabled = true`
-   - `capabilities.providers.gog = { enabled=true, namespace="gog", command=["gogcli","bridge"], timeout_seconds=30 }`
-2. Explicit `[skills.gog]` and `[capabilities.providers.gog]` values take precedence over preset defaults.
+Bundled `gog` behavior:
+1. `[skills.gog].enabled = true` applies default `capabilities.providers.gog` wiring.
+2. `[skills.gog.capability_provider]` can override provider settings from the skill section.
+3. Explicit `[capabilities.providers.gog]` remains available for host-level overrides.
 
 For API keys:
 1. Provider config (`[anthropic].api_key`)

specs/skills.md

@@ -133,7 +133,10 @@ Capability IDs must be namespaced (for example `gog.email`, not `email`).
 Provider execution details are host-owned config, not skill metadata:
 
 ```toml
-[capabilities.providers.gog]
+[skills.gog]
+enabled = true
+
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]
@@ -158,8 +161,14 @@ allow_chat_ids = ["12345"]        # Optional per-skill chat allowlist override
 [skills.defaults]
 allow_chat_ids = ["12345"]        # Optional global default allowlist for all skills
 
-[bundles.gog]
-enabled = true                    # Optional preset: enables bundled gog + default provider wiring
+[skills.gog]
+enabled = true                    # Enables bundled gog skill and provider auto-wiring
+
+[skills.gog.capability_provider]
+enabled = true
+namespace = "gog"
+command = ["gogcli", "bridge"]
+timeout_seconds = 30
 
 [skills.code-review]
 enabled = false                   # Disabled
@@ -168,9 +177,9 @@ enabled = false                   # Disabled
 Config keys match env var names exactly (UPPER_CASE). No case conversion.
 `allow_chat_ids` can be set globally in `[skills.defaults]` and overridden per skill.
 
-`[bundles.gog].enabled = true` applies default `gog` wiring:
-- `skills.gog.enabled = true`
-- `capabilities.providers.gog = { enabled=true, namespace="gog", command=["gogcli","bridge"], timeout_seconds=30 }`
+`[skills.gog].enabled = true` applies default `gog` provider wiring.
+`[skills.gog.capability_provider]` can override provider command/namespace/timeout
+from the same skill section.
 
 Explicit `[skills.gog]` / `[capabilities.providers.gog]` values override preset defaults.
 

src/ash/cli/context.py

@@ -117,23 +117,19 @@ def generate_config_template() -> str:
 # =============================================================================
 # Optional: External Capability Provider (skill-owned)
 # =============================================================================
-# One-switch preset for bundled gog package:
+# Configure bundled gog skill + provider wiring in one place:
 #
-# [bundles.gog]
+# [skills.gog]
 # enabled = true
 #
-# This auto-enables:
-# - [skills.gog] enabled = true
-# - [capabilities.providers.gog] with command ["gogcli", "bridge"]
-#
-# Registers an external capability bridge command (for example from a skill
-# package/repo) that implements the capability provider contract.
-
-# [capabilities.providers.gog]
+# [skills.gog.capability_provider]
 # enabled = true
 # namespace = "gog"
 # command = ["gogcli", "bridge"]
 # timeout_seconds = 30
+#
+# Registers an external capability bridge command (for example from a skill
+# package/repo) that implements the capability provider contract.
 
 # =============================================================================
 # Optional: Semantic Search

src/ash/config/__init__.py

@@ -4,8 +4,6 @@
 from ash.config.models import (
     AshConfig,
     BraveSearchConfig,
-    BundleConfig,
-    BundlesConfig,
     CapabilitiesConfig,
     CapabilityProviderConfig,
     ConfigError,
@@ -29,8 +27,6 @@
 
 __all__ = [
     "AshConfig",
-    "BundleConfig",
-    "BundlesConfig",
     "BraveSearchConfig",
     "CapabilitiesConfig",
     "CapabilityProviderConfig",

src/ash/config/models.py

@@ -387,6 +387,7 @@ class SkillConfig(BaseModel):
     model: str | None = None
     enabled: bool = True
     allow_chat_ids: list[str] | None = None
+    capability_provider: CapabilityProviderConfig | None = None
 
     @field_validator("allow_chat_ids", mode="before")
     @classmethod
@@ -413,7 +414,8 @@ def get_env_vars(self) -> dict[str, str]:
         return {
             k.upper(): str(v)
             for k, v in self.model_dump().items()
-            if k.lower() not in {"model", "enabled", "allow_chat_ids"}
+            if k.lower()
+            not in {"model", "enabled", "allow_chat_ids", "capability_provider"}
         }
 
 
@@ -470,18 +472,6 @@ def _validate_source(self) -> "SkillSource":
         return self
 
 
-class BundleConfig(BaseModel):
-    """Configuration for a bundled optional integration package."""
-
-    enabled: bool = False
-
-
-class BundlesConfig(BaseModel):
-    """Top-level bundle toggles from [bundles.*]."""
-
-    gog: BundleConfig = Field(default_factory=BundleConfig)
-
-
 class ConfigError(Exception):
     """Configuration error."""
 
@@ -542,8 +532,6 @@ def _validate_timezone(cls, v: str) -> str:
     skills: dict[str, SkillConfig] = Field(default_factory=dict)
     # Skill defaults from [skills.defaults]
     skill_defaults: SkillDefaultsConfig = Field(default_factory=SkillDefaultsConfig)
-    # Bundle presets from [bundles.*]
-    bundles: BundlesConfig = Field(default_factory=BundlesConfig)
 
     # External skill sources: [[skills.sources]] array
     skill_sources: list[SkillSource] = Field(default_factory=list)
@@ -607,7 +595,7 @@ def _extract_skills_config(cls, data: dict) -> dict:
             # Remaining entries are per-skill configs
             data["skills"] = skills_data
 
-        _apply_bundle_presets(data)
+        _apply_gog_skill_provider_preset(data)
         return data
 
     @model_validator(mode="after")
@@ -752,29 +740,17 @@ def get_resolved_env(self) -> dict[str, str]:
         }
 
 
-def _apply_bundle_presets(data: dict[str, Any]) -> None:
-    """Apply opinionated bundle presets without overriding explicit config."""
-    bundles = data.get("bundles")
-    if not isinstance(bundles, dict):
+def _apply_gog_skill_provider_preset(data: dict[str, Any]) -> None:
+    """Apply default provider wiring when bundled gog skill is enabled."""
+    skills = data.get("skills")
+    if not isinstance(skills, dict):
         return
-    gog = bundles.get("gog")
-    if not isinstance(gog, dict):
+    gog_skill = skills.get("gog")
+    if not isinstance(gog_skill, dict):
         return
-    enabled = gog.get("enabled")
-    if enabled is not True:
+    if gog_skill.get("enabled") is not True:
         return
 
-    # Enable bundled gog skill by default.
-    skills = data.get("skills")
-    if not isinstance(skills, dict):
-        skills = {}
-    skill_gog = skills.get("gog")
-    if not isinstance(skill_gog, dict):
-        skill_gog = {}
-    skill_gog.setdefault("enabled", True)
-    skills["gog"] = skill_gog
-    data["skills"] = skills
-
     # Wire default external provider bridge command by default.
     capabilities = data.get("capabilities")
     if not isinstance(capabilities, dict):
@@ -785,6 +761,13 @@ def _apply_bundle_presets(data: dict[str, Any]) -> None:
     provider_gog = providers.get("gog")
     if not isinstance(provider_gog, dict):
         provider_gog = {}
+
+    provider_from_skill = gog_skill.get("capability_provider")
+    if isinstance(provider_from_skill, dict):
+        for field in ("enabled", "namespace", "command", "timeout_seconds"):
+            if field in provider_from_skill:
+                provider_gog[field] = provider_from_skill[field]
+
     provider_gog.setdefault("enabled", True)
     provider_gog.setdefault("namespace", "gog")
     provider_gog.setdefault("command", ["gogcli", "bridge"])

src/ash/skills/bundled/README.md

@@ -26,7 +26,10 @@ For sensitive integrations (email/calendar/etc.):
 - Host config provides provider runtime wiring in `config.toml`:
 
 ```toml
-[capabilities.providers.gog]
+[skills.gog]
+enabled = true
+
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]
@@ -44,10 +47,10 @@ Skill metadata must not define provider/container command wiring.
 
 This can live in a single third-party repo/package as long as Ash wiring stays split:
 
-- preset toggle: `[bundles.gog] enabled = true`
-- optional explicit overrides:
-  - skill enablement: `[skills.gog] enabled = true`
-  - provider wiring: `[capabilities.providers.gog] ...`
+- skill enablement + provider defaults: `[skills.gog] enabled = true`
+- optional provider overrides:
+  - `[skills.gog.capability_provider] ...`
+  - or host-level `[capabilities.providers.gog] ...`
 
 ## Layout
 

src/ash/skills/bundled/gog/SKILL.md

@@ -40,10 +40,10 @@ ash-sb capability list
 If `gog.email`/`gog.calendar` are unavailable, report that host config must define:
 
 ```toml
-[bundles.gog]
+[skills.gog]
 enabled = true
 
-[capabilities.providers.gog]
+[skills.gog.capability_provider]
 enabled = true
 namespace = "gog"
 command = ["gogcli", "bridge"]