Cole Miller 66c7bdf037 git: For conflicted files, set project diff excerpts using conflicts only (#44263) ...

It's just distracting having excerpts for all the successfully merged
hunks.

Release Notes:

- git: The project diff now focuses on merge conflicts for files that
have them.

2025-12-06 02:20:14 +00:00

..

acp_thread

Update to ACP SDK v0.8.0 (#44063)

2025-12-03 11:24:08 +00:00

acp_tools

gpui: Unify track_scroll method to receive a reference type (#43518)

2025-11-26 18:03:42 +01:00

action_log

multi_buffer: Remove redundant buffer id field (#43459)

2025-11-25 17:13:16 +01:00

activity_indicator

releases: Add build number to Nightly builds (#42990)

2025-11-24 13:34:04 +01:00

agent

inline assistant: Use tools and remove insertion mode (#44248)

2025-12-05 13:28:29 -08:00

agent_servers

Update to ACP SDK v0.8.0 (#44063)

2025-12-03 11:24:08 +00:00

agent_settings

agent: Add ability to set a default_model per profile (#39220)

2025-11-10 11:11:24 -03:00

agent_ui

inline assistant: Use tools and remove insertion mode (#44248)

2025-12-05 13:28:29 -08:00

ai_onboarding

ai onboarding: Add dismiss button to the sign in banner (#40660)

2025-10-20 08:35:28 -03:00

anthropic

Add support for Opus 4.5 (#43425)

2025-11-24 20:01:43 +00:00

askpass

askpass: Use double quotes for script name in helper command (#43689)

2025-11-28 08:18:19 +01:00

assets

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

assistant_slash_command

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

assistant_slash_commands

util: Move PathMatcher over to RelPath (#43881)

2025-12-01 12:57:51 +00:00

assistant_text_thread

Fix project not getting dropped after closing window (#44237)

2025-12-05 19:53:53 +01:00

audio

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

auto_update

auto_update: Tentatively prevent auto-update loop on Nightly again (#43670)

2025-11-27 14:08:43 +00:00

auto_update_helper

auto_update: Ignore dir removal errors on windows (#42435)

2025-11-11 12:55:19 +00:00

auto_update_ui

release_version: Do not use prerelease field (#43669)

2025-11-27 13:46:43 +00:00

aws_http_client

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

bedrock

bedrock: Support global endpoints and new regional endpoints (#44103)

2025-12-04 12:14:31 +01:00

breadcrumbs

svg_preview: Remove unnecessary dependency on editor (#43147)

2025-11-20 12:18:50 +01:00

buffer_diff

git: Add word diff highlighting (#43269)

2025-12-01 22:36:30 -05:00

call

collab: Add action to copy room id (#44004)

2025-12-02 16:27:36 +00:00

channel

releases: Add build number to Nightly builds (#42990)

2025-11-24 13:34:04 +01:00

cli

Fix zed cli in NixOS WSL instances (#43433)

2025-11-24 15:46:13 -06:00

client

remote: Recognize WSL interop to open browser for codex web login (#44136)

2025-12-04 14:42:26 +00:00

clock

text: Improve panic messages with more information (#42072)

2025-11-06 09:16:45 +00:00

cloud_api_client

Use cloud for auto-update (#42246)

2025-11-10 23:00:55 -07:00

cloud_api_types

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

cloud_llm_client

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

cloud_zeta2_prompt

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

codestral

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

collab

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

collab_ui

collab: Add action to copy room id (#44004)

2025-12-02 16:27:36 +00:00

collections

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

command_palette

Use test db for command palette under vim tests (#43731)

2025-11-28 14:16:44 +00:00

command_palette_hooks

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

component

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

context_server

Add HTTP transport support for MCP servers (#39021)

2025-11-18 16:39:08 +00:00

copilot

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

crashes

Fix "busy" cursor appearing on startup (#44019)

2025-12-02 16:15:18 -05:00

credentials_provider

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

dap

util: Fix zip extraction (#42714)

2025-11-19 12:34:41 +01:00

dap_adapters

Fix attach to process in Go debugger (#43898)

2025-12-01 10:50:28 -05:00

db

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

debug_adapter_extension

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

debugger_tools

editor: Add active match highlight for buffer and project search (#44098)

2025-12-04 03:55:04 +05:30

debugger_ui

debugger: Fix evaluate selection running two evaluations & failing for Python and go (#44205)

2025-12-05 11:08:04 +00:00

deepseek

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

denoise

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

diagnostics

Basic side-by-side diff implementation (#43586)

2025-11-30 22:45:01 -05:00

docs_preprocessor

docs: Ensure macOS and Linux keybindings are escaped in HTML (#39802)

2025-10-23 14:13:35 -04:00

edit_prediction

Fix infinite loop in assemble_excerpts (#44195)

2025-12-05 06:51:26 +00:00

edit_prediction_cli

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

edit_prediction_context

Fix infinite loop in assemble_excerpts (#44195)

2025-12-05 06:51:26 +00:00

edit_prediction_types

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

edit_prediction_ui

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

editor

multi_buffer: Remap excerpt ids to latest excerpt in excerpt fetching (#44229)

2025-12-05 18:20:29 +00:00

eval

Update to ACP SDK v0.8.0 (#44063)

2025-12-03 11:24:08 +00:00

eval_utils

ai: Add an eval for the inline assistant (#43291)

2025-12-03 20:32:25 +00:00

explorer_command_injector

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

extension

releases: Add build number to Nightly builds (#42990)

2025-11-24 13:34:04 +01:00

extension_api

zed_extension_api: Fork new version of extension API (#44025)

2025-12-02 22:26:40 +00:00

extension_cli

Fix categorization of agent server extensions (#41689)

2025-10-31 21:18:22 +00:00

extension_host

Add experimental LSP-based context retrieval system for edit prediction (#44036)

2025-12-04 12:48:39 -08:00

extensions_ui

Fix circular reference issue around PopoverMenu again (#44084)

2025-12-03 21:34:01 +02:00

feature_flags

inline assistant: Use tools and remove insertion mode (#44248)

2025-12-05 13:28:29 -08:00

feedback

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

file_finder

Fix git features not working when a Windows host collaborates with a unix guest (#43515)

2025-11-26 16:56:34 +00:00

file_icons

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

fs

git: Fix branch picker creating new branches with refs/head/ prefixed on the branch name (#44206)

2025-12-05 12:59:13 +00:00

fs_benchmarks

fs: Reintroduce benchmarks crate (#40689)

2025-10-20 10:30:06 +00:00

fsevent

Disable fsevents tests (#43218)

2025-11-20 22:17:50 -07:00

fuzzy

Fix git features not working when a Windows host collaborates with a unix guest (#43515)

2025-11-26 16:56:34 +00:00

git

git: Don't call git2::Repository::find_remote for every blamed buffer (#44107)

2025-12-04 13:25:30 -05:00

git_hosting_providers

Run git2::Repository::find_remote in the background (#44092)

2025-12-03 19:33:40 +00:00

git_ui

git: For conflicted files, set project diff excerpts using conflicts only (#44263)

2025-12-06 02:20:14 +00:00

go_to_line

multi_buffer: Typed MultiBufferOffset (#42707)

2025-11-19 22:00:58 +00:00

google_ai

google_ai: Update Gemini models (#43117)

2025-11-28 15:48:33 -05:00

gpui

gpui: Make length helpers into const functions (#44259)

2025-12-06 01:08:43 +00:00

gpui_macros

Reduce macro burden for rust-analyzer (#42871)

2025-11-17 12:31:00 +00:00

gpui_tokio

workspace: Handle non-cloneable items better (#41215)

2025-10-26 13:24:26 +00:00

html_to_markdown

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

http_client

ai: Add an eval for the inline assistant (#43291)

2025-12-03 20:32:25 +00:00

http_client_tls

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

icons

debugger: Improve step icons (#44017)

2025-12-02 20:38:18 +00:00

image_viewer

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

inspector_ui

Apply show_completions_on_input: false to word & snippet completions (#44021)

2025-12-02 21:33:41 +00:00

install_cli

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

journal

multi_buffer: Typed MultiBufferOffset (#42707)

2025-11-19 22:00:58 +00:00

json_schema_store

Specify a schema to use when dealing with JSONC files (#44250)

2025-12-05 20:26:42 +00:00

keymap_editor

Apply show_completions_on_input: false to word & snippet completions (#44021)

2025-12-02 21:33:41 +00:00

language

Specify a schema to use when dealing with JSONC files (#44250)

2025-12-05 20:26:42 +00:00

language_extension

language: Allow support for ESLint working directories (#43677)

2025-11-28 19:40:23 +05:30

language_model

inline assistant: Use tools and remove insertion mode (#44248)

2025-12-05 13:28:29 -08:00

language_models

bedrock: Support global endpoints and new regional endpoints (#44103)

2025-12-04 12:14:31 +01:00

language_onboarding

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

language_selector

Fix keybind hints flickering in certain scenarios (#40927)

2025-10-22 19:52:38 +00:00

language_tools

editor: Add active match highlight for buffer and project search (#44098)

2025-12-04 03:55:04 +05:30

languages

Specify a schema to use when dealing with JSONC files (#44250)

2025-12-05 20:26:42 +00:00

line_ending_selector

Fix keybind hints flickering in certain scenarios (#40927)

2025-10-22 19:52:38 +00:00

livekit_api

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

livekit_client

collab: Add action to copy room id (#44004)

2025-12-02 16:27:36 +00:00

lmstudio

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

lsp

lsp: Send client process ID in LSP initialize request (#43988)

2025-12-02 14:04:28 +02:00

markdown

markdown: Fix rendering of inline HTML <code> tags (#43513)

2025-12-03 16:58:51 +01:00

markdown_preview

markdown_preview: Remove unnecessary vec allocation (#44238)

2025-12-05 23:27:21 +01:00

media

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

menu

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

migrator

Add more preview tab settings and fix janky behavior (#43921)

2025-12-03 21:56:39 +00:00

miniprofiler_ui

gpui: Unify track_scroll method to receive a reference type (#43518)

2025-11-26 18:03:42 +01:00

mistral

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

multi_buffer

multi_buffer: Remap excerpt ids to latest excerpt in excerpt fetching (#44229)

2025-12-05 18:20:29 +00:00

nc

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

net

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

node_runtime

Passthrough env to npm subcommands when using the system node runtime (#43102)

2025-11-24 11:08:45 -08:00

notifications

sum_tree: Implement recursive Sumtree::find, use it over Cursor::seek if possible (#40700)

2025-10-20 17:20:09 +00:00

ollama

ollama: Fix tool calling (#42275)

2025-11-11 16:10:47 +01:00

onboarding

Allow dynamic set_theme based on Appearance (#42812)

2025-12-01 20:52:57 -07:00

open_ai

Add GPT 5.1 to Zed BYOK (#43492)

2025-11-25 14:17:27 -08:00

open_router

Fix Gemini 3 on OpenRouter (#43416)

2025-11-24 13:24:26 -05:00

outline

multi_buffer: Typed MultiBufferOffset (#42707)

2025-11-19 22:00:58 +00:00

outline_panel

gpui: Unify track_scroll method to receive a reference type (#43518)

2025-11-26 18:03:42 +01:00

panel

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

paths

Miniprofiler (#42385)

2025-11-12 15:31:20 +01:00

picker

gpui: Unify track_scroll method to receive a reference type (#43518)

2025-11-26 18:03:42 +01:00

prettier

Use buffer language when formatting with Prettier (#43368)

2025-12-04 12:07:40 +00:00

project

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

project_benchmarks

search: New recent old search implementation (#40835)

2025-11-13 14:56:40 +01:00

project_panel

Add more preview tab settings and fix janky behavior (#43921)

2025-12-03 21:56:39 +00:00

project_symbols

Add more preview tab settings and fix janky behavior (#43921)

2025-12-03 21:56:39 +00:00

prompt_store

inline assistant: Use tools and remove insertion mode (#44248)

2025-12-05 13:28:29 -08:00

proto

git: Don't call git2::Repository::find_remote for every blamed buffer (#44107)

2025-12-04 13:25:30 -05:00

recent_projects

gpui: Unify track_scroll method to receive a reference type (#43518)

2025-11-26 18:03:42 +01:00

refineable

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

release_channel

release_version: Do not use prerelease field (#43669)

2025-11-27 13:46:43 +00:00

remote

remoting: Server download connect timeout (#44216)

2025-12-05 16:16:46 +01:00

remote_server

Add experimental LSP-based context retrieval system for edit prediction (#44036)

2025-12-04 12:48:39 -08:00

repl

buffer: Keep the shorter language setting names for the common operation (#43915)

2025-12-01 18:55:33 +01:00

reqwest_client

Add experimental Sweep edit prediction provider (#42927)

2025-11-18 01:00:26 +00:00

rich_text

Revert "sum_tree: Replace rayon with futures (#41586) (#41846)

2025-11-03 19:25:15 +00:00

rope

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

rpc

remote: Recognize WSL interop to open browser for codex web login (#44136)

2025-12-04 14:42:26 +00:00

rules_library

buffer: Keep the shorter language setting names for the common operation (#43915)

2025-12-01 18:55:33 +01:00

scheduler

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

schema_generator

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

search

editor: Add active match highlight for buffer and project search (#44098)

2025-12-04 03:55:04 +05:30

session

zed: Fix session ID mismatching for workspace and telemetry (#43659)

2025-12-01 09:12:31 +01:00

settings

settings: Fix inconsistent terminal font weight step size (#44243)

2025-12-05 19:24:59 -03:00

settings_json

settings_ui: Show migration banner (#41112)

2025-10-27 10:13:26 -04:00

settings_macros

Fallible Settings (#42938)

2025-11-21 08:28:17 -07:00

settings_profile_selector

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

settings_ui

Add more preview tab settings and fix janky behavior (#43921)

2025-12-03 21:56:39 +00:00

snippet

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

snippet_provider

Allow trailing commas in builtin JSONC schemas (#43854)

2025-12-04 15:37:32 -05:00

snippets_ui

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

sqlez

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

sqlez_macros

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

story

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

storybook

ui: Remove outdated/unused component stories (#43118)

2025-11-20 01:52:13 -03:00

streaming_diff

Revert "sum_tree: Replace rayon with futures (#41586) (#41846)

2025-11-03 19:25:15 +00:00

sum_tree

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

supermaven

Reorganize edit prediction code and remove old experiments (#44187)

2025-12-04 15:56:57 -08:00

supermaven_api

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

svg_preview

svg_preview: Remove unnecessary dependency on editor (#43147)

2025-11-20 12:18:50 +01:00

system_specs

releases: Add build number to Nightly builds (#42990)

2025-11-24 13:34:04 +01:00

tab_switcher

tab_switcher: Subscribe to workspace events instead of pane events (#44101)

2025-12-03 22:49:44 +00:00

task

Allow trailing commas in builtin JSONC schemas (#43854)

2025-12-04 15:37:32 -05:00

tasks_ui

buffer: Keep the shorter language setting names for the common operation (#43915)

2025-12-01 18:55:33 +01:00

telemetry

Fix telemetry (#42184)

2025-11-07 11:36:05 +00:00

telemetry_events

releases: Add build number to Nightly builds (#42990)

2025-11-24 13:34:04 +01:00

terminal

settings: Fix inconsistent terminal font weight step size (#44243)

2025-12-05 19:24:59 -03:00

terminal_view

terminal view: Use tooltip element for the tab tooltip (#44169)

2025-12-04 16:48:03 -03:00

text

Add experimental LSP-based context retrieval system for edit prediction (#44036)

2025-12-04 12:48:39 -08:00

theme

editor: Add active match highlight for buffer and project search (#44098)

2025-12-04 03:55:04 +05:30

theme_extension

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

theme_importer

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

theme_selector

Allow dynamic set_theme based on Appearance (#42812)

2025-12-01 20:52:57 -07:00

time_format

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

title_bar

Make drag and double click enabled on the whole title bar on macOS (#41839)

2025-11-14 22:46:35 +00:00

toolchain_selector

python: Improve sorting order of toolchains to give higher precedence to project-local virtual environments that are within current subproject (#44141)

2025-12-04 12:33:13 +00:00

ui

Add experimental LSP-based context retrieval system for edit prediction (#44036)

2025-12-04 12:48:39 -08:00

ui_input

debugger_ui: Improve some elements of the UI (#43344)

2025-11-22 23:28:34 -03:00

ui_macros

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

ui_prompt

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

util

Allow trailing commas in builtin JSONC schemas (#43854)

2025-12-04 15:37:32 -05:00

util_macros

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

vercel

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

vim

editor: Add active match highlight for buffer and project search (#44098)

2025-12-04 03:55:04 +05:30

vim_mode_setting

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

watch

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

web_search

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

web_search_providers

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

workspace

Fix persistence for single-file worktrees (#44257)

2025-12-05 23:55:05 +00:00

worktree

worktree: Fix git ignored directories dropping their contents when they are refreshed (#44143)

2025-12-04 18:14:10 +01:00

worktree_benchmarks

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

x_ai

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

zed

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

zed_actions

Add support for git remotes (#42819)

2025-12-04 14:23:36 +01:00

zed_env_vars

Remove workspace-hack (#40216)

2025-10-17 18:58:14 +00:00

zlog

language: Only block the foreground on buffer reparsing when necessary (#43888)

2025-12-01 14:57:15 +01:00

zlog_settings

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

ztracing

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

ztracing_macro

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00