LIghtJUNction
4d1e0ef1be
merge: resolve conflicts from upstream
...
Conflict resolution: accepted HEAD versions for all conflicted files.
2026-04-15 17:03:54 +08:00
Soulter
49531da91d
feat: add on_agent_begin, on_using_llm_tool, on_llm_tool_respond, on_agent_done event hooks ( #7540 )
...
* feat: add on_agent_begin, on_using_llm_tool, on_llm_tool_respond, on_agent_done event hooks
* docs: add version requirement for event hooks in message event guide
* Update astrbot/core/star/star_handler.py
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* Update astrbot/core/astr_agent_hooks.py
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* feat: rename event types to include 'Event' suffix for consistency
* chore: ruff format
---------
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-04-14 18:55:05 +08:00
LIghtJUNction
5303e40931
Merge branch 'master' into dev
...
Resolved all conflicts using dev (HEAD) version:
- func_tool_manager.py: migrated old implementation into new architecture
- tool_loop_agent_runner.py: preserve lazy_load mode, remove step limit
- Platform adapters, dashboard, core modules: use HEAD version
2026-04-10 20:58:41 +08:00
2doright
574e5089ba
docs: fix path concatenation error in storage.md ( #7448 )
...
* docs: 修复 storage.md 中路径拼接的错误示例
get_astrbot_data_path() 返回的是 str 类型，直接使用 / 运算符会导致 TypeError。修改文档示例，添加 Path() 包裹
* docs: 修复 storage.md 中路径拼接的错误示例
get_astrbot_data_path() 返回的是 str 类型，直接使用 / 运算符会导致 TypeError。修改文档示例，添加 Path() 包裹。
2026-04-10 18:41:54 +08:00
LIghtJUNction
43156d6eac
Merge branch 'origin/dev' into dev
...
Resolved merge conflicts in:
- func_tool_manager.py: kept origin version (full implementation)
- astr_main_agent*.py: kept HEAD version (complete refactor)
- cron_tools.py: kept HEAD version (with get_all_tools)
- config/default.py: kept HEAD version (DEFAULT_WEB_SEARCH_PROVIDER)
- dashboard/*.vue: kept HEAD version
- web_searcher engines: kept HEAD version
- Added new tools: knowledge_base_tools, message_tools, registry, web_search_tools
2026-04-08 19:45:16 +08:00
Soulter
94a529d3fd
refactor: remove default web search ( #7416 )
...
* refactor: remove default web search
* chore: ruff format
2026-04-08 13:26:53 +08:00
daniel5u
c517cdb490
feat: add new web search tool Brave Search ( #6847 )
...
* feat:Brave Search API adapted
* Modified hint message
* Modified according to AI reviews
* chore: revert compose.yml changes
---------
Co-authored-by: Soulter <905617992@qq.com >
2026-04-08 12:00:21 +08:00
LIghtJUNction
efa999c221
merge: origin/master into dev
...
Resolve merge conflicts:
- Version logic: keep dev (dynamic version from package metadata)
- Backend: merge EmptyModelOutputError retry logic from master
- Frontend: keep dev design, accept master functional enhancements
- SSL/config: keep dev inline implementation
2026-03-30 17:07:57 +08:00
氕氙
a40a5fe18c
docs: add usage of select_knowledgebase in plugin development docs ( #7115 )
...
* docs: 补充 select_knowledgebase 及 _special 字段文档
在插件配置文档中添加 select_knowledgebase 的说明（返回 list，
支持多选），并列出 AstrBot Core 内部使用的其他 _special 值供参考。
* docs: 优化 _special 字段文档表达
标注内部 _special 值为不稳定实现，请勿在插件中使用；
说明 select_agent_runner_provider:* 中 * 的含义；
修正英文措辞。
2026-03-29 16:26:28 +08:00
エイカク
597ed67467
fix: avoid lsp client cancel scope leaks ( #6961 )
...
* fix: avoid lsp client cancel scope leaks
* fix: observe lsp reader task failures
* fix: trim trailing whitespace in docs
* fix: harden lsp client reconnect handling
* fix: refine lsp client test coverage
* fix: harden lsp reader task teardown
* fix: refine lsp reader failure handling
* fix: centralize lsp reader lifecycle
* docs: fix platform adapter session type
* test: shorten hanging lsp fixture sleep
* docs: translate ai guide details label
* fix: simplify lsp reader task lifecycle
2026-03-26 04:00:44 +09:00
LIghtJUNction
b4a32fbda8
fix: resolve documentation formatting issues
...
- Add 'config' to known zh/en doc structure differences
- Remove trailing whitespace from docs/zh/faq.md
- Remove trailing whitespace from docs/en/dev/plugin-platform-adapter.md
- Ensure all README files end with newline
2026-03-23 02:49:15 +08:00
LIghtJUNction
61e525afd4
Merge branch 'master' into dev
2026-03-21 12:25:04 +08:00
LIU Yaohua
8d9838a293
fix(agent): pass tool_call_timeout to subagent handsoff, cron and background task execution, and increase default timeout from 60 to 120 ( #6713 )
...
* fix(agent): pass tool_call_timeout to SubAgent handoff execution
- Add tool_call_timeout parameter to _execute_handoff method
- Pass run_context.tool_call_timeout to ctx.tool_loop_agent
- Add unit test to verify tool_call_timeout is correctly passed
- Fixes #6711 : SubAgent MCP tool call timeout now respects configured timeout
The SubAgent handoff execution was using the default 60-second timeout
instead of the configured tool_call_timeout from provider settings.
This change ensures that SubAgent MCP tool calls respect the user's
configured timeout settings.
* test: add unit test for tool_call_timeout in SubAgent handoff
* fix: restore deleted test and fix test assertion
- Restore test_collect_handoff_image_urls_filters_extensionless_missing_event_file
- Fix test_collect_handoff_image_urls_keeps_extensionless_existing_event_file assertion
- Keep new test_execute_handoff_passes_tool_call_timeout_to_tool_loop_agent
* refactor: simplify tool_call_timeout passing in _execute_handoff
- Pass run_context.tool_call_timeout directly to ctx.tool_loop_agent
- Remove unnecessary local variable assignment
- Addresses review feedback from Sourcery AI
* fix(config): increase default tool call timeout from 60 to 120 seconds
---------
Co-authored-by: LehaoLin <linlehao@cuhk.edu.cn >
Co-authored-by: Soulter <905617992@qq.com >
2026-03-21 01:30:53 +08:00
JIANG Zijun
5d811d3949
fix: Persist Discord pre-ack emoji config across restart by adding missing default key ( #6031 )
...
* Initial plan
* fix: add discord default platform_specific pre-ack config
Co-authored-by: Jzjerry <20167827+Jzjerry@users.noreply.github.com >
* Delete tests/unit/test_config.py
we don't need to add tests
* fix: use 🤔 as default discord pre-ack emoji
Co-authored-by: Jzjerry <20167827+Jzjerry@users.noreply.github.com >
* add back old test config
* doc: discord pre-ack-emoji doc
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com >
Co-authored-by: Jzjerry <20167827+Jzjerry@users.noreply.github.com >
2026-03-11 16:41:08 +08:00
Soulter
fc33b3eb68
docs: transfer AstrBotDevs/AstrBot-docs to AstrBotDevs/AstrBot ( #5960 )
...
* docs: transfer AstrBotDevs/AstrBot-docs to AstrBotDevs/AstrBot
* refactor: reorder imports and improve type hints in sync_docs_to_wiki.py and upload_doc_images_to_r2.py
* feat: add GitHub Actions workflow to sync wiki with documentation
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com >
Co-authored-by: anka-afk <110004162+anka-afk@users.noreply.github.com >
Co-authored-by: zouyonghe <62183434+zouyonghe@users.noreply.github.com >
Co-authored-by: shuiping233 <49360196+shuiping233@users.noreply.github.com >
Co-authored-by: LIghtJUNction <106986785+LIghtJUNction@users.noreply.github.com >
Co-authored-by: Sjshi763 <179909421+Sjshi763@users.noreply.github.com >
Co-authored-by: xiewoc <70128845+xiewoc@users.noreply.github.com >
Co-authored-by: QingFeng-awa <151742581+QingFeng-awa@users.noreply.github.com >
Co-authored-by: PaloMiku <96452465+PaloMiku@users.noreply.github.com >
Co-authored-by: shangxueink <138397030+shangxueink@users.noreply.github.com >
Co-authored-by: IGCrystal-A <244300990+IGCrystal-A@users.noreply.github.com >
Co-authored-by: RC-CHN <67079377+RC-CHN@users.noreply.github.com >
Co-authored-by: MC090610 <113341105+MC090610@users.noreply.github.com >
Co-authored-by: Waterwzy <196913419+Waterwzy@users.noreply.github.com >
Co-authored-by: Lanhuace-Wan <186303160+Lanhuace-Wan@users.noreply.github.com >
Co-authored-by: LiAlH4qwq <61769640+LiAlH4qwq@users.noreply.github.com >
Co-authored-by: HSOS6 <209910899+HSOS6@users.noreply.github.com >
Co-authored-by: th-dd <162813557+th-dd@users.noreply.github.com >
Co-authored-by: miaoxutao123 <81676466+miaoxutao123@users.noreply.github.com >
Co-authored-by: nuomicici <143102889+nuomicici@users.noreply.github.com >
Co-authored-by: nasyt233 <210103278+nasyt233@users.noreply.github.com >
Co-authored-by: jlugjb <7426462+jlugjb@users.noreply.github.com >
Co-authored-by: Raven95676 <176760093+Raven95676@users.noreply.github.com >
Co-authored-by: Futureppo <180109455+Futureppo@users.noreply.github.com >
Co-authored-by: MliKiowa <61873808+MliKiowa@users.noreply.github.com >
Co-authored-by: Fridemn <150212937+Fridemn@users.noreply.github.com >
Co-authored-by: BakaCookie520 <138355736+BakaCookie520@users.noreply.github.com >
Co-authored-by: YumeYuka <125112916+YumeYuka@users.noreply.github.com >
Co-authored-by: xming521 <32786500+xming521@users.noreply.github.com >
Co-authored-by: ywh555hhh <121592812+ywh555hhh@users.noreply.github.com >
Co-authored-by: stevessr <89645372+stevessr@users.noreply.github.com >
Co-authored-by: roeseth <41995115+roeseth@users.noreply.github.com >
Co-authored-by: ikun-1145141 <265925499+ikun-1145141@users.noreply.github.com >
Co-authored-by: evpeople <54983536+evpeople@users.noreply.github.com >
Co-authored-by: Yue-bin <60509781+Yue-bin@users.noreply.github.com >
Co-authored-by: W1ndys <109416673+W1ndys@users.noreply.github.com >
Co-authored-by: TheFurina <218887821+TheFurina@users.noreply.github.com >
Co-authored-by: Seayon <12275933+Seayon@users.noreply.github.com >
Co-authored-by: OnlyblackTea <38585636+OnlyblackTea@users.noreply.github.com >
Co-authored-by: ocetars <74854972+ocetars@users.noreply.github.com >
Co-authored-by: railgun19457 <117180744+railgun19457@users.noreply.github.com >
Co-authored-by: JunieXD <107397009+JunieXD@users.noreply.github.com >
Co-authored-by: advent259141 <197440256+advent259141@users.noreply.github.com >
Co-authored-by: Doge2077 <91442300+Doge2077@users.noreply.github.com >
Co-authored-by: Bocity <23430545+Bocity@users.noreply.github.com >
Co-authored-by: Aurora-xk <192227833+Aurora-xk@users.noreply.github.com >
2026-03-09 23:38:21 +08:00
