openclacky 0.7.1 → 0.7.3

data/lib/clacky/ui2/ui_controller.rb

@@ -894,11 +894,11 @@ module Clacky
 
       # Handle submit action
       private def handle_submit(data)
-        # Call callback first (allows interrupting previous agent before showing new input)
-        @input_callback&.call(data[:text], data[:images])
-
-        # Append the input content to output area after callback completes
+        # Append the input content to output area first (so it displays before callback execution)
         @layout.append_output(data[:display]) unless data[:display].empty?
+
+        # Then call callback (allows interrupting previous agent before processing new input)
+        @input_callback&.call(data[:text], data[:images])
       end
 
       # Show configuration modal dialog with multi-model support
@@ -953,14 +953,23 @@ module Clacky
           when :add
             new_model = show_model_edit_form(nil, test_callback: test_callback)
             if new_model
+              # Determine anthropic_format based on provider
+              # For Anthropic provider, use Anthropic API format
+              anthropic_format = new_model[:provider] == "anthropic"
+              
               current_config.add_model(
                 model: new_model[:model],
                 api_key: new_model[:api_key],
-                base_url: new_model[:base_url]
-                # anthropic_format defaults to false in add_model method
+                base_url: new_model[:base_url],
+                anthropic_format: anthropic_format
               )
               # Auto-save after adding
               current_config.save
+              # Set newly added model as default
+              current_config.switch_model(current_config.models.length - 1)
+              current_config.save
+              # Return to exit the menu
+              return { action: :switch }
             end
           when :edit
             current_model = current_config.current_model
@@ -1043,9 +1052,40 @@ module Clacky
         is_new = model.nil?
         model ||= {}
         
+        # For new models, show provider selection first
+        selected_provider = nil
+        if is_new
+          # Build provider choices
+          provider_choices = Clacky::Providers.list.map do |id, name|
+            { name: name, value: id }
+          end
+          provider_choices << { name: "─" * 40, disabled: true }
+          provider_choices << { name: "Custom (manual configuration)", value: "custom" }
+          
+          # Show provider selection
+          selected_provider = modal.show(
+            title: "Select Provider",
+            choices: provider_choices
+          )
+          
+          # User cancelled
+          return nil if selected_provider.nil?
+        end
+        
         # Prepare masked API key for display
         masked_key = mask_api_key(model["api_key"])
         
+        # Pre-fill values from provider preset if selected
+        provider_preset = nil
+        if selected_provider && selected_provider != "custom"
+          provider_preset = Clacky::Providers.get(selected_provider)
+        end
+        
+        # Get default values from provider or existing model
+        default_model = provider_preset ? provider_preset["default_model"] : model["model"]
+        default_base_url = provider_preset ? provider_preset["base_url"] : model["base_url"]
+        default_api_key = model["api_key"] || ""
+        
         # Define fields
         fields = [
           {
@@ -1056,13 +1096,13 @@ module Clacky
           },
           {
             name: :model,
-            label: "Model #{is_new ? '' : "(current: #{model['model']})"}:",
-            default: ""
+            label: "Model #{is_new && default_model ? "(default: #{default_model})" : (is_new ? '' : "(current: #{model['model']})")}:",
+            default: default_model || ""
           },
           {
             name: :base_url,
-            label: "Base URL #{is_new ? '' : "(current: #{model['base_url']})"}:",
-            default: ""
+            label: "Base URL #{is_new && default_base_url ? "(default: #{default_base_url})" : (is_new ? '' : "(current: #{model['base_url']})")}:",
+            default: default_base_url || ""
           }
         ]
         
@@ -1103,20 +1143,31 @@ module Clacky
           nil
         end
         
+        # Determine modal title based on provider
+        modal_title = if is_new && selected_provider && selected_provider != "custom"
+          provider_name = Clacky::Providers.get(selected_provider)&.dig("name") || selected_provider
+          "Add #{provider_name} Model"
+        elsif is_new
+          "Add Custom Model"
+        else
+          "Edit Model"
+        end
+        
         # Show modal and collect values
         result = modal.show(
-          title: is_new ? "Add New Model" : "Edit Model",
+          title: modal_title,
           fields: fields,
           validator: validator
         )
         
         return nil if result.nil?
         
-        # Merge with existing model values
+        # Merge with existing model values or provider defaults
         {
           api_key: result[:api_key].to_s.empty? ? model["api_key"] : result[:api_key],
-          model: result[:model].to_s.empty? ? model["model"] : result[:model],
-          base_url: result[:base_url].to_s.empty? ? model["base_url"] : result[:base_url]
+          model: result[:model].to_s.empty? ? (model["model"] || default_model) : result[:model],
+          base_url: result[:base_url].to_s.empty? ? (model["base_url"] || default_base_url) : result[:base_url],
+          provider: selected_provider
         }
       end
       

data/lib/clacky/utils/file_processor.rb

@@ -166,35 +166,30 @@ module Clacky
         end
 
         # Check if file is binary (not text)
-        # @param data [String] File content
+        # @param data [String] File content (should be read in binary mode, encoding: ASCII-8BIT)
         # @param sample_size [Integer] Number of bytes to check (default: 8192)
         # @return [Boolean] True if file appears to be binary
-        def binary_file?(data, sample_size: 8192, min_binary_length: 512)
-          # Check first N bytes for binary content
-          sample = data[0, sample_size] || ""
+        #
+        # Strategy: only trust known magic byte signatures.
+        # We intentionally avoid heuristics (byte-ratio, UTF-8 validity, etc.) because
+        # they produce false positives on legitimate text files containing multibyte
+        # characters (e.g. Chinese, Japanese). Occasionally missing an unlabelled binary
+        # is acceptable; misclassifying a real text file is not.
+        def binary_file?(data, sample_size: 8192)
+          sample = data.b[0, sample_size] || ""
           return false if sample.empty?
 
-          # Check for known binary signatures first
+          # Check for known binary file signatures (magic bytes)
           FILE_SIGNATURES.each do |signature, _format|
             return true if sample.start_with?(signature)
           end
 
-          # Check for WebP (RIFF format)
-          if sample.start_with?("RIFF".b) && sample.length >= 12 && sample[8..11] == "WEBP".b
+          # Check for WebP (RIFF....WEBP header)
+          if sample.start_with?("RIFF".b) && sample.bytesize >= 12 && sample[8..11] == "WEBP".b
             return true
           end
 
-          # Only check non-printable ratio for samples above minimum length
-          # This prevents short outputs from being incorrectly flagged as binary
-          return false if sample.size < min_binary_length
-
-          # Count non-printable characters (excluding common whitespace)
-          non_printable = sample.bytes.count do |byte|
-            byte < 32 && ![9, 10, 13].include?(byte) || byte >= 127
-          end
-
-          # If more than 30% non-printable, consider it binary
-          (non_printable.to_f / sample.size) > 0.3
+          false
         end
 
         # Check if a file at the given path is binary (not text)

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/lib/clacky.rb

@@ -7,6 +7,7 @@ require_relative "clacky/skill_loader"
 
 # Agent system
 require_relative "clacky/agent_config"
+require_relative "clacky/providers"
 require_relative "clacky/session_manager"
 
 # Agent modules

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 ""