Skip to content

Zyl asus#9012

Open
SupeMaker wants to merge 9 commits into
AstrBotDevs:masterfrom
SupeMaker:zyl_asus
Open

Zyl asus#9012
SupeMaker wants to merge 9 commits into
AstrBotDevs:masterfrom
SupeMaker:zyl_asus

Conversation

@SupeMaker

Copy link
Copy Markdown

Modifications / 改动点

  • This is NOT a breaking change. / 这不是一个破坏性变更。

Screenshots or Test Results / 运行截图或测试结果


Checklist / 检查清单

  • 😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
    / 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。

  • 👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
    / 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”

  • 🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in requirements.txt and pyproject.toml.
    / 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到 requirements.txtpyproject.toml 文件相应位置。

  • 😮 My changes do not introduce malicious code.
    / 我的更改没有引入恶意代码。

Zzzzzzouhang and others added 9 commits June 25, 2026 00:12
…form (AstrBotDevs#8983)

- Add At component handling in _parse_to_qqofficial method
- Convert At(qq=openid) to <@openid> plain_text format
- Maintain original message chain order by appending
- Skip At(qq='all') since QQ Official API may not support it

Closes AstrBotDevs#8982
fix: preserve At components when sending messages on qq_official plat…
* fix: reconnect MCP client on terminated session

* Update astrbot/core/agent/mcp_client.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Update mcp_client.py

---------

Co-authored-by: Weilong Liao <37870767+Soulter@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* chore: bump version to 4.26.0

* feat: 更新 v4.26.0 更新日志,添加 WebUI 设置迁移提示及新功能说明

* fix: 修复多个 WebUI 和工具相关问题,提升稳定性和用户体验
@dosubot dosubot Bot added size:XXL This PR changes 1000+ lines, ignoring generated files. area:core The bug / feature is about astrbot's core, backend labels Jun 25, 2026

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry @SupeMaker, your pull request is larger than the review limit of 150000 diff characters

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request updates AstrBot to version 4.26.0, adjusts default context length configurations, adds a changelog, and introduces extensive inline documentation and comments across various core modules. However, several issues need to be addressed: unresolved merge conflict markers were found in openspec/openapi-v1.yaml, duplicate code was introduced in ierror.py, debug console.log statements were left in useMessages.ts, and multiple comments containing hardcoded local development paths need to be cleaned up or removed.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread openspec/openapi-v1.yaml
Comment on lines +4149 to +4150
=======
>>>>>>> 40eeb785 (First commit)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

critical

There are unresolved merge conflict markers ======= and >>>>>>> 40eeb785 (First commit) here. Please resolve the conflict and remove the markers.

Comment thread openspec/openapi-v1.yaml
"200":
$ref: "#/components/responses/Ok"

<<<<<<< HEAD

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

critical

There is an unresolved merge conflict marker <<<<<<< HEAD here. Please resolve the conflict and remove the marker.

Comment thread main.py
sys.path.insert(0, astrbot_root)

site_packages_path = get_astrbot_site_packages_path()
site_packages_path = get_astrbot_site_packages_path() # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\site-packages'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
site_packages_path = get_astrbot_site_packages_path() # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\site-packages'
site_packages_path = get_astrbot_site_packages_path()

skipUserHistory = false,
llmCheckpointId: string | null = null,
) {
console.log("使用startSseStream", chatApi.sendStreamUrl())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Remove the debug console.log statement before merging to production.

selectedProvider: string,
selectedModel: string,
) {
console.log("使用starWeb")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Remove the debug console.log statement before merging to production.

def get_astrbot_plugin_path() -> str:
"""Return the AstrBot plugin directory path."""
return os.path.realpath(os.path.join(get_astrbot_data_path(), "plugins"))
return os.path.realpath(os.path.join(get_astrbot_data_path(), "plugins")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\plugins'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
return os.path.realpath(os.path.join(get_astrbot_data_path(), "plugins")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\plugins'
return os.path.realpath(os.path.join(get_astrbot_data_path(), "plugins"))

def get_astrbot_temp_path() -> str:
"""Return the AstrBot temporary data directory path."""
return os.path.realpath(os.path.join(get_astrbot_data_path(), "temp"))
return os.path.realpath(os.path.join(get_astrbot_data_path(), "temp")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\temp'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
return os.path.realpath(os.path.join(get_astrbot_data_path(), "temp")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\temp'
return os.path.realpath(os.path.join(get_astrbot_data_path(), "temp"))

def get_astrbot_site_packages_path() -> str:
"""Return the AstrBot third-party site-packages directory path."""
return os.path.realpath(os.path.join(get_astrbot_data_path(), "site-packages"))
return os.path.realpath(os.path.join(get_astrbot_data_path(), "site-packages")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\site-packages'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
return os.path.realpath(os.path.join(get_astrbot_data_path(), "site-packages")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\site-packages'
return os.path.realpath(os.path.join(get_astrbot_data_path(), "site-packages"))

def get_astrbot_knowledge_base_path() -> str:
"""Return the AstrBot knowledge base root path."""
return os.path.realpath(os.path.join(get_astrbot_data_path(), "knowledge_base"))
return os.path.realpath(os.path.join(get_astrbot_data_path(), "knowledge_base")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\knowledge_base'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
return os.path.realpath(os.path.join(get_astrbot_data_path(), "knowledge_base")) # 'C:\\Users\\Admin\\Master\\projects\\github\\AstrBot\\data\\knowledge_base'
return os.path.realpath(os.path.join(get_astrbot_data_path(), "knowledge_base"))

extra_tasks.append(asyncio.create_task(task, name=task.__name__)) # type: ignore

tasks_ = [event_bus_task, *(extra_tasks if extra_tasks else [])]
tasks_ = [event_bus_task, *(extra_tasks if extra_tasks else [])] # [<Task pending name='event_bus' coro=<EventBus.dispatch() running at C:\Users\17875\Master\projects\github\AstrBot\astrbot\core\event_bus.py:39>>]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

Avoid leaving hardcoded local development paths in comments. Please remove the redundant comment.

Suggested change
tasks_ = [event_bus_task, *(extra_tasks if extra_tasks else [])] # [<Task pending name='event_bus' coro=<EventBus.dispatch() running at C:\Users\17875\Master\projects\github\AstrBot\astrbot\core\event_bus.py:39>>]
tasks_ = [event_bus_task, *(extra_tasks if extra_tasks else [])]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:core The bug / feature is about astrbot's core, backend size:XXL This PR changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants