Today's release features initial support for resolving merge conflicts, a VS Code settings importer, and improvements to diagnostics reporting.

Enhancements

• Added a VSCode settings importer, available via a zed::ImportVsCodeSettings action. (#29018)
• Diagnostics: Rust diagnostics now show code snippets in monospace font. (#29629)
• Diagnostics: Improved diagnostics by no longer merging when they're on the same line. (#29629)
• Diagnostics: Show the diagnostic code if available. (#29296)
• Added tab_switcher::ToggleAll to search open tabs from all panes and focus the selected one. (#28047)
• Allowed creating entries when nothing is selected in the project panel. (#29336)
• Added support for socks4a proxies. (#27773; thanks MrSubidubi)
• Improved default Helix keybindings. (#29518; thanks jneem)
• Linux: Added support for F10 toggling of menus. (#29607)
• Linux (X11): Added support for pasting images from clipboard. (#29387)

Git

• Implemented initial support for resolving merge conflicts. (#28065)
• Added a git_panel.sort_by_path setting to mix untracked/tracked files in the diff list. (#28791)
• Git blame links now prefer the upstream remote over origin if it exists. (#29382)
• Git inline blame popover now dismisses when the cursor is moved, the editor is scrolled, or the command palette is opened. (#29320)
• Removed the "•" placeholder for "Tracked". The commit button says "Commit Tracked" still by default, and this was misinterpreted to mean "partially staged". Hovering over the button will show you which files are tracked (in addition to the yellow square-with-a-dot-in-it). (#28791)
• Increased the default value of expand_excerpt_lines from 3 to 5. This makes it faster to see more context in the git diff view. (#28791)

Languages

• Python: Improved builtin type highlighting. (#29475; thanks chbk)

Vim

• Added AnyQuotes, AnyBrackets, MiniQuotes, and MiniBrackets text objects. (#26748; thanks oca159)
• Replace with register has been remapped from gr to gR. (#28602; thanks 5brian)

AI

Agent Panel (private beta)

• Added a navigation menu that shows recently opened threads. The button to see the full history view has been moved inside this menu. (#29539)
• Added a new default profile called "Manual" that doesn't include any tools, for general topic chats with the LLM. (#29636)
• Enabled different project windows to use different models in the agent panel. (#29573)
• Enhanced the agent panel so that when revisiting old threads, their original model will be used. (#29573)
• Code snippets in agent panel now link to source files when possible. (#29619)
• Long-running commands are now discouraged. (#29627)

Join the agent panel beta waitlist.

Bug Fixes

• Fixed a bug that could cause conflicted paths to not appear in their own section in the git panel. (#29534)
• Fixed case where extension page scrolls up to the top when installing an extension. (#29640)
• Fixed paragraph spacing in git commit messages. (#29637)
• Fixed several image-related memory leaks. (#29452)
• Fixed an issue where the project settings file would be truncated when opened with zed: open project settings if the ".zed" directory was excluded from the files scanned in a workspace (in "file_scan_exclusions"). (#29578)
• Fixed an issue where markdown code blocks did not wrap correctly. (#29571)
• Fixed an issue where selection and bracket pair highlights would not update when new text was added via collab. (#29558)
• Fixed selecting the correct theme when searching. (#28278; thanks hoodie)
• Fixed an issue where using tab with multiple cursors would result in inconsistent relative indentation across lines. (#29519)
• Fixed issues with code completions where they wouldn't show completions with matched prefix at top. (#29456)
• Fixed an issue where SelectNext and SelectPrevious did not preserve the last selection's cursor direction. (#29293)
• Fixed a crash when inputting ciq in vim mode inside of a raw string in a bash file. (#29617)
• Vim: Fixed a bug when escaping ( and ) in command-palette find and replace. (#29555; thanks Hilda24)
• Vim: Fixed deleting to the end of paragraph when there are no blank lines. (#29490; thanks dinocosta)
• Vim: Fixed 't' motion going on top of character that is at the beginning of soft wrapped line instead of before. (#29303; thanks AidanV)
• Agent Panel: Fixed a bug that would make the whole thread be grayed out upon sending a new message while a user message had a pending edit. (#29565)