LIghtJUNction
5535f0c932
Merge branch 'master' into dev
...
# Conflicts:
# AGENTS.md
# astrbot/__init__.py
# astrbot/cli/utils/__init__.py
# astrbot/core/astr_agent_tool_exec.py
# astrbot/core/computer/booters/local.py
# astrbot/core/cron/manager.py
# astrbot/core/knowledge_base/kb_mgr.py
# astrbot/core/knowledge_base/retrieval/manager.py
# astrbot/core/platform/sources/discord/discord_platform_adapter.py
# astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py
# astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py
# astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py
# astrbot/core/platform/sources/wecom/wecom_adapter.py
# astrbot/core/platform/sources/wecom_ai_bot/wecomai_adapter.py
# astrbot/core/provider/func_tool_manager.py
# astrbot/core/provider/sources/mimo_api_common.py
# astrbot/core/star/star_manager.py
# astrbot/core/tools/computer_tools/fs.py
# astrbot/core/tools/computer_tools/python.py
# astrbot/core/tools/computer_tools/shell.py
# astrbot/core/tools/message_tools.py
# astrbot/core/tools/web_search_tools.py
# astrbot/core/utils/io.py
# astrbot/core/utils/tencent_record_helper.py
# dashboard/package.json
# dashboard/src/assets/mdi-subset/materialdesignicons-subset.css
# dashboard/src/assets/mdi-subset/materialdesignicons-webfont-subset.woff
# dashboard/src/assets/mdi-subset/materialdesignicons-webfont-subset.woff2
# dashboard/src/components/ConfirmDialog.vue
# dashboard/src/components/chat/Chat.vue
# dashboard/src/components/chat/ChatInput.vue
# dashboard/src/components/chat/ChatMessageList.vue
# dashboard/src/components/chat/ConfigSelector.vue
# dashboard/src/components/chat/MessageList.vue
# dashboard/src/components/chat/ProjectDialog.vue
# dashboard/src/components/chat/ProjectList.vue
# dashboard/src/components/chat/ProjectView.vue
# dashboard/src/components/chat/ProviderModelMenu.vue
# dashboard/src/components/chat/RegenerateMenu.vue
# dashboard/src/components/chat/StandaloneChat.vue
# dashboard/src/components/chat/ThreadPanel.vue
# dashboard/src/components/chat/ThreadedMarkdownMessagePart.vue
# dashboard/src/components/chat/message_list_comps/MarkdownMessagePart.vue
# dashboard/src/components/chat/message_list_comps/ReasoningTimeline.vue
# dashboard/src/components/chat/message_list_comps/RefsSidebar.vue
# dashboard/src/components/config/UnsavedChangesConfirmDialog.vue
# dashboard/src/components/extension/MarketPluginCard.vue
# dashboard/src/components/extension/McpServersSection.vue
# dashboard/src/components/extension/SkillsSection.vue
# dashboard/src/components/extension/componentPanel/components/DetailsDialog.vue
# dashboard/src/components/extension/componentPanel/components/RenameDialog.vue
# dashboard/src/components/folder/BaseCreateFolderDialog.vue
# dashboard/src/components/folder/BaseFolderItemSelector.vue
# dashboard/src/components/folder/BaseMoveToFolderDialog.vue
# dashboard/src/components/platform/AddNewPlatform.vue
# dashboard/src/components/provider/AddNewProvider.vue
# dashboard/src/components/provider/ProviderModelsPanel.vue
# dashboard/src/components/shared/BackupDialog.vue
# dashboard/src/components/shared/ChangelogDialog.vue
# dashboard/src/components/shared/ExtensionCard.vue
# dashboard/src/components/shared/FileConfigItem.vue
# dashboard/src/components/shared/KnowledgeBaseSelector.vue
# dashboard/src/components/shared/ListConfigItem.vue
# dashboard/src/components/shared/ObjectEditor.vue
# dashboard/src/components/shared/PersonaForm.vue
# dashboard/src/components/shared/PluginSetSelector.vue
# dashboard/src/components/shared/ProviderSelector.vue
# dashboard/src/components/shared/ReadmeDialog.vue
# dashboard/src/components/shared/SidebarCustomizer.vue
# dashboard/src/components/shared/T2ITemplateEditor.vue
# dashboard/src/components/shared/UninstallConfirmDialog.vue
# dashboard/src/components/shared/WaitingForRestart.vue
# dashboard/src/composables/useMessages.ts
# dashboard/src/composables/useProjects.ts
# dashboard/src/composables/useProviderModelConfigDialog.ts
# dashboard/src/composables/useProviderSources.ts
# dashboard/src/i18n/locales/ru-RU/features/config-metadata.json
# dashboard/src/i18n/locales/ru-RU/features/extension.json
# dashboard/src/i18n/locales/ru-RU/features/provider.json
# dashboard/src/layouts/full/vertical-header/VerticalHeader.vue
# dashboard/src/scss/_override.scss
# dashboard/src/stores/common.js
# dashboard/src/stores/customizer.ts
# dashboard/src/views/ConfigPage.vue
# dashboard/src/views/ConversationPage.vue
# dashboard/src/views/PlatformPage.vue
# dashboard/src/views/SessionManagementPage.vue
# dashboard/src/views/WelcomePage.vue
# dashboard/src/views/alkaid/KnowledgeBase.vue
# dashboard/src/views/alkaid/LongTermMemory.vue
# dashboard/src/views/authentication/auth/LoginPage.vue
# dashboard/src/views/extension/InstalledPluginsTab.vue
# dashboard/src/views/extension/useExtensionPage.js
# dashboard/src/views/knowledge-base/DocumentDetail.vue
# dashboard/src/views/knowledge-base/KBList.vue
# dashboard/src/views/knowledge-base/components/DocumentsTab.vue
# dashboard/src/views/knowledge-base/components/SettingsTab.vue
# dashboard/src/views/knowledge-base/components/TavilyKeyDialog.vue
# dashboard/src/views/persona/FolderTree.vue
# dashboard/src/views/persona/MoveToFolderDialog.vue
# dashboard/src/views/persona/PersonaManager.vue
# requirements.txt
# tests/test_local_shell_component.py
# tests/unit/test_func_tool_manager.py
# tests/unit/test_web_search_tools.py
2026-07-16 17:39:40 +08:00
Weilong Liao
e7d5be632f
feat: add ChatUI project workspaces ( #9066 )
...
* feat: add ChatUI project workspaces
* feat: refine chatui layout
* feat: enhance chat input and project view styles for attachment handling
* feat: adjust chat sidebar brand logo positioning
* feat: enhance project dialog with error handling and loading state
2026-07-03 21:54:20 +08:00
Weilong Liao
de572e3fe0
fix: avoid duplicate send_message_to_user replies ( #9051 )
2026-06-27 16:57:17 +08:00
エイカク
2c8736fe42
fix: harden sandbox file transfers ( #8840 )
...
* fix: harden sandbox file transfers
* fix: check CUA sandbox availability with shell probe
* fix: address sandbox transfer review feedback
* fix: preserve CUA health check cancellation
* fix: tighten CUA health probe checks
2026-06-17 22:25:51 +09:00
Weilong Liao
66ec415e56
fix: restrict local file paths in message tools ( #8660 )
...
* fix: restrict local file paths in message tool
* Update astrbot/core/tools/message_tools.py
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* fix: rf
---------
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-06-08 01:20:47 +08:00
LIghtJUNction
a368609208
Merge remote-tracking branch 'origin/master' into dev
...
# Conflicts:
# astrbot/core/astr_main_agent.py
# astrbot/core/db/__init__.py
# astrbot/core/db/vec_db/faiss_impl/document_storage.py
# astrbot/core/message/components.py
# astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py
# astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py
# astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py
# astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py
# astrbot/core/provider/sources/anthropic_source.py
# astrbot/core/provider/sources/openai_source.py
# astrbot/dashboard/routes/command.py
# astrbot/dashboard/routes/static_file.py
# astrbot/dashboard/server.py
# dashboard/package.json
# dashboard/src/components/chat/ChatInput.vue
# dashboard/src/components/chat/ChatMessageList.vue
# dashboard/src/components/chat/MessageList.vue
# dashboard/src/components/chat/StandaloneChat.vue
# dashboard/src/components/chat/message_list_comps/ReasoningBlock.vue
# dashboard/src/components/provider/ProviderSourcesPanel.vue
# dashboard/src/components/shared/ExtensionCard.vue
# dashboard/src/components/shared/ListConfigItem.vue
# dashboard/src/composables/useProviderSources.ts
# dashboard/src/utils/providerUtils.js
# dashboard/src/views/extension/InstalledPluginsTab.vue
# docs/zh/dev/star/plugin.md
2026-05-30 16:59:16 +08:00
Soulter
49036f8f9d
fix(message_tools): improve description for SendMessageToUserTool usage
...
fixes : #8355
2026-05-30 14:01:25 +08:00
LIghtJUNction
987099d4cb
chore: merge origin/master into dev
2026-05-19 21:15:22 +08:00
NayukiMeko
22ba831a31
fix(message_tools): throw exception and block message sending when path does not exist ( #8149 )
...
* fix(message_tools): 路径不存在时抛出异常并阻止消息发送
- _resolve_path_from_sandbox 在所有解析路径均失败时改为抛出 FileNotFoundError，而非静默返回原始路径，避免将无效路径传递给下游组件
- 新增 component_type 关键字参数，使错误信息能明确指出是 image/record/video/file 哪类资源路径缺失
- 在 call 方法中捕获 FileNotFoundError 并提前返回错误字符串，确保路径无效时不会继续构建或发送任何消息组件
- 补充单元测试，验证缺失图片路径场景下 send_message 不会被调用
* Update tests/unit/test_message_tools.py
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* fix(tools): propagate sandbox error instead of masking as FileNotFoundError
---------
Co-authored-by: Ruochen Pan <badbatch0x01@gmail.com >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: RC-CHN <1051989940@qq.com >
2026-05-13 11:50:06 +08:00
LIghtJUNction
d373a24320
merge: sync origin/master into dev
...
Resolved 76 file conflicts across backend, frontend, and tests:
- Core backend: agent, platform, provider, star, tools, cron, KB, utils
- Dashboard backend: auth, config, plugin routes, server, runtime bootstrap
- Frontend components: shared, extension, provider components
- Frontend views: console, trace, cron, extension, platform, provider, etc.
- Frontend infrastructure: layouts, router, stores, main.ts
- Assets: MDI font subset (css, woff, woff2)
- Tests: fixtures, plugin manager, anthropic provider, dashboard tests
Strategy per file:
- Most backend: merged master improvements (metrics, http_client -> default_headers,
download_url params, plugin i18n, runtime guards, auth middleware)
- Frontend views: adopted master dashboard-shell layout (v-container, is-dark theme)
- InstalledPluginsTab: kept dev pinned-plugins feature (drag-sort, pin/unpin)
- Binary assets: resolved via git checkout
- Tests: merged both branches' assertions and mock updates
2026-05-08 11:04:03 +08:00
NayukiMeko
8098a92f33
fix( #7907 ): send_message_to_user cron 场景下 session 容错 ( #7911 )
...
* fix: send_message_to_user cron 场景下 session 容错 (#7907 )
- LLM 在主动场景可能只传 session_id 而非完整三段式，
from_str 失败时用 current_session 补全前两段。
Co-authored-by: Copilot <copilot@github.com >
* fix: 限制 session 补全仅对裸 session_id 生效，避免误修带冒号的错误输入 (#7907 )
* feat: add session information to cron job payload
Co-authored-by: Copilot <copilot@github.com >
* fix: improve clarity and consistency of safety mode prompts
Co-authored-by: Copilot <copilot@github.com >
---------
Co-authored-by: Copilot <copilot@github.com >
Co-authored-by: Weilong Liao <37870767+Soulter@users.noreply.github.com >
Co-authored-by: Soulter <905617992@qq.com >
2026-05-03 14:37:37 +08:00
Soulter
1aacb46289
fix: improve error message for invalid session format in SendMessageToUserTool
...
Co-authored-by: Copilot <copilot@github.com >
2026-05-01 13:09:27 +08:00
LIghtJUNction
0208dbb15f
Merge branch 'master' of https://github.com/AstrBotDevs/AstrBot into dev
...
# Conflicts:
# dashboard/vite.config.ts
2026-04-29 02:16:18 +08:00
Weilong Liao
8f356b84c7
fix(core): restrict send_message_to_user to current session (security fix #7822 ) ( #7824 )
...
* fix(core): security fix - restrict send_message_to_user to current session only
Closes #7822
SECURITY: Remove the user-controlled 'session' parameter from the
send_message_to_user tool. Previously, a regular user could ask the
LLM to send messages to any arbitrary session (group chat) by
providing a crafted session string, which is a high-risk
vulnerability.
Changes:
- Remove 'session' parameter from tool schema (LLM can no longer
propose it)
- Always use context.context.event.unified_msg_origin as the target
session
- Update description to clearly state that messages can only be sent
to the current user's session
* fix: restore session param but restrict to admin only
- Re-add the parameter removed in the original PR
- Non-admin users can only send to their own session (current_session)
- Admin users can send to any session via the param
- Uses from computer_tools.util (same pattern as fs.py)
- Ref: https://github.com/AstrBotDevs/AstrBot/issues/7822
Co-authored-by: Soulter <soulter@astrbot.app >
* Update message_tools.py
---------
Co-authored-by: AstrBot <bot@astrbot.app >
2026-04-29 00:15:16 +08:00
LIghtJUNction
c4048bb8eb
refactor: delete _internal
...
remove deprecated API modules and example scripts; update core modules
(agents, providers, tools, platform adapters, utils), dashboard package
and components, and unit tests.
2026-04-23 04:16:30 +08:00
LIghtJUNction
33ec7bbf9c
merge: master -> dev
2026-04-23 01:12:06 +08:00
千岚之夏
b40bcbbd86
fix: resolve relative file paths within a local workspace root for the SendMessageToUserTool ( #7668 )
...
* fix: resolve relative file paths against workspace directory
* fix: add path normalization and security check for workspace resolution
* chore: remove temp PR body file
* chore: added some comments
Added comments to clarify path resolution logic.
* Update astrbot/core/tools/message_tools.py
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---------
Co-authored-by: Test User <test@test.com >
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-04-19 14:09:02 +08:00
LIghtJUNction
18e66595f0
chore: ruff check --fix && ruff format .
2026-04-10 20:12:33 +08:00
LIghtJUNction
ec1af1ac0f
ruff check --fix --select ALL
2026-04-10 19:57:02 +08:00
Soulter
38b1b4d4ea
refactor: improve astrbot builtin tool management ( #7418 )
...
* feat: Refactor astrbot builtin tool management
- Introduced a new registry for builtin tools to streamline their management.
- Added `SendMessageToUserTool`, `KnowledgeBaseQueryTool`, and various web search tools as builtin tools.
- Updated `FunctionToolManager` to cache and retrieve builtin tools efficiently.
- Modified `CronJobManager` to utilize the new `SendMessageToUserTool`.
- Enhanced the dashboard to display readonly status for builtin tools and prevent toggling their state.
- Added tests for builtin tool injection and retrieval to ensure proper functionality.
* fix: escape file path in shell command to prevent injection vulnerabilities
2026-04-08 14:49:58 +08:00
