yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cbe6eb2ab8b396b1d88a2d7624dba42e3f2c71d1
zed/crates
T
History
rari404 cbe6eb2ab8 terminal: Remove SHLVL from terminal environment to fix incorrect shell level (#44835) 
Fixes #33958

## Problem

When opening a terminal in Zed, `SHLVL` incorrectly starts at 2 instead
of 1. On `workspace: reload`, it increases by 2 instead of 1.

## Root Cause

1. Zed's `shell_env::capture()` spawns a login shell (`-l -i -c`) to
capture the user's environment, which increments `SHLVL`
2. The captured `SHLVL` is passed through to the PTY options
3. When alacritty_terminal spawns the user's shell, it increments
`SHLVL` again

Result: `SHLVL` = captured value + 1 = 2 (when launched from Finder)

## Solution

Remove `SHLVL` from the environment in `TerminalBuilder::new()` before
passing it to alacritty_terminal. This allows the spawned shell to
initialize `SHLVL` to 1 on its own, matching the behavior of standalone
terminal emulators like iTerm2, Kitty, and Alacritty.

## Testing

- Launch Zed from Finder → open terminal → `echo $SHLVL` → should output
`1`
- Launch Zed from shell → open terminal → `echo $SHLVL` → should output
`1`
- `workspace: reload` → open terminal → `echo $SHLVL` → should remain
`1`
- Tested with bash, zsh, fish

Release Notes:

- Fixed terminal `$SHLVL` starting at 2 instead of 1
([#33958](https://github.com/zed-industries/zed/issues/33958))
2025-12-15 08:12:24 +01:00
..
acp_thread
git: Avoid removing project excerpts for dirty buffers (#44312)
2025-12-15 02:48:15 +00:00
acp_tools
gpui: Unify track_scroll method to receive a reference type (#43518)
2025-11-26 18:03:42 +01:00
action_log
acp: Better telemetry IDs for ACP agents (#44544)
2025-12-10 16:48:08 +00:00
activity_indicator
releases: Add build number to Nightly builds (#42990)
2025-11-24 13:34:04 +01:00
agent
New evals for inline assistant (#44431)
2025-12-14 22:55:41 -08:00
agent_servers
util: Fix shell builder quoting regressions (#44685)
2025-12-12 11:06:49 +00:00
agent_settings
Streaming tool use for inline assistant (#44751)
2025-12-14 03:22:20 +00:00
agent_ui
New evals for inline assistant (#44431)
2025-12-14 22:55:41 -08:00
ai_onboarding
ai onboarding: Add dismiss button to the sign in banner (#40660)
2025-10-20 08:35:28 -03:00
anthropic
Streaming tool use for inline assistant (#44751)
2025-12-14 03:22:20 +00:00
askpass
askpass: Use double quotes for script name in helper command (#43689)
2025-11-28 08:18:19 +01:00
assets
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
assistant_slash_command
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
assistant_slash_commands
util: Move PathMatcher over to RelPath (#43881)
2025-12-01 12:57:51 +00:00
assistant_text_thread
Finish inline telemetry changes (#44842)
2025-12-15 04:07:44 +00:00
audio
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
auto_update
auto_update: Tentatively prevent auto-update loop on Nightly again (#43670)
2025-11-27 14:08:43 +00:00
auto_update_helper
auto_update: Ignore dir removal errors on windows (#42435)
2025-11-11 12:55:19 +00:00
auto_update_ui
release_version: Do not use prerelease field (#43669)
2025-11-27 13:46:43 +00:00
aws_http_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
bedrock
bedrock: Support global endpoints and new regional endpoints (#44103)
2025-12-04 12:14:31 +01:00
breadcrumbs
svg_preview: Remove unnecessary dependency on editor (#43147)
2025-11-20 12:18:50 +01:00
buffer_diff
git: Add word diff highlighting (#43269)
2025-12-01 22:36:30 -05:00
call
collab: Add action to copy room id (#44004)
2025-12-02 16:27:36 +00:00
channel
releases: Add build number to Nightly builds (#42990)
2025-11-24 13:34:04 +01:00
cli
Fix --user-data-dir (#44235)
2025-12-10 00:42:19 +00:00
client
Rework edit prediction CLI (#44562)
2025-12-10 17:36:51 -08:00
clock
text: Improve panic messages with more information (#42072)
2025-11-06 09:16:45 +00:00
cloud_api_client
Use cloud for auto-update (#42246)
2025-11-10 23:00:55 -07:00
cloud_api_types
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
cloud_llm_client
supports_streaming_tools member (#44753)
2025-12-13 00:56:06 +00:00
codestral
Reorganize edit prediction code and remove old experiments (#44187)
2025-12-04 15:56:57 -08:00
collab
Fix race condition in test_collaborating_with_completion (#44806)
2025-12-14 21:58:26 +02:00
collab_ui
Fix telemetry for collab::ToggleMute and remove unregistered actions (#44432)
2025-12-08 22:03:51 +00:00
collections
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
command_palette
Add history to the command palette (#44517)
2025-12-10 07:07:48 +00:00
command_palette_hooks
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
component
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
context_server
util: Fix shell builder quoting regressions (#44685)
2025-12-12 11:06:49 +00:00
copilot
Enable configuring edit prediction providers through the settings UI (#44505)
2025-12-13 11:06:30 -05:00
crashes
Fix "busy" cursor appearing on startup (#44019)
2025-12-02 16:15:18 -05:00
credentials_provider
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
dap
util: Fix zip extraction (#42714)
2025-11-19 12:34:41 +01:00
dap_adapters
language: Add LanguageName::new_static to reduce allocations (#44380)
2025-12-08 19:57:02 +01:00
db
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
debug_adapter_extension
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
debugger_tools
editor: Add active match highlight for buffer and project search (#44098)
2025-12-04 03:55:04 +05:30
debugger_ui
gpui: Implement From<String> for ElementId (#44447)
2025-12-09 09:08:59 +01:00
deepseek
Fix DeepSeek Reasoner tool-call handling and add reasoning_content support (#44301)
2025-12-09 20:54:16 +01:00
denoise
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
diagnostics
language: Spawn language servers on background threads (#44631)
2025-12-11 17:23:27 +00:00
docs_preprocessor
docs: Ensure macOS and Linux keybindings are escaped in HTML (#39802)
2025-10-23 14:13:35 -04:00
edit_prediction
Add an action for capturing your last edit as an edit prediction example (#44841)
2025-12-14 20:50:48 -08:00
edit_prediction_cli
Add an action for capturing your last edit as an edit prediction example (#44841)
2025-12-14 20:50:48 -08:00
edit_prediction_context
Rework edit prediction CLI (#44562)
2025-12-10 17:36:51 -08:00
edit_prediction_types
edit_prediction: Remove duplicate definition of interpolate_edits (#44485)
2025-12-09 15:13:52 +00:00
edit_prediction_ui
Add an action for capturing your last edit as an edit prediction example (#44841)
2025-12-14 20:50:48 -08:00
editor
git: Avoid removing project excerpts for dirty buffers (#44312)
2025-12-15 02:48:15 +00:00
eval
edit prediction cli: Improve language server reliability (#44666)
2025-12-11 22:30:51 +00:00
eval_utils
New evals for inline assistant (#44431)
2025-12-14 22:55:41 -08:00
explorer_command_injector
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
extension
extension_cli: Properly populate manifest with snippet location (#44425)
2025-12-08 21:49:26 +01:00
extension_api
zed_extension_api: Fork new version of extension API (#44025)
2025-12-02 22:26:40 +00:00
extension_cli
extension_cli: Properly populate manifest with snippet location (#44425)
2025-12-08 21:49:26 +01:00
extension_host
extension_cli: Properly populate manifest with snippet location (#44425)
2025-12-08 21:49:26 +01:00
extensions_ui
ui: Remove support for unnecessary Switch colors (#44388)
2025-12-08 13:16:19 +00:00
feature_flags
New evals for inline assistant (#44431)
2025-12-14 22:55:41 -08:00
feedback
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
file_finder
Fix git features not working when a Windows host collaborates with a unix guest (#43515)
2025-11-26 16:56:34 +00:00
file_icons
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
fs
git: Revert "Ignore whitespace in git blame invocation" (#44648)
2025-12-12 14:28:25 +01:00
fs_benchmarks
fs: Reintroduce benchmarks crate (#40689)
2025-10-20 10:30:06 +00:00
fsevent
Disable fsevents tests (#43218)
2025-11-20 22:17:50 -07:00
fuzzy
fuzzy: Use lowercase representations for matrix size calculation (#44338)
2025-12-08 19:50:20 +01:00
git
git: Revert "Ignore whitespace in git blame invocation" (#44648)
2025-12-12 14:28:25 +01:00
git_hosting_providers
git: Improve self-hosted provider support and Bitbucket integration (#42343)
2025-12-08 13:32:14 -05:00
git_ui
git: Avoid removing project excerpts for dirty buffers (#44312)
2025-12-15 02:48:15 +00:00
go_to_line
multi_buffer: Typed MultiBufferOffset (#42707)
2025-11-19 22:00:58 +00:00
google_ai
google_ai: Update Gemini models (#43117)
2025-11-28 15:48:33 -05:00
gpui
Implement Sum trait for Pixels (#44809)
2025-12-14 11:47:15 -07:00
gpui_macros
Reduce macro burden for rust-analyzer (#42871)
2025-11-17 12:31:00 +00:00
gpui_tokio
workspace: Handle non-cloneable items better (#41215)
2025-10-26 13:24:26 +00:00
html_to_markdown
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
http_client
Remove reqwest dependency from gpui (#44424)
2025-12-09 09:29:40 -08:00
http_client_tls
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
icons
Introduce MVP Dev Containers support (#44442)
2025-12-10 12:10:43 -08:00
image_viewer
image viewer: Make image metadata not a button (#44651)
2025-12-11 19:14:36 +00:00
inspector_ui
Apply show_completions_on_input: false to word & snippet completions (#44021)
2025-12-02 21:33:41 +00:00
install_cli
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
journal
multi_buffer: Typed MultiBufferOffset (#42707)
2025-11-19 22:00:58 +00:00
json_schema_store
Specify a schema to use when dealing with JSONC files (#44250)
2025-12-05 20:26:42 +00:00
keymap_editor
Apply show_completions_on_input: false to word & snippet completions (#44021)
2025-12-02 21:33:41 +00:00
language
language: Make TreeSitterData only shared between snapshots of the same version (#44198)
2025-12-12 14:15:50 +01:00
language_extension
language_extension: Handle prefixed WASI windows paths in extension spawning (#44477)
2025-12-09 13:22:57 +01:00
language_model
Finish inline telemetry changes (#44842)
2025-12-15 04:07:44 +00:00
language_models
New evals for inline assistant (#44431)
2025-12-14 22:55:41 -08:00
language_onboarding
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
language_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
language_tools
editor: Add active match highlight for buffer and project search (#44098)
2025-12-04 03:55:04 +05:30
languages
Add angled bracket highlighting for C++ (#44735)
2025-12-13 01:38:44 +01:00
line_ending_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
livekit_api
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
livekit_client
gpui: Implement From<String> for ElementId (#44447)
2025-12-09 09:08:59 +01:00
lmstudio
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
lsp
Move servers back from the background thread (#44696)
2025-12-12 11:16:17 +00:00
markdown
agent_ui: Fix show markdown list checked state (#43567)
2025-12-08 14:04:49 +00:00
markdown_preview
Fix missing buffer font features in Blame UI, Hover Popover and Markdown Preview (#44657)
2025-12-12 09:55:06 +00:00
media
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
menu
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
migrator
Add more preview tab settings and fix janky behavior (#43921)
2025-12-03 21:56:39 +00:00
miniprofiler_ui
gpui: Unify track_scroll method to receive a reference type (#43518)
2025-11-26 18:03:42 +01:00
mistral
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
multi_buffer
git: Avoid removing project excerpts for dirty buffers (#44312)
2025-12-15 02:48:15 +00:00
nc
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
net
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
node_runtime
Introduce MVP Dev Containers support (#44442)
2025-12-10 12:10:43 -08:00
notifications
sum_tree: Implement recursive Sumtree::find, use it over Cursor::seek if possible (#40700)
2025-10-20 17:20:09 +00:00
ollama
ollama: Fix tool calling (#42275)
2025-11-11 16:10:47 +01:00
onboarding
Allow dynamic set_theme based on Appearance (#42812)
2025-12-01 20:52:57 -07:00
open_ai
Add GPT-5.2 support (#44656)
2025-12-11 15:49:10 -05:00
open_router
Fix Gemini 3 on OpenRouter (#43416)
2025-11-24 13:24:26 -05:00
outline
Use single languages::{rust_lang, markdown_lang} in tests across the codebase (#44282)
2025-12-06 18:49:21 +00:00
outline_panel
editor: Fix buffer fold focuses first buffer in multi-buffer instead of the toggled one (#44394)
2025-12-08 21:00:00 +05:30
panel
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
paths
Introduce MVP Dev Containers support (#44442)
2025-12-10 12:10:43 -08:00
picker
Add history to the command palette (#44517)
2025-12-10 07:07:48 +00:00
prettier
Move servers back from the background thread (#44696)
2025-12-12 11:16:17 +00:00
project
git: Revert "Ignore whitespace in git blame invocation" (#44648)
2025-12-12 14:28:25 +01:00
project_benchmarks
search: New recent old search implementation (#40835)
2025-11-13 14:56:40 +01:00
project_panel
Fix label copy for file history menu items (#44569)
2025-12-10 18:00:11 +00:00
project_symbols
Add more preview tab settings and fix janky behavior (#43921)
2025-12-03 21:56:39 +00:00
prompt_store
Streaming tool use for inline assistant (#44751)
2025-12-14 03:22:20 +00:00
proto
Revert "Increase askpass timeout for git operations (#42946)" (#44578)
2025-12-10 18:07:01 -05:00
recent_projects
Introduce MVP Dev Containers support (#44442)
2025-12-10 12:10:43 -08:00
refineable
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
release_channel
release_version: Do not use prerelease field (#43669)
2025-11-27 13:46:43 +00:00
remote
remote: Remove unnecessary and incorrect single quote in MasterProcess (#44697)
2025-12-12 11:53:15 +00:00
remote_server
edit prediction cli: Skip worktree scan (#44658)
2025-12-11 21:05:50 +00:00
repl
Multiple priority scheduler (#44701)
2025-12-12 06:32:30 -08:00
reqwest_client
Remove reqwest dependency from gpui (#44424)
2025-12-09 09:29:40 -08:00
rich_text
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
rope
adds tracing for instrumenting non-async functions (#44147)
2025-12-05 17:23:06 +00:00
rpc
remote: Recognize WSL interop to open browser for codex web login (#44136)
2025-12-04 14:42:26 +00:00
rules_library
buffer: Keep the shorter language setting names for the common operation (#43915)
2025-12-01 18:55:33 +01:00
scheduler
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
schema_generator
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
search
Add support for manual spans, expand instrumentation (#44663)
2025-12-11 22:29:47 +00:00
session
zed: Fix session ID mismatching for workspace and telemetry (#43659)
2025-12-01 09:12:31 +01:00
settings
Streaming tool use for inline assistant (#44751)
2025-12-14 03:22:20 +00:00
settings_json
settings_ui: Show migration banner (#41112)
2025-10-27 10:13:26 -04:00
settings_macros
Fallible Settings (#42938)
2025-11-21 08:28:17 -07:00
settings_profile_selector
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
settings_ui
Finish inline telemetry changes (#44842)
2025-12-15 04:07:44 +00:00
snippet
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
snippet_provider
Add editor::InsertSnippet action (#44428)
2025-12-08 21:38:24 +00:00
snippets_ui
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
sqlez
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
sqlez_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
story
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
storybook
ui: Remove outdated/unused component stories (#43118)
2025-11-20 01:52:13 -03:00
streaming_diff
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
sum_tree
adds tracing for instrumenting non-async functions (#44147)
2025-12-05 17:23:06 +00:00
supermaven
Reorganize edit prediction code and remove old experiments (#44187)
2025-12-04 15:56:57 -08:00
supermaven_api
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
svg_preview
svg_preview: Remove unnecessary dependency on editor (#43147)
2025-11-20 12:18:50 +01:00
system_specs
releases: Add build number to Nightly builds (#42990)
2025-11-24 13:34:04 +01:00
tab_switcher
tab_switcher: Subscribe to workspace events instead of pane events (#44101)
2025-12-03 22:49:44 +00:00
task
Allow trailing commas in builtin JSONC schemas (#43854)
2025-12-04 15:37:32 -05:00
tasks_ui
gpui: Implement From<String> for ElementId (#44447)
2025-12-09 09:08:59 +01:00
telemetry
Fix telemetry (#42184)
2025-11-07 11:36:05 +00:00
telemetry_events
releases: Add build number to Nightly builds (#42990)
2025-11-24 13:34:04 +01:00
terminal
terminal: Remove SHLVL from terminal environment to fix incorrect shell level (#44835)
2025-12-15 08:12:24 +01:00
terminal_view
util: Fix shell builder quoting regressions (#44685)
2025-12-12 11:06:49 +00:00
text
git: Revert "Ignore whitespace in git blame invocation" (#44648)
2025-12-12 14:28:25 +01:00
theme
editor: Add active match highlight for buffer and project search (#44098)
2025-12-04 03:55:04 +05:30
theme_extension
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
theme_importer
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
theme_selector
Allow dynamic set_theme based on Appearance (#42812)
2025-12-01 20:52:57 -07:00
time_format
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
title_bar
Disambiguate branch name in title bar (#44793)
2025-12-14 02:51:58 +00:00
toolchain_selector
lsp: Do not drop lsp buffer handle from editor when a language change leads to buffer having a legit language (#44469)
2025-12-09 21:37:39 +01:00
ui
Enable configuring edit prediction providers through the settings UI (#44505)
2025-12-13 11:06:30 -05:00
ui_input
debugger_ui: Improve some elements of the UI (#43344)
2025-11-22 23:28:34 -03:00
ui_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
ui_prompt
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
util
util: Avoid redundant Arc allocation in SanitizedPath::from_arc (#44479)
2025-12-12 13:33:49 +01:00
util_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
vercel
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
vim
Add scrolling functionality to markdown preview mode (#44585)
2025-12-11 22:18:38 +00:00
vim_mode_setting
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
watch
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
web_search
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
web_search_providers
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
workspace
Enable configuring edit prediction providers through the settings UI (#44505)
2025-12-13 11:06:30 -05:00
worktree
Multiple priority scheduler (#44701)
2025-12-12 06:32:30 -08:00
worktree_benchmarks
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
x_ai
Add support for Grok 4.1 Fast models in xAI provider (#43419)
2025-12-08 16:38:34 +01:00
zed
Add support for manual spans, expand instrumentation (#44663)
2025-12-11 22:29:47 +00:00
zed_actions
Introduce MVP Dev Containers support (#44442)
2025-12-10 12:10:43 -08:00
zed_env_vars
Enable configuring edit prediction providers through the settings UI (#44505)
2025-12-13 11:06:30 -05:00
zeta_prompt
Rework edit prediction CLI (#44562)
2025-12-10 17:36:51 -08:00
zlog
zlog: Fix dynamic mod path filtering (#44296)
2025-12-06 17:56:49 +00:00
zlog_settings
Automate settings registration (#42238)
2025-11-07 22:27:14 +00:00
ztracing
Add support for manual spans, expand instrumentation (#44663)
2025-12-11 22:29:47 +00:00
ztracing_macro
adds tracing for instrumenting non-async functions (#44147)
2025-12-05 17:23:06 +00:00