openclacky 0.6.3 → 0.6.4

data/lib/clacky/config.rb

@@ -4,25 +4,92 @@ require "yaml"
 require "fileutils"
 
 module Clacky
+  # ClaudeCode environment variable compatibility layer
+  # Provides configuration detection from ClaudeCode's environment variables
+  module ClaudeCodeEnv
+    # Environment variable names used by ClaudeCode
+    ENV_API_KEY = "ANTHROPIC_API_KEY"
+    ENV_AUTH_TOKEN = "ANTHROPIC_AUTH_TOKEN"
+    ENV_BASE_URL = "ANTHROPIC_BASE_URL"
+
+    # Default Anthropic API endpoint
+    DEFAULT_BASE_URL = "https://api.anthropic.com"
+
+    class << self
+      # Check if any ClaudeCode authentication is configured
+      def configured?
+        !api_key.nil? && !api_key.empty?
+      end
+
+      # Get API key - prefer ANTHROPIC_API_KEY, fallback to ANTHROPIC_AUTH_TOKEN
+      def api_key
+        if ENV[ENV_API_KEY] && !ENV[ENV_API_KEY].empty?
+          ENV[ENV_API_KEY]
+        elsif ENV[ENV_AUTH_TOKEN] && !ENV[ENV_AUTH_TOKEN].empty?
+          ENV[ENV_AUTH_TOKEN]
+        end
+      end
+
+      # Get base URL from environment, or return default Anthropic API URL
+      def base_url
+        ENV[ENV_BASE_URL] && !ENV[ENV_BASE_URL].empty? ? ENV[ENV_BASE_URL] : DEFAULT_BASE_URL
+      end
+
+      # Get configuration as a hash (includes configured values)
+      # Returns api_key and base_url (always available as there's a default)
+      def to_h
+        {
+          "api_key" => api_key,
+          "base_url" => base_url
+        }.compact
+      end
+    end
+  end
+
   class Config
     CONFIG_DIR = File.join(Dir.home, ".clacky")
     CONFIG_FILE = File.join(CONFIG_DIR, "config.yml")
 
-    attr_accessor :api_key, :model, :base_url
+    # Default model for ClaudeCode environment
+    CLAUDE_DEFAULT_MODEL = "claude-sonnet-4-5"
+
+    attr_accessor :api_key, :model, :base_url, :config_source
 
     def initialize(data = {})
       @api_key = data["api_key"]
-      @model = data["model"] || "gpt-3.5-turbo"
+      @model = data["model"]
       @base_url = data["base_url"] || "https://api.openai.com"
+      @config_source = data["_config_source"] || "default"
     end
 
     def self.load(config_file = CONFIG_FILE)
+      # Load from config file first
       if File.exist?(config_file)
         data = YAML.load_file(config_file) || {}
-        new(data)
+        config_source = "file"
       else
-        new
+        data = {}
+        config_source = nil
+      end
+
+      # If api_key not found in config file, check ClaudeCode environment variables
+      if data["api_key"].nil? || data["api_key"].empty?
+        if ClaudeCodeEnv.configured?
+          data["api_key"] = ClaudeCodeEnv.api_key
+          data["base_url"] = ClaudeCodeEnv.base_url if data["base_url"].nil? || data["base_url"].empty?
+          # Use Claude default model if not specified in config file
+          data["model"] = CLAUDE_DEFAULT_MODEL if data["model"].nil? || data["model"].empty?
+          config_source = "claude_code"
+        elsif config_source.nil?
+          config_source = "default"
+        end
+      elsif config_source.nil?
+        # Config file existed but didn't have api_key
+        config_source = "default"
       end
+
+      data["_config_source"] = config_source
+      new(data)
     end
 
     def save(config_file = CONFIG_FILE)

data/lib/clacky/skill.rb

@@ -135,7 +135,7 @@ module Clacky
       skill_file = @directory.join("SKILL.md")
 
       unless skill_file.exist?
-        raise Clacky::Error, "SKILL.md not found in skill directory: #{@directory}"
+        raise Clacky::AgentError, "SKILL.md not found in skill directory: #{@directory}"
       end
 
       content = skill_file.read
@@ -160,7 +160,7 @@ module Clacky
       frontmatter_match = content.match(/^---\n(.*?)\n---/m)
 
       unless frontmatter_match
-        raise Clacky::Error, "Invalid frontmatter format in SKILL.md: missing closing ---"
+        raise Clacky::AgentError, "Invalid frontmatter format in SKILL.md: missing closing ---"
       end
 
       yaml_content = frontmatter_match[1]
@@ -185,22 +185,22 @@ module Clacky
       # Validate name if provided
       if @name
         unless @name.match?(/^[a-z0-9][a-z0-9-]*$/)
-          raise Clacky::Error,
+          raise Clacky::AgentError,
             "Invalid skill name '#{@name}'. Use lowercase letters, numbers, and hyphens only (max 64 chars)."
         end
         if @name.length > 64
