CM-65100-add-file-support-codex-and-claude#463
Open
RoniCycode wants to merge 5 commits into
Open
Conversation
Collaborator
|
@RoniCycode run ruff and I'll approve this one |
omerr-cycode
previously approved these changes
Jun 3, 2026
Replace the flat top-level mcp_servers payload with a per-file model: global_config_file{path,content} plus each enabled plugin's mcp_config_file + mcp_config_file_path, normalized to {mcpServers}. Add device fields hostname, platform, and logged_in_user to the session-context body; user_id continues to ride the auth token.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Ilanlido
reviewed
Jun 10, 2026
| def _get_logged_in_user() -> Optional[str]: | ||
| """Best-effort OS account name (whoami). None if it can't be resolved.""" | ||
| try: | ||
| return getpass.getuser() |
Collaborator
There was a problem hiding this comment.
switch to os.getlogin()?
| # `[plugins."<plugin>@<marketplace>"]`) carry their own config files. | ||
| config_path = _codex_home() / _CONFIG_TOML_NAME | ||
| global_config_file = build_global_config_file(config_path, config.get('mcp_servers')) | ||
| _, enriched_plugins = _resolve_codex_plugins(config) |
Collaborator
There was a problem hiding this comment.
what is the first parameter that this returns? can we remove it if its no longer needed?
| return mcp_servers, {} | ||
| if not config: | ||
| return None, {} | ||
| config_path = Path.home() / '.cursor' / _MCP_CONFIG_FILENAME |
Collaborator
There was a problem hiding this comment.
this config path is written like 3 times in this file
| # Codex stores MCP servers under `[mcp_servers.<name>]`; the global config | ||
| # file becomes its own session-context file. Plugins (via | ||
| # `[plugins."<plugin>@<marketplace>"]`) carry their own config files. | ||
| config_path = _codex_home() / _CONFIG_TOML_NAME |
Collaborator
There was a problem hiding this comment.
reuse _codex_config_toml_path?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.