Skip to content

merge: integrate geak_v3_db into dev (MCP + multi-agent coexistence)#18

Merged
Umangatamd merged 10 commits intodevfrom
merge/integrate-geak-v3-db
Feb 25, 2026
Merged

merge: integrate geak_v3_db into dev (MCP + multi-agent coexistence)#18
Umangatamd merged 10 commits intodevfrom
merge/integrate-geak-v3-db

Conversation

@Puyuan-Yang
Copy link

@Puyuan-Yang Puyuan-Yang commented Feb 25, 2026

Background

geak_v3_db and dev are two branches developed independently by different team members, with no common git ancestor. This PR merges them using --allow-unrelated-histories and resolves all 60 file conflicts.

Changes

  • Code merge: Resolve 60 add/add conflicts across source, config, docs, and tests
  • README: Merge both READMEs into a unified version, covering GEAK-v3 optimization framework + MCP/RAG integration
  • MCP + ParallelAgent unification: Remove the separate MCP code path; --mcp now flows into the standard ParallelAgent pipeline, enabling --mcp with --num-parallel for multi-GPU + RAG
  • env_factory: Parallel sub-agents create MCPEnabledEnvironment when --mcp is set
  • Bug fix: profiling_tools.py f-string Python 3.10 compatibility (double→single quotes)
  • Config: Apply output truncation templates from geak_v3_db to all agent configs; set default mode to yolo

Puyuan-Yang and others added 9 commits February 6, 2026 09:41
Co-authored-by: Cursor <cursoragent@cursor.com>
- Add MCP integration module (mcp_integration/) from geak_v3_db
- Add AMD/NVIDIA knowledge base (knowledge-base/) from geak_v3_db
- Add RAG scripts and examples from geak_v3_db
- Add --mcp / --debug flags to mini.py entry point
- Add TeeOutput for console log capture to trajectory
- Add langchain optional-dependencies group to pyproject.toml
- Apply output truncation logic to all agent config templates (geak_v3_db)
- Keep dev multi-agent architecture: ParallelAgent, StrategyInteractiveAgent, UnitTestAgent
- Keep dev tools_runtime, save_patch, config_editor, task_parser modules
- Merge mkdocs.yml nav: retain all pages from both branches
- save.py: use ensure_ascii=False for non-ASCII character support

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
- Add missing geak_v3_db content to README.md: detailed config table
  (mini_no_temp, mini_reverse_kl), RAG config parameter table,
  knowledge base document requirements
- Rewrite README_zh.md to match README.md structure: add GEAK-v3 intro,
  multi-agent architecture, parallel optimization, tools, output artifacts

Co-authored-by: Cursor <cursoragent@cursor.com>
…llel

- Remove separate MCP early-return path in mini.py
- MCP environment now flows into the standard ParallelAgent pipeline
- env_factory creates MCPEnabledEnvironment for parallel sub-agents when --mcp
- MCP prompts (SYSTEM_TEMPLATE, INSTANCE_TEMPLATE) injected into agent config
- Fix profiling_tools.py f-string Python 3.10 compatibility (double→single quotes)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@Umangatamd Umangatamd merged commit 2a85039 into dev Feb 25, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants