Compare commits

...

6 Commits

Author SHA1 Message Date
copilot-swe-agent[bot] 04b95d7bc1 style: update dark theme color scheme to match light theme
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-04 17:07:59 +00:00
copilot-swe-agent[bot] bb9f2623d8 refactor: extract hardcoded original_umo key to constant
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-03 17:16:04 +00:00
copilot-swe-agent[bot] 3091b92158 feat: restore original UMO in respond stage and update send_message_to_user tool
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-03 17:14:25 +00:00
copilot-swe-agent[bot] eb667d310c refactor: improve error handling in global context info function
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-03 17:01:47 +00:00
copilot-swe-agent[bot] b8eb110cf4 feat: add global unified context mode configuration and implementation
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-03 16:59:17 +00:00
copilot-swe-agent[bot] 093dab3c98 Initial plan 2026-02-03 16:54:40 +00:00
6 changed files with 82 additions and 4 deletions
+35
View File
@@ -830,6 +830,38 @@ def _get_compress_provider(
return provider return provider
def _apply_global_context_info(event: AstrMessageEvent, req: ProviderRequest) -> None:
"""Add platform and session information to user prompt when in global unified context mode."""
from astrbot.core.config.default import (
GLOBAL_UNIFIED_CONTEXT_UMO,
ORIGINAL_UMO_KEY,
)
if event.unified_msg_origin != GLOBAL_UNIFIED_CONTEXT_UMO:
return
# Get original UMO from extras
original_umo = event.get_extra(ORIGINAL_UMO_KEY)
if not original_umo:
return
# Parse the original UMO to extract platform, message type, and session info
try:
parts = original_umo.split(":", 2)
if len(parts) != 3:
logger.warning(
f"Original UMO format is invalid (expected 3 parts): {original_umo}"
)
return
platform_id, message_type, session_id = parts
context_info = f"[Context: Platform={platform_id}, Type={message_type}, Session={session_id}]"
# Prepend context info to the user prompt
req.prompt = f"{context_info} {req.prompt or ''}"
except Exception as e:
logger.warning(f"Failed to parse original UMO for global context: {e}")
async def build_main_agent( async def build_main_agent(
*, *,
event: AstrMessageEvent, event: AstrMessageEvent,
@@ -888,6 +920,9 @@ async def build_main_agent(
if isinstance(req.contexts, str): if isinstance(req.contexts, str):
req.contexts = json.loads(req.contexts) req.contexts = json.loads(req.contexts)
# Apply global context information if enabled
_apply_global_context_info(event, req)
if config.file_extract_enabled: if config.file_extract_enabled:
try: try:
await _apply_file_extract(event, req, config) await _apply_file_extract(event, req, config)
+10 -1
View File
@@ -212,6 +212,10 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
"required": ["type"], "required": ["type"],
}, },
}, },
"session": {
"type": "string",
"description": "Target session ID in format 'platform:type:session_id'. If not specified, sends to the current session.",
},
}, },
"required": ["messages"], "required": ["messages"],
} }
@@ -253,7 +257,12 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
async def call( async def call(
self, context: ContextWrapper[AstrAgentContext], **kwargs self, context: ContextWrapper[AstrAgentContext], **kwargs
) -> ToolExecResult: ) -> ToolExecResult:
session = kwargs.get("session") or context.context.event.unified_msg_origin # In global context mode, default to original UMO if session not specified
from astrbot.core.config.default import ORIGINAL_UMO_KEY
original_umo = context.context.event.get_extra(ORIGINAL_UMO_KEY)
default_session = original_umo or context.context.event.unified_msg_origin
session = kwargs.get("session") or default_session
messages = kwargs.get("messages") messages = kwargs.get("messages")
if not isinstance(messages, list) or not messages: if not isinstance(messages, list) or not messages:
+6
View File
@@ -17,11 +17,17 @@ WEBHOOK_SUPPORTED_PLATFORMS = [
"lark", "lark",
] ]
# Constant UMO for global unified context mode
GLOBAL_UNIFIED_CONTEXT_UMO = "global::global"
# Key for storing original UMO in event extras when global context mode is enabled
ORIGINAL_UMO_KEY = "original_umo"
# 默认配置 # 默认配置
DEFAULT_CONFIG = { DEFAULT_CONFIG = {
"config_version": 2, "config_version": 2,
"platform_settings": { "platform_settings": {
"unique_session": False, "unique_session": False,
"global_unified_context_mode": False,
"rate_limit": { "rate_limit": {
"time": 60, "time": 60,
"count": 30, "count": 30,
+10
View File
@@ -169,6 +169,16 @@ class RespondStage(Stage):
f"Prepare to send - {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}", f"Prepare to send - {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}",
) )
# Restore original UMO before sending if in global context mode
from astrbot.core.config.default import ORIGINAL_UMO_KEY
original_umo = event.get_extra(ORIGINAL_UMO_KEY)
if original_umo:
logger.debug(
f"Restoring original UMO before sending: {event.unified_msg_origin} -> {original_umo}"
)
event.unified_msg_origin = original_umo
if result.result_content_type == ResultContentType.STREAMING_RESULT: if result.result_content_type == ResultContentType.STREAMING_RESULT:
if result.async_stream is None: if result.async_stream is None:
logger.warning("async_stream 为空,跳过发送。") logger.warning("async_stream 为空,跳过发送。")
@@ -72,11 +72,29 @@ class WakingCheckStage(Stage):
) )
platform_settings = self.ctx.astrbot_config.get("platform_settings", {}) platform_settings = self.ctx.astrbot_config.get("platform_settings", {})
self.unique_session = platform_settings.get("unique_session", False) self.unique_session = platform_settings.get("unique_session", False)
self.global_unified_context_mode = platform_settings.get(
"global_unified_context_mode", False
)
async def process( async def process(
self, self,
event: AstrMessageEvent, event: AstrMessageEvent,
) -> None | AsyncGenerator[None, None]: ) -> None | AsyncGenerator[None, None]:
# apply global unified context mode
if self.global_unified_context_mode:
from astrbot.core.config.default import (
GLOBAL_UNIFIED_CONTEXT_UMO,
ORIGINAL_UMO_KEY,
)
original_umo = event.unified_msg_origin
event.unified_msg_origin = GLOBAL_UNIFIED_CONTEXT_UMO
# Store original UMO for reference in later stages
event.set_extra(ORIGINAL_UMO_KEY, original_umo)
logger.debug(
f"Global unified context mode enabled. Changed UMO from {original_umo} to {GLOBAL_UNIFIED_CONTEXT_UMO}"
)
# apply unique session # apply unique session
if self.unique_session and event.message_obj.type == MessageType.GROUP_MESSAGE: if self.unique_session and event.message_obj.type == MessageType.GROUP_MESSAGE:
sid = build_unique_session_id(event) sid = build_unique_session_id(event)
+3 -3
View File
@@ -4,12 +4,12 @@ const PurpleThemeDark: ThemeTypes = {
name: 'PurpleThemeDark', name: 'PurpleThemeDark',
dark: true, dark: true,
variables: { variables: {
'border-color': '#1677ff', 'border-color': '#3c96ca',
'carousel-control-size': 10 'carousel-control-size': 10
}, },
colors: { colors: {
primary: '#1677ff', primary: '#3c96ca',
secondary: '#722ed1', secondary: '#2288b7',
info: '#03c9d7', info: '#03c9d7',
success: '#52c41a', success: '#52c41a',
accent: '#FFAB91', accent: '#FFAB91',