openclacky 0.7.0 → 0.7.2

data/lib/clacky.rb

@@ -1,21 +1,27 @@
 # frozen_string_literal: true
 
 require_relative "clacky/version"
-require_relative "clacky/config"
 require_relative "clacky/client"
-require_relative "clacky/message_compressor"
 require_relative "clacky/skill"
 require_relative "clacky/skill_loader"
 
 # Agent system
-require_relative "clacky/model_pricing"
 require_relative "clacky/agent_config"
-require_relative "clacky/hook_manager"
-require_relative "clacky/tool_registry"
-require_relative "clacky/thinking_verbs"
-require_relative "clacky/progress_indicator"
+require_relative "clacky/providers"
 require_relative "clacky/session_manager"
-require_relative "clacky/gitignore_parser"
+
+# Agent modules
+require_relative "clacky/agent/message_compressor"
+require_relative "clacky/agent/hook_manager"
+require_relative "clacky/agent/tool_registry"
+
+# UI modules
+require_relative "clacky/ui2/thinking_verbs"
+require_relative "clacky/ui2/progress_indicator"
+
+# Utils
+require_relative "clacky/utils/model_pricing"
+require_relative "clacky/utils/gitignore_parser"
 require_relative "clacky/utils/limit_stack"
 require_relative "clacky/utils/path_helper"
 require_relative "clacky/utils/file_ignore_helper"
@@ -34,12 +40,16 @@ require_relative "clacky/tools/run_project"
 require_relative "clacky/tools/safe_shell"
 require_relative "clacky/tools/trash_manager"
 require_relative "clacky/tools/request_user_feedback"
+require_relative "clacky/tools/invoke_skill"
+require_relative "clacky/tools/undo_task"
+require_relative "clacky/tools/redo_task"
+require_relative "clacky/tools/list_tasks"
 require_relative "clacky/agent"
 
 require_relative "clacky/cli"
 
 module Clacky
+  class AgentInterrupted < Exception; end  # Inherit from Exception to bypass rescue StandardError
   class AgentError < StandardError; end
-  class AgentInterrupted < StandardError; end
   class ToolCallError < AgentError; end  # Raised when tool call fails due to invalid parameters
 end

data/scripts/install.sh

@@ -42,6 +42,17 @@ detect_os() {
         *)          OS=Unknown;;
     esac
     print_info "Detected OS: $OS"
+
+    # Detect Linux distribution
+    if [ "$OS" = "Linux" ]; then
+        if [ -f /etc/os-release ]; then
+            . /etc/os-release
+            DISTRO=$ID
+            print_info "Detected Linux distribution: $DISTRO"
+        else
+            DISTRO=unknown
+        fi
+    fi
 }
 
 # Check if command exists
