Skip to content

feat: Improve code mirror: better diff view, theming and bug fixes#860

Merged
k11kirky merged 4 commits intomainfrom
02-09-revamped_diff_and_file_viewer
Feb 20, 2026
Merged

feat: Improve code mirror: better diff view, theming and bug fixes#860
k11kirky merged 4 commits intomainfrom
02-09-revamped_diff_and_file_viewer

Conversation

@charlesvien
Copy link
Member

@charlesvien charlesvien commented Feb 9, 2026

Closes #655 #623 #775 #764 #700

  • Fix stale diffs after sync/merge
  • Fix missing query invalidations
  • Revamped diff viewer UX: replaced split/unified segmented control with a dropdown menu offering split/unified toggle, word wrap, load full files and word-level diffs
  • Improved diff editor: Added Cmd+F search support; revert button shows on hover only; default changed to unified view with word diffs enabled
  • Removed stale query delay in focusStore: invalidations no longer wrapped in setTimeout, and now include mode-aware query keys

@charlesvien charlesvien changed the title Revamped diff and file viewer feat: Revamped diff and file viewer Feb 9, 2026
@charlesvien charlesvien changed the title feat: Revamped diff and file viewer fix/feat: Revamped diff and file viewer Feb 9, 2026
@charlesvien
Copy link
Member Author

Closes #655 #623 #775 #764 #700

@charlesvien charlesvien marked this pull request as ready for review February 9, 2026 17:56
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 51df361 to f95e1b6 Compare February 9, 2026 17:59
@charlesvien charlesvien force-pushed the 02-09-use_separate_workspaces_directory_per_environment_to_prevent_cross-env_worktree_deletion branch from 6aa8dbf to 6116ed9 Compare February 10, 2026 09:49
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from f95e1b6 to 553564c Compare February 10, 2026 09:49
@charlesvien charlesvien force-pushed the 02-09-use_separate_workspaces_directory_per_environment_to_prevent_cross-env_worktree_deletion branch from 6116ed9 to a632236 Compare February 10, 2026 11:02
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 553564c to 38b33dc Compare February 10, 2026 11:02
Base automatically changed from 02-09-use_separate_workspaces_directory_per_environment_to_prevent_cross-env_worktree_deletion to main February 10, 2026 11:24
@charlesvien charlesvien changed the base branch from main to graphite-base/860 February 10, 2026 12:37
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 38b33dc to fc91077 Compare February 10, 2026 12:37
@charlesvien charlesvien changed the base branch from graphite-base/860 to 02-03-guide_the_user_to_setup_their_workspace_for_existing_tasks_that_have_not_been_checked_out_locally_yet February 10, 2026 12:37
@charlesvien charlesvien force-pushed the 02-03-guide_the_user_to_setup_their_workspace_for_existing_tasks_that_have_not_been_checked_out_locally_yet branch from 3af2ea4 to 7e33e3f Compare February 10, 2026 12:38
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch 2 times, most recently from 420e060 to 7f141b6 Compare February 10, 2026 13:41
@charlesvien charlesvien force-pushed the 02-03-guide_the_user_to_setup_their_workspace_for_existing_tasks_that_have_not_been_checked_out_locally_yet branch from 7e33e3f to cc02dc0 Compare February 10, 2026 13:41
@charlesvien charlesvien changed the base branch from 02-03-guide_the_user_to_setup_their_workspace_for_existing_tasks_that_have_not_been_checked_out_locally_yet to graphite-base/860 February 10, 2026 14:12
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 7f141b6 to f4d0a51 Compare February 10, 2026 14:12
@charlesvien charlesvien changed the base branch from graphite-base/860 to 02-10-remove_loading_spinner_on_session_view_when_creating_a_new_task February 10, 2026 14:13
@charlesvien charlesvien changed the base branch from 02-10-remove_loading_spinner_on_session_view_when_creating_a_new_task to graphite-base/860 February 10, 2026 14:32
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from f4d0a51 to 5962aec Compare February 10, 2026 14:32
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 5962aec to ffe829a Compare February 12, 2026 11:50
@charlesvien charlesvien changed the base branch from graphite-base/860 to main February 12, 2026 17:46
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from ffe829a to 751f3d6 Compare February 20, 2026 03:22
@charlesvien charlesvien changed the base branch from main to graphite-base/860 February 20, 2026 03:29
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from cd91e67 to d24d102 Compare February 20, 2026 03:29
@charlesvien charlesvien marked this pull request as ready for review February 20, 2026 03:29
@charlesvien charlesvien changed the title fix/feat: Revamped diff and file viewer feat: Improve code mirror: better diff view, theming and bug fixes Feb 20, 2026
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from cd85277 to 2789555 Compare February 20, 2026 03:48
@charlesvien charlesvien changed the base branch from graphite-base/860 to 02-19-add_personalization_settings_with_personality_and_custom_instructions February 20, 2026 03:48
Copy link
Contributor

k11kirky commented Feb 20, 2026

Merge activity

  • Feb 20, 5:02 AM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Feb 20, 5:57 AM UTC: Graphite rebased this pull request as part of a merge.
  • Feb 20, 6:02 AM UTC: @k11kirky merged this pull request with Graphite.

@charlesvien charlesvien force-pushed the 02-19-add_personalization_settings_with_personality_and_custom_instructions branch from 74a069f to 9ae083d Compare February 20, 2026 05:43
@charlesvien charlesvien force-pushed the 02-09-revamped_diff_and_file_viewer branch from 2789555 to 3816640 Compare February 20, 2026 05:43
@k11kirky k11kirky changed the base branch from 02-19-add_personalization_settings_with_personality_and_custom_instructions to graphite-base/860 February 20, 2026 05:46
@k11kirky k11kirky changed the base branch from graphite-base/860 to main February 20, 2026 05:56
@k11kirky k11kirky force-pushed the 02-09-revamped_diff_and_file_viewer branch from 3816640 to fce0217 Compare February 20, 2026 05:57
@k11kirky k11kirky merged commit 17065f0 into main Feb 20, 2026
13 checks passed
@k11kirky k11kirky deleted the 02-09-revamped_diff_and_file_viewer branch February 20, 2026 06:02
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.

Diff viewer: allow expanding only N lines of context at a time

3 participants