Do not always close current window in SshConnectionModal; only do so
when the window was spawned from ssh modal. Assign unique IDs to "Open
folder" buttons
Closes #ISSUE
Release Notes:
- N/A
Piotr Osiewicz
created
9c54bd1
macOS: Drop input handler to avoid editor/project not being dropped (#18898)
Click to expand commit body
This fixes the problem of a `Project` sometimes not being dropped when
closing the single, last window of Zed.
Turns out, it wasn't get dropped for the following reason:
1. `editor::Editor` held a reference to project
2. The macOS `input_handler` on the `Window` held a reference to that
`Editor`
3. The AppKit window (and its input handler) get dropped asynchronously
(in the code in this diff), after the window is closed.
4. After the window is closed and no `cx.update()` calls are made
anymore, `flush_effects` is not called anymore.
5. But `flush_effects` is where we dropped entities that don't have any
more references.
In short: we dropped `Editor`, which held a reference to `Project`, out
of band, `flush_effects` wasn't called anymore, and thus the `Project`
wasn't dropped.
cc @ConradIrwin @bennetbo since we talked about this.
Release Notes:
- N/A
Co-authored-by: Antonio <antonio@zed.dev>
Release Notes:
- Fixed an issue where diff hunks at the boundaries of multi buffer
excerpts could not be expanded
Max Brunsfeld
created
b0a9005
client: Send telemetry events with `Content-Type: application/json` (#18886)
Click to expand commit body
This PR updates the telemetry events sent to collab to use
`Content-Type: application/json` instead of `Content-Type: text/plain`.
The POST bodies are JSON, so `application/json` is the correct MIME
type.
I suspect the `text/plain` is a remnant from when the events were still
going through Vercel.
Release Notes:
- N/A
Marshall Bowers
created
801210c
collab: Make `github_user_login` required in `LlmTokenClaims` (#18882)
Click to expand commit body
This PR makes the `github_user_login` field required in the
`LlmTokenClaims`.
We previously added this in
https://github.com/zed-industries/zed/pull/16316 and made it optional
for backwards-compatibility.
It's been more than long enough for all of the previous LLM tokens to
have expired, so we can now make the field required.
Release Notes:
- N/A
Marshall Bowers
created
f861479
collab: Update billing code for LLM usage billing (#18879)
Click to expand commit body
This PR reworks our existing billing code in preparation for charging
based on LLM usage.
We aren't yet exercising the new billing-related code outside of
development.
There are some noteworthy changes for our existing LLM usage tracking:
- A new `monthly_usages` table has been added for tracking usage
per-user, per-model, per-month
- The per-month usage measures have been removed, in favor of the
`monthly_usages` table
- All of the per-month metrics in the Clickhouse rows have been changed
from a rolling 30-day window to a calendar month
Release Notes:
- N/A
---------
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Richard <richard@zed.dev>
Co-authored-by: Max <max@zed.dev>
Marshall Bowers
,
Antonio Scandurra
,
Richard
, and
Max
created
a95fb8f
ssh: Fix text wrapping in loading text (#18876)
Click to expand commit body
This PR adds `flex_wrap` to the loading text container to prevent the
loading modal layout to break.
Release Notes:
- N/A
Danilo Leal
created
744891f
Provide a default value for `is_via_ssh` when it isn't sent via older clients (#18874)
- Includes https://github.com/zed-industries/zed/pull/18845
Peter Tripp
created
5377674
csharp: Add support for triple-slash doc comments (#18869)
Click to expand commit body
This PR adds support for triple-slash (`///`) doc comments in C#.
As requested by https://github.com/zed-industries/zed/issues/18766.
Release Notes:
- N/A
Follow up to https://github.com/zed-industries/zed/pull/18727
---
Release Notes:
- N/A
Danilo Leal
created
3f2de17
collab: Set cached token values when initially creating lifetime usage records (#18865)
Click to expand commit body
This PR fixes an issue where we weren't setting the cached token fields
when initially creating a lifetime usage record.
Release Notes:
- N/A
Marshall Bowers
created
77bf2ad
Add is_via_ssh field to edit events (#18867)
Click to expand commit body
Release Notes:
- N/A
Joseph T. Lyons
created
3da1902
worktree: Depend on `rpc` with `test-support` feature in tests (#18866)
Click to expand commit body
This PR updates the `worktree` crate to depend on `rpc` with the
`test-support` feature flag when running tests.
This fixes an issue I was seeing locally when trying to run tests in the
`worktree` crate:
```
λ cargo test -p worktree -- test_repository_subfolder_git_status
Compiling worktree v0.1.0 (/Users/maxdeviant/projects/zed/crates/worktree)
error[E0432]: unresolved import `rpc::AnyProtoClient`
--> crates/worktree/src/worktree.rs:39:18
|
39 | use rpc::{proto, AnyProtoClient};
| ^^^^^^^^^^^^^^ no `AnyProtoClient` in the root
For more information about this error, try `rustc --explain E0432`.
error: could not compile `worktree` (lib test) due to 1 previous error
```
Release Notes:
- N/A
Marshall Bowers
created
4139e2d
In proposed change editors, apply diff hunks in batches (#18841)
Click to expand commit body
Release Notes:
- N/A
Max Brunsfeld
created
ff7aa02
remote server on macOS: Sign with entitlements (#18863)
Click to expand commit body
This does two things:
- Prevent feature unification
- Sign the remote-server binary with the same entitlements we use for
Zed because we saw this in crash report:
Crashed Thread: 4 Dispatch queue: com.apple.root.user-initiated-qos
Exception Type: EXC_BAD_ACCESS (SIGKILL (Code Signature Invalid))
Exception Codes: UNKNOWN_0x32 at 0x0000000103636644
Exception Codes: 0x0000000000000032, 0x0000000103636644
Termination Reason: Namespace CODESIGNING, Code 2 Invalid Page
VM Region Info: 0x103636644 is in 0x103634000-0x103638000; bytes after
start: 9796 bytes before end: 6587
REGION TYPE START - END [ VSIZE] PRT/MAX SHRMOD REGION DETAIL
VM_ALLOCATE 103630000-103634000 [ 16K] r--/rwx SM=ZER
---> VM_ALLOCATE 103634000-103638000 [ 16K] r-x/rwx SM=COW
VM_ALLOCATE 103638000-103640000 [ 32K] r--/rwx SM=ZER
Which sounds a lot like codesigning/jit/entitlements stuff.
Release Notes:
- N/A
Co-authored-by: Piotr <piotr@zed.dev>
Co-authored-by: Bennet <bennet@zed.dev>
910a773
Display environment loading failures in the activity indicator (#18567)
Click to expand commit body
As @maan2003 noted in #18473, we should warn the user if direnv call
fails
Release Notes:
- Show a notice in the activity indicator if an error occurs while
loading the shell environment
Stanislav Alekseev
created
87cc208
docs: Fix ollama available_models example (#18842)
Peter Tripp
created
b0a16a7
Fix bugs with applying hunks from branch buffers (#18721)
3c91184
collab: Drop mistakenly-added columns from the `usages` table (#18835)
Click to expand commit body
This PR drops the `cache_creation_input_tokens_this_month ` and
`cache_read_input_tokens_this_month ` columns from the `usages` table in
the LLM database.
We mistakenly added these in #18834, but these aren't necessary due to
the structure of the `usages` table. We weren't actually using these
columns anywhere.
Release Notes:
- N/A
Marshall Bowers
created
d55f025
collab: Track cache writes/reads in LLM usage (#18834)
Click to expand commit body
This PR extends the LLM usage tracking to support tracking usage for
cache writes and reads for Anthropic models.
Release Notes:
- N/A
---------
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Antonio <antonio@zed.dev>
Marshall Bowers
,
Antonio Scandurra
, and
Antonio
created
c5d252b
collab: Add missing `cmake` dependency to Dockerfile (#18832)
Click to expand commit body
This PR adds the missing `cmake` dependency to the Docker image that is
now needed in order to build collab.
Release Notes:
- N/A
7d380e9
Temporarily prevent deploying collab to production (#18825)
Click to expand commit body
This PR adds a temporary measure to prevent deploying collab to
production, while we investigate some issues stemming from the HTTP
client change.
Release Notes:
- N/A
Marshall Bowers
created
60c12a8
ssh: Remove old dev servers code paths (#18823)
Click to expand commit body
Closes #ISSUE
Release Notes:
- N/A
Piotr Osiewicz
created
11206a8
ui: Fix avatar indicators getting cut off (#18821)
Click to expand commit body
This PR fixes an issue introduced in #18810 that was causing the avatar
indicators to get cut off.
Release Notes:
- N/A
This PR bumps the Protobuf extension to v0.2.0.
Changes:
- https://github.com/zed-industries/zed/pull/18763
Release Notes:
- N/A
Marshall Bowers
created
a3b6344
ssh: Do not cancel connection process if user is typing password (#18812)
Click to expand commit body
Previously, the connection process would be cancelled after 10 seconds,
even if the connection was established successfully but the user was
still typing in a password.
We know recognize when the user is prompted for a password, and cancel
the timeout task.
Co-Authored-by: Thorsten <thorsten@zed.dev>
Release Notes:
- N/A
---------
Co-authored-by: Thorsten <thorsten@zed.dev>
This PR re-removes `AvatarShape` as it is unused. The previous time it
was removed incorrectly, resulting in square avatars!
Release Notes:
- N/A
Nate Butler
created
25a97a6
ssh: Detect timeouts when server is unresponsive (#18808)
Click to expand commit body
To detect connection timeouts we ping the remote server every X seconds
and attempt to reconnect if the server failed to respond.
Next up is showing some feedback in the UI to make this visible to the
user, and stop reconnecting after X amount of retries.
Release Notes:
- N/A
---------
Co-authored-by: Thorsten <thorsten@zed.dev>
9c5bec5
formatting: Use project environment to find external formatters (#18611)
Click to expand commit body
Closes #18261
This makes sure that we find external formatters in the project
environment.
TODO:
- [x] Use a different type for the triplet of `(buffer_handle,
buffer_path, buffer_env)`. Something like `FormattableBuffer`.
- [x] Test this!!
Release Notes:
- Fixed external formatters not being found, even when they were
available in the `$PATH` of a project.
---------
Co-authored-by: Bennet <bennet@zed.dev>
Thorsten Ball
and
Bennet
created
c03b8d6
ssh remoting: Enable reconnecting after connection losses (#18586)