@@ -60,7 +71,7 @@ check_ruby() {
     if command_exists ruby; then
         RUBY_VERSION=$(ruby -e 'puts RUBY_VERSION' 2>/dev/null)
         print_info "Found Ruby version: $RUBY_VERSION"
-        
+
         if version_ge "$RUBY_VERSION" "3.1.0"; then
             print_success "Ruby version is compatible (>= 3.1.0)"
             return 0
@@ -74,45 +85,18 @@ check_ruby() {
     fi
 }
 
-# Install via Homebrew
-install_via_homebrew() {
-    print_step "Installing via Homebrew..."
-    
-    if ! command_exists brew; then
-        print_error "Homebrew is not installed"
-        print_info "Install Homebrew from: https://brew.sh"
-        return 1
-    fi
-    
-    print_info "Adding OpenClacky tap..."
-    brew tap clacky-ai/openclacky 2>/dev/null || {
-        print_warning "Tap not found or already added, trying direct installation..."
-    }
-    
-    print_info "Installing OpenClacky..."
-    brew install openclacky
-    
-    if [ $? -eq 0 ]; then
-        print_success "OpenClacky installed successfully via Homebrew!"
-        return 0
-    else
-        print_error "Homebrew installation failed"
-        return 1
-    fi
-}
-
 # Install via RubyGems
 install_via_gem() {
     print_step "Installing via RubyGems..."
-    
+
     if ! command_exists gem; then
         print_error "RubyGems is not available"
         return 1
     fi
-    
+
     print_info "Installing OpenClacky gem..."
     gem install openclacky
-    
+
     if [ $? -eq 0 ]; then
         print_success "OpenClacky installed successfully via gem!"
         return 0
@@ -122,46 +106,237 @@ install_via_gem() {
     fi
 }
 
+# Install dependencies and Ruby on macOS
+install_macos_dependencies() {
+    print_step "Installing macOS dependencies and Ruby..."
+    echo ""
+
+    # Install Homebrew (it will automatically install Xcode Command Line Tools if needed)
+    print_info "Checking Homebrew installation..."
+    if ! command_exists brew; then
+        print_info "Installing Homebrew..."
+        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+        # Add Homebrew to PATH
+        echo 'export PATH="/opt/homebrew/bin:$PATH"' >> ~/.zshrc
+        export PATH="/opt/homebrew/bin:$PATH"
+
+        print_success "Homebrew installed successfully"
+    else
+        print_success "Homebrew already installed"
+    fi
+
+    # Install build dependencies
+    print_info "Installing build dependencies..."
+    if brew install openssl@3 libyaml gmp rust; then
+        print_success "Build dependencies installed"
+    else
+        print_error "Failed to install build dependencies"
+        return 1
+    fi
+
+    # Install mise for Ruby version management
+    print_info "Installing mise..."
+    if ! command_exists mise; then
+        if curl https://mise.run | sh; then
+            # Add mise to shell
+            if [ -f ~/.zshrc ]; then
+                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.zshrc
+            fi
+            if [ -f ~/.bash_profile ]; then
+                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bash_profile
+            fi
+
+            export PATH="$HOME/.local/bin:$PATH"
+            eval "$(~/.local/bin/mise activate bash)"
+
+            print_success "mise installed successfully"
+        else
+            print_error "Failed to install mise"
+            return 1
+        fi
+    else
+        print_success "mise already installed"
+    fi
+
+    # Install Ruby 3 via mise
+    print_info "Installing Ruby 3 via mise..."
+    if ~/.local/bin/mise use -g ruby@3; then
+        # Reload mise
+        eval "$(~/.local/bin/mise activate bash)"
+        print_success "Ruby 3 installed successfully"
+    else
+        print_error "Failed to install Ruby 3"
+        return 1
+    fi
+
+    # Verify Ruby installation
+    if check_ruby; then
+        return 0
+    else
+        print_error "Ruby installation verification failed"
+        return 1
+    fi
+}
+
+# Install dependencies and Ruby on Ubuntu/Debian
+install_ubuntu_dependencies() {
+    print_step "Installing Ubuntu dependencies and Ruby..."
+    echo ""
+
+    # Update package list
+    print_info "Updating package list..."
+    if sudo apt update; then
+        print_success "Package list updated"
+    else
+        print_error "Failed to update package list"
+        return 1
+    fi
+
+    # Install build dependencies
+    print_info "Installing build dependencies..."
+    if sudo apt install -y build-essential rustc libssl-dev libyaml-dev zlib1g-dev libgmp-dev git; then
+        print_success "Build dependencies installed"
+    else
+        print_error "Failed to install build dependencies"
+        return 1
+    fi
+
+    # Install mise for Ruby version management
+    print_info "Installing mise..."
+    if ! command_exists mise; then
+        if curl https://mise.run | sh; then
+            # Add mise to shell
+            if [ -f ~/.bashrc ]; then
+                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bashrc
+            fi
+
+            export PATH="$HOME/.local/bin:$PATH"
+            eval "$(~/.local/bin/mise activate bash)"
+
+            print_success "mise installed successfully"
+        else
+            print_error "Failed to install mise"
+            return 1
+        fi
+    else
+        print_success "mise already installed"
+    fi
+
+    # Install Ruby 3 via mise
+    print_info "Installing Ruby 3 via mise..."
+    if ~/.local/bin/mise use -g ruby@3; then
+        # Reload mise
+        eval "$(~/.local/bin/mise activate bash)"
+        print_success "Ruby 3 installed successfully"
+    else
+        print_error "Failed to install Ruby 3"
+        return 1
+    fi
+
+    # Verify Ruby installation
+    if check_ruby; then
+        return 0
+    else
+        print_error "Ruby installation verification failed"
+        return 1
+    fi
+}
+
 # Suggest Ruby installation
 suggest_ruby_installation() {
     print_step "Ruby Installation Options"
     echo ""
-    
+
     if [ "$OS" = "macOS" ]; then
-        print_info "Option 1: Install Ruby via Homebrew (Recommended)"
-        echo "  brew install ruby@3.3"
-        echo "  export PATH=\"/usr/local/opt/ruby@3.3/bin:\$PATH\""
+        print_info "Automatic Installation (Recommended)"
+        echo "  This script can automatically install Ruby and dependencies for you."
+        echo "  Uses mise - a fast, polyglot tool version manager."
+        echo ""
+        read -p "Would you like to install Ruby and dependencies automatically? (y/n) " -n 1 -r
+        echo ""
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            install_macos_dependencies
+            return $?
+        fi
         echo ""
-        print_info "Option 2: Use rbenv"
-        echo "  brew install rbenv ruby-build"
-        echo "  rbenv install 3.3.0"
-        echo "  rbenv global 3.3.0"
-        
+        print_info "Manual Installation with mise:"
+        echo "  # Install Homebrew (it will install Xcode Command Line Tools automatically)"
+        echo "  /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
+        echo ""
+        echo "  # Install dependencies"
+        echo "  brew install openssl@3 libyaml gmp rust"
+        echo ""
+        echo "  # Install mise"
+        echo "  curl https://mise.run | sh"
+        echo "  echo 'eval \"\$(~/.local/bin/mise activate bash)\"' >> ~/.zshrc"
+        echo ""
+        echo "  # Install Ruby 3"
+        echo "  mise use -g ruby@3"
+
     elif [ "$OS" = "Linux" ]; then
-        print_info "Option 1: Use rbenv"
-        echo "  curl -fsSL https://github.com/rbenv/rbenv-installer/raw/main/bin/rbenv-installer | bash"
-        echo "  rbenv install 3.3.0"
-        echo "  rbenv global 3.3.0"
+        if [ "$DISTRO" = "ubuntu" ] || [ "$DISTRO" = "debian" ]; then
+            print_info "Automatic Installation (Recommended)"
+            echo "  This script can automatically install Ruby and dependencies for you."
+            echo "  Uses mise - a fast, polyglot tool version manager."
+            echo ""
+            read -p "Would you like to install Ruby and dependencies automatically? (y/n) " -n 1 -r
+            echo ""
+            if [[ $REPLY =~ ^[Yy]$ ]]; then
+                install_ubuntu_dependencies
+                return $?
+            fi
+            echo ""
+            print_info "Manual Installation with mise (Ubuntu/Debian):"
+            echo "  # Update and install dependencies"
+            echo "  sudo apt update"
+            echo "  sudo apt install -y build-essential rustc libssl-dev libyaml-dev zlib1g-dev libgmp-dev git"
+            echo ""
+            echo "  # Install mise"
+            echo "  curl https://mise.run | sh"
+            echo "  echo 'eval \"\$(~/.local/bin/mise activate bash)\"' >> ~/.bashrc"
+            echo ""
+            echo "  # Install Ruby 3"
+            echo "  mise use -g ruby@3"
+        else
+            print_info "Manual Installation with mise (Other Linux):"
+            echo "  # Install build dependencies (adjust for your distribution)"
+            echo "  # Fedora/RHEL:"
+            echo "  sudo dnf install -y gcc make openssl-devel libyaml-devel zlib-devel gmp-devel git rust"
+            echo ""
+            echo "  # Install mise"
+            echo "  curl https://mise.run | sh"
+            echo "  echo 'eval \"\$(~/.local/bin/mise activate bash)\"' >> ~/.bashrc"
+            echo ""
+            echo "  # Install Ruby 3"
+            echo "  mise use -g ruby@3"
+        fi
+
+    elif [ "$OS" = "Windows" ]; then
+        print_info "Windows Subsystem for Linux (WSL) Installation (Recommended)"
+        echo "  OpenClacky requires a Unix-like environment. We recommend using WSL."
+        echo ""
+        echo "  1. Open PowerShell or Windows Command Prompt in administrator mode"
+        echo "  2. Install WSL with Ubuntu 24.04:"
         echo ""
-        print_info "Option 2: Use RVM"
-        echo "  curl -sSL https://get.rvm.io | bash -s stable --ruby"
+        echo "     wsl --install --distribution Ubuntu-24.04"
         echo ""
-        print_info "Option 3: Use system package manager"
-        echo "  # Ubuntu/Debian:"
-        echo "  sudo apt-get update"
-        echo "  sudo apt-get install ruby-full"
+        echo "  3. Restart your computer if prompted"
+        echo "  4. Launch Ubuntu from the Start menu"
+        echo "  5. Run this installation script again inside Ubuntu:"
         echo ""
-        echo "  # Fedora:"
-        echo "  sudo dnf install ruby ruby-devel"
+        echo "     curl -fsSL https://raw.githubusercontent.com/clacky-ai/open-clacky/main/scripts/install.sh | bash"
+        echo ""
+        print_info "Learn more about WSL: https://learn.microsoft.com/en-us/windows/wsl/install"
     fi
-    
+
     echo ""
     print_info "After installing Ruby, run this script again or use:"
     echo "  gem install openclacky"
+    echo ""
+    print_info "Learn more about mise: https://mise.jdx.dev"
 }
 
-
-
 # Main installation logic
 main() {
     echo ""
@@ -173,49 +348,45 @@ main() {
     echo "║                                                           ║"
     echo "╚═══════════════════════════════════════════════════════════╝"
     echo ""
-    
+
     detect_os
-    
-    # Strategy 1: On macOS, try Homebrew first if available
-    if [ "$OS" = "macOS" ] && command_exists brew; then
-        print_info "Homebrew detected, using it for installation (recommended)"
-        if install_via_homebrew; then
-            show_post_install_info
-            exit 0
-        fi
-        print_warning "Homebrew installation failed, trying Ruby gem installation..."
-    fi
-    
-    # Strategy 2: Check Ruby and install via gem
+
+    # Strategy 1: Check Ruby and install via gem
     if check_ruby; then
         if install_via_gem; then
             show_post_install_info
             exit 0
         fi
     fi
-    
-    # Strategy 3: Suggest installation options
-    print_error "Could not install OpenClacky automatically"
-    echo ""
-    print_step "Available Installation Options:"
-    echo ""
-    
-    if [ "$OS" = "macOS" ]; then
-        if ! command_exists brew; then
-            print_info "Option 1: Install via Homebrew (Recommended)"
-            echo "  If you have Homebrew, install it from: https://brew.sh"
-            echo "  Then run:"
-            echo "    brew tap clacky-ai/openclacky"
-            echo "    brew install openclacky"
-            echo ""
+
+    # Strategy 2: Install Ruby on macOS/Ubuntu or suggest options
+    if [ "$OS" = "macOS" ] || [ "$OS" = "Linux" ]; then
+        print_warning "Ruby not found or version too old"
+        echo ""
+        if suggest_ruby_installation; then
+            # Try installing via gem after Ruby installation
+            if install_via_gem; then
+                show_post_install_info
+                exit 0
+            else
+                print_error "Failed to install OpenClacky gem"
+                exit 1
+            fi
+        else
+            # User declined or installation failed
+            print_info "Ruby installation was not completed"
+            print_info "Please install Ruby manually and run: gem install openclacky"
+            print_info "For more information, visit: https://github.com/clacky-ai/open-clacky"
+            exit 1
         fi
+    else
+        print_error "Could not install OpenClacky automatically"
+        echo ""
+        suggest_ruby_installation
+        echo ""
+        print_info "For more information, visit: https://github.com/clacky-ai/open-clacky"
+        exit 1
     fi
-    
-    suggest_ruby_installation
-    echo ""
-    
-    print_info "For more information, visit: https://github.com/clacky-ai/open-clacky"
-    exit 1
 }
 
 # Post-installation information
@@ -227,19 +398,25 @@ show_post_install_info() {
     echo "║                                                           ║"
     echo "╚═══════════════════════════════════════════════════════════╝"
     echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+    echo "  ⚠️  ${YELLOW}IMPORTANT: Please restart your terminal${NC}"
+    echo ""
+    echo "  After restarting, type: ${GREEN}openclacky${NC}"
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
     print_step "Quick Start Guide:"
     echo ""
     print_info "1. Configure your API key:"
-    echo "   clacky config set"
-    echo ""
-    print_info "2. Start chatting:"
-    echo "   clacky chat"
+    echo "   openclacky"
+    echo "   > /config"
     echo ""
-    print_info "3. Use AI agent mode:"
-    echo "   clacky agent"
+    print_info "2. Create a new project:"
+    echo "   > /new your-project-name"
     echo ""
-    print_info "4. Get help:"
-    echo "   clacky help"
+    print_info "3. Get help:"
+    echo "   > /help"
     echo ""
     print_success "Happy coding! 🚀"
     echo ""

data/scripts/uninstall.sh

@@ -50,7 +50,7 @@ uninstall_homebrew() {
         if brew list openclacky >/dev/null 2>&1; then
             print_step "Uninstalling via Homebrew..."
             brew uninstall openclacky
-            
+
             # Optionally untap
             if brew tap | grep -q "clacky-ai/openclacky"; then
                 read -p "$(echo -e ${YELLOW}?${NC}) Remove Homebrew tap (clacky-ai/openclacky)? [y/N] " -n 1 -r
@@ -60,7 +60,7 @@ uninstall_homebrew() {
                     print_success "Tap removed"
                 fi
             fi
-            
+
             return 0
         fi
     fi
@@ -82,12 +82,12 @@ uninstall_gem() {
 # Remove configuration files
 remove_config() {
     CONFIG_DIR="$HOME/.clacky"
-    
+
     if [ -d "$CONFIG_DIR" ]; then
         print_warning "Configuration directory found: $CONFIG_DIR"
         read -p "$(echo -e ${YELLOW}?${NC}) Remove configuration files (including API keys)? [y/N] " -n 1 -r
         echo
-        
+
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             rm -rf "$CONFIG_DIR"
             print_success "Configuration removed"
@@ -106,24 +106,24 @@ main() {
     echo "║                                                           ║"
     echo "╚═══════════════════════════════════════════════════════════╝"
     echo ""
-    
+
     if ! check_installation; then
         print_warning "OpenClacky does not appear to be installed"
         exit 0
     fi
-    
+
     UNINSTALLED=false
-    
+
     # Try Homebrew first
     if uninstall_homebrew; then
         UNINSTALLED=true
     fi
-    
+
     # Try gem
     if uninstall_gem; then
         UNINSTALLED=true
     fi
-    
+
     if [ "$UNINSTALLED" = false ]; then
         print_error "Could not automatically uninstall OpenClacky"
         print_info "You may need to uninstall manually:"
@@ -131,12 +131,12 @@ main() {
         echo "  - Via RubyGems: gem uninstall openclacky"
         exit 1
     fi
-    
+
     print_success "OpenClacky uninstalled successfully"
-    
+
     # Ask about config removal
     remove_config
-    
+
     echo ""
     print_success "Uninstallation complete!"
     print_info "Thank you for using OpenClacky 👋"