fix: restore proper window layout after diff operations

[alvarosevilla95]

Summary

• Fixes window layout disruption after diff operations complete
• Ensures Claude's terminal maintains proper width ratios (30% default) after diffs

Problem

When Claude creates diff views and the user accepts/rejects changes, the window layout becomes disrupted. The terminal window loses its configured proportions, making the interface less usable.

Solution

Core Fix:

• Added restore_window_layout() function to intelligently restore terminal window proportions
• Integrated restoration at all diff completion points (accept, reject, cleanup)
• Maintains proper terminal width ratios based on user configuration

Technical Implementation

Window Detection

• Handles both snacks.nvim and native terminal implementations
• Graceful fallback when terminal windows aren't found

Layout Restoration Process

1. Find the Claude terminal window among all open windows
2. Calculate proper terminal width based on user configuration (default 30%)
3. Apply width settings with window equalization
4. Re-enforce terminal proportions to prevent drift

Integration Points

• _resolve_diff_as_saved(): Restore layout after user accepts changes
• _cleanup_diff_state(): Restore layout during diff cleanup
• deny_current_diff(): Restore layout when user rejects changes

Files Changed

• lua/claudecode/diff.lua: Integrated window restoration calls, simplified to delegate to terminal module
• lua/claudecode/terminal.lua: Added restore_window_layout() function and get_config() method

[ThomasK33]

Hey @alvarosevilla95, thanks for this PR.

Could you provide me with steps to reproduce this scrambled layout?

[alvarosevilla95]

@ThomasK33 At least for me, this happens when you have Claude propose a diff and you accept / reject it. So:

• Claude proposes diff, I get split diff view next to claude window
• Accept diff, split is closed, but now the remaining window and claude are split 50/50, so i need to resize claude back to its original size

Screen.Recording.2025-07-31.at.12.42.41.mov

With this change, after the diff split closes claude preserves its original width.

[ThomasK33]

Gotcha, thanks for the video. I don't have those issues in my setup, though.

Could you push a minimal fixture that reproduces that bug? This would serve as a reproduction for me locally and validate that this fixes the issue itself.

[alvarosevilla95]

Gotcha, thanks for the video. I don't have those issues in my setup, though.

Could you push a minimal fixture that reproduces that bug? This would serve as a reproduction for me locally and validate that this fixes the issue itself.

ah interesting, need to see what is it on my setup that is triggering it then.. i'll look into it and update / add a fixture accordingly 👍