mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-20 15:40:29 +01:00
8a47b3510959f5daba5c8b45bc3d04d68c5bd551
1807 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
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> |
||
|
|
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>
|
||
|
|
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 |
||
|
|
35bba8eef7 |
Allow builtin language servers to be disabled by default (#65049)
## Summary This addresses the concern mentioned in https://github.com/zed-industries/zed/pull/65030#pullrequestreview-5380076060 Release Notes: - N/A |
||
|
|
1399a804bd |
Make it possible to disable language servers in the extension manifest (#65030)
## Summary This PR enables extension authors to disable language servers from the `extension.toml` as opposed to requiring a change to Zed's default settings. With this in, we no longer need to ship default enabled servers for a given language and can instead resort to extension authors disabling those in their extension. This gives extension authors more control and also finally removes the need to link Zed version releases to extension releases in cases where the extension wants to add a new language server. ## Testing Aside from the added tests, also ran a local build and tested this against the kotlin extension. Worked as I would expect it to. ## 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). - [X] Tests cover the new or changed behavior. Release Notes: - Added the possibility for language server extensions to configure which language servers are enabled/disabled by default. Visit https://zed.dev/docs/extensions/languages.md#opt-in-language-servers for more information. --------- Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com> |
||
|
|
588e7c5241 |
docs: Document extension marketplace categories (#60946)
close #60420 Documents how extension marketplace categories are inferred from `extension.toml`, and lists the fields used for each category. Tested with Prettier and a local mdBook build. Release Notes: - N/A --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev> Co-authored-by: MrSubidubi <finn@zed.dev> |
||
|
|
adfcaa122a |
docs: Document Claude Sonnet 5.5 hosted pricing (#64931)
Release Notes: - N/A |
||
|
|
00def035de |
which_key: Add keyboard shortcut to show pending bindings (#64803)
Follow-up #63343 Depends on #64859 The pending keystrokes indicator lists the bindings that can complete a chord, but only on hover. This PR adds `which_key::ShowPendingBindings`, bound to `alt-/`, which opens that list from the keyboard while a chord is pending. For example, press `cmd-k` (`ctrl-k` on Linux/Windows), then `alt-/`. The list opens without moving focus and stays open until the chord completes or is cleared, even if the pointer moves away. It follows the chord as you type, and timed chords stay paused while it's open. With no chord pending, `alt-/` does nothing. **Why `alt-/`?** `/` shares a key with `?`, which is a common "help" key, and `alt-/` isn't bound in any default or base keymap. When no chord is pending, `alt-/` behaves as before. It only opens this popup while a chord is pending. On macOS, `alt-/` normally types `÷`, and it still does when no chord is pending. The shortcut only kicks in mid-chord. The one thing we lose is that `cmd-k` then `alt-/` used to cancel the chord and type `÷`, and now it opens the popover instead. I think that's rare enough to be okay, and the key can be rebound or unbound. It can be unbound or rebound to another key. One limitation is that it must be bound to a single keystroke. A multi-keystroke binding would need its own pending tracking on top of the chord that's already pending, and we don't want to add a special pending state just for this. https://github.com/user-attachments/assets/0a26b0ad-cd7b-49d9-b466-cce54e02bf80 Release Notes: - Added `alt-/` to show the bindings that can complete a pending multi-keystroke shortcut. |
||
|
|
8a4fd5704c |
title_bar: Add an option to open menus on hover (#48496)
Closes #45603 I wanted to open this and start a conversation/get some feedback after encouragement from people in the above discussion. Currently, the enabled `show_menus` setting causes them to open when hovered over, which generally breaks with a longstanding user expectation for desktop applications. It could be argued that this behavior shouldn't exist at all, but it's of course possible that some people prefer it. To that point, I explored adding an additional option, `show_menus_on_hover`, which is disabled by default. This also checks as to whether any menu is in use so that clicking a menu and then navigating through them opens them accordingly. As mentioned in the discussion, this doesn't address an existing bug where some of the pane icons will blink while moving through the menus. I'm unsure of how this specifically can or should be tested since I'm learning as I go, so for now there's just screenshots from the aforementioned discussion. I'm open to suggestions. As I'm sure some might guess, these changes don't really apply to macOS as the menus are always visible. I also do not have access to a Windows installation at this point. (Tested in Arch Linux / KDE Plasma 6.5.5; ran the release build to take clips)   <img width="1380" height="752" alt="setting" src="https://github.com/user-attachments/assets/7a3614ae-d5fd-4767-9ca4-330c91e40bcc" /> Release Notes: - Changed title-bar menus to require a click before opening. Enable `title_bar.open_menus_on_hover` to open them on hover instead. --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|
|
4f70d91bda |
editor: Add support for customizable soft wrap indentation (#63468)
# Objective - Soft wrapped lines currently inherit the indentation of their first line. This can be challenging for those coming from different editors, or with different expectations. - Allow users to customize the soft wrap behavior to wrap with extra indent, or no indent at all. - Fixes #18687 ## Solution - Introduce 3 soft-wrap indent configuration values (in addition to the default of `same`): `none`, `extra_one`, and `extra_two` (where they are multiples of the indent column width). - Plumb indent configuration through to the various gpui and editor components that are concerned with wrapping. - Update code action icon placement to accommodate `none`-level wrap indentation (preceded by a refactor of the function used to calculate its display row). - Fixed an existing bug in `WrapSnapshot::soft_wrap_indent` where querying a 0-indent wrap returned `None` instead of `Some(0)` ## Testing - Added tests to `wrap_map.rs` for all indentation levels. - Updated the random wrap tests to include indent setting combinations. - Added tests for code action icon placement. - Validated locally by toggling between the various settings and observing how the wrap behaved. ## 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 Changes are grouped by commit to ease review. Screenshots below! <details> <summary>Click to view showcase</summary> **`same` indent** (current Zed behavior) <img width="764" height="844" alt="Screenshot from 2026-08-02 22-45-54" src="https://github.com/user-attachments/assets/83e1465c-0e8e-445d-a172-9e1b446406b7" /> **`none` indent** <img width="764" height="844" alt="Screenshot from 2026-08-02 22-45-39" src="https://github.com/user-attachments/assets/99b282b6-d308-453d-b08b-e10af824f307" /> **`extra_one` indent** <img width="764" height="844" alt="Screenshot from 2026-08-02 22-46-06" src="https://github.com/user-attachments/assets/c7480c84-f1a2-485d-b831-b97fe55c0b03" /> **`extra_two` indent** <img width="764" height="844" alt="Screenshot from 2026-08-02 22-46-19" src="https://github.com/user-attachments/assets/badc4996-e1bf-4237-9add-babf08f13897" /> **the setting** <img width="826" height="336" alt="Screenshot from 2026-08-02 22-42-19" src="https://github.com/user-attachments/assets/906b4e8e-1366-4a4e-a2cf-4f8bd67fd604" /> </details> --- Release Notes: - Added a `soft_wrap_indent` setting (`"none"`, `"same"`, `"extra_one"`, `"extra_two"`) to configure indentation for soft-wrapped continuation lines. - Fixed soft-wrap continuation line indentation calculation for unindented lines starting at column 0. - [GPUI] Added `IndentAdjustment` enum to `LineWrapper` to control indentation of soft-wrapped continuation lines. --------- Co-authored-by: Kirill Bulatov <mail4score@gmail.com> |
||
|
|
e52ab15eac |
Improve contribution guidelines and experience (#64296)
# Objective Both our PR template and contribution guidelines are too convoluted. This results in: - contributors missing important information because the information is buried in the contributing file - worse commit descriptions post-merge due to the most important information being buried and or a lot of boilerplate present - the PR template often being neglected by staff themselves entirely - more work for reviewers/engineer on triage here since they have to repeatedly point people at the contribution gudelines ## Solution In order to take a stab at improving this, this PR goes for the following: 1. Shrink the PR template - this aims at reducing the cognitive load looking at this and filling it out whilst preserving all the important information needed for reviewers - a lot of text has been removed to make commit messages in the repo more readable - keep text still visible as opposed to having HTML comments so that reviewers spot this and can raise ## Testing Tested this by giving it a read myself and iterating with Kirill on the final wording/sorting/organization of contents and files. ## Self-Review Checklist: - [-] I've reviewed my own diff for quality, security, and reliability - [-] 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) - [-] Tests cover the new/changed behavior - [-] Performance impact has been considered and is acceptable ## Showcase <details> <summary>The new contribution guidelines</summary> <img width="1209" height="1293" alt="grafik" src="https://github.com/user-attachments/assets/6a3f5012-7f46-48b7-add2-9f2400f01c57" /> </details> <details> <summary>The PR template in action</summary> <img width="879" height="688" alt="grafik" src="https://github.com/user-attachments/assets/87e5ad65-7ade-45b8-b8a8-8818c9a49ba8" /> </details> --- Release Notes: - N/A --------- Co-authored-by: zelenenka <241371603+zelenenka@users.noreply.github.com> |
||
|
|
5ddc17645c |
Fix entries folding on clicks in the outline panel (#64736)
Closes https://github.com/zed-industries/zed/discussions/51877 Now, with the new, outline-less, mode in that panel, this issue is even more prominent, ergo the fix. https://github.com/user-attachments/assets/3b0af227-1c3f-4182-bd44-707641b886b8 Release Notes: - Fixed entries folding on clicks in the outline panel |
||
|
|
d528c665e1 |
Add JSONL and NDJSON support to tabular preview (#64471)
## Objective Extend the existing tabular preview to support `.jsonl` and `.ndjson` files, making it easier to compare fields across records. Discussed in https://github.com/zed-industries/zed/discussions/62917. ## Solution Parse each nonblank line as a JSON object and reuse the existing table preview. Top-level keys become columns in first-seen order, with new keys from later records appended to the right. - Preserve JSON values, including large numbers, without numeric conversion. - Display nested objects and arrays as compact JSON. - Keep missing fields, `null`, `"null"`, and empty strings distinct. - Show invalid-record errors with source line numbers and recover after edits. - Preserve sorting and filters unless column names or order change. - Add JSONL/NDJSON to the existing preview shortcuts and document the behavior. Also fix a crash found during CSV regression testing: deleting rows could leave the renderer using an old row mapping against shorter data. Clear the mapping and virtual list together before recomputing them. The preview remains read-only, accepts object records only, and uses the existing text-based sorting and full-file parsing behavior. ## Testing - All 20 tests in `tabular_data_preview` passed. - The multiline CSV deletion regression passed across 20 scheduler seeds. - `cargo fmt -p tabular_data_preview -- --check` passed. - `./script/clippy -p tabular_data_preview` passed. - `cargo build -p zed --bin zed` passed. - `git diff --check` passed. - Manual QA on macOS, including retesting the reported CSV crash. Windows and Linux were not tested locally. Large-file performance has not been benchmarked. To try it, open a `.jsonl` or `.ndjson` file and run `tabular data: open preview` or `tabular data: open preview to the side`. ## 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 - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase <img width="2358" height="1576" alt="image" src="https://github.com/user-attachments/assets/8f7e7725-5a5c-465d-aa0a-d61cbb22d04f" /> The example shows source-order columns, fields introduced by later records, nested values, and the distinction between missing values, nulls, and strings. Release Notes: - Added JSONL and NDJSON support to the tabular data preview. --------- Co-authored-by: Anthony Eid <anthony@zed.dev> |
||
|
|
bd692a8021 |
docs: Update hosted model pricing and availability (#64647)
Release Notes: - N/A --------- Co-authored-by: morgankrey <morgan@zed.dev> |
||
|
|
6971ae21e9 |
opencode: Fetch models dynamically (#64585)
Release Notes: - opencode: Fetch model list dynamically so that new models are always available immediately |
||
|
|
63b29c2edd |
Add support for the "..." entry in terminal.path_hyperlink_regexes (#64552)
## Objective Allow custom terminal path regexes to extend inherited entries without copying them. This PR also corrects the existing mismatch between the documented and shipped default regexes. This is the last submission in the #64399 series, following #62769, #64222, #64440, #64484, and #64540. ## Solution The `"..."` entry is intentionally supported at the top level only. A `"..."` line inside a multiline entry remains regex text. Existing configurations that use bare `...` as a three-character regex can preserve that behavior by writing `["..."]` as an entry instead. The shipped regexes and hyperlink matching behavior are unchanged. ## Testing All focused tests and all hyperlink tests pass on macOS. The documented default expressions were checked against the shipped values. ## 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: - Added support for `"..."` in `terminal.path_hyperlink_regexes` to extend inherited regexes without repeating them. |
||
|
|
36726df0c3 |
sidebar: Group threads sidebar settings (#64395)
## Objective Group the threads sidebar settings together in JSON and the Settings Editor, using consistent “Threads Sidebar” terminology. This follows up on #63452 now that #62883 has added configurable default width, and includes the auto-open setting added since then. ## Solution - Group `position`, `default_width`, and `auto_open` under `agent.threads_sidebar`, and display their controls together in Settings. - Automatically migrate `agent.sidebar_side`, `agent.threads_sidebar_default_width`, and `agent.threads_sidebar_auto_open` across supported settings scopes, preserving existing nested values. - Apply changes to the default width immediately, including when the sidebar was manually resized, and clear the saved width override. Unrelated settings changes preserve manual sizing. - Document all three settings, including the previously missing position entry. ## Testing The following targeted checks passed on the local changes: - `cargo test -p migrator nest_agent_threads_sidebar_settings` — 7 tests passed. - `cargo test -p sidebar -p workspace -p agent_settings -p gpui_platform --features gpui_platform/runtime_shaders --lib -- width threads_sidebar_settings test_open_directory_in_existing_window` — 9 tests passed. - `cargo fmt --all` completed successfully. - `git diff --check` passed. - From `docs`: `npx prettier --check src/reference/all-settings.md src/ai/parallel-agents.md` passed. Coverage includes migration precedence and supported scopes, settings defaults and width limits, manual sizing and resets, persisted widths, and auto-open behavior. Full application tests and manual UI testing were not run. Clippy was not rerun after the final terminology changes. ## 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: - Improved threads sidebar settings by grouping position, default width, and auto-open together, and applying default-width changes even after manual resizing. |
||
|
|
4c7f3574f2 |
Add support for "..." in edit_predictions_disabled_in (#64546)
## Objective Let projects and language-specific settings add scopes where edit predictions are disabled without repeating inherited scopes. Part of #64399. ## Solution Extend the `"..."` convention from #62769, #64222, #64440, #64484, and #64540 to `edit_predictions_disabled_in`. For example, a global `["comment"]` and a language override of `["string", "..."]` disable predictions in both scopes. Inherited scopes are inserted at `"..."`, and duplicates keep their first occurrence. Omitting the marker replaces the list, `[]` clears it, and omitting the setting preserves inheritance. The default remains `[]`. ## Testing Tested on macOS through settings loading, covering project and language-specific overrides, inheritance, replacement, and clearing. The language settings tests passed. Live editor behavior has not been checked manually. To check manually, configure global `["comment"]` and a language override of `["string", "..."]`. Confirm predictions are disabled in both scopes, then remove `"..."` and repeat with `[]` to check replacement and clearing. ## 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: - Added support for `"..."` in `edit_predictions_disabled_in` so project and language-specific settings can extend inherited scopes. --------- Co-authored-by: Kirill Bulatov <mail4score@gmail.com> |
||
|
|
5a137cbc9b |
Add support for "..." in edit_predictions.disabled_globs (#64540)
## Objective Let users and projects add edit prediction exclusion patterns without repeating defaults or inherited patterns. Part of #64399. ## Solution Extend the `"..."` convention from #62769, #64222, #64440, and #64484 to `edit_predictions.disabled_globs` using `SplicingVec`. Inherited patterns are inserted at `"..."`, and duplicates retain their first occurrence. Omitting the marker replaces the list, `[]` clears it, and omitting the setting preserves inheritance. Opening an absent setting now initializes it with `["..."]` instead of clearing inherited patterns, and the selection is located by parsing the JSON instead of a regex, so a commented-out or nested `"disabled_globs"` can no longer capture it. Cursor imports append `"..."` like the `files.exclude` import does, so Zed's sensitive-file defaults survive an import; empty lists and empty or literal `"..."` entries are dropped, matching `enabled_patterns`. ## Testing Tested on macOS with settings merge and loading tests, Cursor import tests, the UI settings update and selection path (including commented-out and nested decoy keys), the new `settings_json` key-path lookup, and Copilot integration coverage. To check manually, configure custom disabled patterns alongside `"..."` and confirm that both custom patterns and inherited sensitive-file patterns remain disabled. Repeat without `"..."` and with `[]` to verify replacement and clearing. Opening the setting when it is absent should preserve inherited patterns. ## 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: - Added support for `"..."` in `edit_predictions.disabled_globs` so custom patterns can extend inherited exclusions, and fixed "Configure Excluded Files" selecting the wrong list when a commented-out `disabled_globs` precedes it. --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev> |
||
|
|
8d085f1928 |
Import VS Code files.exclude into file_scan_exclusions (#64492)
## Objective Import VS Code’s `files.exclude` into `file_scan_exclusions`. The previous `files.watcherExclude` mapping was dead code: it expected an array, while VS Code stores an object of `pattern: bool`. `files.watcherExclude` only stops watching, and the files stay visible in VS Code, so it is not a match for `file_scan_exclusions`. `files.exclude` hides files from the explorer and search, which matches `file_scan_exclusions`, and its default set is nearly identical to Zed's. Related to #62769, reported during the review of #64484. A meta follow-up to #64399. ## Solution Import nonempty `files.exclude` patterns enabled with `true`, ignoring disabled and malformed entries, including VS Code's `{"when": ...}` form. Append `"..."` so the imported list extends inherited exclusions instead of replacing them. Inputs with no usable patterns leave the inherited list unchanged. `files.watcherExclude` is no longer imported. ## Testing The new regression tests reproduce the bug and verify the fix. To check manually, import `{"files.exclude":{"**/build/**":true,"**/cache/**":false}}` and verify that `file_scan_exclusions` becomes `["**/build/**", "..."]`, and that `.git` stays hidden in the project panel. ## 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 importing VS Code `files.exclude` into `file_scan_exclusions`. --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev> |
||
|
|
887149bbdd |
Ignore invalid file patterns individually (#64525)
## Objective Prevent one invalid file pattern from discarding valid patterns or causing settings loading to panic. The pre-existing exclusion-matcher bug was reported during review of #64492 (part of #64399). ## Solution Ignore invalid entries individually and log their errors in `file_scan_exclusions`, `file_scan_inclusions`, `file_types`, `hidden_files`, `private_files`, and `read_only_files`. Preserve valid inherited entries without changing `"..."`, replacement, or empty list behavior. Valid brace inclusion patterns remain usable, including when an alternative spans multiple directories. ## Testing Reproduced matcher loss and inclusion and file type panic paths before fixing them. Targeted tests pass on macOS for mixed, inherited, replacement, empty, and all-invalid lists, including inherited `.git` exclusions, private file protections, and inclusion rescans with brace patterns. Windows and Linux execution remains untested. ## 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 invalid file patterns discarding valid exclusions, hidden file rules, or read-only rules, or causing inclusion settings to panic. Also fixed invalid private file patterns discarding valid protections and invalid file type patterns causing settings loading to panic. --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev> |
||
|
|
526c95d474 |
Improve internal links across documentation (#64481)
## Summary - Adds 63 internal links across 41 documentation pages. - Connects existing terms such as Agent Panel, semantic tokens, edit predictions, and language-specific debugging to their detailed reference pages. - Uses existing wording for 60 links and makes three small wording changes where a natural anchor did not already exist. ## Why this matters Readers can now move from overview and configuration pages to the relevant detailed guidance without searching the documentation manually. The changes add navigation only. They do not change product behavior or documented requirements. ## Jev experiment This PR came from a local experiment using Jev to audit internal links across the published documentation. The audit scripts are not included in this PR. - Code shortlisted 2,715 possible source and destination page pairs. - Jev made two separate decisions for each pair: whether the link would help the reader, and which exact existing phrase should become the anchor. - Five strong links without existing anchor text went to GPT-5.6 Luna for minimal rewrite options. Jev then selected among those fixed options. - A local review interface surfaced the results for Pass or Fail decisions before any files changed. Human review approved 66 changes. Two no longer matched the current `main` branch, and review removed one circular link, leaving the 63 links in this PR. ## Validation - `pnpm dlx prettier@3.5.0 <changed docs> --check` - `lychee --exclude '^http' './docs/src/**/*'` — 0 errors - `mdbook build docs` - Verified that the diff adds exactly 63 Markdown links Release Notes: - Improved links between related documentation pages. |