Skip to content

feat(write): add document character count in write toolbar#286

Closed
musnows wants to merge 2 commits into
KunAgent:developfrom
musnows:codex/reapply-write-word-count-224
Closed

feat(write): add document character count in write toolbar#286
musnows wants to merge 2 commits into
KunAgent:developfrom
musnows:codex/reapply-write-word-count-224

Conversation

@musnows

@musnows musnows commented Jun 14, 2026

Copy link
Copy Markdown
Collaborator

Summary

Verification

  • npm test -- src/renderer/src/components/write/write-workspace-view-utils.test.ts
  • npm run typecheck
  • npm run build

Reapplies #226
Fixes #224

musnows added 2 commits June 14, 2026 14:23
- make write assistant use compact timeline cards
- reduce changed-files diff preview height and spacing

Fixes KunAgent#224

-- Commit By Codex --
@XingYu-Zhong

Copy link
Copy Markdown
Collaborator

感谢提交此 PR!

该 PR 与多个开放 PR 在本地化文件上存在冲突,暂时无法直接合入:

本地化文件冲突

具体来说,以上多个 PR 都在 common.json 的同一个 namespace 下各自插入了新的翻译条目,导致 JSON 结构产生合并冲突。

建议修复步骤:

  1. 等待上述 PR(尤其是 PR feat(workspace): add file tree preview panel #279、PR feat: add embedded terminal panel #282 这两个大型 PR)合入 develop
  2. git fetch origin && git rebase origin/develop
  3. common.json 中手动合并冲突:只保留本 PR 新增的 key(字数统计相关的 writeWordCount 等),不要覆盖其他 PR 已合入的 key
  4. 重新提交

暂时关闭此 PR,待 locale 文件稳定后重新提交。感谢你的贡献!🙏

@XingYu-Zhong

Copy link
Copy Markdown
Collaborator

关闭此 PR,待 rebase 解决冲突后欢迎重新提交。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants