Skip to content

fix(chat): prevent long-history work from blocking the main thread #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3316891527 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(chat): prevent long-history work from blocking the main thread #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
628f1b5
fix(chat): move long-history work off main thread
3316891527 Sep 9, 2026
d0fdd16
fix(chat): serialize window refresh and handle async send errors
3316891527 Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 36 additions & 41 deletions app/src/main/java/com/ai/assistance/operit/core/chat/AIMessageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,28 +376,28 @@ object AIMessageManager {
lastActiveChatKey = chatKey
activeEnhancedAiServiceByChatId[chatKey] = enhancedAiService

val buildMemoryStartTime = messageTimingNow()
val memory = getMemoryFromMessages(
messages = chatHistory,
splitByRole = splitHistoryByRole,
targetRoleName = currentRoleName,
groupOrchestrationMode = groupOrchestrationMode
)
logMessageTiming(
stage = "sendMessage.buildMemory",
startTimeMs = buildMemoryStartTime,
details = "chatKey=$chatKey, source=${chatHistory.size}, result=${memory.size}, splitByRole=$splitHistoryByRole, groupOrchestration=$groupOrchestrationMode"
)
if (splitHistoryByRole && !currentRoleName.isNullOrBlank()) {
val assistantCount = memory.count { it.kind == PromptTurnKind.ASSISTANT }
val userCount = memory.count { it.kind == PromptTurnKind.USER }
AppLogger.d(
TAG,
"按角色拆解历史: role=$currentRoleName, assistant=$assistantCount, user=$userCount, total=${memory.size}"
return withContext(Dispatchers.IO) {
val buildMemoryStartTime = messageTimingNow()
val memory = getMemoryFromMessages(
messages = chatHistory,
splitByRole = splitHistoryByRole,
targetRoleName = currentRoleName,
groupOrchestrationMode = groupOrchestrationMode
)
}
logMessageTiming(
stage = "sendMessage.buildMemory",
startTimeMs = buildMemoryStartTime,
details = "chatKey=$chatKey, source=${chatHistory.size}, result=${memory.size}, splitByRole=$splitHistoryByRole, groupOrchestration=$groupOrchestrationMode"
)
if (splitHistoryByRole && !currentRoleName.isNullOrBlank()) {
val assistantCount = memory.count { it.kind == PromptTurnKind.ASSISTANT }
val userCount = memory.count { it.kind == PromptTurnKind.USER }
AppLogger.d(
TAG,
"按角色拆解历史: role=$currentRoleName, assistant=$assistantCount, user=$userCount, total=${memory.size}"
)
}

return withContext(Dispatchers.IO) {
val limitHistoryStartTime = messageTimingNow()
val maxImageHistoryUserTurns = apiPreferences.maxImageHistoryUserTurnsFlow.first()
val maxMediaHistoryUserTurns = apiPreferences.maxMediaHistoryUserTurnsFlow.first()
Expand Down Expand Up @@ -702,7 +702,7 @@ object AIMessageManager {
return null
}

val memoryTagRegex = Regex("<memory>.*?</memory>", RegexOption.DOT_MATCHES_ALL)
val memoryTagRegex = ChatMarkupRegex.memoryTag
val conversationReviewEntries = mutableListOf<Pair<String, String>>()
fun normalizeForReview(text: String): String {
return text
Expand Down Expand Up @@ -1393,11 +1393,7 @@ object AIMessageManager {
targetRoleName: String,
removeStatusTags: (String) -> String
): PromptTurn? {
// 清理思考内容
val cleanedContent = ChatUtils.removeThinkingContent(message.content).trim()
val contentWithoutStatus = removeStatusTags(cleanedContent)

// 非角色隔离模式：直接返回 assistant 消息
// 非角色隔离模式和当前角色消息无需清洗；只有跨角色桥接才需要移除思考内容。
if (!isRoleScopedMode) {
return PromptTurn(
kind = PromptTurnKind.ASSISTANT,
Expand All @@ -1407,25 +1403,24 @@ object AIMessageManager {

// 角色隔离模式：判断是当前角色还是其他角色
val messageRoleName = message.roleName.trim()
return if (messageRoleName == targetRoleName) {
// 当前角色的消息：作为 assistant 返回
PromptTurn(
if (messageRoleName == targetRoleName) {
return PromptTurn(
kind = PromptTurnKind.ASSISTANT,
content = message.content
)
} else {
// 其他角色的消息：转换为 user 消息，添加角色标签
val roleLabel = if (messageRoleName.isNotBlank()) messageRoleName else "unknown"
val bridgedContent = removeStatusTags(cleanedContent)
if (bridgedContent.isBlank()) {
null
} else {
PromptTurn(
kind = PromptTurnKind.USER,
content = "[From role: $roleLabel]\n$bridgedContent"
)
}
}

val cleanedContent = ChatUtils.removeThinkingContent(message.content).trim()
val bridgedContent = removeStatusTags(cleanedContent)
// 其他角色的消息：转换为 user 消息，添加角色标签
val roleLabel = if (messageRoleName.isNotBlank()) messageRoleName else "unknown"
if (bridgedContent.isBlank()) {
return null
}
return PromptTurn(
kind = PromptTurnKind.USER,
content = "[From role: $roleLabel]\n$bridgedContent"
)
}

private fun processUserMessage(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/ai/assistance/operit/services/ChatServiceCore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class ChatServiceCore(
messageProcessingDelegate.cancelMessageForDestructiveMutation(chatId)
}
chatHistoryDelegate.setAfterDestructiveHistoryMutation { chatId ->
messageCoordinationDelegate.refreshStableContextWindow(chatId = chatId)
messageCoordinationDelegate.scheduleStableContextWindowRefresh(chatId = chatId)
}

initialized = true
Expand Down
Loading