diff --git a/Bookworm-Setup.sh b/Bookworm-Setup.sh
index fc2e2a1..c47d457 100644
--- a/Bookworm-Setup.sh
+++ b/Bookworm-Setup.sh
@@ -248,7 +248,7 @@ save_secrets_to_cache() {
   local today
   today=$(date +%Y-%m-%d)
   local data="EXPIRY=$today"
-  local env_keys="ANTHROPIC_API_KEY ANTHROPIC_BASE_URL GITHUB_PERSONAL_ACCESS_TOKEN SLACK_BOT_TOKEN ATLASSIAN_API_TOKEN BROWSERBASE_API_KEY FIRECRAWL_API_KEY"
+  local env_keys="ANTHROPIC_API_KEY ANTHROPIC_BASE_URL GITHUB_PERSONAL_ACCESS_TOKEN SLACK_BOT_TOKEN ATLASSIAN_API_TOKEN BROWSERBASE_API_KEY FIRECRAWL_API_KEY GEMINI_API_KEY"
   for k in $env_keys; do
     local v="${!k}"
     if [ -n "$v" ]; then
@@ -326,8 +326,9 @@ TEMPLATE_FILE="$CLAUDE_DIR/settings.template.json"
 SETTINGS_FILE="$CLAUDE_DIR/settings.json"
 if [ -f "$TEMPLATE_FILE" ]; then
   CLAUDE_ROOT=$(echo "$CLAUDE_DIR" | sed 's/\\/\//g')
-  sed "s|{{CLAUDE_ROOT}}|$CLAUDE_ROOT|g; s|{{HOME}}|$HOME|g" "$TEMPLATE_FILE" > "$SETTINGS_FILE"
-  success "settings.json 已渲染"
+  SHELL_BIN="${SHELL:-/bin/zsh}"
+  sed "s|{{CLAUDE_ROOT}}|$CLAUDE_ROOT|g; s|{{HOME}}|$HOME|g; s|{{PWSH_PATH}}|$SHELL_BIN|g" "$TEMPLATE_FILE" > "$SETTINGS_FILE"
+  success "settings.json 已渲染 (SHELL=$SHELL_BIN)"
 fi
 
 # ============================================================