Revert "fix(zsh): use global scope for typeset to support lazy loading" (#2810)

Author: ssddOnTop

crates/forge_main/src/zsh/plugin.rs

@@ -44,9 +44,7 @@ pub fn generate_zsh_plugin() -> Result<String> {
     output.push_str(&completions_str);
 
     // Set environment variable to indicate plugin is loaded (with timestamp)
-    // Use typeset -g so the variable is global even when eval'd inside a function
-    // (e.g. lazy-loading plugin managers like zinit, zplug, zsh-defer)
-    output.push_str("\ntypeset -g _FORGE_PLUGIN_LOADED=$(date +%s)\n");
+    output.push_str("\n_FORGE_PLUGIN_LOADED=$(date +%s)\n");
 
     Ok(output)
 }
@@ -57,9 +55,7 @@ pub fn generate_zsh_theme() -> Result<String> {
         super::normalize_script(include_str!("../../../../shell-plugin/forge.theme.zsh"));
 
     // Set environment variable to indicate theme is loaded (with timestamp)
-    // Use typeset -g so the variable is global even when eval'd inside a function
-    // (e.g. lazy-loading plugin managers like zinit, zplug, zsh-defer)
-    content.push_str("\ntypeset -g _FORGE_THEME_LOADED=$(date +%s)\n");
+    content.push_str("\n_FORGE_THEME_LOADED=$(date +%s)\n");
 
     Ok(content)
 }

shell-plugin/forge.theme.zsh

@@ -1,8 +1,7 @@
 #!/usr/bin/env zsh
 
 # Enable prompt substitution for RPROMPT
-# Use emulate to ensure setopt applies globally even when sourced from a function
-emulate -R zsh -c 'setopt PROMPT_SUBST'
+setopt PROMPT_SUBST
 
 # Model and agent info with token count
 # Fully formatted output directly from Rust
@@ -24,7 +23,6 @@ function _forge_prompt_info() {
 
 # Right prompt: agent and model with token count (uses single forge prompt command)
 # Set RPROMPT if empty, otherwise append to existing value
-# Use typeset -g to ensure RPROMPT is set globally even when sourced from a function
 if [[ -z "$_FORGE_THEME_LOADED" ]]; then
-    typeset -g RPROMPT='$(_forge_prompt_info)'"${RPROMPT:+ ${RPROMPT}}"
+    RPROMPT='$(_forge_prompt_info)'"${RPROMPT:+ ${RPROMPT}}"
 fi

shell-plugin/lib/config.zsh

@@ -1,38 +1,36 @@
 #!/usr/bin/env zsh
 
 # Configuration variables for forge plugin
-# Using typeset -gh (global + hidden) so variables survive lazy-loading
-# from within a function scope (e.g. zinit, zplug, zsh-defer) while
-# staying hidden from `typeset` listings.
+# Using typeset to keep variables local to plugin scope and prevent public exposure
 
-typeset -gh _FORGE_BIN="${FORGE_BIN:-forge}"
-typeset -gh _FORGE_CONVERSATION_PATTERN=":"
-typeset -gh _FORGE_MAX_COMMIT_DIFF="${FORGE_MAX_COMMIT_DIFF:-100000}"
-typeset -gh _FORGE_DELIMITER='\s\s+'
-typeset -gh _FORGE_PREVIEW_WINDOW="--preview-window=bottom:75%:wrap:border-sharp"
+typeset -h _FORGE_BIN="${FORGE_BIN:-forge}"
+typeset -h _FORGE_CONVERSATION_PATTERN=":"
+typeset -h _FORGE_MAX_COMMIT_DIFF="${FORGE_MAX_COMMIT_DIFF:-100000}"
+typeset -h _FORGE_DELIMITER='\s\s+'
+typeset -h _FORGE_PREVIEW_WINDOW="--preview-window=bottom:75%:wrap:border-sharp"
 
 # Detect fd command - Ubuntu/Debian use 'fdfind', others use 'fd'
-typeset -gh _FORGE_FD_CMD="$(command -v fdfind 2>/dev/null || command -v fd 2>/dev/null || echo 'fd')"
+typeset -h _FORGE_FD_CMD="$(command -v fdfind 2>/dev/null || command -v fd 2>/dev/null || echo 'fd')"
 
 # Detect bat command - use bat if available, otherwise fall back to cat
 if command -v bat &>/dev/null; then
-    typeset -gh _FORGE_CAT_CMD="bat --color=always --style=numbers,changes --line-range=:500"
+    typeset -h _FORGE_CAT_CMD="bat --color=always --style=numbers,changes --line-range=:500"
 else
-    typeset -gh _FORGE_CAT_CMD="cat"
+    typeset -h _FORGE_CAT_CMD="cat"
 fi
 
 # Commands cache - loaded lazily on first use
-typeset -gh _FORGE_COMMANDS=""
+typeset -h _FORGE_COMMANDS=""
 
 # Hidden variables to be used only via the ForgeCLI
-typeset -gh _FORGE_CONVERSATION_ID
-typeset -gh _FORGE_ACTIVE_AGENT
+typeset -h _FORGE_CONVERSATION_ID
+typeset -h _FORGE_ACTIVE_AGENT
 
 # Previous conversation ID for :conversation - (like cd -)
-typeset -gh _FORGE_PREVIOUS_CONVERSATION_ID
+typeset -h _FORGE_PREVIOUS_CONVERSATION_ID
 
 # Session-scoped model and provider overrides (set via :model / :m).
 # When non-empty, these are passed as --model / --provider to every forge
 # invocation for the lifetime of the current shell session.
-typeset -gh _FORGE_SESSION_MODEL
-typeset -gh _FORGE_SESSION_PROVIDER
+typeset -h _FORGE_SESSION_MODEL
+typeset -h _FORGE_SESSION_PROVIDER

shell-plugin/lib/highlight.zsh

@@ -3,14 +3,6 @@
 # Syntax highlighting configuration for forge commands
 # Style the conversation pattern with appropriate highlighting
 # Keywords in yellow, rest in default white
-#
-# Use global declarations so we update the shared zsh-syntax-highlighting
-# collections even when sourced from within a function (lazy-loading plugin
-# managers). Patterns must remain an associative array because the pattern
-# highlighter stores regex => style entries in ZSH_HIGHLIGHT_PATTERNS.
-
-typeset -gA ZSH_HIGHLIGHT_PATTERNS
-typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
 
 # Style tagged files
 ZSH_HIGHLIGHT_PATTERNS+=('@\[[^]]#\]' 'fg=cyan,bold')