codexmgr 0.2.1__tar.gz → 0.3.0__tar.gz

{codexmgr-0.2.1 → codexmgr-0.3.0}/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.4
 Name: codexmgr
-Version: 0.2.1
+Version: 0.3.0
 Summary: Manage project-local Codex configuration from reusable templates
+Project-URL: Repository, https://github.com/JulianKimmig/codexmgr/
 Keywords: agents,cli,codex,configuration,skills
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
@@ -24,9 +25,9 @@ Description-Content-Type: text/markdown
 # codexmgr
 
 `codexmgr` manages reusable Codex project setup. Keep shared `AGENTS.md`
-snippets, skills, hooks, custom agents, rule files, packages, and safe MCP
-overrides in one manager home, then sync the selected pieces into each project
-from `.codex/codexmgr.toml`.
+snippets, skills, hooks, custom agents, rule files, packages, and reusable MCP
+source files in one manager home, then sync the selected pieces into each
+project from `.codex/codexmgr.toml`.
 
 The tool is for people who use Codex in several repositories and do not want to
 copy the same agent instructions by hand. When a shared rule changes, update it
@@ -37,7 +38,7 @@ Use `codexmgr` when a project should:
 - build `AGENTS.md` from reusable instruction snippets
 - share skills, hooks, custom agents, and rule files across repositories
 - enable packaged Codex setups made from those reusable pieces
-- keep project MCP overrides out of the user-level Codex config
+- keep reusable MCP server definitions out of the user-level Codex config
 - check whether generated Codex files match the project config
 - run `codex` with project `.codex/config.toml` values passed as `-c` overrides
 
@@ -148,7 +149,7 @@ file for you, and you can also edit it by hand when that is clearer.
 - `.codex/codexmgr.lock`: resolved AGENTS.md, agent, skill, hook, rule, and MCP
   state
 - `.codex/config.toml`: project-local Codex config, including generated
-  `[[skills.config]]` entries and `[mcp_servers.<id>]` overrides
+  `[[skills.config]]` entries and `[mcp_servers.<id>]` server definitions
 - `.codex/hooks.json`: generated hook config for enabled reusable hook bundles
 - `.codex/hooks/<name>`: copied support files for enabled hook bundles
 - `.codex/agents/<name>.toml`: copied custom-agent definitions
@@ -170,7 +171,7 @@ Manual content outside this block is preserved. If the block is missing,
 
 `.codex/codexmgr.toml` can opt into each resource type independently. A minimal
 file may only contain `[agents_md]`; larger projects can add skills, custom
-agents, hooks, reusable rules, and MCP overrides as needed. Package commands
+agents, hooks, reusable rules, and MCP sources or overlays as needed. Package commands
 write those same tables rather than a separate package table.
 
 ```toml
@@ -188,6 +189,8 @@ disabled = ["experimental-hook"]
 [rules]
 enabled = ["react/", "python/testing.md"]
 disabled = ["react/materials/"]
+[mcp]
+enabled = ["browsermcp"]
 [mcp.servers.browsermcp]
 enabled = true
 bearer_token_env_var = "BROWSERMCP_TOKEN"
@@ -232,6 +235,9 @@ Rule refs resolve under `$CODEXMGR_HOME/rules/` and use POSIX-style relative
 paths. Folder refs have a trailing slash and copy regular files recursively into
 `.rules/` while preserving relative paths.
 
+Rule listings are grouped by folder. `codexmgr rules list` prints an indented
+tree, while the TUI Rules screen shows the same refs in a collapsible tree.
+
 File rule refs copy one file. Extensionless refs prefer an existing `<ref>.md`.
 Enabled refs expand first, then disabled file or folder refs remove entries from
 that candidate set.
@@ -292,7 +298,8 @@ These commands run `apply` automatically unless `--no-sync` is passed.
 
 `codexmgr tui` opens a Textual-based terminal UI for project-local
 configuration. It shows `AGENTS.md` snippets, skills, hooks, custom agents,
-rules, packages, and MCP server enable overrides in selectable lists.
+packages, and reusable MCP sources in selectable lists. Rules are shown
+in a collapsible folder tree.
 
 Changes are staged in memory while you navigate. Press `s` to save; the save
 writes `.codex/codexmgr.toml` once and runs `apply` once unless `--no-sync` was
@@ -300,7 +307,9 @@ used.
 
 For resources with explicit enable and disable lists, `space` cycles the
 highlighted row through available, enabled, and disabled states. Package
-profiles appear as separate selectable rows under their package.
+profiles appear as separate selectable rows under their package. In the Rules
+tree, cycling a file or folder node updates the full canonical rule ref behind
+that basename label.
 
 ```bash
 codexmgr tui
