LIghtJUNction 005b836fea Merge remote-tracking branch 'origin/master' into dev ...

# Conflicts:
#	astrbot/core/knowledge_base/kb_helper.py
#	astrbot/core/knowledge_base/kb_mgr.py
#	dashboard/src/components/extension/PinnedPluginItem.vue
#	dashboard/src/components/provider/ProviderModelsPanel.vue
#	dashboard/src/components/provider/ProviderSourcesPanel.vue
#	dashboard/src/components/shared/ConsoleDisplayer.vue
#	dashboard/src/main.ts
#	dashboard/src/stores/auth.ts
#	dashboard/src/views/ConversationPage.vue
#	dashboard/src/views/ProviderPage.vue
#	dashboard/src/views/authentication/auth/LoginPage.vue
#	dashboard/src/views/knowledge-base/KBList.vue
#	requirements.txt

2026-04-02 21:37:21 +08:00

..

agent

chore: commit all changes

2026-04-02 21:23:23 +08:00

backup

chore: commit all changes

2026-04-02 21:23:23 +08:00

computer

chore: commit all changes

2026-04-02 21:23:23 +08:00

config

Merge remote-tracking branch 'origin/master' into dev

2026-04-02 21:37:21 +08:00

cron

chore: commit all changes

2026-04-02 21:23:23 +08:00

db

chore: commit all changes

2026-04-02 21:23:23 +08:00

knowledge_base

Merge remote-tracking branch 'origin/master' into dev

2026-04-02 21:37:21 +08:00

message

chore: commit all changes

2026-04-02 21:23:23 +08:00

pipeline

chore: commit all changes

2026-04-02 21:23:23 +08:00

platform

chore: commit all changes

2026-04-02 21:23:23 +08:00

provider

Merge remote-tracking branch 'origin/master' into dev

2026-04-02 21:37:21 +08:00

skills

merge: origin/master into dev

2026-03-30 17:07:57 +08:00

star

chore: commit all changes

2026-04-02 21:23:23 +08:00

tools

chore: commit all changes

2026-04-02 21:23:23 +08:00

utils

chore: commit all changes

2026-04-02 21:23:23 +08:00

__init__.py

Revert SDK integration, fix test paths, restore original code

2026-03-23 01:56:39 +08:00

astr_agent_context.py

重构：彻底放弃md5保存密码

2026-03-21 00:09:58 +08:00

astr_agent_hooks.py

Feat/sdk integration (#6807)

2026-03-22 22:44:05 +08:00

astr_agent_run_util.py

Revert "feat: SDK integration and various improvements"

2026-03-23 01:18:03 +08:00

astr_agent_tool_exec.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

astr_main_agent_resources.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

astr_main_agent.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

astrbot_config_mgr.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

astrbot_config_mgr.py.tmp.384899.1774276528543

feat: add integration tests infrastructure and MCP echo server fixture

2026-03-23 23:01:55 +08:00

conversation_mgr.py

Feat/sdk integration (#6807)

2026-03-22 22:44:05 +08:00

core_lifecycle.py

chore: smart commit — update AGENTS.md, run ruff format, and apply small targeted fixes

2026-04-01 00:52:50 +08:00

event_bus.py

fix(core): event bus and pipeline stage updates

2026-03-22 19:08:56 +08:00

exceptions.py

feat: implement EmptyModelOutputError for handling empty responses across providers and enhance retry logic in ToolLoopAgentRunner (#7104)

2026-03-29 00:03:05 +08:00

file_token_service.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

initial_loader.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

log.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

persona_error_reply.py

…

persona_mgr.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

platform_message_history_mgr.py

Revert SDK integration, fix test paths, restore original code

2026-03-23 01:56:39 +08:00

sentinels.py

…

subagent_orchestrator.py

Revert "feat: SDK integration and various improvements"

2026-03-23 01:18:03 +08:00

tool_provider.py

…

umop_config_router.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

updator.py

chore: commit all changes

2026-04-02 21:23:23 +08:00

zip_updator.py

docs: replace prints with logger in upload_doc_images_to_r2.py

2026-03-19 23:30:25 +08:00