claudepod 1.0.2 → 1.1.1

package/.devcontainer/setup-zsh.sh

@@ -4,12 +4,39 @@
 
 set -euo pipefail
 
+# Clear npm prefix environment variables that conflict with NVM
+unset npm_config_prefix 2>/dev/null || true
+unset NPM_CONFIG_PREFIX 2>/dev/null || true
+
 echo "🐚 Setting up enhanced ZSH configuration..."
 
+# State tracking directory  
+STATE_DIR="/workspace/.devcontainer/state"
+
+# Function to create state marker
+create_state_marker() {
+    local component="$1"
+    local method="${2:-unknown}"
+    
+    mkdir -p "$STATE_DIR"
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $method" > "$STATE_DIR/${component}.installed"
+    chown -R node:node "$STATE_DIR"
+}
+
+# Function to check if component is already installed
+is_component_installed() {
+    local component="$1"
+    
+    [ -f "$STATE_DIR/${component}.installed" ]
+}
+
 # Variables
 ZSH_CUSTOM="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}"
 NODE_USER="node"
 
+# Source shell configuration modules
+source "/workspace/.devcontainer/scripts/shell/zsh-config.sh"
+
 # Function to install ZSH plugin
 install_zsh_plugin() {
     local plugin_name="$1"
@@ -42,206 +69,15 @@ install_powerlevel10k() {
     fi
 }
 
-# Function to create enhanced .zshrc
-create_zshrc() {
-    echo "📝 Creating enhanced .zshrc configuration..."
-    
-    # Backup existing .zshrc if it exists
-    if [ -f "$HOME/.zshrc" ]; then
-        cp "$HOME/.zshrc" "$HOME/.zshrc.backup.$(date +%s)" 2>/dev/null || true
-    fi
-    
-    cat > "$HOME/.zshrc" << 'EOF'
-# ClaudePod ZSH Configuration
-# Path to your oh-my-zsh installation
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set name of the theme to load
-ZSH_THEME="powerlevel10k/powerlevel10k"
-
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# Disable P10k configuration wizard
-export POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true
-
-# ZSH Configuration
-CASE_SENSITIVE="false"
-HYPHEN_INSENSITIVE="true"
-DISABLE_AUTO_UPDATE="false"
-DISABLE_UPDATE_PROMPT="true"
-export UPDATE_ZSH_DAYS=7
-DISABLE_MAGIC_FUNCTIONS="false"
-DISABLE_LS_COLORS="false"
-DISABLE_AUTO_TITLE="false"
-ENABLE_CORRECTION="true"
-COMPLETION_WAITING_DOTS="true"
-DISABLE_UNTRACKED_FILES_DIRTY="false"
-HIST_STAMPS="yyyy-mm-dd"
-
-# ZSH Plugins
-plugins=(
-  git
-  docker
-  docker-compose
-  node
-  npm
-  python
-  pip
-  vscode
-  zsh-syntax-highlighting
-  zsh-autosuggestions
-  zsh-completions
-  fast-syntax-highlighting
-  history-substring-search
-  colored-man-pages
-  command-not-found
-  extract
-  z
-)
-
-# Load Oh My Zsh
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-export LANG=en_US.UTF-8
-export EDITOR='code'
-export ARCHFLAGS="-arch x86_64"
-
-# History configuration
-HISTSIZE=50000
-SAVEHIST=50000
-setopt HIST_EXPIRE_DUPS_FIRST
-setopt HIST_IGNORE_DUPS
-setopt HIST_IGNORE_ALL_DUPS
-setopt HIST_IGNORE_SPACE
-setopt HIST_FIND_NO_DUPS
-setopt HIST_SAVE_NO_DUPS
-setopt HIST_BEEP
-setopt SHARE_HISTORY
-
-# Path configuration
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="/usr/local/share/npm-global/bin:$PATH"
-
-# Node.js/NVM configuration
-export NVM_DIR="/usr/local/share/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-
-# Python configuration
-if command -v python3 &> /dev/null; then
-    alias python=python3
-    alias pip=pip3
-fi
+# ZSH configuration is now handled by focused generator functions:
+# - generate_zsh_basic_config(): Basic ZSH settings, plugins, history  
+# - generate_zsh_aliases(): All alias definitions
+# - generate_zsh_functions(): Shell utility functions
+# - generate_zsh_welcome(): Welcome message and final configuration
+# - create_zshrc(): Main orchestrator function  
+# See: /workspace/.devcontainer/scripts/shell/zsh-config.sh
 
-# ClaudePod aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-alias gs='git status'
-alias gd='git diff'
-alias gc='git commit'
-alias gco='git checkout'
-alias gp='git push'
-alias gl='git log --oneline --graph --decorate'
-alias ga='git add'
-alias gb='git branch'
-alias gm='git merge'
-alias gr='git rebase'
-alias gf='git fetch'
-alias gpl='git pull'
-
-# Development aliases
-alias c='code .'
-alias cls='clear'
-alias h='history'
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-alias ~='cd ~'
-
-# Claude Code aliases
-alias claude='claude --model sonnet --dangerously-skip-permissions'
-alias claude-help='claude --help'
-alias claude-mcp='claude mcp list'
-alias claude-version='claude --version'
-
-# Docker aliases (if docker is available)
-if command -v docker &> /dev/null; then
-    alias d='docker'
-    alias dc='docker-compose'
-    alias dps='docker ps'
-    alias dpsa='docker ps -a'
-    alias di='docker images'
-    alias drm='docker rm'
-    alias drmi='docker rmi'
-fi
-
-# Useful functions
-# Extract various archive formats
-extract() {
-    if [ -f $1 ]; then
-        case $1 in
-            *.tar.bz2)   tar xjf $1     ;;
-            *.tar.gz)    tar xzf $1     ;;
-            *.bz2)       bunzip2 $1     ;;
-            *.rar)       unrar e $1     ;;
-            *.gz)        gunzip $1      ;;
-            *.tar)       tar xf $1      ;;
-            *.tbz2)      tar xjf $1     ;;
-            *.tgz)       tar xzf $1     ;;
-            *.zip)       unzip $1       ;;
-            *.Z)         uncompress $1  ;;
-            *.7z)        7z x $1        ;;
-            *)           echo "'$1' cannot be extracted via extract()" ;;
-        esac
-    else
-        echo "'$1' is not a valid file"
-    fi
-}
-
-# Create directory and cd into it
-mkcd() {
-    mkdir -p "$1" && cd "$1"
-}
-
-# Find process by name
-findp() {
-    ps aux | grep -v grep | grep "$1"
-}
-
-# Quick HTTP server
-serve() {
-    local port="${1:-8000}"
-    python3 -m http.server "$port"
-}
-
-# Load Powerlevel10k configuration
-if [[ -r ~/.p10k.zsh ]]; then
-  source ~/.p10k.zsh
-fi
-
-# Auto-suggestions configuration
-ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#666666"
-ZSH_AUTOSUGGEST_STRATEGY=(history completion)
-ZSH_AUTOSUGGEST_USE_ASYNC=true
-
-# Syntax highlighting configuration
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
-
-# Welcome message
-if [[ -n "$ZSH_VERSION" && -z "$VSCODE_RESOLVING_ENVIRONMENT" ]]; then
-    echo "🚀 Welcome to ClaudePod!"
-    echo "💡 Type 'claude' to start using Claude Code"
-    echo "📋 Run 'claude mcp list' to see available MCP servers"
-fi
-EOF
-
-    echo "✅ Enhanced .zshrc created"
-}
+# Note: The actual create_zshrc() function is now imported from the module above
 
 # Function to create Powerlevel10k configuration
 create_p10k_config() {
@@ -336,6 +172,18 @@ EOF
 
 # Main setup function
 main() {
+    # Check if ZSH setup is already complete
+    if is_component_installed "zsh-setup"; then
+        echo "✅ ZSH enhancement already complete (marker found)"
+        if [ -f "$HOME/.zshrc" ] && [ -d "$HOME/.oh-my-zsh/custom/themes/powerlevel10k" ]; then
+            echo "✓ .zshrc and Powerlevel10k theme verified"
+            return 0
+        else
+            echo "⚠️  Marker exists but files missing, re-running setup..."
+            rm -f "$STATE_DIR/zsh-setup.installed"
+        fi
+    fi
+    
     echo "🐚 Starting ZSH enhancement setup..."
     
     # Ensure we're running as the correct user
@@ -350,9 +198,9 @@ main() {
         exit 1
     fi
     
-    # Suppress NVM errors during this process
+    # Source NVM for this process
     export NVM_DIR="/usr/local/share/nvm"
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" 2>/dev/null || true
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
     
     # Install Powerlevel10k theme
     install_powerlevel10k
@@ -377,9 +225,10 @@ main() {
         sudo chsh -s /usr/bin/zsh "$NODE_USER" || echo "⚠️  Could not change default shell"
     fi
     
+    create_state_marker "zsh-setup" "plugins+theme+config"
     echo "✅ ZSH enhancement setup complete!"
     echo "💡 Restart your terminal or run 'source ~/.zshrc' to apply changes"
 }
 
 # Execute main function
-main
+main