Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
8df2789
languages: Fix C/C++ outline for mixed storage classes and type quali…
ozacod Jan 6, 2026
3da9269
Add agent thread sharing (#46140)
mikayla-maki Jan 6, 2026
a8bc84c
ep cli: Include cursor file in errors (#46192)
agu-z Jan 6, 2026
5be7d6f
ep cli: Refresh cursor path entry (#46195)
agu-z Jan 6, 2026
6070b30
ep cli: Create entries from new files in edit history (#46196)
agu-z Jan 6, 2026
f0e0213
ep cli: Fix finalize counter (#46198)
agu-z Jan 6, 2026
8ca6381
Fix some issues with edit prediction CLI (#46197)
maxbrunsfeld Jan 6, 2026
f3c0208
Add sweep acceptance tracking (#46199)
probably-neb Jan 6, 2026
189241b
collab: Remove invite-related columns from `users` table (#46202)
maxdeviant Jan 6, 2026
c38dc0a
Fix stale pull diagnostics for open buffers (#46201)
reflectronic Jan 6, 2026
f3e5e3e
repl: Add inlay repl output display, skip empty lines on execution, a…
auriium2 Jan 7, 2026
4e28080
extension_ci: Be more explicit with version bump (#46208)
MrSubidubi Jan 7, 2026
c764f78
Add clear filter button to outline and collab panels' search (#46210)
danilo-leal Jan 7, 2026
b5ac0f9
Render images in agent threads (#46167)
rtfeldman Jan 7, 2026
ff73a91
Make all paths relative in captured EP examples (#46213)
maxbrunsfeld Jan 7, 2026
3387021
lsp: Refresh `textDocument/diagnostic` on `workspace/diagnostic/refre…
aviatesk Jan 7, 2026
09ce318
Add a GPUI testing example (#46215)
mikayla-maki Jan 7, 2026
67e2a23
Fix coalescing of multi-line edits (#46220)
maxbrunsfeld Jan 7, 2026
8f961a4
gpui: Make all foreground tasks drop when the app dies (#46219)
mikayla-maki Jan 7, 2026
f4aad4b
Improve visual test runner: consolidate setup, add constants, remove …
rtfeldman Jan 7, 2026
7274a96
Revert "agent_ui: Fix agent UI stealing focus on start up" (#46231)
Veykril Jan 7, 2026
6b90aaa
status_bar: Add encoding indicator (#45476)
tomopumipumi Jan 7, 2026
55dc348
Autofix run cargo machete --fix too (#46232)
ConradIrwin Jan 7, 2026
a1bacce
agent: Remove extraneous character in `system_prompt` template (#46238)
hebo6 Jan 7, 2026
49e4102
project: Fix organize imports action not working for Python (#45874)
abdelq Jan 7, 2026
692bf30
docs: Add documentation for `auto_update_extensions` (#46130)
DaZhi-the-Revelator Jan 7, 2026
f90fe5c
language_models: Make wording for setting env vars consistent (#46240)
kubkon Jan 7, 2026
00becd8
docs: Add LGPL v3 and zlib as accepted extension licenses (#46242)
MrSubidubi Jan 7, 2026
9e9269b
settings: Add Sapling directory to default `file_scan_exclusions` (#4…
corywilhite Jan 7, 2026
f845893
ui_input: Only render number field border on focus (#46165)
dinocosta Jan 7, 2026
754bfad
Add GH workflow to surface comments on closed bugs (#46249)
zelenenka Jan 7, 2026
a354473
Fix the action version in Closed Bugs GH workflow (#46251)
zelenenka Jan 7, 2026
1362582
Override project status in Closed Bugs workflow (#46253)
zelenenka Jan 7, 2026
134c5e6
ep cli: Handle opening buffers from files created by the edit history…
agu-z Jan 7, 2026
523c27a
ep cli: Clean leftover git locks (#46255)
agu-z Jan 7, 2026
cf8200f
Skip worktree trust queries for remote collab project clients (#46256)
SomeoneToIgnore Jan 7, 2026
0136e41
ep: Fix incorrect example count in failure summary (#46257)
osyvokon Jan 7, 2026
82826e7
ep: Fix revision resolution for tilde expressions (#46258)
osyvokon Jan 7, 2026
b41eb6e
Add fallback message when preview changelog is empty (#46260)
JosephTLyons Jan 7, 2026
7fa65ea
Add action tracking to enable token healing for Sweep (#46212)
probably-neb Jan 7, 2026
f119b97
ep cli: Make the udiff parsing more resilient (#46264)
agu-z Jan 7, 2026
a2c233b
Do not try to open PDF, zip and other binaries (#46262)
SomeoneToIgnore Jan 7, 2026
c56b225
Bump Zed to v0.220 (#46265)
JosephTLyons Jan 7, 2026
1ac2b97
Make tasks inherit their callers priority (#46179)
yara-blue Jan 7, 2026
69acab7
Let agent see output of killed terminal tools (#46218)
rtfeldman Jan 7, 2026
49c4dcb
ep: Fix code block extraction to require closing fence at line start …
osyvokon Jan 7, 2026
3e8d013
Polish the Closed Bugs GH workflow (#46271)
zelenenka Jan 7, 2026
30dc8c5
ep cli: More substatus granularity (#46266)
agu-z Jan 7, 2026
76fed22
ep: Add file deletion support in unified diff parsing (#46279)
osyvokon Jan 7, 2026
19e7ee5
Remove BACKWARDS from buffer search settings
Jan 7, 2026
a3733b8
Use transparent clear color for opaque windows on Linux (#46281)
reflectronic Jan 7, 2026
4831e5c
git: Fix project diff sorting not matching the git panel when tree vi…
cole-miller Jan 7, 2026
97c35c0
gpui: Actually remove the Result from AsyncApp (#45809)
mikayla-maki Jan 7, 2026
6758732
mercury: Fix spurious newline removal (#46289)
probably-neb Jan 7, 2026
40a2c72
settings_ui: Organize page data (#46275)
probably-neb Jan 7, 2026
0e1ed18
docs: Add Tailwind CSS mode instructions (#46292)
gaauwe Jan 7, 2026
05efa59
Add variable row height mode to table UI element (#46190)
HalavicH Jan 7, 2026
e2cd9ac
git: Fix base text in branch diff and text diff view not being highli…
cole-miller Jan 8, 2026
fc770b6
Create project entries for entry ancestors when scanning is disabled …
agu-z Jan 8, 2026
42af91d
ep cli: Resume from output file (#46293)
agu-z Jan 8, 2026
74c3608
Update pulldown-cmark to v0.13.0 to fix crash (#46267)
drbh Jan 8, 2026
3835d40
git: Don't show binary files in past commit view (#46312)
cole-miller Jan 8, 2026
7e39e15
editor: Don't paint hunk controls when the text area is too narrow to…
cole-miller Jan 8, 2026
5a739af
feat: Add TableRow newtype to help hold table column count invariant
HalavicH Jan 6, 2026
538bc42
feat: Remove const generics from data table
HalavicH Jan 6, 2026
850c48f
fix: Update keymap editor table creation to not rely on const generics
HalavicH Jan 6, 2026
311d573
refactor: Update handle renderer
HalavicH Jan 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
63 changes: 63 additions & 0 deletions .github/workflows/add_commented_closed_issue_to_project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: "Surface closed issues someone's commented on"

on:
issue_comment:
types:
- created

permissions:
contents: read

jobs:
add-to-project:
if: >
github.repository == 'zed-industries/zed' &&
github.event.issue.state == 'closed' &&
github.event.issue.pull_request == null &&
github.event.issue.type != null &&
github.event.issue.type.name == 'Bug' &&
github.event.comment.user.type != 'Bot'
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- id: get-app-token
uses: actions/create-github-app-token@bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1 # v2.1.4
with:
app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
owner: zed-industries

- id: check-staff
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
github-token: ${{ steps.get-app-token.outputs.token }}
script: |
try {
const response = await github.rest.teams.getMembershipForUserInOrg({
org: 'zed-industries',
team_slug: 'staff',
username: context.payload.comment.user.login
});
return response.data.state === 'active';
} catch (error) {
// 404 means user is not a member
if (error.status === 404) {
return false;
}
throw error;
}

- if: steps.check-staff.outputs.result == 'true'
run: |
echo "::notice::Skipping issue #${{ github.event.issue.number }} - commenter is staff member"

# github-script outputs are JSON strings, so we compare against 'false' (string)
- if: steps.check-staff.outputs.result == 'false'
run: |
echo "::notice::Adding issue #${{ github.event.issue.number }} to project (comment by ${{ github.event.comment.user.login }})"

- if: steps.check-staff.outputs.result == 'false'
uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
with:
project-url: https://github.com/orgs/zed-industries/projects/73
github-token: ${{ steps.get-app-token.outputs.token }}
10 changes: 10 additions & 0 deletions .github/workflows/autofix_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,20 @@ jobs:
- name: autofix_pr::run_autofix::run_cargo_fmt
run: cargo fmt --all
shell: bash -euxo pipefail {0}
- name: autofix_pr::run_autofix::install_cargo_machete
if: ${{ inputs.run_clippy }}
uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386
with:
command: install
args: cargo-machete@0.7.0
- name: autofix_pr::run_autofix::run_cargo_fix
if: ${{ inputs.run_clippy }}
run: cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged
shell: bash -euxo pipefail {0}
- name: autofix_pr::run_autofix::run_cargo_machete_fix
if: ${{ inputs.run_clippy }}
run: cargo machete --fix
shell: bash -euxo pipefail {0}
- name: autofix_pr::run_autofix::run_clippy_fix
if: ${{ inputs.run_clippy }}
run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/extension_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ jobs:
BUMP_FILES+=("Cargo.toml")
fi

bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"
bump2version \
--search "version = \"{current_version}"\" \
--replace "version = \"{new_version}"\" \
--current-version "$OLD_VERSION" \
--no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"

if [[ -f "Cargo.toml" ]]; then
cargo update --workspace
Expand Down
37 changes: 30 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ members = [
"crates/edit_prediction_ui",
"crates/edit_prediction_context",
"crates/editor",
"crates/encoding_selector",
"crates/eval",
"crates/eval_utils",
"crates/explorer_command_injector",
Expand Down Expand Up @@ -292,6 +293,7 @@ deepseek = { path = "crates/deepseek" }
derive_refineable = { path = "crates/refineable/derive_refineable" }
diagnostics = { path = "crates/diagnostics" }
editor = { path = "crates/editor" }
encoding_selector = { path = "crates/encoding_selector" }
eval_utils = { path = "crates/eval_utils" }
extension = { path = "crates/extension" }
extension_host = { path = "crates/extension_host" }
Expand Down Expand Up @@ -599,7 +601,7 @@ profiling = "1"
prost = "0.9"
prost-build = "0.9"
prost-types = "0.9"
pulldown-cmark = { version = "0.12.0", default-features = false }
pulldown-cmark = { version = "0.13.0", default-features = false }
quote = "1.0.9"
rand = "0.9"
rayon = "1.8"
Expand Down
6 changes: 6 additions & 0 deletions Procfile.all
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
collab: RUST_LOG=${RUST_LOG:-info} cargo run --package=collab serve all
cloud: cd ../cloud; cargo make dev
dashboard: cd ../cloud/packages/dashboard; pnpm dev
website: cd ../zed.dev; pnpm dev --port=3000
livekit: livekit-server --dev
blob_store: ./script/run-local-minio
3 changes: 3 additions & 0 deletions assets/settings/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,7 @@
"**/.svn",
"**/.hg",
"**/.jj",
"**/.sl",
"**/.repo",
"**/CVS",
"**/.DS_Store",
Expand Down Expand Up @@ -1472,6 +1473,8 @@
"cursor_position_button": true,
// Whether to show active line endings button in the status bar.
"line_endings_button": false,
// Control when to show the active encoding in the status bar.
"active_encoding_button": "non_utf8",
},
// Settings specific to the terminal
"terminal": {
Expand Down
4 changes: 3 additions & 1 deletion crates/acp_thread/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ path = "src/acp_thread.rs"
doctest = false

[features]
test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot", "dep:image"]

[dependencies]
action_log.workspace = true
agent-client-protocol.workspace = true
base64.workspace = true
agent_settings.workspace = true
anyhow.workspace = true
buffer_diff.workspace = true
Expand All @@ -31,6 +32,7 @@ language.workspace = true
language_model.workspace = true
markdown.workspace = true
parking_lot = { workspace = true, optional = true }
image = { workspace = true, optional = true }
portable-pty.workspace = true
project.workspace = true
prompt_store.workspace = true
Expand Down
Loading