Skip to content

chore: integrate thirteen reviewed changes into dev - #191

Merged
3316891527 merged 42 commits into
devfrom
test/integrate-13-prs-20261110
Nov 10, 2026
Merged

3316891527 merged 42 commits into
devfrom
test/integrate-13-prs-20261110

Conversation

@3316891527

Copy link
Copy Markdown
Owner

将 #178–#190 的 13 项改动从统一测试分支合入 dev,保留各功能来源提交、合并记录和 #190 后续编译、JVM 日志隔离及主题颜色修复。精确来源与冲突处理记录见 docs/TODO/chore/integrate-13-prs/sources.json。

用户已简单体验确认 #183、#184、#185、#186、#187、#189 正常,并授权本次集成。最近颜色修复的 Kotlin PSI 和仓库整洁、本地化、Markdown 链接检查通过;此前集成验证含 157 个 Kotlin 文件语法检查、8 项流解析和 17 项候选基准回归。最新集成版本 Build 与 Android Tests 已启动,未查询远端结果;未将这些有限验证表述为完整 Android 或设备验收。

本次合并后继续补充插件更新中的加载与结果提示,再通过独立发布同步将 dev 合入 main。关联 Issue:N/A,维护者授权集成。

Reverse the seven merge results in reverse first-parent order. The resulting tree exactly matches dev before PR #170, including original whitespace. Keep all original feature branches and the remote pre-rollback backup.

No feature or rollback PR may be merged without explicit maintainer permission.
Run candidate checks for stacked targets and honor ci:full-android to require assembleDebug and testDebugUnitTest. Clean the restored historical FFmpeg trailing space. Keep all PRs open pending explicit maintainer permission.
Reapply the complete original merge diff from PR #170 on the reviewed rollback base.
Original merge: 29f6728

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #171 on the reviewed rollback base.
Original merge: 7f83633

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #172 on the reviewed rollback base.
Original merge: 798841d

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #173 on the reviewed rollback base.
Original merge: 2f5570f

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #174 on the reviewed rollback base.
Original merge: 51e8efa

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #175 on the reviewed rollback base.
Original merge: cc8ef86

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Reapply the complete original merge diff from PR #176 on the reviewed rollback base.
Original merge: c944cdd

Keep this work open for maintainer review. No merge or auto-merge without explicit permission.
Metadata discovery uses a separate engine and does not initialize the live IPC runtime. Bind storage endpoints at module load so cold UI requests can list entries, groups and character cards. Remove test-only handler registration and cover cold discovery, restart and warm calls. Keep existing storage protection and data format.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant