oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
697c2ba71fa3d1d87e917b75bcee605a9447c4b2
oak-gpui/crates
T
History
Max Brunsfeld 697c2ba71f Enable merge conflict parsing for currently-unmerged files (#31549) 
Previously, we only enabled merge conflict parsing for files that were
unmerged at the last time a change was detected to the repo's merge
heads. Now we enable the parsing for these files *and* any files that
are currently unmerged.

The old strategy meant that conflicts produced via `git stash pop` would
not be parsed.

Release Notes:

- Fixed parsing of merge conflicts when the conflict was produced by a
`git stash pop`
2025-05-27 13:34:39 -07:00
..
activity_indicator
Use shortened SHA when displaying version to install (#31281)
2025-05-23 14:53:53 +00:00
agent
Add warning message when editing a message in a thread (#31508)
2025-05-27 16:26:47 -04:00
agent_settings
Rename assistant_settings to agent_settings (#31513)
2025-05-27 15:16:55 +00:00
anthropic
anthropic: Fix Claude 4 model display names to match official order (#31218)
2025-05-22 21:00:54 +00:00
askpass
askpass: Workaround rust lang 69343 (#30774)
2025-05-16 05:04:36 -04:00
assets
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
assistant_context_editor
Rename assistant_settings to agent_settings (#31513)
2025-05-27 15:16:55 +00:00
assistant_slash_command
chore: Make terminal_view own the TerminalSlashCommand (#31070)
2025-05-21 09:27:54 +00:00
assistant_slash_commands
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
assistant_tool
agent: Namespace MCP server tools (#30600)
2025-05-27 17:47:44 +00:00
assistant_tools
agent: Keep horizontal scrollbar in edit file tool cards (#31510)
2025-05-27 17:24:22 +02:00
audio
agent: Add sound notification when done generating (#31472)
2025-05-26 21:20:41 -03:00
auto_update
Use shortened SHA when displaying version to install (#31281)
2025-05-23 14:53:53 +00:00
auto_update_helper
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
auto_update_ui
Restyle notification close control (#30262)
2025-05-08 14:10:30 +00:00
aws_http_client
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
bedrock
Update default models to newer versions (#31415)
2025-05-27 10:54:42 +02:00
breadcrumbs
breadcrumbs: Update multibuffer to match singleton (#28267)
2025-04-07 20:26:55 +00:00
buffer_diff
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
call
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
channel
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
cli
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
client
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
clock
Add the ability to follow the agent as it makes edits (#29839)
2025-05-04 08:28:39 +00:00
collab
collab: Add support for overage billing for Claude Opus 4 (#31544)
2025-05-27 18:37:57 +00:00
collab_ui
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
collections
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
command_palette
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
command_palette_hooks
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
component
component: Replace linkme with inventory (#30705)
2025-05-14 23:29:11 +02:00
context_server
context_server: Fix casing of mimeType in tool responses (#30703)
2025-05-26 10:29:45 +02:00
copilot
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
credentials_provider
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
dap
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
dap_adapters
debugger beta: Fix gdb/delve JSON data conversion from New Session Modal (#31501)
2025-05-27 17:28:41 +00:00
db
Add end of service notifications (#30982)
2025-05-20 00:20:00 +00:00
debug_adapter_extension
debugger beta: Fix dap_schema for DAP extensions (#31173)
2025-05-22 07:24:46 -04:00
debugger_tools
Rename debug: commands to dev: (#30675)
2025-05-14 11:15:27 +02:00
debugger_ui
debugger beta: Autoscroll to recently saved debug scenario when saving a scenario (#31528)
2025-05-27 21:35:17 +03:00
deepseek
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
diagnostics
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
docs_preprocessor
docs_preprocessor: Ensure keybind is found for actions with arguments (#27224)
2025-05-27 16:56:03 +00:00
editor
agent: Keep horizontal scrollbar in edit file tool cards (#31510)
2025-05-27 17:24:22 +02:00
eval
Rename assistant_settings to agent_settings (#31513)
2025-05-27 15:16:55 +00:00
extension
extension: Update to wasm32-wasip2 target (#30953)
2025-05-26 16:06:38 +02:00
extension_api
extension: Update to wasm32-wasip2 target (#30953)
2025-05-26 16:06:38 +02:00
extension_cli
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
extension_host
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
extensions_ui
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
feature_flags
Add a picker for jj bookmark list (#30883)
2025-05-17 16:42:45 +00:00
feedback
Use shortened SHA when displaying version to install (#31281)
2025-05-23 14:53:53 +00:00
file_finder
Properly handle ignored files in the file finder (#31542)
2025-05-27 18:34:28 +00:00
file_icons
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
fs
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
fsevent
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
fuzzy
Fix out-of-bounds panic in fuzzy matcher with Unicode/multibyte characters (#30546)
2025-05-12 14:43:14 +00:00
git
agent: Don't track large and common binary files (#31352)
2025-05-26 11:31:25 +00:00
git_hosting_providers
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
git_ui
Enable merge conflict parsing for currently-unmerged files (#31549)
2025-05-27 13:34:39 -07:00
go_to_line
editor: Add minimap (#26893)
2025-05-07 23:11:09 +03:00
google_ai
Update default models to newer versions (#31415)
2025-05-27 10:54:42 +02:00
gpui
windows: Fix title bar not responsing (#31532)
2025-05-27 16:43:48 +00:00
gpui_macros
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
gpui_tokio
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
html_to_markdown
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
http_client
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
http_client_tls
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
icons
Add Code Actions to the Toolbar (#31236)
2025-05-23 16:55:29 +05:30
image_viewer
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
indexed_docs
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
inline_completion
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
inline_completion_button
Add overdue invoices check (#31290)
2025-05-23 20:02:02 +00:00
inspector_ui
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
install_cli
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
jj
Add a picker for jj bookmark list (#30883)
2025-05-17 16:42:45 +00:00
jj_ui
Add a picker for jj bookmark list (#30883)
2025-05-17 16:42:45 +00:00
journal
VSCode Settings import (#29018)
2025-04-23 20:54:09 +00:00
language
Cursor settings import (#31424)
2025-05-27 14:14:25 -04:00
language_extension
debugger/extensions: Revert changes to extension store related to language config (#30225)
2025-05-08 14:01:39 +02:00
language_model
Default to fast model first for commit messages (#31385)
2025-05-26 10:37:44 +02:00
language_models
language_models: Add support for tool use to LM Studio provider (#30589)
2025-05-26 13:54:17 +02:00
language_selector
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
language_tools
language_tools: Increase available space for language server logs (#30742)
2025-05-27 00:57:45 +03:00
languages
task: Wrap programs in ""s (#31537)
2025-05-27 19:33:16 +02:00
livekit_api
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
livekit_client
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
lmstudio
language_models: Add support for tool use to LM Studio provider (#30589)
2025-05-26 13:54:17 +02:00
lsp
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
markdown
Fix some completion docs render delays (#31486)
2025-05-27 04:58:02 +00:00
markdown_preview
Canonicalize markdown link paths (#29119)
2025-05-21 12:57:51 -04:00
media
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
menu
agent: Add new panel navigation dropdown (#29539)
2025-04-29 21:58:45 -03:00
migrator
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
mistral
mistral: Add DevstralSmallLatest model to Mistral and Ollama (#31099)
2025-05-22 14:22:35 -04:00
multi_buffer
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
node_runtime
Fix unzipping clangd and codelldb on Windows (#31080)
2025-05-21 21:17:14 +03:00
notifications
component: Replace linkme with inventory (#30705)
2025-05-14 23:29:11 +02:00
ollama
mistral: Add DevstralSmallLatest model to Mistral and Ollama (#31099)
2025-05-22 14:22:35 -04:00
open_ai
open_ai: Fix parallel tools issue (#30467)
2025-05-26 11:46:35 +00:00
outline
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
outline_panel
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
panel
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
paths
Cursor settings import (#31424)
2025-05-27 14:14:25 -04:00
picker
picker: Improve input padding (#31422)
2025-05-26 09:55:47 -03:00
prettier
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
project
Enable merge conflict parsing for currently-unmerged files (#31549)
2025-05-27 13:34:39 -07:00
project_panel
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
project_symbols
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
prompt_store
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
proto
Allow LSP adapters to decide, which diagnostics to underline (#31450)
2025-05-26 22:19:02 +03:00
recent_projects
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
refineable
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
release_channel
Use shortened SHA when displaying version to install (#31281)
2025-05-23 14:53:53 +00:00
remote
Make it possible to use cargo-zigbuild for ZED_BUILD_REMOTE_SERVER (#31467)
2025-05-27 16:56:27 +00:00
remote_server
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
repl
Add kernel detection for language support of runnable markdown cells (#29664)
2025-05-21 20:23:05 -07:00
reqwest_client
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
rich_text
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
rope
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
rpc
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
rules_library
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
schema_generator
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
search
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
semantic_index
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
semantic_version
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
session
Avoid unnecessary DB writes (#29417)
2025-04-25 17:41:49 +03:00
settings
Cursor settings import (#31424)
2025-05-27 14:14:25 -04:00
settings_ui
Cursor settings import (#31424)
2025-05-27 14:14:25 -04:00
snippet
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
snippet_provider
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
snippets_ui
snippets: Add icons and file names to snippet scope selector (#30212)
2025-05-26 13:44:09 +00:00
sqlez
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
sqlez_macros
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
story
gpui: Add a standard text example (#30747)
2025-05-16 17:35:44 +02:00
storybook
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
streaming_diff
Introduce a new StreamingEditFileTool (#29733)
2025-05-01 17:37:43 +02:00
sum_tree
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
supermaven
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
supermaven_api
Keep file permissions when extracting zip archives on Unix (#31304)
2025-05-23 20:45:32 +00:00
tab_switcher
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
task
task: Wrap programs in ""s (#31537)
2025-05-27 19:33:16 +02:00
tasks_ui
debugger beta: Autoscroll to recently saved debug scenario when saving a scenario (#31528)
2025-05-27 21:35:17 +03:00
telemetry
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
telemetry_events
Add new action to run agent eval (#29158)
2025-04-21 21:30:21 -07:00
terminal
terminal: Consume event during processing (#30869)
2025-05-23 14:28:53 +03:00
terminal_view
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
text
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
theme
theme: Add colors for minimap thumb and border (#30785)
2025-05-26 18:23:41 +00:00
theme_extension
Add workspace-hack (#27277)
2025-04-02 13:26:34 -07:00
theme_importer
theme: Add colors for minimap thumb and border (#30785)
2025-05-26 18:23:41 +00:00
theme_selector
theme_selector: Don't select last theme when fuzzy searching (#28278)
2025-04-28 14:29:17 +00:00
time_format
agent: Add date separators to Thread History (#29961)
2025-05-06 10:18:48 +00:00
title_bar
Remove the ability to book onboarding (#31404)
2025-05-26 15:02:51 +03:00
toolchain_selector
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
ui
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
ui_input
component: Replace linkme with inventory (#30705)
2025-05-14 23:29:11 +02:00
ui_macros
Update syn crate from 1.0.109 to 2.0.101 (#31301)
2025-05-23 19:31:25 +00:00
ui_prompt
markdown: Don't retain MarkdownStyle in favor of using MarkdownElement directly (#28255)
2025-04-07 19:03:24 +00:00
util
Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443)
2025-05-26 17:43:57 +00:00
util_macros
Fix license symlinks (#29758)
2025-05-01 19:24:14 +00:00
vim
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
vim_mode_setting
VSCode Settings import (#29018)
2025-04-23 20:54:09 +00:00
web_search
agent: Expose web search tool to beta users (#29273)
2025-04-23 15:30:20 +00:00
web_search_providers
Use anyhow more idiomatically (#31052)
2025-05-20 23:06:07 +00:00
welcome
Remove the ability to book onboarding (#31404)
2025-05-26 15:02:51 +03:00
workspace
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
worktree
Use read-only access methods for read-only entity operations (#31479)
2025-05-26 23:04:31 -04:00
zed
Rename assistant_settings to agent_settings (#31513)
2025-05-27 15:16:55 +00:00
zed_actions
debugger: Add keyboard navigation for breakpoint list (#31221)
2025-05-26 19:40:07 +00:00
zeta
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
zlog
zlog: Replace usages of env_logger in tests with zlog (#31436)
2025-05-26 11:48:50 -04:00
zlog_settings
VSCode Settings import (#29018)
2025-04-23 20:54:09 +00:00