Merge/2.0 into main

[rayrayraykk]

Merge Checklist: upstream/main (v1.1.12) → dev/agentscope2.0

Version: 2.0.0b1

---

1. Merge Status Overview

All 170 commits from main have been included in the branch via git merge.
Conflicted files were resolved manually, prioritizing the 2.0 architecture while porting key feature changes from main.

---

2. Itemized Review of Key Commits from Main

Architecture/Core

Status	Commit	Description	Remarks / Notes
✅	d8ebd2b1	Proactive cache pollution prevention fix	Manually merged: _PROACTIVE_MAX_ITERS
✅	6d17c5da	Non-blocking file writing via aiofiles	Manually merged into file_io.py
✅	65bd2999	_is_dangerous_self_kill shell protection	Manually ported, commit eb628367
✅	a6c34d94	spawn_subagent tool	Manually added export to __init__.py
✅	ae145f4d	Atomic session state writing	Included (auto-merged)
✅	1fd9efe4	Session filename deduplication	Included (auto-merged)
✅	1878668b	Fix for mission crash on corrupted JSON	Included (auto-merged)
✅	a3faf745	token_usage using active model max_input_length	Included (turn_usage.py)
✅	3f7bec05	Non-blocking flush adaptive rate limiting	Included (auto-merged)
✅	daf33e4a	Port persistence	Included (auto-merged)
✅	e7baf615	MCP OAuth IndexError fix	Included (auto-merged)
✅	6023d529	Skip files that cannot be added during backup	Included (auto-merged)
✅	f987262f	Xiaoyi dual WebSocket refactoring	Manually merged schema imports
✅	c52949a2	Sanitize tool schemas (400 fix)	Included (openai_chat_model_compat)
✅	a0d5a366	Silence extra data warnings in raw_decode	Included (json_utils.py)
✅	af931f25	Awaiting broadcast_to_subscribers	N/A (2.0 uses the new Agent base class)
✅	881b9dbd	Non-standard kwargs → extra_body	N/A (2.0 uses extra_generate_kwargs)

Provider/Model

Status	Commit	Description	Remarks / Notes
✅	d53c1535	OpenRouter attribution headers	Included (HTTP-Referer, X-Title)
✅	78cc2276	ProviderManager fallback max_input_length	Included (auto-merged)
✅	36db83b0	Free model OAuth	Included (auto-merged)
✅	7b76b428	Xiaomi MiMo built-in provider	Included (auto-merged)
✅	381c02	Fix for multi-provider formatter	Included (title_generator)

Channels

Status	Commit	Description	Remarks / Notes
✅	f22bbc8a	Yuanbao channel	Included (auto-merged)
✅	f275999a	Telegram tool_guard approval	Included (auto-merged)
✅	d4b4e17a	QQ QR code authorization	Included (qrcode_auth_handler.py)
✅	3625891e	DingTalk stream resumption after sleep	Included (auto-merged)
✅	ab72e961	DingTalk SSL certificate configuration	Included (auto-merged)
✅	473554b2	Fix for DingTalk cross-user message merging	Included (auto-merged)
✅	714725c7	Channel ACL sender username	Included (auto-merged)
✅	b5392627	Channel webhook image/video preview	Included (auto-merged)

MCP

Status	Commit	Description	Remarks / Notes
✅	ee018a8a	MCP tool name alias-rewrite	Included (auto-merged)
✅	900c1c9f	Fix for MCP process leaks	Included (auto-merged)
✅	a5fb5b00	MCP per-server tool whitelist	Backend missing — The PUT /mcp/tools/{key} endpoint was not added to the 2.0 router; the frontend UI exists but the backend API is mismatched.

Skills/Plugins

Status	Commit	Description	Remarks / Notes
✅	6353f815	Prompt section registry	Included (prompt_contributors.py)
✅	2446ec9c	Plugins uninstall hooks	Included (2.0 already has a more complete implementation)
✅	0f6757a9	Batch downloading of skill tags	Included (auto-merged)
✅	3da0c105	Plugin Market tab	Included (auto-merged)
✅	0ee3621c	cloudpaw A2A AgentHub import	Included (auto-merged)
✅	547c144b	Self-evolving skill creation	Partially missing — _analyse_batch_refs in make_skill_tools.py was not ported (though run_tool_batch.py is included and SKILL.md is updated).

Browser

Status	Commit	Description	Remarks / Notes
✅	4e8f010e	Browser coordinate clicking (page_x/page_y)	Missing — browser_control.py was sourced from the 2.0 version and has not been adapted for the new parameters.
✅	1054657b	Browser profile isolation (cross-browser switching)	Missing — Same as above; 2.0 already has a different profile implementation.

Console/Frontend

Status	Commit	Description	Remarks / Notes
✅	All console/ changes	UI features (widescreen, model page, session list, etc.)	All included via auto-merge
✅	b9726dc2	Vietnamese language support	Included
✅	352efce4	Code syntax highlighting	Included
✅	6d3ce942	Models page redesign	Included

Desktop/Build

Status	Commit	Description	Remarks / Notes
✅	0e5a00b0	Tauri external link fix	Included (auto-merged)
✅	3058d65f	Tauri plugin dependency installation fix	Included (auto-merged)
✅	65bd2999	Windows console crash protection	Included (manually ported)
✅	7e265e52	Fixed-port support	Included (auto-merged)

---

4. Version Change Summary

Item	Old Version	New Version
QwenPaw	1.1.12.post1	2.0.0b1
agentscope	1.0.20	2.0.2
reme-ai	0.3.1.10	0.4.0.0
Minimum Python Version	3.10	3.11
agentscope-runtime	1.1.6	Removed (built-in in 2.0)
Added Dependencies	-	textual>=4.0, wcmatch>=10.0

[github-actions]

Welcome to QwenPaw! 🐾

Hi @rayrayraykk, this is your 189th Pull Request.

🙌 Join Developer Community

Thanks so much for your contribution! We'd love to invite you to join the official QwenPaw developer group! You can find the Discord and DingTalk group links under the "Developer Community" section on our docs page:
https://qwenpaw.agentscope.io/docs/community

We truly appreciate your enthusiasm—and look forward to your future contributions! 😊

We'll review your PR soon.

[Copilot]

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.