Merge remote-tracking branch 'upstream/r-dev' into sync/pr-1564-upstream-20260331

# Conflicts:
#	src/chat/brain_chat/PFC/conversation.py
#	src/chat/brain_chat/PFC/pfc_KnowledgeFetcher.py
#	src/chat/knowledge/lpmm_ops.py
This commit is contained in:
A-Dawn
2026-03-31 10:43:55 +08:00
179 changed files with 21829 additions and 20118 deletions

2
.gitignore vendored
View File

@@ -278,6 +278,8 @@ logs
.vscode
/config/*
config/mcp_config.json
!config/mcp_config.json.template
config/old/bot_config_20250405_212257.toml
temp/