Conversation
refactor: 同步滑动窗口与记忆模块的重构到 main
chore(main): 同步 dev 到 main 收拢 222 个提交的漂移（不发布 tag）
fix(deny): 升级 rustls 修复 RUSTSEC-2026-0285，并加 dev 的 advisory 漂移定时检查
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
3 participants
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.
为什么
main上刚合并的 #36 带了三件dev还没有的东西：f343ae8升级 rustls 至 0.23.45，修复 RUSTSEC-2026-0285；1851411dependabot.yml显式target-branch: dev；ef2d432deny-drift.yml+CONTRIBUTING.md的漂移处理说明。dev目前 0 ahead / 7 behindmain，所以上面这些都不在集成分支上。后果是：基于dev的每一个 Dependabot PR 都继续红在同一个
Security (cargo-deny)上（advisory 检查是全局的，与 PR 内容无关），必须先把锁文件修复同步过来，重定向后的 PR 才有机会转绿。
做什么
按
CONTRIBUTING.md「发布流程」第 3 步，把main合回dev（--no-ff合并，保留同步点）。dev是main的祖先，本次合并是纯快进内容，不改动任何文件——PR 的文件列表应当只有main已有的那 7 个提交带来的差异（相对dev而言）。后续
合并后逐个 rebase 已重定向到
dev的 9 个 Dependabot PR（#27–#35）。