Repository navigation
feat: 生成中消息排队与当前轮引导(适配上游 #1481) - #190
Merged
4 commits merged intoNov 10, 2026
Merged
4 commits merged into
4 commits merged into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更说明 / Description
生成回复期间,补充输入现在可以携带自己的附件和引用排队,在本轮完成后发送;用户也可以明确选择“引导当前轮”,让活跃回复在采样或工具完成边界接收补充。
实现范围 / Changes
OKToast.info(...).show(),非当前聊天的文字草稿读取现有ChatDraftRepository.loadDraft()。Job?、语音与 A2UI 所有权检查。发送前总结保存成功后再发送,取消包装任务会取消实际发送;尚未写入用户记录的失败输入返还队列,已保存输入不重复返还。适配上游 #1481,来源固定为
446b76c1f4a4633b3bf8d0b469879fde1519cff5。上游仍为 Draft,本 PR 按本仓库目录、异步发送、流修订和结构化消息模型完成独立适配。本项基于
dev@c944cdd8bd1b81dd92a53b00f3680f966fe10bc8。不增加数据库版本,不包含子代理、AAswordman#1485 或延迟排查。队列由当前聊天界面驱动,附件/引用草稿与队列不保证跨进程恢复。waifu、群组编排和接管回复的插件不接受当前轮引导。#188/#189 保持独立;与两项提交分别进行 Git 合并模拟,均无文本冲突,未实际合并分支。验证 / Validation
功能实现阶段的独立 JVM 验证执行过 63 项定向测试。接口修复提交
1edc0351已将 5 处提示调用接到 OKToast、旧草稿映射引用接到 ChatDraftRepository。该提交的 PR Check 成功进入:app:testDebugUnitTest,3304 项中 3 项失败、15 项跳过,失败均为 InterruptedSamplingContentTest 调用 Android 日志桩。Fast checks 通过,Candidate checks 的失败来自同一组测试结果汇总。当前修复
fb7bf270aac04039f26ccb8ee52abcce6bdac1c6为这 5 项测试统一设置 AppLogger.enableSystemLog,并在每项测试后恢复原值,保留全部测试与断言,应用日志实现不变。本地先用真实 AppLogger 和抛异常的 Android 日志桩复现原来的 3 项失败;修复后,同组 5 项和相邻解析 3 项测试全部通过。宿主仅为未使用的应用入口提供编译依赖,并使用资源常量、SmartString 的无 Compose 标记副本和逐字提取的收尾函数;没有替换 AppLogger。本次 1 个修改 Kotlin 文件通过 PSI 语法检查;针对整个 PR 的 44 个变更文件,仓库整洁、本地化和 Markdown 链接检查均为 0 错误、0 警告。本地未重新执行完整 3304 项应用测试或 APK 构建。最新提交将各启动一次现有 Build 和 Android Tests,受理情况保存在交付记录;不将启动受理当作通过,启动后不监视结果。
文档与设备验收 / Documentation
实施记录与设备验收步骤 · 队列和引导说明
重点核对采样中与工具执行中的引导、附件和引用归属、取消/失败返还、总结前后取消,以及现有语音、A2UI、waifu 和群聊行为。
检查清单 / Checklist