Skip to content

Fix desktop diff row rendering and summaries / 修复桌面端 diff 行渲染和摘要#4387

Merged
esengine merged 3 commits into
main-v2from
fix/diff-rendering-issue-4382
Jun 14, 2026
Merged

Fix desktop diff row rendering and summaries / 修复桌面端 diff 行渲染和摘要#4387
esengine merged 3 commits into
main-v2from
fix/diff-rendering-issue-4382

Conversation

@SivanCola

Copy link
Copy Markdown
Collaborator

Summary

  • Render full and inline diff rows against a shared scroll width so add/delete backgrounds fill long-line horizontal scrolling.
  • Add old/new line number gutters to both full and inline diff views, with sticky gutters during horizontal scrolling.
  • Persist writer tool summaries before archived tool payloads drop raw args/output, restoring the visible +N -M edit summary.

Verification

  • pnpm --dir desktop/frontend test
  • pnpm --dir desktop/frontend typecheck
  • pnpm --dir desktop/frontend test:typecheck
  • pnpm --dir desktop/frontend check:css
  • pnpm --dir desktop/frontend build
  • Chromium layout fixture for full/inline diff scroll width and sticky line gutters.

Fixes #4382

Render diff rows against a shared scroll width, add old/new line gutters for full and inline diffs, and persist writer summaries before tool data archiving.

Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
@SivanCola SivanCola requested a review from esengine as a code owner June 14, 2026 13:52
@github-actions github-actions Bot added v2 Go rewrite (1.x) — main-v2 branch, active development desktop Wails desktop app (desktop/**) labels Jun 14, 2026
@SivanCola SivanCola enabled auto-merge June 14, 2026 13:56

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e38a1da37d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread desktop/frontend/src/lib/useController.ts Outdated
Comment thread desktop/frontend/src/lib/useController.ts
Clear cached writer summaries on failed tool results and defer replace-all multi_edit summaries until the backend result reports the actual replacement count.

Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
Resolve the frontend test script conflict by preserving the main-v2 todo/history tests and this PR's diff-rendering regression coverage.

Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
@SivanCola

Copy link
Copy Markdown
Collaborator Author

Updated this PR in 444a761 and resolved the conflicts with main-v2.

Conflict resolution:

  • Preserved the main-v2 test script additions (test-todo-visibility.mjs and history-tool-status.test.ts).
  • Preserved this PR's diff-rendering.test.ts coverage in both test and test:all.

Verification:

  • pnpm --dir desktop/frontend test passed
  • pnpm --dir desktop/frontend typecheck passed
  • pnpm --dir desktop/frontend test:typecheck passed
  • pnpm --dir desktop/frontend check:css passed
  • pnpm --dir desktop/frontend build passed

@esengine esengine merged commit 86b3c79 into main-v2 Jun 14, 2026
13 checks passed
@esengine esengine deleted the fix/diff-rendering-issue-4382 branch June 14, 2026 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

desktop Wails desktop app (desktop/**) v2 Go rewrite (1.x) — main-v2 branch, active development

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: 文本编辑显示框删除新增颜色渲染不全,行号缺失

2 participants