LIghtJUNction e16e5c7630 fix: resolve merge conflicts from upstream and fix tool conflict resolution ...

- ToolSet.add() now protects active tools from inactive overrides
- Add missing _has_meaningful_content() method in RespondStage
- Remove is_local=True from ExecuteShellTool (no longer supported)
- Fix ToolSet() missing namespace argument in get_full_tool_set()
- Rewrite tests to match new tool architecture (cron_tools, func_tool_manager, tool_conflict_resolution)

2026-04-15 20:45:11 +08:00

..

agent

merge: resolve conflicts from upstream

2026-04-15 17:03:54 +08:00

backup

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

computer

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

config

chore: bump version to 4.23.1

2026-04-13 23:39:34 +08:00

cron

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

db

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

knowledge_base

fix: improve error handling for knowledge base upload (#7536)

2026-04-14 16:44:14 +08:00

message

refactor: remove TUI module and fix type annotations

2026-04-11 18:27:15 +08:00

pipeline

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

platform

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

provider

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

skills

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

star

merge: resolve conflicts from upstream

2026-04-15 17:03:54 +08:00

tools

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

utils

merge: resolve conflicts from upstream

2026-04-15 17:03:54 +08:00

__init__.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

astr_agent_context.py

…

astr_agent_hooks.py

feat: add on_agent_begin, on_using_llm_tool, on_llm_tool_respond, on_agent_done event hooks (#7540)

2026-04-14 18:55:05 +08:00

astr_agent_run_util.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

astr_agent_tool_exec.py

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

astr_main_agent_resources.py

feat: filesystem grep, read, write, edit file and workspace support (#7402)

2026-04-11 17:01:54 +08:00

astr_main_agent.py

feat: filesystem grep, read, write, edit file and workspace support (#7402)

2026-04-11 17:01:54 +08:00

astrbot_config_mgr.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

astrbot_config_mgr.py.tmp.384899.1774276528543

…

conversation_mgr.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

core_lifecycle.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

event_bus.py

chore: ruff check --fix --select ALL

2026-04-10 20:05:08 +08:00

exceptions.py

fix: improve knowledge base upload error messages (#7534)

2026-04-14 16:27:06 +08:00

file_token_service.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

initial_loader.py

chore: commit all changes

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

log.py

fix(core): suppress SSL protocol errors from logging

2026-04-10 22:46:52 +08:00

persona_error_reply.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

persona_mgr.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

platform_message_history_mgr.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

sentinels.py

…

subagent_orchestrator.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

tool_provider.py

…

umop_config_router.py

chore: ruff check --fix --select ALL

2026-04-10 20:05:08 +08:00

updator.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00

zip_updator.py

chore: ruff check --fix && ruff format .

2026-04-10 20:12:33 +08:00