encoreshao-fix-issue

Implement a fix following the human-thinking loop — understand the root cause, plan the minimal change, implement, verify the problem is actually gone