yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3c82ddf261cd31d6150cd4aebf4ccbfc6518ea2e
zed/crates
T
History
Danilo Leal 3c82ddf261 git_ui: Fix "resolve with agent" merge conflict notification (#51290) 
Follow up to https://github.com/zed-industries/zed/pull/49807

This PR fixes the merge conflict notification by making it appear only
once per a given set of conflicted paths, as opposed to showing every
time the `ConflictsUpdated` or `StatusesChanged` even would fire.

Release Notes:

- N/A
2026-03-11 11:35:59 -03:00
..
acp_thread
acp: Update to 0.10.2 (#51280)
2026-03-11 12:52:03 +00:00
acp_tools
ui: Improve performance in the CopyButton component (#47292)
2026-01-21 13:40:42 -03:00
action_log
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
activity_indicator
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
agent
agent: Support providers streaming edits out of order (#51286)
2026-03-11 14:56:53 +01:00
agent_servers
acp: Update to 0.10.2 (#51280)
2026-03-11 12:52:03 +00:00
agent_settings
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
agent_ui
acp: Update to 0.10.2 (#51280)
2026-03-11 12:52:03 +00:00
ai_onboarding
acp: Claude Code -> Claude Agent (#49345)
2026-02-17 10:41:10 +00:00
anthropic
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
askpass
Reduce amount of monomorphizations from FnMut closures (#49453)
2026-02-18 12:00:02 +01:00
assets
…
assistant_slash_command
Handle removed IconName variants in text thread deserialization (#47624)
2026-01-26 23:56:55 +00:00
assistant_slash_commands
build: Tear up crate graph (move terminal closer to editor) (#48602)
2026-02-06 20:14:35 +01:00
assistant_text_thread
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
audio
livekit_client: Route selected audio input/output devices into legacy audio (#51128)
2026-03-09 20:50:52 +01:00
auto_update
auto_update: Always display update progress when requesting manual update (#51087)
2026-03-09 10:10:42 +00:00
auto_update_helper
Try to fix auto-updates when Explorer.exe holds Zed.exe (#50332)
2026-03-03 17:47:35 +01:00
auto_update_ui
auto_update_ui: Add announcement toast component (#49543)
2026-02-19 10:41:16 -03:00
aws_http_client
…
bedrock
bedrock: Add Claude Sonnet 4.6 (#49439)
2026-02-19 07:23:27 +01:00
breadcrumbs
Clean up some Cargo.toml files (#48623)
2026-02-06 20:21:19 +00:00
buffer_diff
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
call
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
channel
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
cli
zed: Clear the FORCE_CLI_MODE environment variable after reading (#46475)
2026-03-06 19:18:33 +00:00
client
Refresh LLM API token on organization change (#50931)
2026-03-06 19:15:21 +00:00
clock
text: Narrow insertion-relative offsets from usize to u32 (#49801)
2026-02-25 08:12:04 +01:00
cloud_api_client
cloud_api_client: Send the organization ID in LLM token requests (#50517)
2026-03-04 15:45:33 +01:00
cloud_api_types
cloud_api_client: Send the organization ID in LLM token requests (#50517)
2026-03-04 15:45:33 +01:00
cloud_llm_client
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
codestral
zeta: Allow the server to select the editable and context ranges more flexibly (#50975)
2026-03-09 19:58:31 -04:00
collab
collab: Update test database schema (#51233)
2026-03-10 18:36:49 -04:00
collab_ui
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
collections
…
command_palette
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
command_palette_hooks
…
component
…
component_preview
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
context_server
Revert "Allow always_allow patterns for Nushell, Elvish, and Rc shells" (#48050)
2026-01-30 21:26:13 +00:00
copilot
Add size to DiskState to detect file changes (#49436)
2026-03-10 13:55:57 -05:00
copilot_chat
Enable extended reasoning for Anthropic models in Copilot (#46540)
2026-03-08 09:34:46 +00:00
copilot_ui
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
crashes
Redact string panics (#51248)
2026-03-11 03:08:39 +00:00
credentials_provider
gpui: Actually remove the Result from AsyncApp (#45809)
2026-01-07 12:48:24 -08:00
csv_preview
Add CSV preview with live table view and interactive features (#48207)
2026-03-03 15:49:40 +01:00
dap
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
dap_adapters
util: Always use posix_spawn on macOS even with pre_exec hooks (#49090)
2026-02-13 20:16:11 +01:00
db
Increase SQLite busy_timeout from 1ms to 500ms (#49039)
2026-02-12 16:26:13 +00:00
debug_adapter_extension
Revert "Revert scheduler update (#46659)" (#46671)
2026-01-14 07:19:13 +00:00
debugger_tools
Reduce amount of monomorphizations from FnMut closures (#49453)
2026-02-18 12:00:02 +01:00
debugger_ui
Move threads sidebar into agent panel (#51241)
2026-03-10 23:45:55 -07:00
deepseek
deepseek: Fix for max output tokens blocking completions (#45236)
2025-12-18 12:47:34 +00:00
denoise
…
dev_container
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
diagnostics
Do not derive symbol highlights if they do not fit into multi buffer (#50948)
2026-03-09 15:50:44 +00:00
docs_preprocessor
docs: Add consent banner (#50302)
2026-03-04 15:38:31 +01:00
edit_prediction
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
edit_prediction_cli
ep: Add multi-region format (#51185)
2026-03-10 13:43:27 +02:00
edit_prediction_context
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
edit_prediction_types
Differentiate between explicit rejection and ignored in ep acceptance tracking (#48409)
2026-02-04 17:54:11 -05:00
edit_prediction_ui
ep: Skip context retrieval when already performed (#51100)
2026-03-09 14:42:15 +00:00
editor
Do not load runnables and diagnostics in git panel (#51270)
2026-03-11 10:51:54 +00:00
encoding_selector
Revert PRs for landing in main (#48969)
2026-02-12 00:28:17 +00:00
etw_tracing
time_format: Add Windows implementation (#50227)
2026-02-28 21:47:30 -05:00
eval
Refresh LLM API token on organization change (#50931)
2026-03-06 19:15:21 +00:00
eval_cli
agent: Allow NativeAgent to work with multiple projects (#51202)
2026-03-10 17:04:48 +01:00
eval_utils
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
explorer_command_injector
explorer_command_injector: Avoid COM out-pointer overwrite in class factory exports (#49210)
2026-02-28 22:42:19 -05:00
extension
extension_cli: Add tests for semantic token rules and language tasks (#50750)
2026-03-09 11:47:12 +01:00
extension_api
extension_api: Add language server schema methods (#48334)
2026-03-07 11:05:10 +01:00
extension_cli
extension_cli: Add tests for semantic token rules and language tasks (#50750)
2026-03-09 11:47:12 +01:00
extension_host
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
extensions_ui
extensions_ui: Fix extension author list overflow (#51045)
2026-03-09 12:18:12 -03:00
feature_flags
Redact string panics (#51248)
2026-03-11 03:08:39 +00:00
feedback
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
file_finder
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
file_icons
…
fs
fs: Fix no-overwrite rename races (#51090)
2026-03-10 03:56:45 +05:30
fs_benchmarks
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
fuzzy
fuzzy: Use lowercase representations for matrix size calculation (#44338)
2025-12-08 19:50:20 +01:00
git
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
git_graph
git_graph: Add select first & last actions (#50956)
2026-03-10 19:34:42 +00:00
git_hosting_providers
Implement extract_pull_request for GitLab provider (#47973)
2026-01-31 21:56:34 +00:00
git_ui
git_ui: Fix "resolve with agent" merge conflict notification (#51290)
2026-03-11 11:35:59 -03:00
go_to_line
Do not derive symbol highlights if they do not fit into multi buffer (#50948)
2026-03-09 15:50:44 +00:00
google_ai
Remove deprecated Gemini 3 Pro Preview (#50503)
2026-03-04 15:53:26 +00:00
gpui
Do not derive symbol highlights if they do not fit into multi buffer (#50948)
2026-03-09 15:50:44 +00:00
gpui_linux
gpui(linux): Pass display_id to layer shell get_layer_surface (#50520)
2026-03-08 00:39:04 -05:00
gpui_macos
Remove Executor::close() (#50970)
2026-03-07 04:11:45 +00:00
gpui_macros
gpui: Add property_test macro (#50935)
2026-03-06 14:03:45 +00:00
gpui_platform
gpui_web: Implement fetch based HTTP client (#50463)
2026-03-02 16:18:01 +01:00
gpui_tokio
gpui: Actually remove the Result from AsyncApp (#45809)
2026-01-07 12:48:24 -08:00
gpui_util
GPUI on the web (#50228)
2026-02-26 18:36:50 +01:00
gpui_web
Remove Executor::close() (#50970)
2026-03-07 04:11:45 +00:00
gpui_wgpu
Linux: Handle device lost with wgpu (#50898)
2026-03-05 22:59:48 -07:00
gpui_windows
Disable the IME on Windows when text input is unexpected (#51041)
2026-03-08 04:54:05 +00:00
html_to_markdown
…
http_client
cloud_api_client: Send the organization ID in LLM token requests (#50517)
2026-03-04 15:45:33 +01:00
http_client_tls
…
icons
git: Add the ability to resolve merge conflicts with the agent (#49807)
2026-03-10 11:19:26 -03:00
image_viewer
image_viewer: Use checkerboard from GPUI (#49575)
2026-02-24 12:56:59 +01:00
inspector_ui
Reduce amount of closure monomorphizations part 2 (#49688)
2026-02-20 08:32:45 +00:00
install_cli
Revert PRs for landing in main (#48969)
2026-02-12 00:28:17 +00:00
journal
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
json_schema_store
extension_api: Add language server schema methods (#48334)
2026-03-07 11:05:10 +01:00
keymap_editor
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
language
Add size to DiskState to detect file changes (#49436)
2026-03-10 13:55:57 -05:00
language_extension
extension_api: Add language server schema methods (#48334)
2026-03-07 11:05:10 +01:00
language_model
Refresh LLM API token on organization change (#50931)
2026-03-06 19:15:21 +00:00
language_models
open_ai: Support reasoning summaries in OpenAI Responses API (#50959)
2026-03-09 13:51:22 +00:00
language_onboarding
…
language_selector
language_selector: Auto-select current language when opening (#48475)
2026-02-26 15:18:25 +00:00
language_tools
buffer_diff: Do not block on parsing in set_snapshot_with_secondary_inner (#50385)
2026-02-28 11:53:06 +00:00
languages
languages: Validate pylsp binary before returning from check_if_user_installed (#51034)
2026-03-11 09:12:18 +01:00
line_ending_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
livekit_api
Update Rust crate jsonwebtoken to v10 [SECURITY] (#48294)
2026-02-03 15:51:40 -05:00
livekit_client
livekit_client: Always use output device's reported channels num (#51276)
2026-03-11 13:09:08 +01:00
lmstudio
ai: Add LMStudio API URL & API key support (#48309)
2026-03-06 16:49:55 +00:00
lsp
git: Move diff num stat calculation to repository snapshot layer (#50645)
2026-03-04 18:54:23 +00:00
markdown
markdown_preview: Enable parser options individually (#50440)
2026-03-05 14:00:08 +00:00
markdown_preview
markdown_preview: Fix slow checkbox check/uncheck UI updates (#48633)
2026-03-06 17:23:50 +01:00
media
…
menu
ui: Add submenus to ContextMenu (#45743)
2025-12-30 07:49:01 -03:00
migrator
editor: Add support for no auto-indent on enter (#47751)
2026-03-04 20:29:20 +00:00
miniprofiler_ui
project_panel: Fix scrolling in empty area below file list (#50683)
2026-03-04 19:13:32 +01:00
mistral
mistral: Enable streaming tool calls (#50793)
2026-03-05 08:59:05 +00:00
multi_buffer
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
nc
acp: Claude Code -> Claude Agent (#49345)
2026-02-17 10:41:10 +00:00
net
Add ETW profile recorder action (#49712)
2026-02-20 13:36:04 +00:00
node_runtime
util: Always use posix_spawn on macOS even with pre_exec hooks (#49090)
2026-02-13 20:16:11 +01:00
notifications
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
ollama
ollama: Remove backwards compatibility for Ollama tool call IDs (#49246)
2026-02-16 14:33:29 +00:00
onboarding
Reduce amount of monomorphizations from FnMut closures (#49453)
2026-02-18 12:00:02 +01:00
open_ai
open_ai: Support reasoning summaries in OpenAI Responses API (#50959)
2026-03-09 13:51:22 +00:00
open_path_prompt
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
open_router
Add user picked model to be used as a default for open router provider when generating comments and thread summary (#47475)
2026-02-12 14:02:16 +00:00
outline
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
outline_panel
Do not derive symbol highlights if they do not fit into multi buffer (#50948)
2026-03-09 15:50:44 +00:00
panel
build: Decouple git_ui from recent_projects (#48062)
2026-02-02 13:30:07 +01:00
paths
Remove Supermaven-related code from Zed (#50537)
2026-03-02 22:18:49 +00:00
picker
picker: Prevent clicking non-selectable entries from confirming selection (#50705)
2026-03-05 18:59:01 +00:00
platform_title_bar
Move threads sidebar into agent panel (#51241)
2026-03-10 23:45:55 -07:00
prettier
Add configurable LSP timeout setting (#44745)
2026-02-07 00:36:37 +00:00
project
Add size to DiskState to detect file changes (#49436)
2026-03-10 13:55:57 -05:00
project_benchmarks
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
project_panel
project_panel: Reveal in file manager when no entry is selected (#50866)
2026-03-10 14:42:32 +05:30
project_symbols
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
prompt_store
Revert "Allow always_allow patterns for Nushell, Elvish, and Rc shells" (#48050)
2026-01-30 21:26:13 +00:00
proto
agent: Re-use ACP connections per project (#51209)
2026-03-10 17:32:51 +00:00
recent_projects
recent_projects: Fix open project buttons hidden when there are no recent projects (#51207)
2026-03-10 15:49:05 +00:00
refineable
gpui: Make refining a Style properly refine the TextStyle (#42852)
2025-12-15 13:30:13 +00:00
release_channel
release_version: Do not use prerelease field (#43669)
2025-11-27 13:46:43 +00:00
remote
Fix a few cases where we weren't escaping shell vars correctly (#50562)
2026-03-02 23:31:11 -07:00
remote_connection
build: Decouple git_ui from recent_projects (#48062)
2026-02-02 13:30:07 +01:00
remote_server
agent: Re-use ACP connections per project (#51209)
2026-03-10 17:32:51 +00:00
repl
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
reqwest_client
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
rope
editor: Prevent panic in lsp_symbols_at_cursor with diff hunks handling (#51077)
2026-03-09 08:35:19 +00:00
rpc
Support LSP document symbols in breadcrumbs and outline UI (#48780)
2026-02-11 21:30:03 +02:00
rules_library
picker: Prevent clicking non-selectable entries from confirming selection (#50705)
2026-03-05 18:59:01 +00:00
scheduler
Remove Executor::close() (#50970)
2026-03-07 04:11:45 +00:00
schema_generator
Add project settings schema to schema_generator CLI (#44321)
2025-12-16 10:48:14 -05:00
search
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
session
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
settings
editor: Add support for no auto-indent on enter (#47751)
2026-03-04 20:29:20 +00:00
settings_content
Enable diff stats in the git panel by default (#51215)
2026-03-10 18:21:16 +00: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
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
settings_ui
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
shell_command_parser
Skip /dev/null redirects from terminal auto-allow command extraction (#49503)
2026-02-18 13:01:01 -05:00
snippet
…
snippet_provider
extension_cli: Validate that all snippets can be parsed (#47649)
2026-01-26 13:49:26 +00:00
snippets_ui
Revert PRs for landing in main (#48969)
2026-02-12 00:28:17 +00:00
sqlez
sqlez: Open named in-memory databases as SQLite URIs (#50967)
2026-03-10 20:25:12 +00:00
sqlez_macros
…
story
…
storybook
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
streaming_diff
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
sum_tree
gpui: Add property_test macro (#50935)
2026-03-06 14:03:45 +00:00
svg_preview
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
system_specs
releases: Add build number to Nightly builds (#42990)
2025-11-24 13:34:04 +01:00
tab_switcher
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
task
extension_cli: Add tests for semantic token rules and language tasks (#50750)
2026-03-09 11:47:12 +01:00
tasks_ui
Re-add MultiWorkspace (#48800)
2026-02-12 01:06:23 +00:00
telemetry
Fix telemetry (#42184)
2025-11-07 11:36:05 +00:00
telemetry_events
ep_cli: rated-after: query (#47906)
2026-01-28 16:36:44 -08:00
terminal
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
terminal_view
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
text
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
theme
Add .cppm (C++20 module interface) to C++ file extensions (#50667)
2026-03-04 10:30:33 +00:00
theme_extension
…
theme_importer
vim: Add configurable yank highlight background color (#49517)
2026-02-26 12:01:57 +00:00
theme_selector
Allow dynamic set_theme based on Appearance (#42812)
2025-12-01 20:52:57 -07:00
time_format
time_format: Add Windows implementation (#50227)
2026-02-28 21:47:30 -05:00
title_bar
Move threads sidebar into agent panel (#51241)
2026-03-10 23:45:55 -07:00
toolchain_selector
Revert "Added support for dismissing the toolchain path selector via … (#49504)
2026-02-18 17:07:10 -05:00
ui
ui: Fix end_hover gradient overlay in ListItem (#51237)
2026-03-10 23:12:26 +00:00
ui_input
build: Decouple git_ui from recent_projects (#48062)
2026-02-02 13:30:07 +01:00
ui_macros
…
ui_prompt
…
util
Fix parsing of filenames like main (1).log (#50770)
2026-03-10 06:57:43 +00:00
util_macros
…
vercel
project: Move tests to integration layer (#47596)
2026-01-25 21:35:32 +01:00
vim
Prevent remote edits from triggering edit predictions when collaborating (#51196)
2026-03-10 15:23:49 +00:00
vim_mode_setting
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
watch
Remove unreferenced dev dependencies (#51093)
2026-03-09 13:22:12 +01:00
web_search
…
web_search_providers
cloud_api_client: Send the organization ID in LLM token requests (#50517)
2026-03-04 15:45:33 +01:00
which_key
Add Vim-like Which-key Popup menu (#43618)
2025-12-17 11:53:48 -07:00
workspace
git_ui: Fix "resolve with agent" merge conflict notification (#51290)
2026-03-11 11:35:59 -03:00
worktree
Add size to DiskState to detect file changes (#49436)
2026-03-10 13:55:57 -05:00
worktree_benchmarks
gpui: Extract gpui_platform out of gpui (#49277)
2026-02-19 18:57:49 +01:00
x_ai
Add support for streaming tool input to more providers (#50682)
2026-03-04 17:36:25 +01:00
zed
Move threads sidebar into agent panel (#51241)
2026-03-10 23:45:55 -07:00
zed_actions
git: Add the ability to resolve merge conflicts with the agent (#49807)
2026-03-10 11:19:26 -03:00
zed_env_vars
Enable configuring edit prediction providers through the settings UI (#44505)
2025-12-13 11:06:30 -05:00
zeta_prompt
ep: Add multi-region format (#51185)
2026-03-10 13:43:27 +02:00
zlog
zlog: Fix log file rotation never truncating original file (#50571)
2026-03-03 08:37:58 +00:00
zlog_settings
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
ztracing
ztracing: Annotate more callsites that invoke TreeSitter (#47522)
2026-02-11 11:24:04 +00:00
ztracing_macro
adds tracing for instrumenting non-async functions (#44147)
2025-12-05 17:23:06 +00:00