Skip to content

fix(environments): forward VELLUM_ENVIRONMENT across desktop→CLI→daemon handoffs #25633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clopen-set merged 1 commit into from
Apr 14, 2026
Merged

fix(environments): forward VELLUM_ENVIRONMENT across desktop→CLI→daemon handoffs #25633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cli/src/lib/local.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,11 +855,15 @@ export async function startLocalDaemon(
HOME: process.env.HOME || home,
PATH: [...extraDirs, basePath].filter(Boolean).join(":"),
};
// Forward optional config env vars the daemon may need
// Forward optional config env vars the daemon may need.
// `VELLUM_ENVIRONMENT` must be forwarded so the daemon resolves
// env-scoped paths (device ID, platform/guardian tokens, XDG
// config dir) to the same location as the CLI that spawned it.
for (const key of [
"ANTHROPIC_API_KEY",
"APP_VERSION",
"BASE_DATA_DIR",
"VELLUM_ENVIRONMENT",
"VELLUM_PLATFORM_URL",
"QDRANT_HTTP_PORT",
"QDRANT_URL",
Expand Down
5 changes: 5 additions & 0 deletions clients/macos/vellum-assistant/App/VellumCli.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ final class VellumCli: AssistantManagementClient {

/// Environment variable keys forwarded from the host process to CLI
/// child processes. Centralised so every call site stays in sync.
/// `VELLUM_ENVIRONMENT` must be forwarded so the bundled CLI resolves
/// env-scoped paths (lockfile, device ID, platform/guardian tokens,
/// workspace config) to the same location the desktop app uses. The
/// app's Info.plist sets this at build time (see `build.sh:1054`).
nonisolated private static let forwardedEnvKeys: [String] = [
"VELLUM_ENVIRONMENT",
"VELLUM_PLATFORM_URL",
"VELLUM_WORKSPACE_DIR",
"ASSISTANT_GIT_USER_NAME", "ASSISTANT_GIT_USER_EMAIL",
Expand Down