Repository navigation
docs(research): 从 Draft PR #96–#103 / #101 摘取未入库的证据 - #261
Merged
Merged
Conversation
This was referenced Oct 31, 2026
这些分支挂在已被 main 取代的 ConPTY 后端上，整体重基不可行（merge-tree 实测 16 处冲突），但它们的结论文档与固定验证身份在 main 上缺失。 本次只新增、不修改 main 已有文件（diff 全部为 A，0 处修改）： - docs/research/ 14 份：ConPTY 源 margin 的 runtime/controls/styles、experimental backend、 native viewport resize、resize replay cost、Vim msys input/runtime、WindTerm styled margin reference、 workflow record checkpoint、workspace native viewport、clipboard stage observation - experiments/conpty/results/ 40 个固定结果与 validation 身份 - experiments/shell/results/ 25 个 - research/ui/results/ 2 个 代码侧（backend_probe.cpp、margin_controls.py 等基于旧后端的实现）不摘取，旧后端已由 main 的 cmake/ConptyBackend.cmake 取代。 摘取后即可关闭 #96/#98/#100/#102/#103/#101，并在各自评论中指向这些新位置。
JavaZeroo
force-pushed
the
docs/salvage-r56-evidence
branch
from
October 31, 2026 03:34
a824daf to
00da469
Compare
This was referenced Oct 31, 2026
5 tasks
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.
问题与最终行为
#96 / #98 / #100 / #102 / #103 / #101这 6 个 Draft PR 挂在已被 main 取代的 ConPTY 后端（fix/conpty-backend-r47）上，对 main 的git merge-tree实测冲突 13–16 处，整体重基不可行。但它们的结论文档与固定验证身份不在 main 上——直接关闭会丢失证据。本 PR 把这些文件摘出来落到 main，代码侧不摘。
最终行为：83 个文件净新增，全部为
A，0 处修改 main 已有文件。docs/research/16 份（含 2 份 Qt IME 计划文档）experiments/conpty/results/40 份experiments/shell/results/25 份research/ui/results/2 份验证
git cat-file -e origin/main:<path>确认 main 上不存在后才摘取，因此不存在覆盖git diff --name-status origin/main...HEAD统计：A: 83，无M/Ddocs/adr/、docs/milestones/（最后一项经修正后确认）性能影响（如适用）
不适用。纯文档与固定证据新增，无构建与运行影响。
来源与限制
research/windterm-style-reference-r56（含 research: 在隔离 Windows 构建固定 ConPTY margin 候选 #96→docs(reference): retain WindTerm styled margin residual and decision boundary #103 全部堆叠提交）、diagnose/clipboard-stages-r99、feat/qt-ime-r2backend_probe.cpp、margin_controls.py、conpty-upstream.yml等基于旧后端的实现与 CI 配置——旧后端已由 main 的cmake/ConptyBackend.cmake+cmake/CopyConptyBackend.cmake取代（ADR-0007）