Skip to content

refactor(config): isolate global MCP and skills config / 重构配置：隔离全局 MCP 和 Skills 配置#3328

Closed
SivanCola wants to merge 29 commits into
main-v2from
sivancola_0606_dev
Closed

refactor(config): isolate global MCP and skills config / 重构配置：隔离全局 MCP 和 Skills 配置#3328
SivanCola wants to merge 29 commits into
main-v2from
sivancola_0606_dev

Conversation

@SivanCola
Copy link
Copy Markdown
Collaborator

@SivanCola SivanCola commented Jun 6, 2026

Summary

  • move user config/state paths to ~/.reasonix and split MCP/skills into mcp.toml and skills.toml
  • stop loading project-level config, MCP, skills, commands, and .env as runtime config sources
  • add migration/import/doctor support plus backups and diagnostics for legacy files
  • update CLI, controller, skill, and desktop MCP consumers to write the new global files

Tests

  • go test ./internal/cli ./internal/config ./internal/skill ./internal/boot ./internal/control ./internal/doctor

Notes

  • Desktop module tests require frontend/dist embed output; Go semantic changes were checked by focused package tests.

@SivanCola SivanCola requested a review from esengine as a code owner June 6, 2026 05:19
@github-actions github-actions Bot added the v2 Go rewrite (1.x) — main-v2 branch, active development label Jun 6, 2026
chatgpt-codex-connector[bot]
chatgpt-codex-connector Bot reviewed Jun 6, 2026
View reviewed changes
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ca501cea45

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread internal/cli/cli.go Outdated
Comment thread internal/config/migrate.go
@SivanCola SivanCola changed the title refactor(config): isolate global MCP and skills config refactor(config): isolate global MCP and skills config / 重构配置：隔离全局 MCP 和 Skills 配置 Jun 6, 2026
@SivanCola
Copy link
Copy Markdown
Collaborator Author

SivanCola commented Jun 6, 2026

Updated this PR by merging the capability installer work from #3292 into sivancola_0606_dev.

Merge notes:

  • Preserved the isolated global MCP/skills config layout from this branch.
  • Adapted install_source persistence to write MCP servers to mcp.toml and skill roots to skills.toml.
  • Kept subagent model/effort profile wiring from the remote sivancola_0606_dev head.

Local verification passed:

  • go test ./internal/config ./internal/installsource ./internal/boot ./internal/skill ./internal/agent -count=1
  • go test ./... -count=1
  • go build ./...

SivanCola added 16 commits June 6, 2026 13:41
@SivanCola
Merge PR #3330 into sivancola_0606_dev
a6145d0 
# Conflicts:
#	internal/boot/boot.go
@SivanCola
Support nested skill discovery
a5e5f58
@SivanCola
Fix sivancola dev CI issues
f88cae9
@SivanCola
Merge branch 'sivancola_0606_dev' of github.com:esengine/DeepSeek-Rea…
4025d4b 
…sonix into sivancola_0606_dev
@SivanCola
Merge nested skill discovery into sivancola dev
2f5d335 
# Conflicts:
#	internal/config/render.go
#	internal/config/render_test.go
@SivanCola
fix(cli): honor subagent profiles in ACP task
6f58bf7
@SivanCola
Merge PR #3330 ACP fix into sivancola_0606_dev
da8c03c
@SivanCola
fix(agent): satisfy subagent profile CI checks
4512c2d
@SivanCola
Merge PR #3330 CI fix into sivancola_0606_dev
ebcc830 
# Conflicts:
#	internal/agent/task.go
@SivanCola
Fix skill installer canonical layout
41b3b75
@SivanCola
Simplify MCP startup behavior
093f077
@SivanCola
Merge codex/mcp-skills into sivancola_0606_dev
46a25c4 
# Conflicts:
#	internal/installsource/install_source.go
#	internal/installsource/install_source_test.go
#	internal/installsource/skill.go
@SivanCola
Merge MCP startup simplification into sivancola_0606_dev
3090367 
# Conflicts:
#	internal/boot/boot_test.go
#	internal/cli/mcp.go
#	internal/config/config.go
#	internal/config/render.go
#	internal/config/render_test.go
@SivanCola
Merge latest sivancola_0606_dev
02e352f
@SivanCola
Fix skill install canonical format
9546bba
@SivanCola
Merge codex/mcp-skills into sivancola_0606_dev
f9aa008
@SivanCola SivanCola force-pushed the sivancola_0606_dev branch 2 times, most recently from e22fb78 to 4cdb498 Compare June 6, 2026 09:00
@SivanCola SivanCola force-pushed the sivancola_0606_dev branch from 4cdb498 to 24f8b72 Compare June 6, 2026 09:09
@SivanCola
Copy link
Copy Markdown
Collaborator Author

SivanCola commented Jun 6, 2026

Superseded by the newly split main-v2 based PRs (#3365-#3370) and by narrower existing feature PRs such as #3292. This integration branch mixes multiple feature areas and overlaps with the new focused PR stack, so it is being closed to avoid duplicate review scope. If the global MCP/Skills config split still needs to land, it should be resubmitted as a narrow PR directly against main-v2.

@SivanCola SivanCola closed this Jun 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

@esengine esengine Awaiting requested review from esengine esengine is a code owner

Assignees

No one assigned

Labels

v2 Go rewrite (1.x) — main-v2 branch, active development

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@SivanCola