Fix agent servers loading environment from home dir instead of project dir#52763
Merged
benbrandt merged 3 commits intozed-industries:mainfrom Mar 31, 2026
Merged
Conversation
…t dir All local agent server types were calling `local_directory_environment` with `paths::home_dir()`, causing direnv and shell environment to be loaded from `~` rather than the project's worktree directory. This meant project-specific `.envrc` variables (e.g. Google Vertex credentials) were never picked up by external agents like Claude. Added `default_environment()` on `ProjectEnvironment` that resolves the default visible worktree path and uses it for environment loading, falling back to home_dir() only when no worktree is available.
Extract `default_worktree_path` as a separate public method on `ProjectEnvironment` for testability and reuse. Add integration tests verifying environment loading uses the project worktree directory.
|
We require contributors to sign our Contributor License Agreement, and we don't have @derekparker on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
benbrandt
requested changes
Mar 30, 2026
benbrandt
approved these changes
Mar 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
All local agent server types were calling
local_directory_environmentwith
paths::home_dir(), causing direnv and shell environment to beloaded from
~rather than the project's worktree directory. This meantproject-specific
.envrcvariables (e.g. Google Vertex credentials)were never picked up by external agents like Claude.
Added
default_environment()onProjectEnvironmentthat resolves thedefault visible worktree path and uses it for environment loading,
falling back to home_dir() only when no worktree is available.
Self-Review Checklist:
Closes #ISSUE
Release Notes: