Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Filter app runtime env vars from terminal spawn environment

Julius Marminge4b4abcdd7d19
diff --git a/apps/server/src/terminalManager.test.ts b/apps/server/src/terminalManager.test.ts
index bf7da6199..efbd8ce62 100644
--- a/apps/server/src/terminalManager.test.ts
+++ b/apps/server/src/terminalManager.test.ts
@@ -424,4 +424,49 @@ describe("TerminalManager", () => {
manager.dispose();
});
+
+ it("filters app runtime env variables from terminal sessions", async () => {
+ const originalValues = new Map<string, string | undefined>();
+ const setEnv = (key: string, value: string | undefined) => {
+ if (!originalValues.has(key)) {
+ originalValues.set(key, process.env[key]);
+ }
+ if (value === undefined) {
+ delete process.env[key];
+ return;
+ }
+ process.env[key] = value;
+ };
+ const restoreEnv = () => {
+ for (const [key, value] of originalValues) {
+ if (value === undefined) {
+ delete process.env[key];
+ } else {
+ process.env[key] = value;
+ }
+ }
+ };
+
+ setEnv("PORT", "5173");
+ setEnv("T3CODE_PORT", "3773");
+ setEnv("VITE_DEV_SERVER_URL", "http://localhost:5173");
+ setEnv("TEST_TERMINAL_KEEP", "keep-me");
+
+ try {
+ const { manager, ptyAdapter } = makeManager();
+ await manager.open(openInput());
+ const spawnInput = ptyAdapter.spawnInputs[0];
+ expect(spawnInput).toBeDefined();
+ if (!spawnInput) return;
+
+ expect(spawnInput.env.PORT).toBeUndefined();
+ expect(spawnInput.env.T3CODE_PORT).toBeUndefined();
+ expect(spawnInput.env.VITE_DEV_SERVER_URL).toBeUndefined();
+ expect(spawnInput.env.TEST_TERMINAL_KEEP).toBe("keep-me");
+
+ manager.dispose();
+ } finally {
+ restoreEnv();
+ }
+ });
});
diff --git a/apps/server/src/terminalManager.ts b/apps/server/src/terminalManager.ts
index eb881f3cd..8e1b39eb8 100644
--- a/apps/server/src/terminalManager.ts
+++ b/apps/server/src/terminalManager.ts
@@ -26,6 +26,11 @@ import { runProcess } from "./processRunner";
const DEFAULT_HISTORY_LINE_LIMIT = 5_000;
const DEFAULT_PERSIST_DEBOUNCE_MS = 40;
const DEFAULT_SUBPROCESS_POLL_INTERVAL_MS = 1_000;
+const TERMINAL_ENV_BLOCKLIST = new Set([
+ "PORT",
+ "ELECTRON_RENDERER_PORT",
+ "ELECTRON_RUN_AS_NODE",
+]);
type TerminalSubprocessChecker = (terminalPid: number) => Promise<boolean>;
@@ -234,6 +239,27 @@ function toSessionKey(threadId: string, terminalId: string): string {
return `${threadId}\u0000${terminalId}`;
}
+function shouldExcludeTerminalEnvKey(key: string): boolean {
+ const normalizedKey = key.toUpperCase();
+ if (normalizedKey.startsWith("T3CODE_")) {
+ return true;
+ }
+ if (normalizedKey.startsWith("VITE_")) {
+ return true;
+ }
+ return TERMINAL_ENV_BLOCKLIST.has(normalizedKey);
+}
+
+function createTerminalSpawnEnv(baseEnv: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
+ const spawnEnv: NodeJS.ProcessEnv = {};
+ for (const [key, value] of Object.entries(baseEnv)) {
+ if (value === undefined) continue;
+ if (shouldExcludeTerminalEnvKey(key)) continue;
+ spawnEnv[key] = value;
+ }
+ return spawnEnv;
+}
+
export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
private readonly sessions = new Map<string, TerminalSessionState>();
private readonly logsDir: string;
@@ -467,6 +493,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
let startedShell: string | null = null;
try {
const shellCandidates = resolveShellCandidates(this.shellResolver);
+ const terminalEnv = createTerminalSpawnEnv(process.env);
let lastSpawnError: unknown = null;
for (const shell of shellCandidates) {
@@ -476,7 +503,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
cwd: session.cwd,
cols: session.cols,
rows: session.rows,
- env: process.env,
+ env: terminalEnv,
});
startedShell = shell;
break;