1

scripts/api-server-dev.mjs

@@ -8,9 +8,18 @@ const apiServerExePath = resolve(
   repoRoot,
   'server-rs/target/debug/api-server.exe',
 );
-const shellEnvKeys = new Set(Object.keys(process.env));
 const LOCAL_ENV_FILES = ['.env', '.env.local', '.env.secrets.local'];
 
+function buildProtectedEnvKeys(baseEnv) {
+  return new Set(
+    Object.entries(baseEnv)
+      .filter(([, value]) => String(value ?? '').trim())
+      .map(([key]) => key),
+  );
+}
+
+const shellEnvKeys = buildProtectedEnvKeys(process.env);
+
 function loadEnvFile(path, target, protectedKeys = shellEnvKeys) {
   if (!existsSync(path)) {
     return;
@@ -54,7 +63,7 @@ export function loadApiServerEnv(
 
 export function mergeApiServerEnv(repoRootPath, baseEnv = process.env) {
   const mergedEnv = { ...baseEnv };
-  loadApiServerEnv(repoRootPath, mergedEnv, new Set(Object.keys(baseEnv)));
+  loadApiServerEnv(repoRootPath, mergedEnv, buildProtectedEnvKeys(baseEnv));
   return mergedEnv;
 }