mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 06:59:22 +01:00
main
1931 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
3c2118dd69 |
Correct hosted model pricing and availability (#67165)
Update the hosted-model reference to match Cloud's customer-visible catalog. - Add Claude Haiku 5.5 pricing and its enforced 100k context window. - Add Gemini 3.8 Flash pricing and its 1M context window. - Move retired GPT-5.2-Codex out of the pricing/context tables and replace the stale recommendation with GPT-5.3-Codex. - Leave GPT-6.2 models out of the public reference while their rollout is staff-only. Prices come from Cloud's `crates/billing/src/plans.rs`, including the 10% Zed markup. Context limits come from `crates/llm_api/src/services/model_service.rs`. The customer rollouts are cloud#4143 and cloud#3909; GPT-5.2-Codex retirement is cloud#3135. No billing data, database rows, or model access changes. The human author reviewed the changes and removed the required README.md review notice; that removal has been committed and pushed. This is the single source PR to main; the premature manual stable PR #67166 is closed. Publishing to preview and stable will use the docs workflow, with its source revision explicitly verified first. `script/trigger-docs-build --from-main` selects the workflow from main but still checks out the channel release branch; it does not copy this PR from main. Fable 5.2 documentation is already present on the current stable branch and public Markdown page. Validation: - `cd docs && npx --yes prettier --check src/account/zed-hosted-models.md` passed. - `git diff --check` passed. - A Python consistency check passed: 35 models have matching pricing/context entries; all documented prices apply exactly 10% markup; new rates, context limits, retirement, Fable retention, and GPT-6.2 exclusion match the intended change. - `cd docs && npx --yes prettier --check src/` reports pre-existing formatting issues in six unchanged files: configuring-languages.md, development.md, extensions/themes.md, languages/r.md, reference/all-settings.md, and vim.md. Those files are out of scope. - The full mdBook build was not run locally. Release Notes: - N/A |
||
|
|
e944cfa2fe |
docs: Mention system clipboard register in Helix's core differences (#67140)
## Summary After the discussion on https://github.com/zed-industries/zed/issues/66782, update the Helix mode's documentation, specifically in the "Core Differences" section to mention that, by default, the system clipboard register is used for yanking, deleting and pasting and instructing users how to set `vim.use_system_clipboard` to make it behave just like Helix and use the internal register by default instead. ## Testing Tested manually by running `mdbook serve docs` and reading that section of the documentation. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - N/A |
||
|
|
d3d58c304b |
docs: Mention that new MCP server extensions will no longer be accepted (#67045)
Release Notes: - N/A |
||
|
|
917559da35 |
sidebar: Add keyboard navigation to the thread switcher (#66951)
## Summary The thread switcher only cycles: `ctrl-tab` steps forward, `ctrl-shift-tab` steps back, and releasing the modifier confirms. Its view only handles `menu::Confirm`, `menu::Cancel` and `agents_sidebar::ToggleThreadSwitcher`, so the global `menu::SelectNext` / `menu::SelectPrevious` bindings – arrow keys, `ctrl-n` / `ctrl-p` – and `menu::SelectFirst` / `menu::SelectLast` do nothing while it is open. With threads from several workspaces in the list, reaching the nth entry costs n−1 presses of the trigger. This PR makes the switcher handle those four actions, like the other modal lists in Zed: - Next and previous wrap around and preview the selected thread without confirming it, the same way the cycle bindings do. - `ctrl-up` / `ctrl-down` are bound in the `ThreadSwitcher` context, mirroring the tab switcher, so the selection can move while the modifier that opened the switcher is still held. On macOS, `ctrl-up` / `ctrl-down` are taken by Mission Control and App Exposé by default, so they may never reach Zed – `ctrl-n` / `ctrl-p` still work with `ctrl` held. The thread switcher paragraph in `docs/src/ai/parallel-agents.md` mentions the new keys. Proposed in discussion #66923. https://github.com/user-attachments/assets/b5138dab-3e16-4e2a-a99a-a5b7708a66bc ## Testing - `test_thread_switcher_menu_navigation_wraps_without_confirming` covers wrapping in both directions, `SelectFirst` / `SelectLast`, and checks that stepping previews a thread without confirming it or recording an access – only `menu::Confirm` does. - `cargo test -p sidebar` and `./script/clippy -p sidebar` pass locally. - Tested manually on macOS: open the switcher with `ctrl-tab`, keep `ctrl` held and step with `ctrl-n` / `ctrl-p`, release to confirm. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Added keyboard navigation to the thread switcher: arrow keys, `ctrl-n` / `ctrl-p`, Home / End, and `ctrl-up` / `ctrl-down` while the switcher's modifier is held. |
||
|
|
12c1fc907f |
agent: Prompt for always_confirm patterns on in-project file edits (#67037)
`edit_file` and `write_file` skip the permission prompt for files inside the project whenever the settings decision is `Confirm`. That is intended for a `confirm` default, where in-project edits are reviewed after the agent makes them. It also swallowed explicit `always_confirm` patterns, which the docs say always prompt. - `authorize_file_edit` now prompts when an `always_confirm` pattern matches the path. It checks both the raw path and its normalized form, so a `..` segment can't sidestep a pattern. - A `confirm` default is unchanged: in-project edits still don't prompt. - The docs, `default.json` and the `ToolPermissionMode::Confirm` doc comment described `confirm` as "always prompt". They now describe what the edit tools do with a `confirm` default and point to `always_confirm` for prompting on specific files. Related to #62276. This is an alternative to #66684, which would prompt on every in-project edit under the default settings. Release Notes: - Fixed `always_confirm` patterns for the `edit_file` and `write_file` agent tools not prompting for files inside the project. |
||
|
|
a57e2fdc38 |
Unifying agent instructions to AGENTS.md (#66716)
## Summary Closes #66715 It's a follow-up of #45939 ## Testing This PR includes two commits. The first commit only removes CLAUDE.md and GEMINI.md, and the second involves changes to [dangerfile.ts](https://github.com/zed-industries/zed/blob/main/script/danger/dangerfile.ts). Reset the second if not favored. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
3e23a0c482 |
Change the default settings value for file_finder.prefill_query_from_selection (#66856)
Closes https://github.com/zed-industries/zed/issues/66651 Changes the default for `prefill_query_from_selection`, as this is a rather intrusive setting/breaking change and should not have went in like it did here for all finders. ## Testing Updated the existing tests. ## Self-review - [X] I've reviewed my diff for quality, security, reliability, and performance. - [N/A] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [X] Tests cover the new or changed behavior. Release Notes: - Breaking: Changed the default value for the `file_finder.prefill_query_from_selection` from `true` to `false`. If you want to return to the previous behavior, toggle the setting at [zed://settings/file_finder.prefill_query_from_selection](zed://settings/file_finder.prefill_query_from_selection) |
||
|
|
b6ff193ba6 |
Stop showing worktree trust modal after "Stay in Restricted Mode" is called (#66649)
Closes https://github.com/zed-industries/zed/issues/58246 * Starts to remember "Stay in Restricted Mode" calls to avoid repeated worktree trust pop-ups * Uses `RemoteConnectionIdentity` instead of the prior type (removed) as more detailed remote host identifier (has a port value now) * Migrates worktree trust DB to that, more detailed, data format Release Notes: - Stopped showing worktree trust modal after "Stay in Restricted Mode" is called |
||
|
|
ba06cc5191 |
Add setting to show/hide title bar (#65671)
## Summary Restores `title_bar.show` from #37428 with `always`, `never`, and `hide_in_full_screen`. - On macOS the whole native titlebar is hidden, so fullscreen no longer reveals an empty bar at the top edge. - The Threads Sidebar and thread history headers drop their window controls together with the title bar. - With client-side decorations, the window frame is square at corners where no title bar, status bar or sidebar rounds the content. - Leaving the Threads Sidebar falls back to the workspace when the previously focused element is gone. Includes macOS window-control handling adapted from #42540. Related discussion: #55183. ## Testing Tests and clippy for the touched crates pass on macOS and Linux. Not run on Windows or under a real Linux compositor. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover visibility changes and focus restoration. Release Notes: - Added a setting to hide the title bar always or only in fullscreen. - [GPUI] Added `Window::set_native_titlebar_visibility` on macOS and `FocusHandle::is_rendered`. - [GPUI] Fixed fullscreen changes not notifying window bounds observers on Wayland and X11. - [GPUI] Fixed the macOS titlebar staying opaque after a failed fullscreen entry. --------- Co-authored-by: Kirill Bulatov <mail4score@gmail.com> |
||
|
|
92cc693f0e |
Document hosted Claude Fable 5.2 pricing (#66822)
Release Notes: - N/A |
||
|
|
4ed72e0135 |
docs: Clarify that Bun tests can be run but not debugged (#66642)
## Summary The JavaScript and TypeScript pages list Bun as a test framework you can debug without extra config. That's not the case: `@types/bun` only adds the `bun test` run tasks, and `vscode-js-debug` can't debug Bun, which is what #49033 ran into. This drops Bun from that list on both pages and rewrites the note: Bun tests can be run as tasks, but not debugged. Closes #49033 ## Testing Docs only, same change on both pages. `prettier@3.5.0 --check` passes on both files. I checked the claim against the code rather than in the debugger: `@types/bun` only sets `bun_package_path` (`crates/languages/src/package_json.rs`), which adds the two `bun test` tasks in `crates/languages/src/typescript.rs`, and `NodeLocator` (`crates/project/src/debugger/locators/node.rs`) only builds debug scenarios for `$TYPESCRIPT_RUNNER`, `npm`, `pnpm` and `yarn`, so those tasks never show up in the debugger. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). N/A, docs only. - [ ] Tests cover the new or changed behavior. N/A, docs only. Release Notes: - N/A |
||
|
|
597c383bcd |
Respect focus when selecting CLI workspaces (#66386)
## Summary When worktree matches tie, prefer the focused window and the active workspace within each window. When `--add` has no matching worktree, reuse the preferred workspace. For diff-only `--add`, reuse a focused local window without adding the working directory as a root. --- I've been carrying variations of these changes for a while, since the UX of using Jujutsu in the integrated terminal with Zed hasn't been great. ## Testing Manually tested using Jujutsu and the following configuration: ```toml [merge-tools.zed] diff-args = ["--add", "--diff", "$left", "$right"] edit-args = ["--wait", "--add", "--diff", "$left", "$right"] ``` ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Fixed `zed --add` choosing the wrong window or project when matches are ambiguous, and stopped `zed --add --diff` from adding an unwanted project folder. |
||
|
|
94f3eb1b72 |
Bookmark picker (#60005)
# Objective - Add a picker for bookmarks to view all bookmarks in the workspace, with support for filtering, previewing, opening files and jumping to corresponding positions. ## Solution - Add a picker delegate and related actions to pop up a picker modal displaying the bookmark list upon trigger - Display the label of the bookmark, its file path and line number. If the bookmark label is empty, use the text on the line where the bookmark is located as the label. - Support enabling preview to view surrounding code of bookmarks simultaneously - Open the preview tag and reuse the existing tab pane on primary confirm; open a separate tab pane on secondary confirm - Design distinct result display layouts for horizontal and vertical modes to prevent excessive text truncation ## Testing - Conducted manual testing - Added two test cases ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase https://github.com/user-attachments/assets/4126fec0-0177-4f05-8cd8-738e6c358164 ## Current Limitations - The current picker does not provide initial layout information to its delegate. If it is opened in horizontal mode initially, the result list will render in vertical mode, causing severe text truncation. This issue should be straightforward to resolve with minor adjustments to the picker-related code. #60007 - The current preview highlights bookmark rows by matching the full line of text, which results in an unappealing visual effect. It would be preferable if the picker code could support full-row highlighting natively in a future update. --- Release Notes: - Added a picker to show all bookmarks inside current workspace |
||
|
|
9a8ab54db4 |
agent: Allow auto title generation to be disabled (#63998)
# Objective The objective of this PR is to add a configuration option to disable automatic title generation for agent threads. This feature is desirable for users (e.g. as discussed in #63701) with token-based or compute constraints as it can prevent unnecessary (for some) overhead from title generation in addition to unnecessary large cache misses. My personal motivation is that automatic title generation pushes my entire context to my compute backend, which is a complete cache miss because (it appears) the prefix to the prompt is different. Whether it is intentional or not, automatic title generation can fire concurrent to actual generation (see Misc Notes [1]), slowing down my machine (and the output) considerably. ## Solution This PR adds a configuration option, which is exposed in the UI as well as through the standard settings.json channels, to disable automatic title generation. It's worth noting that manual title generation, as well as manual thread renaming, is still preserved. The configuration merely disables the _automatic_ title generation when the option is enabled. Ignoring the code for setting up the configuration option, this PR effectively adds a single condition to the `generate_title` call in `thread.rs` (in `run_turn_internal` that constitutes the automatic title generation. To my knowledge, this is what constitutes the "automatic title generation" and in the situation where I've seen it triggered reliably, it is no longer triggered when the disabling option is set. ## Testing - Did you test these changes? If so, how? - _Yes. I tested the functionality manually through disabling the "Auto-Generate Thread Titles" option in the Settings UI and triggering the condition where I knew automatic title generation would fire (described in Misc Notes [1]). I also tested manual title renaming and the "Regenerate thread title" function to ensure those functions were not affected. I also ran `cargo test --workspace`, which succeeded, and did UI regression tests (although it appears that my settings menu changes were not covered by them, since they did not fail when I didn't update the baseline)_ - _I also added automated tests for the feature, as well as tests to ensure that manual title generation is not affected._ - Are there any parts that need more testing? - _I was unable to fully test "Regenerate thread title" because it seems incompatible with my local LLM (it gets updated to a blank string after the compute backend returns). This is the case with the latest stable Zed (v1.19.2) and does not constitute a regression in my eyes. The automated tests I wrote should cover any regressions for users with a fully functional "Regenerate thread title" button._ - How can other people (reviewers) test your changes? Is there anything specific they need to know? - _Try to trigger automatic title generation with "Auto-Generate Thread Titles" enabled and disabled. You can verify that manual title generation ("Regenerate Thread Title") and manual title renaming also works._ - _It's worth noting that hosting my own compute backend (oMLX) was crucial in discovering and diagnosing this problem. If a tester does not have access to this, they will need to find another method of knowing if the `generate_title` method fires (such as a simple `println!`)._ - If relevant, what platforms did you test these changes on, and are there any important ones you can't test? - _**I only tested my changes on macOS 27 beta**, although the change set should be platform agnostic._ ## Self-Review Checklist: - [X] I've reviewed my own diff for quality, security, and reliability - [X] Unsafe blocks (if any) have justifying comments - [X] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [X] Tests cover the new/changed behavior - [X] Performance impact has been considered and is acceptable ## Showcase I have provided a screenshot of the location of the new toggle below <details> <summary>Click to view screenshot of Settings page</summary> <img width="1012" height="863" alt="Screenshot 2026-09-09 at 9 41 27 PM" src="https://github.com/user-attachments/assets/5dd14f38-8cd1-46d1-b5bf-f2a6fb68c628" /> Above is a screenshot of the placement of the new Settings Menu item ("Auto-Generate Thread Titles"). It is disabled, which is not the default. </details> ## Misc Notes [1]: My "sure fire" way of triggering the automatic title generation (at an inconvenient time) is to stop a prefill request after sending a message in an existing thread (which will trigger the automatic title generation) then resend the message. Perhaps a healthier behaviour would be to cancel in-progress title generation if another generation request come in, but I think it is advantageous to give users an option to disable automatic title generation regardless. **LLM-Use Disclosure:** I used an LLM to assist in isolating the part of the code responsible for automatic title generation triggering and generating a portion of the code I am posting here. I have thoroughly understood, checked, and tested the code which I am submitting manually, and take full professional responsibility for its quality. I have added a `Signed-off-by` section to my commit message to indicate my signing off, and a `Co-Authored-By` section to indicate LLM use. **No LLM was used in the writing of this PR text or commit message.** Thank you! Please let me know if you want me to change anything. --- Release Notes: - Feature: Added a configuration option to disable automatic title generation for agent threads --------- Signed-off-by: Frederick Morlock <me@freddy.us> Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
e231594b6b |
git: Add date format and per-view date style settings (#66533)
## Summary resolves #15272, take 2 of #58950 tl;dr: add following options: ```json { "git": { "date_format": "locale", // "locale" (default), "iso", or a strftime format like "%Y-%m-%d %H:%M" "blame": { "date_style": "relative" }, "inline_blame": { "date_style": "relative" }, "branch_picker": { "date_style": "relative" }, "stash_picker": { "date_style": "relative" } }, "git_panel": { "date_style": "relative" }, "git_graph": { "date_style": "absolute" } } ``` design per https://github.com/zed-industries/zed/pull/58950#issuecomment-6017682621, also pinging @smitbarmase per request ## Testing screenshots are taken on fedora linux 44 + kde plasma 6.7.5 <img width="2560" height="1440" alt="image" src="https://github.com/user-attachments/assets/0784f1f7-0e00-4be5-893d-775d617b33e4" /> <img width="1125" height="937" alt="image" src="https://github.com/user-attachments/assets/7ae6c876-3a93-4876-a151-85632d54d982" /> <img width="1407" height="340" alt="image" src="https://github.com/user-attachments/assets/2178804a-444b-4613-9024-3700b15e0cfe" /> changed each config values `Date Format {locale/iso/strftime} x Date Style {relative/absolute}` and they all seem to work without issues also, invalid date format will default to `locale` (with an warning log like below) ``` 2026-11-05T00:14:08+09:00 WARN [project::project_settings] Invalid git.date_format: invalid component name `Q` at byte index 1 ``` ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Added `git.date_format` and per-view `date_style` settings for git dates --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
4814ef66aa |
Document how preferred_line_length affects Rewrap (#66534)
Closes #47449 ## Summary The docs for `preferred_line_length` only describe soft wrap, but the setting also controls the column `editor::Rewrap` wraps to, even when soft wrap is off. This adds that to the setting's entry in `all-settings.md` and to its comment in `default.json`. The old description also appears in `crates/settings_content/src/language.rs` and `crates/settings_ui/src/page_data.rs`. I left those alone to keep this docs-only, but I'm happy to update them too if you'd like. ## Testing Tested on macOS with Zed 1.26.2, the installed release, since this PR only changes docs and a comment. 1. Add these settings: ```json "languages": { "Plain Text": { "preferred_line_length": 40, "soft_wrap": "none" } } ``` 2. In a `.txt` file, paste one long line of text with spaces and run `editor: rewrap`. It wraps at column 40. 3. Undo, change `soft_wrap` to `editor_width`, and run `editor: rewrap` again. It still wraps at column 40. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). (N/A: no UI changes) - [ ] Tests cover the new or changed behavior. (N/A: docs and comment only) Release Notes: - N/A --------- Co-authored-by: Kirill Bulatov <mail4score@gmail.com> |
||
|
|
9fa6fd3f44 |
Worktree picker: search also by branch name (#66384)
## Summary In the worktree picker, can now search by both branch and worktree name instead of only by worktree name. With the current implementation whenever the worktree and a checked out branch do not share same name and the user wants to switch worktree, they have to remember the worktree name, or do some workaround like launching `zed .` from the worktree. It's not possible to switch worktree using the branch picker, as it will try to check out the branch in the current worktree (this change doesn't touch that behaviour). An example where it exists a branch named `a-random-branch` checked out in worktree `zed-deliberate-purpose` Before, when searching by `random` the worktree does not appear: <img width="696" height="197" alt="image" src="https://github.com/user-attachments/assets/cd1674c1-3ca6-4337-ad16-439f58df9e03" /> After, it is fuzzy matched because of the branch name: <img width="668" height="189" alt="image" src="https://github.com/user-attachments/assets/ed521e76-bc1b-4e4e-b662-7caba46ff91a" /> ## Testing I manually tested the change, but only on macOS. I have been using it for a few weeks with megarepos and tens of worktrees/branches. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Added the possibility to search also by branch name in the worktree picker. |
||
|
|
8e8f54c67e |
Actualize all-settings.md contents (#66410)
Update stale defaults and add missing entries from default.json Release Notes: - N/A --------- Co-authored-by: Finn Evers <finn@zed.dev> |
||
|
|
504abf602a |
feat: config to toggle edit prediction button in the status bar (#66450)
## Summary Resolves https://github.com/zed-industries/zed/discussions/26095 https://github.com/user-attachments/assets/fca26dcc-e526-4e69-b611-4b3cdcc91066 ## Testing Manually test your changes; report results, mention platforms if relevant. How can reviewers test this easily? Include setup and steps. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [ ] Tests cover the new or changed behavior. Release Notes: - Added an `edit_predictions.button` setting to toggle the edit prediction button in the status bar |
||
|
|
00b86477f8 |
debugger: Allow configuring the default panel size (#66435)
Closes #66412 Add `debugger.default_width` for left/right docking and `debugger.default_height` for bottom docking, along with controls in the Settings Editor. Both default to 300 pixels, preserving the existing default size. ## Testing - All 22 debugger panel tests and 76 Settings Editor tests pass. - Built and visually checked the Settings Editor on macOS with defaults of 300/300 and custom values of 495/275 after relaunch. - Rust formatting, documentation formatting, and `git diff --check` pass. Release Notes: - Added support for configuring the debugger panel’s default size via `debugger.default_width` and `debugger.default_height`. Co-authored-by: Amp <amp@ampcode.com> |
||
|
|
9e23c1f43e |
docs: Load c15t from the hosted CDN (#66413)
Replace the vendored c15t v2 bundle with the Inth-hosted c15t v3 script. Release Notes: - N/A |
||
|
|
2eb2928c15 |
tasks: Do not run worktree hooks in restricted mode (#66284)
## Summary What problem does this solve, how, and why does this change matter? Use "Closes #123" for each issue resolved. Include artifacts produced when testing: before/after screenshots, GIFs, videos, benchmarks. ## Testing Manually test your changes; report results, mention platforms if relevant. How can reviewers test this easily? Include setup and steps. ## Self-review - [ ] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [ ] Tests cover the new or changed behavior. Release Notes: - Worktree task hooks no longer run when a given workspace is in restricted mode. |
||
|
|
5a534d7b5d |
git: Add git auto fetch (#53089)
## Summary
Adds an opt-in periodic background `git fetch --all` for local
repositories, so remote-tracking branches and ahead/behind counts stay
current without a manual fetch.
Because the fetch runs unattended, it behaves differently from a
user-initiated fetch:
- **Trusted repositories only.** Re-checked on every tick, since a
worktree can be trusted or restricted at any point in a session.
- **Never prompts.** Credentials that need no interaction (e.g. an SSH
agent, or a credential helper answering from a keychain) still work.
Anything that would need input fails instead of blocking on a prompt
nothing will answer.
- **Silent.** No activity indicator in the status bar, since a spinner
every minute is noise. Failures are logged at debug level.
- **Stays out of the user's way.** It runs off the repository's serial
job queue, so status refreshes and staging aren't stalled behind the
network. A user-initiated fetch, pull, or push preempts an in-flight
background fetch rather than waiting for it.
- **Leaves the repository clean when stopped.** Stopping a fetch (a
settings change, preemption, closing the project) asks git to terminate
so it can remove its ref lockfiles, rather than killing it and leaving a
stale `.lock` behind that breaks every later fetch. It also never
triggers auto-maintenance on the user's behalf.
## Configuration
```json [settings]
{
"git": {
"auto_fetch": {
"enabled": false,
"interval_secs": 60
}
}
}
```
- `enabled` (default `false`): whether to fetch from all remotes in the
background.
- `interval_secs` (default `60`, clamped to a minimum of `15`): how
often to fetch.
Both are exposed in the settings UI under **Version Control > Git
Integration**, where the interval is only shown while auto-fetch is
enabled, and documented in `docs/src/reference/all-settings.md`.
Unrelated settings changes don't restart the timer.
## Implementation design
### `GitCaller`
The remote-capable `GitRepository` methods (`fetch`, `pull`, `push`,
`commit`) take a `GitCaller` instead of a bare `AskPassDelegate`:
```rust
pub enum GitCaller {
/// A user started this and is waiting on it. Prompts route to the UI.
User(AskPassDelegate),
/// No user attached. Never prompts, and stops when the receiver resolves.
Background(Option<oneshot::Receiver<()>>),
}
```
Every such command goes through `GitBinary::run_remote_command`, which
applies everything the caller implies. git, credential helpers, and ssh
each prompt through a different mechanism, so keeping the list in one
place means no call site can miss one. For `Background`:
| Prompt channel | Mitigation |
| --- | --- |
| git's own terminal prompt | `GIT_TERMINAL_PROMPT=0` |
| Credential helpers | `credential.interactive=false`, which is narrower
than clearing `credential.helper` so helpers that answer without
prompting keep working |
| askpass | `core.askPass=`, and `GIT_ASKPASS`/`SSH_ASKPASS` unset |
| ssh (key passphrases, host key confirmation) | `-o BatchMode=yes`
composed onto the ssh command git would otherwise use
(`GIT_SSH_COMMAND`, then `core.sshCommand`, then `ssh`), so custom ssh
commands keep working. Setups that only set the deprecated `GIT_SSH` are
left alone, since setting `GIT_SSH_COMMAND` would silently replace them.
|
`gc.auto=0` is also set, since auto-maintenance can repack the whole
repository. gpg's pinentry when signing isn't covered, as no background
caller signs.
### Cancellation
A background command is spawned with `kill_on_drop` and raced against
its cancel receiver, where a dropped sender counts as cancellation:
1. If already cancelled before spawning, git is never started.
2. On cancellation, git is sent `SIGTERM`
(`util::process::request_termination`), which runs its handlers that
remove lockfiles.
3. If it hasn't exited within a 2s grace period, it's killed.
Windows has no equivalent signal, so cancellation there is a kill.
### Scheduling
- Each repository has a timer task, restarted only when `enabled` or
`interval_secs` change.
- On each tick, the timer checks trust, then tries to acquire the
repository's `fetch_lock` semaphore and skips the tick if it's held. It
spawns a **detached** fetch task that holds the permit until the fetch
settles.
- `AutoFetchState.cancel` holds the sender, and is the only thing
bounding the fetch's lifetime. It's dropped on a settings change, on
preemption, and when the repository is dropped, so every way of stopping
a fetch goes through graceful cancellation.
- Running off the serial job queue is safe because auto-fetch mutates no
`Repository` state. It only updates remote-tracking refs, which git
guards with its own lockfiles, and the results reach the UI via the
resulting git directory rescan. Manual fetch stays on the queue, since
it also writes snapshot state via `refresh_branch_list`.
- `fetch`, `pull`, and `push` call `preempt_auto_fetch()`, which drops
the cancel sender, then wait on `fetch_lock` inside their job. That wait
is bounded by a cancelled fetch shutting down rather than by the
network, and stops them failing with "cannot lock ref" against a
background fetch.
## Test plan
`test_auto_fetch` covers:
- [x] An untrusted repository is never auto-fetched, and fetching begins
once its worktree is trusted
- [x] Timer fires on schedule, and again on the following interval
- [x] Unrelated settings change mid-interval doesn't reset the timer
- [x] Disabling `auto_fetch` stops all fetches
- [x] Re-enabling with a longer interval respects the new cadence
## Review
Self-Review Checklist:
- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable
Addresses
#24611(https://github.com/zed-industries/zed/discussions/24611)
Release Notes:
- git: Added option (off-by-default) to automatically fetch upstream of
the current branch and default upstream of the project. Enable it with:
```
{
"git": {
"auto_fetch": {
"enabled": false,
"interval_secs": 60
}
}
}
```.
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Codex (GPT-6) <noreply@openai.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
|
||
|
|
2c2f737ab2 |
gpui: Add sendable foreground execution for web HTTP clients (#66165)
## Summary This cleans up the gpui_platform code a bit, and in combination the way we set up the http client for the web. This does introduce a `ForegroundExecutor` variant that it itself is Send-able, allowing to dispatch foreground futures from background workers (by requiring the future to be Send, unlike `ForegroundExecutor`), which is a requirement for web fetch. a31c7b54c60738b82524e4e4c12aec2f6caf101d fixes a bunch of warnings with our binary names Release Notes: - [gpui] N/A |
||
|
|
f14592c4a5 |
Require macOS 12 and SDK 26 (#65994)
Closes https://github.com/zed-industries/zed/issues/9307 Use SDK 26 and require newer macOS. The latter allows to remove a few deprecated API usages. Release Notes: - [GPUI] BREAKING: bumped minimum macOS version to 12 (Monterey) |
||
|
|
eee7501970 |
agent: Remove checkpoints (#65989)
Closes #62283 Closes #58444 Follow-up #65304 Supersede #64000, #62301 Before every message, the agent snapshotted every Git repo in the project and waited for it before sending the prompt, and every Git status change during a turn took another one. In large workspaces this took tens of seconds, and on Windows it could hang forever. #65304 already skipped it for external agents and subagents. The snapshot only exists for "Restore Checkpoint", which very few people use, so this removes checkpoints entirely. Putting them behind a setting would keep the snapshot code and its maintenance around for a feature few people use. - Removed: - "Restore Checkpoint" button - Snapshots before, during and after each turn - Git, remote and proto code behind them (proto ids reserved) - Checkpoints docs section - Stays: - Editing an earlier message - Rejecting the agent's edits - Worktree archive snapshots Release Notes: - Removed agent checkpoints and the "Restore Checkpoint" button. Taking a checkpoint before every message made the agent slow to respond, or hang, in large Git repositories. To undo the agent's changes, reject its edits or use Git. |
||
|
|
340c703bb2 |
project_panel: Preserve clipboard contents when duplicating entries (#60894)
# Objective - Duplicate in the project panel currently overwrites the system clipboard, and also replaces any pending Copy or Cut in the panel. - Fixes #60891 ## Solution - Duplicate now copies the selected entries directly through the project's copy path instead of running Copy then Paste. - That avoids writing file paths to the system clipboard and leaves the panel's pending Copy/Cut state alone. - Copy, Cut, and Paste keep their existing clipboard behavior. Filename disambiguation, recursive directory copies, undo, selection updates, auto-open, and the rename editor still go through the shared transfer path. ## Testing - Added `test_duplicate_preserves_clipboards`, which checks that Duplicate leaves the system clipboard unchanged, still copies the selected entry, does not paste external clipboard paths, and still honors a pending Cut afterward. - Ran `cargo test -p project_panel test_duplicate_preserves_clipboards`. - Existing `test_create_duplicate_items` still covers the rename-after-duplicate UI. - Reviewers can reproduce the original bug by copying some text, duplicating a file or folder in the project panel, then pasting: the original text should still be there. Copy and Cut should still write paths to the system clipboard as before. - The clipboard write is platform-agnostic. I did not do a separate Windows/Linux UI pass beyond the unit test. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - Fixed duplicating files or folders in the project panel overwriting clipboard contents. --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
5d47f83542 |
Allow opening README files by default (#65389)
Closes https://github.com/zed-industries/zed/discussions/38228 https://github.com/user-attachments/assets/4f80a4a8-8e4a-499b-b51f-4d389fe1f781 Release Notes: - Added a way to open README files by default, use `"on_new_window": "readme",` to configure |
||
|
|
d7adf3e7e2 |
project_panel: Add extension sort order (#65776)
Adds an `extension` value to `project_panel.sort_order` so files with the same extension appear consecutively. - Files are grouped by lowercased last extension in ascending order (`foo.tar.gz` groups under `gz`). - Extensionless files and dotfiles come first. - Within a group, names use the existing natural sort. - `sort_mode` still controls directories vs. files. Directories count as having no extension so `mixed` mode keeps a consistent (transitive) ordering. Includes unit tests in `util`, a panel-level test, a benchmark entry, and settings/docs updates. Release Notes: - Added an `extension` option to `project_panel.sort_order` that groups files by extension 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: Kirill Bulatov <mail4score@gmail.com> |
||
|
|
d678e7de4d |
Document Gemini 4 Argon hosted pricing (#65707)
Add Gemini 4 Argon to the hosted-model pricing and context-window tables, and note its cached-input billing. Part of CLO-1544. Release Notes: - N/A |
||
|
|
953ac75529 |
Add builtin Pyrefly language server support (#44262)
I'm continuing the work of @lolpack's PR https://github.com/zed-industries/zed/pull/40953. This makes it such that user no longer needs to install the external pyrefly extension to use pyrefly. It also auto-downloads Pyrefly binary when there's no existing installation, which the pyrefly extension currently can't do. We don't publish Pyrefly release artifacts to github (yet), so the easiest way to obtain a Pyrefly installation is with PyPI. Given that the PyLSP adapter is already doing a PyPI-based installation, I've essentially copy&pasted most of the logic from there into pyrefly adapter so Pyrefly could work in exactly the same way for now. There are a lot of code duplications here! My thought was to get the functionality in first, and I can send followup PRs to extract duplicated code into common helper functions. I tested the change in 2 scenarios: - No `pyrefly` binary is found in `$PATH` - There's an existing `pyrefly` binary in `$PATH` -- I obtained it with `uv tool install pyrefly`. In both scenarios I ran the test by removing the Pyrefly exteranl plugin, start Zed, open a `.py` file with type errors in it, and verify that cmd-click (gotodef) works. Console output for scenario 1: ``` > cargo run Blocking waiting for file lock on package cache Blocking waiting for file lock on package cache Blocking waiting for file lock on package cache Finished `dev` profile [unoptimized + debuginfo] target(s) in 31.62s Running `target/debug/zed` 2025-12-04T20:58:07-08:00 INFO [zed] ========== starting zed version 0.217.0+dev.65f328bd614282c1c370672106a9a279f8f22a3a, sha 65f328b ========== 2025-12-04T20:58:08-08:00 WARN [zed::reliability] Minidump endpoint not set 2025-12-04T20:58:08-08:00 INFO [extension_host] extensions updated. loading 2, reloading 0, unloading 0 2025-12-04T20:58:08-08:00 WARN [audio::audio_settings] Denoise does not work on debug builds, not enabling 2025-12-04T20:58:08-08:00 INFO [workspace] Rendered first frame 2025-12-04T20:58:09-08:00 WARN [audio::audio_settings] Denoise does not work on debug builds, not enabling 2025-12-04T20:58:16-08:00 INFO [lsp] starting language server process. binary path: "/Users/grievejia/Library/Application Support/Zed/languages/ruff/ruff-0.14.8/ruff-aarch64-apple-darwin/ruff", working directory: "/Users/grievejia/scratch/pyre_test", args: ["server"] 2025-12-04T20:58:20-08:00 INFO [lsp] starting language server process. binary path: "/Users/grievejia/Library/Application Support/Zed/languages/pyrefly/pyrefly-venv/bin/pyrefly", working directory: "/Users/grievejia/scratch/pyre_test", args: ["lsp"] ... ``` We could see that the venv installation is successful and the auto-installed Pyrefly binary is used. Console output for scenario 2: ``` > cargo run Finished `dev` profile [unoptimized + debuginfo] target(s) in 29.62s Running `target/debug/zed` 2025-12-04T21:01:26-08:00 INFO [zed] ========== starting zed version 0.217.0+dev.65f328bd614282c1c370672106a9a279f8f22a3a, sha 65f328b ========== 2025-12-04T21:01:27-08:00 WARN [zed::reliability] Minidump endpoint not set 2025-12-04T21:01:27-08:00 INFO [extension_host] extensions updated. loading 2, reloading 0, unloading 0 2025-12-04T21:01:27-08:00 WARN [audio::audio_settings] Denoise does not work on debug builds, not enabling 2025-12-04T21:01:27-08:00 INFO [workspace] Rendered first frame 2025-12-04T21:01:28-08:00 WARN [audio::audio_settings] Denoise does not work on debug builds, not enabling 2025-12-04T21:01:34-08:00 INFO [language] found user-installed language server for pyrefly. path: "/Users/grievejia/.local/bin/pyrefly", arguments: ["lsp"] 2025-12-04T21:01:34-08:00 INFO [lsp] starting language server process. binary path: "/Users/grievejia/.local/bin/pyrefly", working directory: "/Users/grievejia/scratch/pyre_test", args: ["lsp"] ``` We could see that the correct installed Pyrefly binary was picked up. Release Notes: - Added Pyrefly as builtin language server option --------- Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> |
||
|
|
05d5e10362 |
Document subagent model and reasoning effort (#65505)
## Summary I came across this gap while trying to understand how choosing a model for subagents affects their reasoning effort. The agent settings guide mentions `agent.subagent_model`, but does not explain that relationship. This PR adds a configuration example and a model selection table covering reasoning and speed settings, explains how to find supported effort values, keeps the settings reference and Rust field documentation aligned, and links the explanation from the agent settings and tool guides. ## Self-review - [x] I’ve reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. --- Release Notes: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
8d541bcc9b |
Fix broken links and stale content in docs (#65490)
## Summary Fixes broken links in `docs/src`. Notes: - **Rego:** pointed to `open-policy-agent/zed-rego` (same extension, moved from `StyraInc`), but it was dropped from the registry in zed-industries/extensions#7599. The Rego page may need removing. - **Roc:** removed `roc_language_server` from setup; the extension now runs `roc experimental-lsp`. - **Meson:** `jobpaardekooper/zed-meson` is the registry's replacement (zed-industries/extensions#4980). - **Removed:** Gemini gemtext (dropped from registry) and the Sweep blog link (site gone, [archived copy](https://web.archive.org/web/20260806152854/https://blog.sweep.dev/posts/oss-next-edit)). ## Testing Ran a link checker over `docs/` and checked each new target by hand. Clicked through the fixed links with `mdbook serve docs`. ## Self-review - [ ] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [ ] Tests cover the new or changed behavior. Used Claude to find and verify the links; I reviewed each change. Release Notes: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
5f08939a5d |
docs: Document Bedrock custom endpoints (#64103)
# Objective `endpoint_url` was not mentioned anywhere in the gateway docs for the Bedrock provider, so there was no way to discover that it exists, that it only redirects the Converse API, or that the built-in GPT and Grok models are Mantle models that ignore it and go to AWS regardless. ## Solution - Describe the solution used to achieve the objective above. Document the setting, the Converse-only scope, and the `available_models` workaround for gateways that expose the Converse API but not an OpenAI-compatible one -- including that model names there are sent verbatim without a cross-region inference prefix. Separately, it might be nice to describe how the Mantle models can be redirected using custom `anthropic_compatible` or `openai_compatible` providers, since Mantle implements the Messages, Responses, and Chat Completions routes. ## Testing >- Did you test these changes? If so, how? Yes, I tested the documented config and confirmed that the model is displayed in the model picker and that when selected the request is sent to the gateway. I am using Tailscale Aperture in this environment, and it captures and logs the entire request and response. >- Are there any parts that need more testing? I don't think so. >- How can other people (reviewers) test your changes? Is there anything specific they need to know? You'll need a gateway and access to AWS Bedrock, or evaluate the source and the tests. Tailscale Aperture is remarkably easy to set up as a gateway. >- If relevant, what platforms did you test these changes on, and are there any important ones you can't test? I don't think the platform is relevant, but I was testing Zed on Windows, with WSL. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A --------- Co-authored-by: Loren Gordon <8457307+lorengordon@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
a34a062bb7 |
Update edit prediction messaging for the Free plan (#65258)
Starting Oct 7th, the free plan will no longer include Zed's hosted edit predictions. ## Testing - Added `test_free_plan_edit_predictions_ended_for_zed_provider`. It covers: - the Free vs Pro plan rule, with Cloud still reporting a 2,000 allowance - the default vs explicitly chosen provider - the Ollama exclusion - the notice only firing when the user accepted predictions - All `edit_prediction` tests pass. - Clippy with `--deny warnings` passes on the touched crates. - The docs pass prettier. - Screenshots of an earlier revision were captured with the visual test runner. The latest copy and the Copilot removal haven't been checked in a running build. Release Notes: - N/A |
||
|
|
83b332342f |
Support inlay hint edits via double clicks and AcceptInlayHint action (#64789)
Closes https://github.com/zed-industries/zed/discussions/51582 https://github.com/user-attachments/assets/fb4ae2c2-c134-4c7c-8fea-e886b085fc32 Limitations: * we cannot accept all inlay hint at once, as each of them may apply contradicting text edits (e.g. altering imports) * next hint will be accepted with a slight delay, as, after the edit, we need to re-fetch the hints and then resolve that new hint to get the edits Release Notes: - Supported inlay hint edits via double clicks and `AcceptInlayHint` action |
||
|
|
ef33e891bf |
Make mermaid diagram font family configurable (#63430)
# Objective Fix #63428 ## Solution Add a settings option `"mermaid_font_family"` to allow escape from `"ui_font_family"`. Does not affect any default behavior. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase <img width="2426" height="1456" alt="Image" src="https://github.com/user-attachments/assets/70ec2ae3-a184-4523-bce2-272c8f33b840" /> <img width="1838" height="668" alt="image" src="https://github.com/user-attachments/assets/93711957-8f9c-42cd-afc0-a1ac84f1d7a3" /> Release Notes: - Make mermaid diagram font family configurable to fix #63428 Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com> |
||
|
|
09745431b5 |
Document GPT-6.1 Sol hosted pricing (#65236)
Add GPT-6.1 Sol to the hosted-model pricing and context-window tables. Release Notes: - N/A |
||
|
|
e7c8cbeed6 |
extensions_ui: Add extension_suggestions setting to disable extension suggestions (#65109)
## Summary
Zed shows a notification suggesting extensions for the languages of the
files you open. Right now the only way to silence it is to dismiss each
suggestion one by one (stored per extension), or to add every extension
to `auto_install_extensions`. There is no way to turn the feature off as
a whole.
This adds an `extension_suggestions` setting (default `true`). When set
to `false`, `show_suggestion` returns early and no suggestion
notification is shown.
```json
{
"extension_suggestions": false
}
```
To make the feature discoverable, this also:
- Adds an **Extension Suggestions** toggle to the General settings page.
- Adds a third **Never Suggest Extensions** action to suggestion
notifications that disables the setting globally.
Changes: `ExtensionSettingsContent` / `ExtensionSettings` get the new
field (non-optional `bool` with `serde(default_true)`),
`assets/settings/default.json` and `docs/src/reference/all-settings.md`
document it, `settings_ui` renders the toggle on the General page,
`MessageNotification` gains support for a tertiary action, and
`extension_suggestions.rs` checks the setting and wires up the new
notification action.
## Testing
- Added `test_no_suggestion_when_extension_suggestions_disabled` (opens
`index.html` with the setting off, expects no notification).
- Added
`test_disabling_extension_suggestions_persists_and_stops_suggestions`
(invokes the new action, asserts the setting is disabled and no further
suggestions appear).
- `cargo test -p extensions_ui extension_suggestions`: 22 pass, 2 fail.
The 2 failures (`test_suggestion_returns_after_uninstall`,
`test_suggestion_returns_after_failed_install`) also fail on `main`
without this change.
- Manually checked on macOS with a local release build: the General →
Extensions toggle works, and the **Never Suggest Extensions** action
disables the setting globally.
To test: toggle it off in Settings → General → Extensions, or click
**Never Suggest Extensions** on a suggestion notification, then open a
file whose language has a suggested extension.
## Self-review
- [x] I've reviewed my diff for quality, security, reliability, and
performance.
- [x] UI changes follow the
[checklist](https://zed.dev/docs/development/ui-checklist).
- [x] Tests cover the new or changed behavior.
Release Notes:
- Added an `extension_suggestions` setting to turn off extension
suggestions.
---------
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: MrSubidubi <finn@zed.dev>
Co-authored-by: Finn Evers <finn.evers@outlook.de>
|
||
|
|
cad56bd65a |
languages: Stop treating .env files as shell scripts (#64242)
# Objective Closes #58584. `.env` files are classified as Shell Script, so Zed runs `bash-language-server` on them and `shellcheck` [reports SC2034 on every line](https://github.com/zed-industries/zed/issues/58584#issuecomment-4625839715). ## Solution Add an `Env` language that reuses the Bash grammar and registers no LSP adapters, so highlighting stays and no language server starts. `.envrc` remains Shell Script, since direnv executes it as shell. #7124 mapped `.env` to Shell Script for highlighting and `redactions.scm`, not for linting. `Env` keeps both and only drops the language server. ## Testing - By hand on Windows with `shellcheck` on `PATH`: a `.env` reports 18 SC2034 warnings before and none after. - Unit test covers the `.env` / `.envrc` / `.sh` classification. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [ ] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase <details> <summary>Click to view showcase</summary> <img width="811" height="841" alt="Group 1" src="https://github.com/user-attachments/assets/fe05e884-e915-420d-a0ba-4075fef8a3d3" /> </details> --- Release Notes: - Fixed `.env` files being treated as shell scripts, which made `shellcheck` report SC2034 on every line. ".env" files now use a separate Env language. |
||
|
|
96dec006df |
docs: Add Homebrew casks to the list of Linux packages (#65116)
The Homebrew casks [`zed`](https://github.com/Homebrew/homebrew-cask/blob/main/Casks/z/zed.rb) and [`zed@preview`](https://github.com/Homebrew/homebrew-cask/blob/main/Casks/z/zed%40preview.rb) from the official repository now support Linux since these PRs were merged: * <https://github.com/Homebrew/homebrew-cask/pull/291231> * <https://github.com/Homebrew/homebrew-cask/pull/291370> ## Summary Lists the Homebrew packages `zed` and `zed@preview` in the “Installing via a package manager” section of the “Zed on Linux” document. ## Testing No testing deemed necessary. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - N/A |
||
|
|
5eed2397a8 |
git_ui: Add command to create tags at HEAD (#61973)
Add a Command Palette action that creates a lightweight local tag at the active repository's HEAD. Refresh tag consumers after creation and show success or failure notifications. # Objective This adds a `git: create tag at head` Command Palette action for creating a lightweight local tag at the active repository's current `HEAD`. ## Solution The action uses the existing single-line Git modal style and notification patterns. Tag creation uses `git update-ref` with a required nonexistent previous value, preventing an existing tag from being overwritten. It also: - Supports local and remote project repositories. - Refreshes Git graph and history views after tag creation. - Shows a bottom-centered success toast. - Uses the existing critical error prompt for failures. - Documents that created tags are local and are not pushed automatically. ## Testing - `cargo test -p git test_create_ref_requires_ref_to_not_exist` - `cargo test -p git_ui test_create_tag_at_head` ## Showcase https://github.com/user-attachments/assets/81ceffdb-d5f7-4e97-b513-4ee04b55b619 --- Release Notes: - Add command to create tags at HEAD --------- Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com> Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com> |
||
|
|
01376d4926 |
git_hosting_providers: Add Gitiles provider (#63996)
Add Gitiles support to git hosting providers, to enable permalink / git
blame diff link features working for repositories browsed with Gitiles
(used by Gerrit).
Permalinks use the Gitiles URL format:
{base_url}/{repo}/+/{sha}/{path}#{line}
Configured via git_hosting_providers setting:
{ "provider": "gitiles", "name": "...", "base_url": "https://..." }
# Objective
- Add basic permalink + git blame linking support for another common Git
provider (Gerrit + Gitiles).
Gerrit/Gitiles is a self hosted setup used at several large
corporations, so it would be nice to have native support for it
alongside the other git hosting providers. It is relevant to many
people.
URL can vary substantially between different self hosted setups. URL can
be like https://gerrit.example.com or something more elaborate like
https://vcs.internal.example.com/plugins/gitiles.
This does not implement avatars or PR links (as the similar Chromium
provider does) since exact Gerrit setup (e.g. trailers used, avatars
used) can differ significantly between different self hosted instances.
It implements the fundamental Gitiles link part instead which is still
very useful, and is reliable; `base_url` can be set to the gitiles "Git
repositories on [instance]" [base
page](https://gerrit.googlesource.com/), and this integration will then
work.
## Solution
- Implements a new GitHostingProvider which constructs Gitiles format
permalinks based on the user config.
Implementation follows inspiration from other providers: Tangled /
Chromium (also Gitiles/Gerrit based but tied specifically to Chromium).
## Testing
- Unit tests cover the logic in this change.
- Built for Windows, performed exploratory testing (adding multiple
providers, different base_urls, trying a self hosted Gerrit instance vs
googlesource, git blame link through UI works, copy permalink via
right-click context menu in code works).
## Self-Review Checklist:
- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments -> N/A
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines) -> N/A
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable
## Showcase
#### "Copy permalink to line"
<img width="1958" height="677" alt="image"
src="https://github.com/user-attachments/assets/802a02af-db4e-4b9c-a7d5-ac26dc52cd7e"
/>
Above results in clipboard being set to:
https://gerrit.googlesource.com/gitiles/+/77d36f6ff5f50316daa82c6753af2c3217859df4/java/com/google/gitiles/GitilesUrls.java#34
#### Git blame diff view links to remote Gitiles view for the commit:
<img width="2242" height="808" alt="image"
src="https://github.com/user-attachments/assets/2792397a-83ae-4294-ae61-5a631975950d"
/>
Above example opens this link in browser:
https://gerrit.googlesource.com/gitiles/+/67c7844b7f7f228229c037cf297296874f50692c
---
`settings.json` for showcase example:
```json
"git_hosting_providers": [
{
"provider": "gitiles",
"name": "Gerrit Googlesource",
"base_url": "https://gerrit.googlesource.com"
}
],
```
---
Release Notes:
- Added `gitiles` as a Git hosting provider for Gitiles/Gerrit
deployments, enabling permalinks and navigation from git blame diff
view.
Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
|
||
|
|
badfb8d31f |
docs: Fix tab-switcher keybindings (#65105)
## Summary Fixes missing keybinding pills in the Tab Switcher documentation on Linux. The keybinding processing in `docs/theme/plugins.js` assumed every `<kbd>` element contained both macOS and Linux variants separated by `|`. Hand-written keybindings such as `ctrl`, `tab`, and `shift` only contain a single value, making them render empty on Linux. This change falls back to the first keybinding when a Linux-specific value is not provided. Also removes the `tab_switcher::ToggleAll` keybinding reference from the documentation, since the action does not have a default keybinding. Closes #65087. ### Before <img width="1890" height="942" alt="image" src="https://github.com/user-attachments/assets/e3d1298e-2e4f-404f-9f64-74e04d53a27f" /> ### After <img width="1600" height="797" alt="image" src="https://github.com/user-attachments/assets/7a3ef09b-0125-4184-8352-bdd174839720" /> ## Testing - Ran the Zed documentation locally with `mdbook serve docs`. - Verified the Tab Switcher documentation on Linux. - Confirmed that single-sided keybindings (`ctrl`, `tab`, `shift`, etc.) now render correctly. - Confirmed that keybindings containing both macOS/Linux variants continue to render correctly. - Confirmed the `ToggleAll` entry no longer displays the 'no default binding' message. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [ ] Tests cover the new or changed behavior. Release Notes: - N/A --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com> |
||
|
|
7ea5428f0c |
agent: Improve custom bedrock model support (#64953)
## Summary Improve custom model support for Amazon Bedrock (**not** Mantle). Add the ability to specify existing model configuration settings in custom models. Specifying custom Amazon Bedrock Converse models is useful for a few key reasons: - Adding new models before Zed adds support - ex. Grok 4.6 was added 8/19, but is not yet added to the Zed agent picker. - Using application inference profiles to track individual usage - Using fully custom models uploaded and hosted in Bedrock Custom models should be as configurable as the provided models can be. Currently, they are not. Thinking, tools, and image support cannot be configured for custom models. This PR adds support for these settings. Configuration Changes for objects under `language_models` -> `bedrock` -> `available_models`: - Added `supports_tools` bool value to indicate that the model supports tool use - Added `supports_images` bool value to indicate that the model supports image recognition - Added `thinking` key that can either be a bool to enable basic thinking, or an object to describe additional thinking details: - `adaptive` bool to indicate whether model thinking can have adaptive levels (low, high, medium, etc.) - `has_xhigh` bool to indicate whether the model supports the xhigh adaptive thinking level. Unused if `adaptive` is false - `budget_tokens` to specify how many tokens the model can use for a thinking operation The new configuration format is mostly backwards compatible with the old format. i.e. **most** existing configurations will not break if this fix is merged. The only exception is now custom model `name`s are completely unmodified instead of potentially having a region prefix added to them. The user is responsible for making sure the `us.` (or whatever region) prefix is added to the model identifier. `allow_global` will have no impact on these models and they will be used if specified even if they are global models. I can change this behavior if it is desired. I think custom should be fully custom, though. We can optionally bounce a model specifier if it does not have a region prefix or has the `global` prefix if `allow_global` is false. I am open to feedback on the configuration keys and values. Misc changes: - The default `default_temperature` value for custom models is now `None` instead of 1.0. Some models do not support temperature and a default of 1.0 is still a value that the Bedrock endpoint will reject. ## Testing - Existing automated unit tests pass - Newly added automated unit tests pass - Tested manually with models currently unsupported in Zed (Grok 4.6/4.7, Kimi K3) - Models show up, function properly, show thinking level settings (incl. xhigh, if `has_xhigh` specified), can use tools, can add images - Manually tested model with custom ARN (application inference profile) ## Self-review - [X] I've reviewed my diff for quality, security, reliability, and performance. - [N/A] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [X] Tests cover the new or changed behavior. Release Notes: - Improved custom model support for Amazon Bedrock --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com> |
||
|
|
c83abe7d0e |
git_ui: Allow collapsing the commit editor and commit details (#63236)
## Summary - The commit message editor in the Git panel is pinned to six lines and its only two controls both make it *larger* — one fills the panel, the other opens the modal. Anyone who commits from a terminal pays for an input they never use, and the Changes list is what gets squeezed. - In the Git Graph detail panel, the author metadata and the commit message render at a fixed size above the changed-files list, so shortening the panel (e.g. dragging the terminal up) hides the file list entirely. ## Changes **Git panel — collapsible commit editor** - New `git::ToggleCommitEditor` action. - A chevron beside the commit button hides the editor down to a thin bar; the commit button row stays available. - State persists per workspace via `SerializedGitPanel`, seeded from a new `git_panel.commit_editor` setting (`expanded` | `collapsed`, default `expanded`). - Collapsing clears the fill state — a hidden editor cannot also fill the panel. - `activation_focus_handle` no longer focuses an editor that isn't rendered. **Git Graph — collapsible commit details** - A disclosure folds the author metadata (avatar, refs, email, SHA, provider link) down to a single author + short-sha line. - A second disclosure folds the commit message body. - The changed-files container is already `flex_1().min_h_0()`, so it reclaims the freed space with no other layout change. **Settings plumbing** - `GitPanelCommitEditor` in `settings_content`, wired through `GitPanelSettings`, `assets/settings/default.json`, the settings UI, and `docs/src/reference/all-settings.md`. ## Test plan - [x] `test_toggle_commit_editor_collapsed` added, covering the toggle, persistence of the flag, and the fill/collapse exclusion. - [x] Manually verified in a dev build: chevron hides and restores the editor, Changes list expands into the freed space, action appears in the command palette, state survives a restart, and the `collapsed` setting seeds a new workspace. - [x] Manually verified both disclosures in the Git Graph detail panel with the panel shortened, including that the collapse state survives selecting a different commit. Release Notes: - Improved the Git panel by allowing the commit message editor to be collapsed, and the Git Graph commit details by making the metadata and commit message sections collapsible. ### Evidance Test | Expand | Collapse | Settings Git Panel | | ------- | --------- | ------------------ | | <img width="675" height="965" alt="Screenshot 2026-08-26 at 15 00 46" src="https://github.com/user-attachments/assets/70c56d02-35fc-45ac-988c-24ccd6d1a19e" /> | <img width="661" height="962" alt="Screenshot 2026-08-26 at 15 00 57" src="https://github.com/user-attachments/assets/2c32fa5d-30fc-4f35-8323-afbc2a031210" /> | <img width="1041" height="956" alt="Screenshot 2026-08-26 at 16 50 40" src="https://github.com/user-attachments/assets/67f166b6-5cd9-4430-bba3-fa765715c557" /> | --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com> |
||
|
|
309f91f564 |
copilot: Move enterprise URI to top-level setting (#65082)
This PR is moving the `enterprise` URI to a top level `copilot` settings because it is used for both Edit Predictions and Copilot Chat. Previously it was listed under `languages > copilot > enterprise_uri` Release Notes: - N/A |
||
|
|
6708a25004 |
docs: Document default open behavior setting (#64610)
# Objective Update https://zed.dev/docs to include documentation for the `default_open_behavior` setting, introduced by #58805, just like we do for `cli_default_open_behavior`. This was discovered while I was revisiting https://github.com/zed-industries/zed/discussions/44355 . ## Solution Update the documentation for the `Windows & Projects > Opening in a New Window > Via Settings` section. ## Testing Used `mdbook serve docs` to build the documentation and review the edits. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase <details> <summary>Before</summary> <img width="3792" height="2458" alt="CleanShot 2026-09-22 at 16 27 41@2x" src="https://github.com/user-attachments/assets/6722aa35-dc9a-4414-9338-bd08182af71b" /> </details> <details> <summary>After</summary> <img width="3792" height="2458" alt="CleanShot 2026-09-22 at 16 27 03@2x" src="https://github.com/user-attachments/assets/ec8ceb77-a2a9-495f-b145-85f5b8efddde" /> </details> --- Release Notes: - N/A |
||
|
|
28d5832adb |
markdown_preview: Add heading_font_weight setting (#64421)
Headings in the Markdown preview are hardcoded to semibold (600). Users
who set a lighter UI font, or who simply prefer lighter headings, have
no way to change this.
This adds `markdown_preview.heading_font_weight`, applied to H1 through
H6 in the preview. It defaults to `600`, so existing rendering is
unchanged unless the setting is set.
```jsonc
{
"markdown_preview": {
"heading_font_weight": 500
}
}
```
The value flows through `ThemeSettings` alongside the existing preview
typography settings, so the generic `markdown` crate gains no dependency
on `markdown_preview`. Because notebook Markdown cells share the preview
typography, they follow the setting too. Bold text inside headings and
table header cells keep their own weights. The setting is also exposed
in the settings editor under Markdown Preview Font, and documented in
the visual customization docs.
## Before / after
| Default (`600`) | `"heading_font_weight": 500` |
| --- | --- |
| <img width="2000" height="1299" alt="heading-weight-600-default"
src="https://github.com/user-attachments/assets/403d29bb-34ed-4cb1-b333-920ec5ee65f0"
/> | <img width="2000" height="1299" alt="heading-weight-500"
src="https://github.com/user-attachments/assets/9fbdd7f9-2d56-4815-a39e-fd1325ba7cd2"
/> |
## Testing
- New tests in `crates/markdown` assert every preview heading level
resolves to `600` by default and to the configured weight when set, and
that the weight does not leak into editor or agent Markdown.
- Verified manually in a dev build with `SF Pro` at weights 500 and 600;
the open preview re-renders on settings save.
Release Notes:
- Added `markdown_preview.heading_font_weight` to configure the font
weight of headings in the Markdown preview.
|
||
|
|
07310d0f9d |
docs: Fix missing keybindings in tab switcher documentation (#65060)
## Summary What problem does this solve, how, and why does this change matter? Closes #64909. used the same #kb way as others for these two instead of <kdb>, this is limited to docs only. <img width="1184" height="90" alt="image" src="https://github.com/user-attachments/assets/11826738-5e54-478a-bc73-e17cba7192b4" /> ## Testing to test: run ```mdbook serve docs``` and go to: ``http://localhost:3000/tab-switcher.html`` ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). <!-- N/A: Documentation only --> - [ ] Tests cover the new or changed behavior. <!-- N/A: Documentation only --> Release Notes: - N/A |