PR #4779 silently reverted #4652 which was already merged to main

[zzhenyao]

What happened?

PR #4779 reverted a feature from PR #4652 without any explanation.

What did you expect to happen?

When conflicts occur, they should be resolved within the PR, not by reverting an unrelated feature.

Client information

N/A

Login information

N/A

Anything else we need to know?

N/A

[qwen-code-ci-bot]

Thanks for raising this concern about PR #4779 and its interaction with the previously merged PR #4652.

To help maintainers triage and route this effectively, could you please clarify a few things?

• Which specific feature, file, or behavior from feat(input): move physical cursor to visual cursor for IME input #4652 was removed by feat(stats): add interactive /stats dashboard with cross-session tracking #4779? A link to the exact diff/commit range would be very helpful.
• What is the current user-visible impact (e.g., a missing command, broken behavior, regression)? If there are reproduction steps, please share them.
• What outcome are you looking for from this issue (e.g., restoring the reverted code, an explanation on the PR, a process change)?

Without these details this is difficult to route. If the concern is purely about PR process/governance rather than a code defect, a discussion or a comment on the relevant PR may be a more appropriate venue.

[qwen-code-ci-bot]

Triage

• Type: bug (regression)
• Labels: type/bug, category/ui, scope/components, priority/P2, welcome-pr
• Next: Restore PR feat(input): move physical cursor to visual cursor for IME input #4652 (IME cursor positioning) that was explicitly reverted by a commit in PR feat(stats): add interactive /stats dashboard with cross-session tracking #4779

Investigation

The claim is confirmed. PR #4779 (feat(stats): add interactive /stats dashboard) contains an explicit commit titled:

Revert "feat(input): move physical cursor to visual cursor for IME in…"

This commit reverted all changes from PR #4652 across 5 files:

File	What was reverted
BaseTextInput.tsx	Removed addLayoutListener + CursorContext imports, findRootNode helper, entire useEffect for physical cursor positioning, prefixWidth prop, ref={rootRef} on <Box>
InputPrompt.tsx	Removed prefixWidth calculation and prop passing
AgentComposer.tsx	Removed prefixWidth variable and prop passing
package.json	Removed patch-package dependency and postinstall script
patches/ink+7.0.3.patch	Deleted entire file (exposed ink/dom and ink/components/CursorContext)

Current main still has the revert — zero references to addLayoutListener, CursorContext, findRootNode, or prefixWidth in any source file. No subsequent PR has restored the fix.

Root Cause

PR #4779 was a large feature PR (48 files changed) that likely had merge conflicts with #4652 during development. Rather than resolving the conflicts, the author chose to revert #4652 entirely within their PR. The revert was committed as part of the feature branch and merged to main.

Fix Direction

Confidence: confirmed. Re-apply PR #4652 on top of current main. The revert was clean so the original diff should apply with minimal conflict. The fix is self-contained to the 5 files above and does not interact with the stats dashboard feature.

Original PR #4652 fixed issue #3456 (CJK IME composition text appears at wrong position).

Community PRs welcome — see welcome-pr label. The fix is straightforward: cherry-pick or re-apply the #4652 diff.

中文说明

• 类型: bug（回退）
• 标签: type/bug, category/ui, scope/components, priority/P2, welcome-pr
• 下一步: 恢复被 PR feat(stats): add interactive /stats dashboard with cross-session tracking #4779 中一个显式 revert 提交撤销的 PR feat(input): move physical cursor to visual cursor for IME input #4652（IME 光标定位）

调查结果

举报内容已确认。PR #4779（feat(stats): 添加交互式 /stats 仪表盘）包含一个标题为：

Revert "feat(input): move physical cursor to visual cursor for IME in…"

的显式 revert 提交，撤销了 PR #4652 在 5 个文件中的全部更改：

文件	被撤销的内容
BaseTextInput.tsx	移除了 addLayoutListener + CursorContext 导入、findRootNode 辅助函数、整个物理光标定位的 useEffect、prefixWidth 属性、<Box> 上的 ref={rootRef}
InputPrompt.tsx	移除了 prefixWidth 计算和属性传递
AgentComposer.tsx	移除了 prefixWidth 变量和属性传递
package.json	移除了 patch-package 依赖和 postinstall 脚本
patches/ink+7.0.3.patch	删除了整个文件（暴露了 ink/dom 和 ink/components/CursorContext）

当前 main 分支仍然处于被回退状态——源代码中没有任何 addLayoutListener、CursorContext、findRootNode 或 prefixWidth 的引用。后续没有 PR 恢复它。

根因

PR #4779 是一个大型功能 PR（修改了 48 个文件），在开发期间可能与 #4652 存在合并冲突。作者没有解决冲突，而是选择在其 PR 中完全回退 #4652。该回退作为功能分支的一部分被提交并合并到 main。

修复方向

置信度：已确认。 在当前 main 上重新应用 PR #4652。由于这是一个干净的回退，原始 diff 应该能以最小冲突应用。修复仅限于上述 5 个文件，与 stats 仪表盘功能无交互。

原始 PR #4652 修复了 issue #3456（CJK 输入法组合文本出现在错误位置）。

欢迎社区 PR——参见 welcome-pr 标签。修复方法简单：cherry-pick 或重新应用 #4652 的 diff。

— Qwen Code · qwen3.7-max

[zzhenyao]

The current process lacks restrictions on reverting already-merged features. PR authors should resolve conflicts with upstream branches themselves, rather than reverting upstream commits. Merged features should be protected.

[BenGuanRan]

Apologies — that revert in #4779 was my mistake.

#4779 had a merge conflict with #4652 during integration, and I chose to revert rather than properly resolve the conflict so the stats dashboard could land sooner. That was the wrong call: a merged feature should not be silently rolled back inside an unrelated PR, and certainly not without explanation.

I'll open a PR today to restore #4652 in full (the 5 source files plus patches/ink+7.0.3.patch) and link it back here. Sorry for the disruption to you and the community.

[BenGuanRan]

PR opened: #4993

Restores #4652 in full as two cherry-picks with original authors preserved (@zzhenyao for the IME cursor commit, @LaZzyMan for the follow-up that fixes the showYoloStyling rename from #4600). Once it lands this issue can be closed.