diff --git a/local/cline.sh b/local/cline.sh
index 937f71ef..afbb1e5e 100755
--- a/local/cline.sh
+++ b/local/cline.sh
@@ -31,32 +31,10 @@ else
 fi
 
 log_step "Setting up environment variables..."
-# Export env vars for current session
-export OPENROUTER_API_KEY="${OPENROUTER_API_KEY}"
-export OPENAI_API_KEY="${OPENROUTER_API_KEY}"
-export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
-
-# Persist to shell config
-SHELL_CONFIG=""
-if [[ -f "${HOME}/.zshrc" ]]; then
-    SHELL_CONFIG="${HOME}/.zshrc"
-elif [[ -f "${HOME}/.bashrc" ]]; then
-    SHELL_CONFIG="${HOME}/.bashrc"
-fi
-
-if [[ -n "${SHELL_CONFIG}" ]]; then
-    # Remove old entries if they exist
-    sed -i.bak '/^export OPENROUTER_API_KEY=/d' "${SHELL_CONFIG}" 2>/dev/null || true
-    sed -i.bak '/^export OPENAI_API_KEY=/d' "${SHELL_CONFIG}" 2>/dev/null || true
-    sed -i.bak '/^export OPENAI_BASE_URL=/d' "${SHELL_CONFIG}" 2>/dev/null || true
-
-    # Add new entries
-    printf '\nexport OPENROUTER_API_KEY="%s"\n' "${OPENROUTER_API_KEY}" >> "${SHELL_CONFIG}"
-    printf 'export OPENAI_API_KEY="%s"\n' "${OPENROUTER_API_KEY}" >> "${SHELL_CONFIG}"
-    printf 'export OPENAI_BASE_URL="https://openrouter.ai/api/v1"\n' >> "${SHELL_CONFIG}"
-
-    log_info "Environment variables persisted to ${SHELL_CONFIG}"
-fi
+inject_env_vars_local upload_file run_server \
+    "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_BASE_URL=https://openrouter.ai/api/v1"
 
 echo ""
 log_info "Local machine setup completed successfully!"
diff --git a/local/plandex.sh b/local/plandex.sh
index fcb310b4..81825d31 100644
--- a/local/plandex.sh
+++ b/local/plandex.sh
@@ -40,25 +40,8 @@ fi
 
 # Inject environment variables
 log_step "Setting up environment variables..."
-
-# Add to shell config
-SHELL_CONFIG=""
-if [[ -f "${HOME}/.zshrc" ]]; then
-    SHELL_CONFIG="${HOME}/.zshrc"
-elif [[ -f "${HOME}/.bashrc" ]]; then
-    SHELL_CONFIG="${HOME}/.bashrc"
-else
-    SHELL_CONFIG="${HOME}/.bashrc"
-    touch "${SHELL_CONFIG}"
-fi
-
-# Check if already configured
-if ! grep -q "export OPENROUTER_API_KEY=" "${SHELL_CONFIG}" 2>/dev/null; then
-    printf '\n# OpenRouter API Key for Plandex\nexport OPENROUTER_API_KEY="%s"\n' "${OPENROUTER_API_KEY}" >> "${SHELL_CONFIG}"
-fi
-
-# Export for current session
-export OPENROUTER_API_KEY="${OPENROUTER_API_KEY}"
+inject_env_vars_local upload_file run_server \
+    "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}"
 
 echo ""
 log_info "Local setup completed successfully!"
@@ -73,11 +56,13 @@ if [[ -n "${SPAWN_PROMPT:-}" ]]; then
     escaped_prompt=$(printf '%q' "${SPAWN_PROMPT}")
 
     # Execute without TTY
-    bash -c "source ${SHELL_CONFIG} && plandex new && plandex tell ${escaped_prompt}"
+    source ~/.zshrc 2>/dev/null || true
+    plandex new && plandex tell ${escaped_prompt}
 else
     # Interactive mode: start Plandex normally
     log_step "Starting Plandex..."
     sleep 1
     clear
-    interactive_session "source ${SHELL_CONFIG} && plandex"
+    source ~/.zshrc 2>/dev/null || true
+    exec plandex
 fi