@@ -312,9 +321,10 @@ The dashboard shows generated-file sync state. By default it lists stale
 generated paths; with `--show-diff`, it shows unified diffs for the staged
 configuration.
 
-MCP editing in the TUI is intentionally limited to the project-local `enabled`
-override. Advanced MCP fields remain available through the `codexmgr mcp ...`
-commands.
+MCP editing in the TUI is intentionally limited to loading and unloading
+reusable `$CODEXMGR_HOME/mcp/*.toml` sources. Advanced per-server overlay fields
+remain available through the `codexmgr mcp ...` commands or direct
+`.codex/codexmgr.toml` edits.
 
 ## Template Format
 
@@ -421,8 +431,9 @@ codexmgr rules enable [--no-sync] <rule-ref> [...]
 codexmgr rules disable [--no-sync] <rule-ref> [...]
 ```
 
-`skill list`, `agents list`, `hooks list`, and `rules list` print available
-resources and mark configured entries as enabled, disabled, or missing.
+`skill list`, `agents list`, and `hooks list` print available resources and
+mark configured entries as enabled, disabled, or missing. `rules list` prints
+the same state in an indented folder hierarchy.
 
 Enable commands validate manager-home sources when the source type must already
 exist. Enable and disable lists stay mutually exclusive, and repeated commands
@@ -465,40 +476,62 @@ The wrapper can run with a just-in-time package/profile overlay without changing
 codexmgr codex --package repo-rules --profile strict python -- exec "review this"
 ```
 
-## Project MCP Overrides
+## Project MCP Sources
 
-`codexmgr mcp ...` edits only project-local configuration:
+`codexmgr mcp ...` loads reusable MCP definitions from `$CODEXMGR_HOME/mcp`
+into project-local configuration:
 
-- source state is stored in `.codex/codexmgr.toml` under
-  `[mcp.servers.<id>]`
-- `apply` writes generated overrides into `.codex/config.toml` under
+- reusable source state is stored in `.codex/codexmgr.toml` under `[mcp]`
+- per-project server overlays are stored under `[mcp.servers.<id>]`
+- `apply` writes generated server definitions into `.codex/config.toml` under
   `[mcp_servers.<id>]`
 - `$CODEX_HOME/config.toml` and `~/.codex/config.toml` are never modified
 
 Mutating MCP commands require a project `.codex/` directory and run `apply`
-automatically unless `--no-sync` is passed. They do not create or remove MCP
-server definitions; use `codex mcp add` or direct Codex config editing for the
-base server setup.
+automatically unless `--no-sync` is passed.
+
+Create reusable source files in the same `mcp_servers` shape Codex reads from
+`config.toml`:
+
+```toml
+# ~/.codexmgr/mcp/browsermcp.toml
+[mcp_servers.browsermcp]
+command = "browsermcp"
+args = ["--port", "3000"]
+env_vars = ["BROWSERMCP_TOKEN"]
+```
 
-List MCP servers available from Codex and show any project override state:
+List reusable sources and show project state:
 
 ```bash
 codexmgr mcp list
-codexmgr mcp show context7
+codexmgr mcp show browsermcp
 codexmgr mcp validate
 ```
 
-`codexmgr mcp list` shells out to `codex mcp list --json` for read-only
-discovery. It does not edit user configuration.
-
-Enable or disable an existing server without deleting its definition:
+Enable or disable reusable sources for the current project:
 
 ```bash
-codexmgr mcp disable context7
-codexmgr mcp enable context7
+codexmgr mcp enable browsermcp context7
+codexmgr mcp disable browsermcp
+```
+
+`disable` unloads the source from `[mcp].enabled`. It does not keep a generated
+server definition with `enabled = false`.
+
+Use `[mcp.servers.<id>]` for project-local overlays. Overlays merge after source
+files, so they can override or add fields:
+
+```toml
+[mcp]
+enabled = ["browsermcp"]
+
+[mcp.servers.browsermcp]
+enabled = false
+bearer_token_env_var = "BROWSERMCP_TOKEN"
 ```
 
