Repository navigation
docs(core): archive the confirmed hidden-frame return difference - #314
Conversation
Record the 2026-11-04 user decision: keep the full hidden-frame body and accept the observed WindTerm 2.7.0 return-time clipping as an intentional product difference. Update ADR-0010, FEATURES, EVIDENCE and the hidden-height retention test contract so the original observation, intentional product difference, engineering regression and formal-path acceptance stay separate records. The preserved strict audit failure, offline supplemental audit and semantic_acceptance=false are unchanged; #27/#29 stay open and the change does not claim complete resize/reflow, WindTerm equivalence or R2 acceptance. Co-authored-by: JavaZeroo <[email protected]>
|
@JavaZeroo-Bot 请在现有 PR #314 / ticket 2e7373117ea0e21d783b8ef977a13581 继续处理主线合入后的冲突。这是调度者明确派单，允许更新本任务分支、验证并推送；不要另建并行开发 worker，不触发 Codex review，不自行合并。 事实：PR #313 已在精确 head c3888ff 的 10/10 CI 成功后合入 main，merge 4caff3b。随后 #314（head 21a353d）从 CLEAN 变为 CONFLICTING / DIRTY，尚未合并。这是新的基线冲突，不是旧 CI 失败。 目标：在现有独立工作树安全整合最新 origin/main，保留 #313 Unicode 实际验证及其所有限制，同时保留 #314 已确认的隐藏帧完整正文策略与确认引用。先检查工作树和提交，保护未提交成果；建议合并 main 到任务分支并正常推送，避免重写已发布历史。不要修改冻结原版记录、补充审计或 production 实现；不把缺失 fallback 算验收通过，不把已确认有意差异改回“待决定”。 出口：无冲突的新 head、diff --check、文档链接与确认范围核对、适当定向验证、该新 head 的完整必要 CI；在本 PR 报告冲突文件和处理结果。旧 head 的 10/10 不能替代新 head 验证。由调度者重新核验后合并，#27/#29/#30 仍 OPEN。 用户已经在 #27/#29 评论明确接受完整正文保留；不要重新询问同一决定。后续真实 Qt 隐藏帧七阶段验证等剩余工作待本交付结束再按单 worker 派发。继续 Flash 优先与既定模型费用门槛。 |
Resolve docs/EVIDENCE.md and docs/FEATURES.md conflicts by keeping both #313's fixed-Unicode Qt presentation evidence and its limits and #314's confirmed hidden-frame full-body decision, intentional-difference record and formal-path status. No production or frozen-record changes; the preserved strict audit failure, offline supplement and semantic_acceptance=false keep their identity. Co-authored-by: JavaZeroo <[email protected]>
主线合入后的冲突处理结果按调度者派单，已把最新 冲突文件与处理仅两个文件冲突：
未改动 production 实现、冻结原版记录、补充审计或 验证（新 head
|
背景
2026-11-04 用户在调度会话对「隐藏帧返回时保留完整正文还是匹配原版的返回裁剪」明确答复：“保留完整正文，明确接受与 WindTerm 的这项差异”（决定评论、#312 补充审计）。本 PR 把该决定归档到 ADR / FEATURES / EVIDENCE 与测试合同，不修改实现。
改动
docs/FEATURES.md、docs/EVIDENCE.md：把「待确认差异」更新为已确认有意差异，仍保留原版观察与工程身份。experiments/core/resize_hidden_height_test.cpp合同注释：明确这是工程回归，不是原版 oracle，也不是正式 Qt 路径对确认场景的验收。experiments/core/results/2026-11-04-hidden-height-retention/README.md：追加同日确认指向；Qt 行注明既有套件回归不覆盖本场景。research/ui/results/2026-11-02-resize-hidden-height-reference/README.md：追加 2026-11-04 确认后续；原严格失败、离线补充审计、semantic_acceptance=false、hidden_height_policy_classification=null均不改写。验证
git diff --check：退出 0。resize_hidden_height_test成功；ctest --test-dir build -C Release -R '^retained_resize_hidden_height_core$'：1/1 通过。python -B -X utf8 -m unittest research.ui.test_resize_hidden_height_reference research.ui.test_export_resize_hidden_height_reference research.ui.test_audit_resize_hidden_height_tail：40 tests OK。边界