-          raise Clacky::Error, "Skill name '#{@name}' exceeds 64 characters."
+          raise Clacky::AgentError, "Skill name '#{@name}' exceeds 64 characters."
         end
       end
 
       # Validate context
       if @context && @context != "fork"
-        raise Clacky::Error, "Invalid context '#{@context}'. Only 'fork' is supported."
+        raise Clacky::AgentError, "Invalid context '#{@context}'. Only 'fork' is supported."
       end
 
       # Validate allowed-tools format
       if @allowed_tools && !@allowed_tools.is_a?(Array)
-        raise Clacky::Error, "allowed-tools must be an array of tool names"
+        raise Clacky::AgentError, "allowed-tools must be an array of tool names"
       end
     end
 

data/lib/clacky/skill_loader.rb

@@ -167,7 +167,7 @@ module Clacky
     def create_skill(name, content, description = nil, location: :global)
       # Validate name
       unless name.match?(/^[a-z0-9][a-z0-9-]*$/)
-        raise Clacky::Error,
+        raise Clacky::AgentError,
           "Invalid skill name '#{name}'. Use lowercase letters, numbers, and hyphens only."
       end
 
@@ -178,7 +178,7 @@ module Clacky
       when :project
         Pathname.new(@working_dir).join(".clacky", "skills", name)
       else
-        raise Clacky::Error, "Unknown skill location: #{location}"
+        raise Clacky::AgentError, "Unknown skill location: #{location}"
       end
 
       # Create directory if it doesn't exist
@@ -270,7 +270,7 @@ module Clacky
       @loaded_from[skill.identifier] = source_type
 
       skill
-    rescue Clacky::Error => e
+    rescue Clacky::AgentError => e
       @errors << "Error loading skill '#{skill_name}' from #{skill_dir}: #{e.message}"
       nil
     rescue StandardError => e

data/lib/clacky/tools/edit.rb

@@ -46,14 +46,23 @@ module Clacky
           content = File.read(path)
           original_content = content.dup
 
-          # Check if old_string exists
-          unless content.include?(old_string)
-            return { error: "String to replace not found in file" }
+          # Try exact match first
+          if content.include?(old_string)
+            actual_old_string = old_string
+            occurrences = content.scan(old_string).length
+          else
+            # Try smart whitespace normalization
+            match_result = try_smart_match(content, old_string)
+            
+            if match_result
+              actual_old_string = match_result[:matched_string]
+              occurrences = match_result[:occurrences]
+            else
+              # Provide helpful error with context
+              return build_helpful_error(content, old_string, path)
+            end
           end
 