-Update token and environment references without storing literal token values:
+Update common token and environment references from the CLI:
 
 ```bash
 codexmgr mcp set-token-env figma FIGMA_TOKEN
@@ -508,7 +541,7 @@ codexmgr mcp set-env-header figma Authorization FIGMA_AUTH_HEADER
 codexmgr mcp unset-env-header figma Authorization
 ```
 
-Set a small allowlist of non-secret fields from TOML literals:
+Set a small allowlist of overlay fields from TOML literals:
 
 ```bash
 codexmgr mcp set-field context7 required true
@@ -518,12 +551,11 @@ codexmgr mcp set-field context7 default_tools_approval_mode '"prompt"'
 
 Supported `set-field` names are `required`, `startup_timeout_sec`,
 `tool_timeout_sec`, `enabled_tools`, `disabled_tools`, and
-`default_tools_approval_mode`. The direct `enable` and `disable` commands manage
-the `enabled` field.
+`default_tools_approval_mode`.
 
-Literal API token writes are intentionally not part of this command surface;
-prefer environment variable references such as `bearer_token_env_var`,
-`env_vars`, and `env_http_headers`.
+Source files and hand-written overlays can use the full Codex `mcp_servers`
+shape. Prefer environment variable references such as `bearer_token_env_var`,
+`env_vars`, and `env_http_headers` for secrets.
 
 ## Development
 

{codexmgr-0.2.1 → codexmgr-0.3.0}/README.md

@@ -1,9 +1,9 @@
 # codexmgr
 
 `codexmgr` manages reusable Codex project setup. Keep shared `AGENTS.md`
-snippets, skills, hooks, custom agents, rule files, packages, and safe MCP
-overrides in one manager home, then sync the selected pieces into each project
-from `.codex/codexmgr.toml`.
+snippets, skills, hooks, custom agents, rule files, packages, and reusable MCP
+source files in one manager home, then sync the selected pieces into each
+project from `.codex/codexmgr.toml`.
 
 The tool is for people who use Codex in several repositories and do not want to
 copy the same agent instructions by hand. When a shared rule changes, update it
@@ -14,7 +14,7 @@ Use `codexmgr` when a project should:
 - build `AGENTS.md` from reusable instruction snippets
 - share skills, hooks, custom agents, and rule files across repositories
 - enable packaged Codex setups made from those reusable pieces
-- keep project MCP overrides out of the user-level Codex config
+- keep reusable MCP server definitions out of the user-level Codex config
 - check whether generated Codex files match the project config
 - run `codex` with project `.codex/config.toml` values passed as `-c` overrides
 
@@ -125,7 +125,7 @@ file for you, and you can also edit it by hand when that is clearer.
 - `.codex/codexmgr.lock`: resolved AGENTS.md, agent, skill, hook, rule, and MCP
   state
 - `.codex/config.toml`: project-local Codex config, including generated
-  `[[skills.config]]` entries and `[mcp_servers.<id>]` overrides
+  `[[skills.config]]` entries and `[mcp_servers.<id>]` server definitions
 - `.codex/hooks.json`: generated hook config for enabled reusable hook bundles
 - `.codex/hooks/<name>`: copied support files for enabled hook bundles
 - `.codex/agents/<name>.toml`: copied custom-agent definitions
@@ -147,7 +147,7 @@ Manual content outside this block is preserved. If the block is missing,
 
 `.codex/codexmgr.toml` can opt into each resource type independently. A minimal
 file may only contain `[agents_md]`; larger projects can add skills, custom
-agents, hooks, reusable rules, and MCP overrides as needed. Package commands
+agents, hooks, reusable rules, and MCP sources or overlays as needed. Package commands
 write those same tables rather than a separate package table.
 
 ```toml
@@ -165,6 +165,8 @@ disabled = ["experimental-hook"]
 [rules]
 enabled = ["react/", "python/testing.md"]
 disabled = ["react/materials/"]
+[mcp]
+enabled = ["browsermcp"]
 [mcp.servers.browsermcp]
 enabled = true
 bearer_token_env_var = "BROWSERMCP_TOKEN"
@@ -209,6 +211,9 @@ Rule refs resolve under `$CODEXMGR_HOME/rules/` and use POSIX-style relative
 paths. Folder refs have a trailing slash and copy regular files recursively into
 `.rules/` while preserving relative paths.
 
+Rule listings are grouped by folder. `codexmgr rules list` prints an indented
+tree, while the TUI Rules screen shows the same refs in a collapsible tree.
+
 File rule refs copy one file. Extensionless refs prefer an existing `<ref>.md`.
 Enabled refs expand first, then disabled file or folder refs remove entries from
 that candidate set.
