refactor: Optimize the Zsh script injection logic to avoid conflicts with JetBrains.

Author: Micro66

jetbrains_plugin/src/main/kotlin/com/sina/weibo/agent/terminal/WeCoderTerminalCustomizer.kt

@@ -161,25 +161,40 @@ class WeCoderTerminalCustomizer : LocalTerminalCustomizer() {
   }
 
   /**
-   * Inject VSCode integration script for Zsh
+   * Inject VSCode integration script for Zsh (safe with JetBrains shell integration)
    */
-  private fun injectZshScript(command: Array<String>, envs: MutableMap<String, String>, scriptPath: String): Array<String> {
-    // Save user's original ZDOTDIR environment variable
-    val userZdotdir = envs["ZDOTDIR"]
-      ?: System.getenv("ZDOTDIR")
-      ?: System.getProperty("user.home")
-
-    // 🔧 Protect the JETBRAINS_INTELLIJ_ZSH_DIR environment variable to prevent it from being cleared.
+  private fun injectZshScript(
+    command: Array<String>,
+    envs: MutableMap<String, String>,
+    scriptPath: String
+  ): Array<String> {
+    // 1) 如果 JetBrains 自带的 zsh shell integration 已经在场，就不要去改 ZDOTDIR，避免冲突
     val jetbrainsZshDir = envs["JETBRAINS_INTELLIJ_ZSH_DIR"] ?: System.getenv("JETBRAINS_INTELLIJ_ZSH_DIR")
-    if (jetbrainsZshDir != null) {
-      envs["JETBRAINS_INTELLIJ_ZSH_DIR"] = jetbrainsZshDir
-      logger.info("🔧 Preserved JETBRAINS_INTELLIJ_ZSH_DIR: $jetbrainsZshDir")
+    val shellExeName = File(command[0]).name
+    val looksLikeJbZsh = command[0].contains("/plugins/terminal/shell-integrations/zsh")
+
+    if (jetbrainsZshDir != null || looksLikeJbZsh) {
+      logger.info("🔒 Detected JetBrains Zsh integration (JETBRAINS_INTELLIJ_ZSH_DIR=$jetbrainsZshDir, looksLikeJbZsh=$looksLikeJbZsh). Skip overriding ZDOTDIR.")
+      // 仍然保留用户原始 ZDOTDIR 到环境，便于脚本内按需使用
+      val userZdotdir = envs["ZDOTDIR"] ?: System.getenv("ZDOTDIR") ?: System.getProperty("user.home")
+      envs["USER_ZDOTDIR"] = userZdotdir
+      return command
     }
 
+    // 2) 只有当 scriptPath 看起来是一个有效的 ZDOTDIR（至少包含 .zshrc）时才注入
+    val dir = File(scriptPath)
+    val hasZshrc = File(dir, ".zshrc").exists()
+    if (!dir.isDirectory || !hasZshrc) {
+      logger.warn("🚫 Zsh script dir '$scriptPath' is invalid (dir=$dir, hasZshrc=$hasZshrc). Skip overriding ZDOTDIR.")
+      return command
+    }
+
+    // 3) 记录并安全覆写
+    val userZdotdir = envs["ZDOTDIR"] ?: System.getenv("ZDOTDIR") ?: System.getProperty("user.home")
     envs["USER_ZDOTDIR"] = userZdotdir
     envs["ZDOTDIR"] = scriptPath
-    
-    logger.info("🔧 Saved original ZDOTDIR: $userZdotdir, set new ZDOTDIR: $scriptPath")
+
+    logger.info("🔧 Set ZDOTDIR to '$scriptPath' (saved original as USER_ZDOTDIR='$userZdotdir'), shell=$shellExeName")
     return command
   }