-          # Count occurrences
-          occurrences = content.scan(old_string).length
-
           # If not replace_all and multiple occurrences, warn about ambiguity
           if !replace_all && occurrences > 1
             return {
@@ -64,9 +73,9 @@ module Clacky
 
           # Perform replacement
           if replace_all
-            content = content.gsub(old_string, new_string)
+            content = content.gsub(actual_old_string, new_string)
           else
-            content = content.sub(old_string, new_string)
+            content = content.sub(actual_old_string, new_string)
           end
 
           # Write modified content
@@ -84,6 +93,100 @@ module Clacky
         end
       end
 
+      private def try_smart_match(content, old_string)
+        # Normalize whitespace: convert all leading whitespace to single space for comparison
+        normalized_old = normalize_leading_whitespace(old_string)
+        
+        # Find all potential matches in content with normalized whitespace
+        matches = []
+        content_lines = content.lines
+        old_lines = old_string.lines
+        
+        return nil if old_lines.empty?
+        
+        # Scan through content to find matches
+        (0..content_lines.length - old_lines.length).each do |start_idx|
+          slice = content_lines[start_idx, old_lines.length]
+          next unless slice
+          
+          # Check if this slice matches when normalized
+          if lines_match_normalized?(slice, old_lines)
+            matched_string = slice.join
+            matches << { start: start_idx, matched_string: matched_string }
+          end
+        end
+        
+        return nil if matches.empty?
+        
+        # Return the first match and count total occurrences
+        {
+          matched_string: matches.first[:matched_string],
+          occurrences: matches.length
+        }
+      end
+
+      private def normalize_leading_whitespace(text)
+        # Normalize each line's leading whitespace
+        text.lines.map { |line| line.sub(/^\s+/, ' ') }.join
+      end
+
+      private def lines_match_normalized?(lines1, lines2)
+        return false unless lines1.length == lines2.length
+        
+        lines1.zip(lines2).all? do |line1, line2|
+          # Normalize leading whitespace and compare
+          norm1 = line1.sub(/^\s+/, ' ')
+          norm2 = line2.sub(/^\s+/, ' ')
+          norm1 == norm2
+        end
+      end
+
+      private def build_helpful_error(content, old_string, path)
+        # Find similar content to help debug
+        old_lines = old_string.lines
+        first_line_pattern = old_lines.first&.strip
+        
+        if first_line_pattern && !first_line_pattern.empty?
+          # Find lines that match the first line (ignoring whitespace)
+          content_lines = content.lines
+          similar_locations = []
+          
+          content_lines.each_with_index do |line, idx|
+            if line.strip == first_line_pattern
+              # Show context: 2 lines before and after
+              start_idx = [0, idx - 2].max
+              end_idx = [content_lines.length - 1, idx + old_lines.length + 2].min
+              context = content_lines[start_idx..end_idx].join
+              
+              similar_locations << {
+                line_number: idx + 1,
+                context: context
+              }
+            end
+          end
+          
+          if similar_locations.any?
+            context_preview = similar_locations.first[:context]
+            # Escape newlines for better display
+            context_display = context_preview.lines.first(5).map { |l| "  #{l}" }.join
+            
+            return {
+              error: "String to replace not found in file. The first line of old_string exists at line #{similar_locations.first[:line_number]}, " \
+                     "but the full multi-line string doesn't match. This is often caused by whitespace differences (tabs vs spaces). " \
+                     "\n\nContext around line #{similar_locations.first[:line_number]}:\n#{context_display}\n\n" \
+                     "TIP: Make sure to copy the exact whitespace characters from the file. Use file_reader to see the actual content."
+            }
+          end
+        end
+        
+        # Generic error if no similar content found
+        {
+          error: "String to replace not found in file '#{File.basename(path)}'. " \
+                 "Make sure old_string matches exactly (including all whitespace). " \
+                 "TIP: Use file_reader to view the exact content first, then copy the exact string including all spaces and tabs."
+        }
+      end
+
       def format_call(args)
         path = args[:file_path] || args['file_path'] || args[:path] || args['path']
         "Edit(#{Utils::PathHelper.safe_basename(path)})"

data/lib/clacky/tools/glob.rb

@@ -39,6 +39,9 @@ module Clacky
           return { error: "Pattern cannot be empty" }
         end
 
+        # Expand ~ in pattern to user's home directory
+        pattern = pattern.gsub("~", Dir.home)
+
         # Validate base_path
         unless Dir.exist?(base_path)
           return { error: "Base path does not exist: #{base_path}" }
@@ -59,8 +62,12 @@ module Clacky
             ignored: 0
           }
 
-          # Change to base path and find matches
-          full_pattern = File.join(base_path, pattern)
+          # Build full pattern - handle absolute paths correctly
+          full_pattern = if File.absolute_path?(pattern)
+                          pattern
+                        else
+                          File.join(base_path, pattern)
+                        end
           all_matches = Dir.glob(full_pattern, File::FNM_DOTMATCH)
                            .reject { |path| File.directory?(path) }
                            .reject { |path| path.end_with?(".", "..") }

data/lib/clacky/ui2/ui_controller.rb

@@ -393,7 +393,7 @@ module Clacky
       def show_complete(iterations:, cost:, duration: nil, cache_stats: nil)
         # Update status back to 'idle' when task is complete
         update_sessionbar(status: 'idle')
-        
+
         # Clear user tip when agent stops working
         @input_area.clear_user_tip
         @layout.render_input
@@ -452,10 +452,10 @@ module Clacky
       def clear_progress
         # Calculate elapsed time before stopping
         elapsed_time = @progress_start_time ? (Time.now - @progress_start_time).to_i : 0
-        
+
         # Stop the progress thread
         stop_progress_thread
-        
+
         # Update the final progress line to gray (stopped state)
         if @progress_message && elapsed_time > 0
           final_output = @renderer.render_progress("#{@progress_message}… (#{elapsed_time}s)")
@@ -557,7 +557,7 @@ module Clacky
 
         # Create InlineInput with styled prompt
         inline_input = Components::InlineInput.new(
-          prompt: "  Press Enter to approve, 'n' to reject, or provide feedback: ",
+          prompt: "Press Enter/y to approve(Shift+Tab for all), 'n' to reject, or type feedback: ",
           default: nil
         )
         @inline_input = inline_input

data/lib/clacky/version.rb

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

data/lib/clacky.rb

@@ -37,6 +37,7 @@ require_relative "clacky/agent"
 require_relative "clacky/cli"
 
 module Clacky
-  class Error < StandardError; end
+  class AgentError < StandardError; end
   class AgentInterrupted < StandardError; end
+  class ToolCallError < AgentError; end  # Raised when tool call fails due to invalid parameters
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - windy
@@ -159,6 +159,7 @@ files:
 - clacky-legacy/clacky.gemspec
 - clacky-legacy/clarky.gemspec
 - docs/ui2-architecture.md
+- docs/why-openclacky.md
 - homebrew/README.md
 - homebrew/openclacky.rb
 - lib/clacky.rb