@@ -269,7 +274,8 @@ These commands run `apply` automatically unless `--no-sync` is passed.
 
 `codexmgr tui` opens a Textual-based terminal UI for project-local
 configuration. It shows `AGENTS.md` snippets, skills, hooks, custom agents,
-rules, packages, and MCP server enable overrides in selectable lists.
+packages, and reusable MCP sources in selectable lists. Rules are shown
+in a collapsible folder tree.
 
 Changes are staged in memory while you navigate. Press `s` to save; the save
 writes `.codex/codexmgr.toml` once and runs `apply` once unless `--no-sync` was
@@ -277,7 +283,9 @@ used.
 
 For resources with explicit enable and disable lists, `space` cycles the
 highlighted row through available, enabled, and disabled states. Package
-profiles appear as separate selectable rows under their package.
+profiles appear as separate selectable rows under their package. In the Rules
+tree, cycling a file or folder node updates the full canonical rule ref behind
+that basename label.
 
 ```bash
 codexmgr tui
@@ -289,9 +297,10 @@ The dashboard shows generated-file sync state. By default it lists stale
 generated paths; with `--show-diff`, it shows unified diffs for the staged
 configuration.
 
-MCP editing in the TUI is intentionally limited to the project-local `enabled`
-override. Advanced MCP fields remain available through the `codexmgr mcp ...`
-commands.
+MCP editing in the TUI is intentionally limited to loading and unloading
+reusable `$CODEXMGR_HOME/mcp/*.toml` sources. Advanced per-server overlay fields
+remain available through the `codexmgr mcp ...` commands or direct
+`.codex/codexmgr.toml` edits.
 
 ## Template Format
 
@@ -398,8 +407,9 @@ codexmgr rules enable [--no-sync] <rule-ref> [...]
 codexmgr rules disable [--no-sync] <rule-ref> [...]
 ```
 
-`skill list`, `agents list`, `hooks list`, and `rules list` print available
-resources and mark configured entries as enabled, disabled, or missing.
+`skill list`, `agents list`, and `hooks list` print available resources and
+mark configured entries as enabled, disabled, or missing. `rules list` prints
+the same state in an indented folder hierarchy.
 
 Enable commands validate manager-home sources when the source type must already
 exist. Enable and disable lists stay mutually exclusive, and repeated commands
@@ -442,40 +452,62 @@ The wrapper can run with a just-in-time package/profile overlay without changing
 codexmgr codex --package repo-rules --profile strict python -- exec "review this"
 ```
 
-## Project MCP Overrides
+## Project MCP Sources
 
-`codexmgr mcp ...` edits only project-local configuration:
+`codexmgr mcp ...` loads reusable MCP definitions from `$CODEXMGR_HOME/mcp`
+into project-local configuration:
 
-- source state is stored in `.codex/codexmgr.toml` under
-  `[mcp.servers.<id>]`
-- `apply` writes generated overrides into `.codex/config.toml` under
+- reusable source state is stored in `.codex/codexmgr.toml` under `[mcp]`
+- per-project server overlays are stored under `[mcp.servers.<id>]`
+- `apply` writes generated server definitions into `.codex/config.toml` under
   `[mcp_servers.<id>]`
 - `$CODEX_HOME/config.toml` and `~/.codex/config.toml` are never modified
 
 Mutating MCP commands require a project `.codex/` directory and run `apply`
-automatically unless `--no-sync` is passed. They do not create or remove MCP
-server definitions; use `codex mcp add` or direct Codex config editing for the
-base server setup.
+automatically unless `--no-sync` is passed.
+
+Create reusable source files in the same `mcp_servers` shape Codex reads from
+`config.toml`:
+
+```toml
+# ~/.codexmgr/mcp/browsermcp.toml
+[mcp_servers.browsermcp]
+command = "browsermcp"
+args = ["--port", "3000"]
+env_vars = ["BROWSERMCP_TOKEN"]
+```
 
-List MCP servers available from Codex and show any project override state:
+List reusable sources and show project state:
 
 ```bash
 codexmgr mcp list
-codexmgr mcp show context7
+codexmgr mcp show browsermcp
 codexmgr mcp validate
 ```
 
-`codexmgr mcp list` shells out to `codex mcp list --json` for read-only
-discovery. It does not edit user configuration.
-
-Enable or disable an existing server without deleting its definition:
+Enable or disable reusable sources for the current project:
 
 ```bash
-codexmgr mcp disable context7
-codexmgr mcp enable context7
+codexmgr mcp enable browsermcp context7
+codexmgr mcp disable browsermcp
+```
+
+`disable` unloads the source from `[mcp].enabled`. It does not keep a generated
+server definition with `enabled = false`.
+
+Use `[mcp.servers.<id>]` for project-local overlays. Overlays merge after source
+files, so they can override or add fields:
+
+```toml
+[mcp]
+enabled = ["browsermcp"]
+
+[mcp.servers.browsermcp]
+enabled = false
+bearer_token_env_var = "BROWSERMCP_TOKEN"
 ```
 
-Update token and environment references without storing literal token values:
+Update common token and environment references from the CLI:
 
 ```bash
 codexmgr mcp set-token-env figma FIGMA_TOKEN
@@ -485,7 +517,7 @@ codexmgr mcp set-env-header figma Authorization FIGMA_AUTH_HEADER
 codexmgr mcp unset-env-header figma Authorization
 ```
 
-Set a small allowlist of non-secret fields from TOML literals:
+Set a small allowlist of overlay fields from TOML literals:
 
 ```bash
 codexmgr mcp set-field context7 required true
@@ -495,12 +527,11 @@ codexmgr mcp set-field context7 default_tools_approval_mode '"prompt"'
 
 Supported `set-field` names are `required`, `startup_timeout_sec`,
 `tool_timeout_sec`, `enabled_tools`, `disabled_tools`, and
-`default_tools_approval_mode`. The direct `enable` and `disable` commands manage
-the `enabled` field.
+`default_tools_approval_mode`.
 
-Literal API token writes are intentionally not part of this command surface;
-prefer environment variable references such as `bearer_token_env_var`,
-`env_vars`, and `env_http_headers`.
+Source files and hand-written overlays can use the full Codex `mcp_servers`
+shape. Prefer environment variable references such as `bearer_token_env_var`,
+`env_vars`, and `env_http_headers` for secrets.
 
 ## Development
 

{codexmgr-0.2.1 → codexmgr-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codexmgr"
-version = "0.2.1"
+version = "0.3.0"
 description = "Manage project-local Codex configuration from reusable templates"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -21,6 +21,9 @@ classifiers = [
     "Typing :: Typed",
 ]
 
+[project.urls]
+Repository = "https://github.com/JulianKimmig/codexmgr/"
+
 [project.scripts]
 codexmgr = "codexmgr.interface.cli:entrypoint"
 

{codexmgr-0.2.1 → codexmgr-0.3.0}/src/codexmgr/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.1"
+__version__ = "0.3.0"

{codexmgr-0.2.1 → codexmgr-0.3.0}/src/codexmgr/interface/parsers/mcp.py

@@ -19,21 +19,21 @@ def add_mcp_parser(
     Returns:
         None. The parser is mutated in place.
     """
-    mcp = subparsers.add_parser("mcp", help="Manage project MCP server overrides")
+    mcp = subparsers.add_parser("mcp", help="Manage project MCP sources and overrides")
     mcp_subparsers = mcp.add_subparsers(dest="mcp_command", required=True)
 
-    mcp_subparsers.add_parser("list", help="List project MCP server overrides")
+    mcp_subparsers.add_parser("list", help="List reusable MCP sources")
 
-    show = mcp_subparsers.add_parser("show", help="Show one project MCP override")
-    show.add_argument("server_id", help="MCP server id")
+    show = mcp_subparsers.add_parser("show", help="Show one reusable MCP source")
+    show.add_argument("server_id", help="MCP source name")
 
-    enable = mcp_subparsers.add_parser("enable", help="Enable an MCP server locally")
+    enable = mcp_subparsers.add_parser("enable", help="Enable reusable MCP sources")
     add_no_sync_argument(enable)
-    enable.add_argument("server_ids", nargs="+", help="MCP server ids")
+    enable.add_argument("server_ids", nargs="+", help="MCP source names")
 
-    disable = mcp_subparsers.add_parser("disable", help="Disable an MCP server locally")
+    disable = mcp_subparsers.add_parser("disable", help="Disable reusable MCP sources")
     add_no_sync_argument(disable)
-    disable.add_argument("server_ids", nargs="+", help="MCP server ids")
+    disable.add_argument("server_ids", nargs="+", help="MCP source names")
 
     token = mcp_subparsers.add_parser(
         "set-token-env",

{codexmgr-0.2.1 → codexmgr-0.3.0}/src/codexmgr/mcp/__init__.py

@@ -26,31 +26,69 @@ from .fields import (
     validate_field,
     validate_override,
 )
+from .project import (
+    disable_mcp_sources,
+    enable_mcp_sources,
+    mcp_source_names,
+    set_mcp_source_enabled_in_config,
+)
+from .resolution import (
+    McpResolution,
+    empty_mcp_resolution,
+    resolve_project_mcp,
+    validate_mcp_config,
+)
+from .sources import (
+    McpSource,
+    available_mcp_source_names,
+    load_mcp_source,
+    load_mcp_sources,
+    mcp_source_file,
+    mcp_sources_dir,
+    require_mcp_source,
+    resolve_mcp_source,
+)
 
 __all__ = [
     "APPROVAL_MODES",
     "CodexMcpServer",
+    "McpResolution",
+    "McpSource",
     "SAFE_FIELDS",
     "SET_FIELD_NAMES",
     "add_env_var",
     "apply_mcp_overrides",
+    "available_mcp_source_names",
     "available_state",
     "configured_overrides",
+    "disable_mcp_sources",
     "discover_codex_servers",
+    "empty_mcp_resolution",
+    "enable_mcp_sources",
     "is_string_map",
     "known_fields",
+    "load_mcp_source",
+    "load_mcp_sources",
     "mcp_lock_data",
+    "mcp_source_file",
+    "mcp_source_names",
+    "mcp_sources_dir",
     "parse_value",
     "remove_env_var",
+    "require_mcp_source",
+    "resolve_mcp_source",
     "require_string_list",
+    "resolve_project_mcp",
     "resolve_overrides",
     "set_enabled",
+    "set_mcp_source_enabled_in_config",
     "set_env_header",
     "set_field",
     "set_token_env",
     "unset_env_header",
     "unsupported_field_warnings",
     "validate_field",
+    "validate_mcp_config",
     "validate_override",
     "validate_overrides",
 ]

{codexmgr-0.2.1 → codexmgr-0.3.0}/src/codexmgr/mcp/apply.py

@@ -1,4 +1,4 @@
-"""Apply project MCP overrides to generated Codex config and lock data."""
+"""Apply project MCP server tables to generated Codex config and lock data."""
 
 from collections.abc import Mapping, MutableMapping
 from typing import Any
@@ -9,14 +9,14 @@ from ..core.toml_io import ensure_toml_table
 
 def apply_mcp_overrides(
     codex_config: MutableMapping[str, Any],
-    overrides: Mapping[str, Mapping[str, Any]],
+    servers: Mapping[str, Mapping[str, Any]],
     previous_lock: Mapping[str, Any],
 ) -> None:
-    """Apply MCP overrides to a local Codex config document.
+    """Apply MCP server tables to a local Codex config document.
 
     Args:
         codex_config: Mutable .codex/config.toml document.
-        overrides: Current MCP overrides.
+        servers: Current generated MCP server tables.
         previous_lock: Previous codexmgr lock data.
     """
     mcp_servers = ensure_toml_table(
@@ -25,7 +25,7 @@ def apply_mcp_overrides(
         ".codex/config.toml [mcp_servers] must be a table",
     )
     _remove_previous_fields(mcp_servers, previous_lock)
-    for server_id, fields in overrides.items():
+    for server_id, fields in servers.items():
         target = ensure_toml_table(
             mcp_servers,
             server_id,
@@ -34,16 +34,23 @@ def apply_mcp_overrides(
         target.update(known_fields(fields))
 
 
-def mcp_lock_data(overrides: Mapping[str, Mapping[str, Any]]) -> dict[str, Any]:
-    """Build lock data for MCP overrides.
+def mcp_lock_data(
+    enabled_sources: list[str],
+    servers: Mapping[str, Mapping[str, Any]],
+) -> dict[str, Any]:
+    """Build lock data for generated MCP state.
 
     Args:
-        overrides: Current MCP overrides.
+        enabled_sources: Reusable MCP source names enabled by the project.
+        servers: Current generated MCP server tables.
 
     Returns:
         Lockfile MCP data.
     """
-    return {"servers": {key: known_fields(value) for key, value in overrides.items()}}
+    return {
+        "enabled": list(enabled_sources),
+        "servers": {key: known_fields(value) for key, value in servers.items()},
+    }
 
 
 def _remove_previous_fields(