apm-cli 0.19.0__tar.gz → 0.21.0__tar.gz

{apm_cli-0.19.0/src/apm_cli.egg-info → apm_cli-0.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.19.0
+Version: 0.21.0
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License
@@ -72,7 +72,7 @@ Dynamic: license-file
 
 Think `package.json`, `requirements.txt`, or `Cargo.toml` — but for AI agent configuration.
 
-GitHub Copilot · Claude Code · Cursor · OpenCode · Codex · Gemini · Windsurf
+GitHub Copilot · Claude Code · Cursor · OpenCode · Codex · Gemini · Windsurf · Kiro
 
 **[Documentation](https://microsoft.github.io/apm/)** · **[Quick Start](https://microsoft.github.io/apm/getting-started/quick-start/)** · **[CLI Reference](https://microsoft.github.io/apm/reference/cli-commands/)** · **[Roadmap](https://github.com/orgs/microsoft/projects/2304)**
 
@@ -135,7 +135,7 @@ One command, no configuration -- VS Code and GitHub Copilot read the file automa
 
 One `apm.yml` describes every primitive your agents need — instructions, skills, prompts, agents, hooks, plugins, MCP servers — and `apm install` reproduces the exact same setup across every client on every machine. `apm.lock.yaml` pins the resolved tree the way `package-lock.json` does for npm.
 
-- **[One manifest for everything](https://microsoft.github.io/apm/reference/primitive-types/)** — declared once, deployed across Copilot, Claude, Cursor, OpenCode, Codex, Gemini, Windsurf
+- **[One manifest for everything](https://microsoft.github.io/apm/reference/primitive-types/)** — declared once, deployed across Copilot, Claude, Cursor, OpenCode, Codex, Gemini, Windsurf, Kiro
 - **[Install from anywhere](https://microsoft.github.io/apm/guides/dependencies/)** — GitHub, GitLab, Bitbucket, Azure DevOps, GitHub Enterprise, Gitea, Gogs, any git host
 - **[Transitive dependencies](https://microsoft.github.io/apm/guides/dependencies/)** — packages can depend on packages; APM resolves the full tree
 - **[Author plugins](https://microsoft.github.io/apm/guides/plugins/)** — build Copilot, Claude, and Cursor plugins with dependency management, then export standard `plugin.json`
@@ -149,6 +149,7 @@ Agent context is executable in effect — a prompt is a program for an LLM. APM
 
 - **[Content security](https://microsoft.github.io/apm/enterprise/security/)** — `apm install` blocks compromised packages before agents read them; `apm audit` runs the same checks on demand
 - **[Lockfile integrity](https://microsoft.github.io/apm/enterprise/governance/)** — `apm.lock` records resolved sources and content hashes for full provenance
+- **[SBOM export](https://microsoft.github.io/apm/reference/cli/lock/)** — `apm lock export --format cyclonedx|spdx` emits a standard inventory of what reached disk, straight from the lockfile — provenance for procurement, not a compliance attestation
 - **[Drift detection](https://microsoft.github.io/apm/guides/drift-detection/)** — `apm audit` rebuilds your agent context in scratch and diffs it against your working tree to catch hand-edits before they ship
 - **[MCP trust boundaries](https://microsoft.github.io/apm/guides/mcp-servers/)** — transitive MCP servers require explicit consent
 
@@ -156,6 +157,8 @@ Agent context is executable in effect — a prompt is a program for an LLM. APM
 
 `apm-policy.yml` lets a security team say *"these are the only sources, scopes, and primitives this org will allow"* and have every `apm install` enforce it — with tighten-only inheritance from enterprise to org to repo, a published bypass contract, and audit-mode CI gates.
 
+apm-policy.yml governs what gets installed; your agent harness governs what runs. The two planes do not overlap.
+
 - **[Governance Guide](https://microsoft.github.io/apm/enterprise/governance-guide/)** — the canonical enterprise reference: enforcement points, bypass contract, air-gapped story, failure semantics, rollout playbook
 - **[Policy reference](https://microsoft.github.io/apm/enterprise/policy-reference/)** — every check, every field, every default
 - **[Adoption playbook](https://microsoft.github.io/apm/enterprise/adoption-playbook/)** — staged rollout from warn to block across hundreds of repos
@@ -214,7 +217,7 @@ apm marketplace add github/awesome-copilot
 apm install azure-cloud-development@awesome-copilot
 ```
 
-Or add an MCP server (wired into Copilot, Claude, Cursor, Codex, OpenCode, Gemini, and Windsurf):
+Or add an MCP server (wired into Copilot, Claude, Cursor, Codex, OpenCode, Gemini, Windsurf, and Kiro):
 
 ```bash
 apm install --mcp io.github.github/github-mcp-server --transport http   # connects over HTTPS

{apm_cli-0.19.0 → apm_cli-0.21.0}/README.md

@@ -4,7 +4,7 @@
 
 Think `package.json`, `requirements.txt`, or `Cargo.toml` — but for AI agent configuration.
 
-GitHub Copilot · Claude Code · Cursor · OpenCode · Codex · Gemini · Windsurf
+GitHub Copilot · Claude Code · Cursor · OpenCode · Codex · Gemini · Windsurf · Kiro
 
 **[Documentation](https://microsoft.github.io/apm/)** · **[Quick Start](https://microsoft.github.io/apm/getting-started/quick-start/)** · **[CLI Reference](https://microsoft.github.io/apm/reference/cli-commands/)** · **[Roadmap](https://github.com/orgs/microsoft/projects/2304)**
 
@@ -67,7 +67,7 @@ One command, no configuration -- VS Code and GitHub Copilot read the file automa
 
 One `apm.yml` describes every primitive your agents need — instructions, skills, prompts, agents, hooks, plugins, MCP servers — and `apm install` reproduces the exact same setup across every client on every machine. `apm.lock.yaml` pins the resolved tree the way `package-lock.json` does for npm.
 
-- **[One manifest for everything](https://microsoft.github.io/apm/reference/primitive-types/)** — declared once, deployed across Copilot, Claude, Cursor, OpenCode, Codex, Gemini, Windsurf
+- **[One manifest for everything](https://microsoft.github.io/apm/reference/primitive-types/)** — declared once, deployed across Copilot, Claude, Cursor, OpenCode, Codex, Gemini, Windsurf, Kiro
 - **[Install from anywhere](https://microsoft.github.io/apm/guides/dependencies/)** — GitHub, GitLab, Bitbucket, Azure DevOps, GitHub Enterprise, Gitea, Gogs, any git host
 - **[Transitive dependencies](https://microsoft.github.io/apm/guides/dependencies/)** — packages can depend on packages; APM resolves the full tree
 - **[Author plugins](https://microsoft.github.io/apm/guides/plugins/)** — build Copilot, Claude, and Cursor plugins with dependency management, then export standard `plugin.json`
@@ -81,6 +81,7 @@ Agent context is executable in effect — a prompt is a program for an LLM. APM
 
 - **[Content security](https://microsoft.github.io/apm/enterprise/security/)** — `apm install` blocks compromised packages before agents read them; `apm audit` runs the same checks on demand
 - **[Lockfile integrity](https://microsoft.github.io/apm/enterprise/governance/)** — `apm.lock` records resolved sources and content hashes for full provenance
+- **[SBOM export](https://microsoft.github.io/apm/reference/cli/lock/)** — `apm lock export --format cyclonedx|spdx` emits a standard inventory of what reached disk, straight from the lockfile — provenance for procurement, not a compliance attestation
 - **[Drift detection](https://microsoft.github.io/apm/guides/drift-detection/)** — `apm audit` rebuilds your agent context in scratch and diffs it against your working tree to catch hand-edits before they ship
 - **[MCP trust boundaries](https://microsoft.github.io/apm/guides/mcp-servers/)** — transitive MCP servers require explicit consent
 
@@ -88,6 +89,8 @@ Agent context is executable in effect — a prompt is a program for an LLM. APM
 
 `apm-policy.yml` lets a security team say *"these are the only sources, scopes, and primitives this org will allow"* and have every `apm install` enforce it — with tighten-only inheritance from enterprise to org to repo, a published bypass contract, and audit-mode CI gates.
 
+apm-policy.yml governs what gets installed; your agent harness governs what runs. The two planes do not overlap.
+
 - **[Governance Guide](https://microsoft.github.io/apm/enterprise/governance-guide/)** — the canonical enterprise reference: enforcement points, bypass contract, air-gapped story, failure semantics, rollout playbook
 - **[Policy reference](https://microsoft.github.io/apm/enterprise/policy-reference/)** — every check, every field, every default
 - **[Adoption playbook](https://microsoft.github.io/apm/enterprise/adoption-playbook/)** — staged rollout from warn to block across hundreds of repos
@@ -146,7 +149,7 @@ apm marketplace add github/awesome-copilot
 apm install azure-cloud-development@awesome-copilot
 ```
 
-Or add an MCP server (wired into Copilot, Claude, Cursor, Codex, OpenCode, Gemini, and Windsurf):
+Or add an MCP server (wired into Copilot, Claude, Cursor, Codex, OpenCode, Gemini, Windsurf, and Kiro):
 
 ```bash
 apm install --mcp io.github.github/github-mcp-server --transport http   # connects over HTTPS

{apm_cli-0.19.0 → apm_cli-0.21.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apm-cli"
-version = "0.19.0"
+version = "0.21.0"
 description = "MCP configuration tool"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -105,6 +105,9 @@ max-returns = 12       # Stage 1 (was 18)
 # Stage 1 (was 100). Stage 2 target: <=20 (McCabe industry standard).
 max-complexity = 50
 
+[tool.ruff.lint.isort]
+known-first-party = ["apm_cli"]
+
 [tool.ruff.lint.per-file-ignores]
 # Subprocess calls are intentional in a CLI tool
 "src/apm_cli/**" = ["S603", "S607"]

apm_cli-0.21.0/src/apm_cli/adapters/client/antigravity.py

@@ -0,0 +1,54 @@
+"""Antigravity CLI (agy) implementation of MCP client adapter.
+
+Antigravity CLI is Google's Gemini-derived agentic CLI.  Unlike Gemini
+CLI (which stores MCP servers in ``settings.json``), Antigravity reads a
+dedicated ``mcp_config.json`` with an ``mcpServers`` key -- the same JSON
+schema, a different file:
+
+.. code-block:: json
+
+   {
+     "mcpServers": {
+       "server-name": {
+         "command": "npx",
+         "args": ["-y", "@modelcontextprotocol/server-foo"],
+         "env": { "KEY": "value" }
+       }
+     }
+   }
+
+Scope resolution: project scope writes to
+``<project_root>/.agents/mcp_config.json`` (opt-in -- the directory must
+already exist).  User scope writes to ``~/.gemini/config/mcp_config.json``
+unconditionally, creating the directory if needed.
+
+Ref: https://antigravity.google/docs/mcp
+"""
+
+from pathlib import Path
+
+from .gemini import GeminiClientAdapter
+
+
+class AntigravityClientAdapter(GeminiClientAdapter):
+    """Antigravity CLI MCP client adapter.
+
+    Reuses GeminiClientAdapter's ``_format_server_config`` and
+    ``configure_mcp_server`` (identical ``mcpServers`` JSON schema) and
+    overrides only the config directory, the config filename, and the
+    display name.  Antigravity writes MCP servers to a dedicated
+    ``mcp_config.json`` rather than ``settings.json``.
+    """
+
+    supports_user_scope: bool = True
+    target_name: str = "antigravity"
+
+    def _get_config_dir(self) -> Path:
+        """Return the ``.agents`` or ``~/.gemini/config`` directory."""
+        if self.user_scope:
+            return Path.home() / ".gemini" / "config"
+        return self.project_root / ".agents"
+
+    def get_config_path(self):
+        """Return the path to ``mcp_config.json`` for the active scope."""
+        return str(self._get_config_dir() / "mcp_config.json")

{apm_cli-0.19.0 → apm_cli-0.21.0}/src/apm_cli/adapters/client/base.py

@@ -4,8 +4,9 @@ import os
 import re
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import ClassVar
+from typing import Any, ClassVar
 
+from ...models.dependency.mcp import _RESERVED_EXTRA_KEYS
 from ...utils.console import _rich_error, _rich_warning
 
 _INPUT_VAR_RE = re.compile(r"\$\{input:([^}]+)\}")
@@ -28,6 +29,20 @@ _ENV_PLACEHOLDER_RE = re.compile(r"<([A-Z_][A-Z0-9_]*)>|" + _ENV_VAR_RE.pattern)
 # deprecation warnings across all servers in a single install run.
 _LEGACY_ANGLE_VAR_RE = re.compile(r"<([A-Z_][A-Z0-9_]*)>")
 
+# Config keys that ``_extra`` passthrough must NEVER set on a rendered harness
+# config. Covers the modeled MCP fields (imported single-source from the model)
+# plus harness-specific aliases that mirror a modeled field under a different
+# name -- e.g. Codex emits ``http_headers`` for remote auth headers, which must
+# not be injectable via passthrough. Enforced unconditionally per adapter path
+# (NOT guarded by "key absent from config"), so it also closes paths that do not
+# pre-set the key. Security boundary for PR #1765 / issue #1670.
+_EXTRA_DENYLIST = _RESERVED_EXTRA_KEYS | frozenset({"http_headers"})
+
+
+def registry_field_is_required(field: dict[str, Any]) -> bool:
+    """Return True unless registry metadata explicitly marks a field optional."""
+    return field.get("required", field.get("is_required", True)) is not False
+
 
 def _translate_env_placeholder(value):
     """Pure-textual translation of env-var placeholders to the canonical
@@ -113,6 +128,29 @@ class MCPClientAdapter(ABC):
     # (e.g. ``VSCodeClientAdapter``) that have no ``KNOWN_TARGETS`` entry.
     mcp_servers_key: str = ""
 
+    @staticmethod
+    def _merge_extra(config: dict, server_info: dict) -> dict:
+        """Merge harness-specific ``_extra`` keys from server_info into config.
+
+        Two guards apply:
+
+        * Denylist (unconditional): a key naming a modeled MCP field -- or a
+          harness alias of one (see ``_EXTRA_DENYLIST``) -- is dropped on EVERY
+          path, even when the config does not already carry it. This stops a
+          passthrough value from shadowing/redirecting a modeled field on
+          adapter paths that start empty or set only a subset of keys.
+        * Shadow guard: a non-reserved key is appended only when absent, so it
+          never overwrites a value the adapter set itself.
+        """
+        extra = server_info.get("_extra")
+        if extra and isinstance(extra, dict):
+            for k, v in extra.items():
+                if k in _EXTRA_DENYLIST:
+                    continue
+                if k not in config:
+                    config[k] = v
+        return config
+
     # Whether this adapter's config path is user/global-scoped (e.g.
     # ``~/.copilot/``) rather than workspace-scoped (e.g. ``.vscode/``).
     # Adapters that target a global path should override this to ``True``
@@ -481,7 +519,7 @@ class MCPClientAdapter(ABC):
             name = env_var.get("name", "")
             if not name:
                 continue
-            required = env_var.get("required", True)
+            required = registry_field_is_required(env_var)
 
             value = env_overrides.get(name) or os.getenv(name)
             if not value and required and not skip_prompting:
@@ -797,12 +835,15 @@ class MCPClientAdapter(ABC):
         )
 
         # First pass: identify variables with empty values to warn the user.
-        empty_value_vars = [ev for ev in env_vars if ev.get("required") and not ev.get("value")]
+        empty_value_vars = [
+            ev for ev in env_vars if registry_field_is_required(ev) and not ev.get("value")
+        ]
         if empty_value_vars and skip_prompting:
             var_names = [ev.get("name") for ev in empty_value_vars]
             _rich_warning(
-                f"Warning: The following required environment variables have no default "
-                f"value and cannot be prompted in non-interactive mode: {var_names}"
+                f"Required environment variables have no default value and cannot be "
+                f"prompted in non-interactive mode: {var_names}. Set them in your "
+                "environment and rerun `apm install`."
             )
 
         for env_var in env_vars:
@@ -837,9 +878,9 @@ class MCPClientAdapter(ABC):
 
             # Priority 4: interactive prompt
             default_value = env_var.get("value", "")
-            required = env_var.get("required", False)
+            required = registry_field_is_required(env_var)
 
-            if not skip_prompting:
+            if not skip_prompting and required:
                 from rich.prompt import Prompt
 
                 description = env_var.get("description", "")
@@ -859,11 +900,10 @@ class MCPClientAdapter(ABC):
                 resolved[name] = default_value
             elif required:
                 _rich_warning(
-                    f"Warning: Required environment variable '{name}' could not be resolved. "
-                    f"The MCP server may not function correctly."
+                    f"Required environment variable '{name}' could not be resolved. "
+                    f"The MCP server may not function correctly. Set {name} in your "
+                    "environment and rerun `apm install`."
                 )
                 resolved[name] = ""
-            else:
-                resolved[name] = default_value
 
         return resolved

{apm_cli-0.19.0 → apm_cli-0.21.0}/src/apm_cli/adapters/client/codex.py

@@ -219,6 +219,7 @@ class CodexClientAdapter(MCPClientAdapter):
                 return self.normalize_project_arg(arg)
 
             config["args"] = [_process_stdio_arg(arg) for arg in raw.get("args") or []]
+            self._merge_extra(config, server_info)
             return config
 
         # Remote MCP handling.
@@ -273,6 +274,7 @@ class CodexClientAdapter(MCPClientAdapter):
             if http_headers:
                 remote_config["http_headers"] = http_headers
                 self._warn_input_variables(http_headers, server_name, "Codex CLI")
+            self._merge_extra(remote_config, server_info)
             return remote_config
 
         if not packages:
@@ -361,6 +363,7 @@ class CodexClientAdapter(MCPClientAdapter):
                         resolved_env,
                     )
 
+        self._merge_extra(config, server_info)
         return config
 
     def _process_arguments(  # pylint: disable=duplicate-code  # structural similarity with copilot adapter is intentional

{apm_cli-0.19.0 → apm_cli-0.21.0}/src/apm_cli/adapters/client/copilot.py

@@ -26,6 +26,7 @@ from .base import (
     _extract_legacy_angle_vars,
     _has_env_placeholder,
     _stringify_env_literal,
+    registry_field_is_required,
 )
 from .base import (
     _translate_env_placeholder as _translate_env_placeholder,
@@ -441,6 +442,7 @@ class CopilotClientAdapter(MCPClientAdapter):
             tools_override = server_info.get("_apm_tools_override")
             if tools_override:
                 config["tools"] = tools_override
+            self._merge_extra(config, server_info)
             return config
 
         # Check for remote endpoints first (registry-defined priority)
@@ -483,6 +485,7 @@ class CopilotClientAdapter(MCPClientAdapter):
             if tools_override:
                 config["tools"] = tools_override
 
+            self._merge_extra(config, server_info)
             return config
 
         # Get packages from server info
@@ -506,6 +509,7 @@ class CopilotClientAdapter(MCPClientAdapter):
         if tools_override:
             config["tools"] = tools_override
 
+        self._merge_extra(config, server_info)
         return config
 
     def _apply_auth_and_headers(
@@ -698,6 +702,7 @@ class CopilotClientAdapter(MCPClientAdapter):
             return translated
 
         if self._supports_runtime_env_substitution:
+            env_overrides = env_overrides or {}
             resolved = {}
             placeholder_keys = []
             for env_var in env_vars:
@@ -706,12 +711,18 @@ class CopilotClientAdapter(MCPClientAdapter):
                 name = env_var.get("name", "")
                 if not name:
                     continue
+                required = registry_field_is_required(env_var)
+                override_value = env_overrides.get(name)
+                has_override = bool(
+                    override_value.strip() if isinstance(override_value, str) else override_value
+                )
                 if name in default_github_env:
                     # Non-secret literal default -- preserve as-is.
                     resolved[name] = default_github_env[name]
-                else:
+                elif required or has_override:
                     # Emit a runtime-substitution placeholder; APM never reads
-                    # or stores the value.
+                    # or stores the value. Optional variables are included only
+                    # when install-time collection observed a value.
                     resolved[name] = self._format_runtime_env_placeholder(name)
                     placeholder_keys.append(name)
             # Record for the post-install summary line and the

{apm_cli-0.19.0 → apm_cli-0.21.0}/src/apm_cli/adapters/client/cursor.py

@@ -148,6 +148,7 @@ class CursorClientAdapter(CopilotClientAdapter):
                 else arg
                 for arg in args
             ]
+            self._merge_extra(config, server_info)
             return config
 
         # --- remote endpoints ---
@@ -169,6 +170,7 @@ class CursorClientAdapter(CopilotClientAdapter):
             config["url"] = (remote.get("url") or "").strip()
 
             self._apply_auth_and_headers(config, remote, server_info, env_overrides, "Cursor")
+            self._merge_extra(config, server_info)
             return config
 
         # --- local packages ---
@@ -194,6 +196,7 @@ class CursorClientAdapter(CopilotClientAdapter):
                     f"{[p.get('registry_name', 'unknown') for p in packages]}."
                 )
 
+        self._merge_extra(config, server_info)
         return config
 
     # ------------------------------------------------------------------ #

{apm_cli-0.19.0 → apm_cli-0.21.0}/src/apm_cli/adapters/client/gemini.py

@@ -61,7 +61,7 @@ class GeminiClientAdapter(CopilotClientAdapter):
     # revisit in a follow-up.
     _supports_runtime_env_substitution: bool = False
 
-    def _get_gemini_dir(self) -> Path:
+    def _get_config_dir(self) -> Path:
         """Return the ``.gemini`` directory for the active scope."""
         if self.user_scope:
             return Path.home() / ".gemini"
@@ -69,22 +69,24 @@ class GeminiClientAdapter(CopilotClientAdapter):
 
     def get_config_path(self):
         """Return the path to ``settings.json`` for the active scope."""
-        return str(self._get_gemini_dir() / "settings.json")
+        return str(self._get_config_dir() / "settings.json")
 
     def update_config(self, config_updates):
         """Merge *config_updates* into the ``mcpServers`` section of settings.json.
 
-        Project scope is opt-in: if ``<project_root>/.gemini/`` does not
+        Project scope is opt-in: if the target config directory does not
         exist, this method returns silently. User scope always writes,
-        creating ``~/.gemini/`` if needed.
+        creating the directory if needed.
 
         Preserves all other top-level keys in settings.json (theme, tools,
         hooks, etc.).
         """
-        gemini_dir = self._get_gemini_dir()
-        if not self.user_scope and not gemini_dir.is_dir():
+        config_dir = self._get_config_dir()
+        if not self.user_scope and not config_dir.is_dir():
             logger.debug(
-                "Skipping Gemini project-scope write -- %s does not exist (opt-in)", gemini_dir
+                "Skipping %s project-scope write -- %s does not exist (opt-in)",
+                self.target_name,
+                config_dir,
             )
             return
 
@@ -97,7 +99,9 @@ class GeminiClientAdapter(CopilotClientAdapter):
             current_config["mcpServers"][name] = entry
 
         if not config_path.parent.is_dir():
-            logger.debug("Creating %s for Gemini CLI user configuration", config_path.parent)
+            logger.debug(
+                "Creating %s for %s user configuration", config_path.parent, self.target_name
+            )
         config_path.parent.mkdir(parents=True, exist_ok=True)
         with open(config_path, "w", encoding="utf-8") as f:
             json.dump(current_config, f, indent=2)
@@ -151,13 +155,16 @@ class GeminiClientAdapter(CopilotClientAdapter):
                     raw["env"], env_overrides=env_overrides
                 )
                 config["env"] = resolved_env_for_args
-                self._warn_input_variables(raw["env"], server_info.get("name", ""), "Gemini CLI")
+                self._warn_input_variables(
+                    raw["env"], server_info.get("name", ""), self.target_name
+                )
             config["args"] = [
                 self._resolve_variable_placeholders(arg, resolved_env_for_args, runtime_vars)
                 if isinstance(arg, str)
                 else arg
                 for arg in raw.get("args") or []
             ]
+            self._merge_extra(config, server_info)
             return config
 
         # --- remote endpoints ---
@@ -170,7 +177,7 @@ class GeminiClientAdapter(CopilotClientAdapter):
                 transport = "http"
             elif transport not in ("sse", "http", "streamable-http"):
                 raise ValueError(
-                    f"Unsupported remote transport '{transport}' for Gemini. "
+                    f"Unsupported remote transport '{transport}' for {self.target_name}. "
                     f"Server: {server_info.get('name', 'unknown')}. "
                     f"Supported transports: http, sse, streamable-http."
                 )
@@ -192,9 +199,10 @@ class GeminiClientAdapter(CopilotClientAdapter):
 
             if config.get("headers"):
                 self._warn_input_variables(
-                    config["headers"], server_info.get("name", ""), "Gemini CLI"
+                    config["headers"], server_info.get("name", ""), self.target_name
                 )
 
+            self._merge_extra(config, server_info)
             return config
 
         # --- local packages ---
@@ -208,6 +216,7 @@ class GeminiClientAdapter(CopilotClientAdapter):
 
         package = self._select_best_package(packages)
         if not package:
+            self._merge_extra(config, server_info)
             return config
 
         registry_name = self._infer_registry_name(package)
@@ -245,6 +254,7 @@ class GeminiClientAdapter(CopilotClientAdapter):
         if resolved_env:
             config["env"] = resolved_env
 
+        self._merge_extra(config, server_info)
         return config
 
     def configure_mcp_server(
@@ -256,19 +266,20 @@ class GeminiClientAdapter(CopilotClientAdapter):
         server_info_cache=None,
         runtime_vars=None,
     ):
-        """Configure an MCP server in ``.gemini/settings.json``.
+        """Configure an MCP server in the target's ``settings.json``.
 
         Delegates to the parent for config formatting, then writes to
-        the Gemini CLI settings file.
+        the target CLI settings file.
         """
         if not server_url:
             _rich_error("server_url cannot be empty", symbol="error")
             return False
 
-        if not self.user_scope and not self._get_gemini_dir().is_dir():
+        if not self.user_scope and not self._get_config_dir().is_dir():
             logger.debug(
-                "Gemini opt-in gate: %s absent, skipping configure_mcp_server",
-                self._get_gemini_dir(),
+                "%s opt-in gate: %s absent, skipping configure_mcp_server",
+                self.target_name,
+                self._get_config_dir(),
             )
             return True
 
@@ -292,10 +303,16 @@ class GeminiClientAdapter(CopilotClientAdapter):
             server_config = self._format_server_config(server_info, env_overrides, runtime_vars)
             self.update_config({config_key: server_config})
 
-            _rich_success(f"Configured MCP server '{config_key}' for Gemini CLI", symbol="success")
+            _rich_success(
+                f"Configured MCP server '{config_key}' for {self.target_name}",
+                symbol="success",
+            )
             return True
 
         except Exception as e:
-            logger.debug("Gemini MCP configuration failed: %s", e)
-            _rich_error("Failed to configure MCP server for Gemini CLI", symbol="error")
+            logger.debug("%s MCP configuration failed: %s", self.target_name, e)
+            _rich_error(
+                f"Failed to configure MCP server for {self.target_name}",
+                symbol="error",
+            )
             return False