openclacky 0.6.2 → 0.6.3

data/lib/clacky/ui2/themes/hacker_theme.rb

@@ -32,7 +32,7 @@ module Clacky
           user: [:white, :white],
           assistant: [:bright_green, :white],
           tool_call: [:bright_cyan, :cyan],
-          tool_result: [:cyan, :white],
+          tool_result: [:bright_cyan, :cyan],
           tool_denied: [:bright_yellow, :yellow],
           tool_planned: [:bright_cyan, :cyan],
           tool_error: [:bright_red, :red],

data/lib/clacky/ui2/themes/minimal_theme.rb

@@ -29,7 +29,7 @@ module Clacky
           user: [:white, :white],
           assistant: [:green, :white],
           tool_call: [:cyan, :cyan],
-          tool_result: [:white, :white],
+          tool_result: [:cyan, :cyan],
           tool_denied: [:yellow, :yellow],
           tool_planned: [:cyan, :cyan],
           tool_error: [:red, :red],

data/lib/clacky/ui2/ui_controller.rb

@@ -147,6 +147,12 @@ module Clacky
         @mode_toggle_callback = block
       end
 
+      # Set skill loader for command suggestions
+      # @param skill_loader [Clacky::SkillLoader] The skill loader instance
+      def set_skill_loader(skill_loader)
+        @input_area.set_skill_loader(skill_loader)
+      end
+
       # Append output to the output area
       # @param content [String] Content to append
       def append_output(content)
@@ -214,7 +220,7 @@ module Clacky
 
         # Delta tokens with color coding (green/yellow/red + dim)
         delta_tokens = token_data[:delta_tokens]
-        delta_str = "+#{delta_tokens}"
+        delta_str = delta_tokens.negative? ? "#{delta_tokens}" : "+#{delta_tokens}"
         color_style = if delta_tokens > 10000
           :red
         elsif delta_tokens > 5000
@@ -222,7 +228,11 @@ module Clacky
         else
           :green
         end
-        colored_delta = pastel.decorate(delta_str, color_style, :dim)
+        colored_delta = if delta_tokens.negative?
+          pastel.cyan(delta_str)
+        else
+          pastel.decorate(delta_str, color_style, :dim)
+        end
         token_info << colored_delta
 
         # Cache status indicator (using theme)
@@ -342,10 +352,13 @@ module Clacky
 
         # Remove <think>...</think> blocks (multiline, case-insensitive)
         # Also handles variations like <thinking>...</thinking>
-        filtered = content.gsub(%r{<think(?:ing)?>\s*.*?\s*</think(?:ing)?>}mi, '')
+        filtered = content.gsub(%r{<think(?:ing)?>[\s\S]*?</think(?:ing)?>}mi, '')
+
+        # Clean up multiple empty lines left behind (max 2 consecutive newlines)
+        filtered.gsub!(/\n{3,}/, "\n\n")
 
-        # Clean up extra whitespace left behind
-        filtered.gsub(/\n{3,}/, "\n\n").strip
+        # Remove leading and trailing whitespace
+        filtered.strip
       end
 
       # Show tool call
@@ -556,8 +569,9 @@ module Clacky
         # Collect input (blocks until user presses Enter)
         result_text = inline_input.collect
 
-        # Clean up - remove the inline input line (use layout to track position)
-        @layout.remove_last_line
+        # Clean up - remove the inline input lines (handle wrapped lines)
+        line_count = inline_input.line_count
+        @layout.remove_last_line(line_count)
 
         # Append the final response to output
         if result_text.nil?
@@ -594,41 +608,15 @@ module Clacky
         require 'diffy'
 
         diff = Diffy::Diff.new(old_content, new_content, context: 3)
-        all_lines = diff.to_s(:color).lines
-        plain_lines = diff.to_s.lines
-
-        # Add line numbers to diff output
-        old_line_num = 0
-        new_line_num = 0
-
-        numbered_lines = all_lines.each_with_index.map do |line, index|
-          # Use plain text to detect line type (remove ANSI codes)
-          plain_line = plain_lines[index]&.chomp || line.gsub(/\e\[[0-9;]*m/, '').chomp
-
-          # Remove trailing newline from colored line to avoid double newlines
-          colored_line = line.chomp
-
-          # Determine line type and number (use single line number for simplicity)
-          if plain_line.start_with?('+') || plain_line.start_with?('-') || plain_line.start_with?(' ')
-            new_line_num += 1
-            sprintf("%4d | %s", new_line_num, colored_line)
-          elsif plain_line.start_with?('@@')
-            # Diff header: extract line numbers from @@ -old_start,old_count +new_start,new_count @@
-            if plain_line =~ /@@ -(\d+)(?:,\d+)? (\d+)(?:,\d+)? @@/
-              new_line_num = $2.to_i - 1
-            end
-            sprintf("%4s | %s", "", colored_line)
-          else
-            # Other lines (headers, etc.)
-            sprintf("%4s | %s", "", colored_line)
-          end
-        end
+        diff_lines = diff.to_s(:color).lines
 
-        display_lines = numbered_lines.first(max_lines)
-        display_lines.each { |line| append_output(line) }
+        # Show diff without line numbers
+        diff_lines.take(max_lines).each do |line|
+          append_output(line.chomp)
+        end
 
-        if all_lines.size > max_lines
-          append_output("\n... (#{all_lines.size - max_lines} more lines, diff truncated)")
+        if diff_lines.size > max_lines
+          append_output("\n... (#{diff_lines.size - max_lines} more lines, diff truncated)")
         end
       rescue LoadError
         # Fallback if diffy is not available
@@ -788,16 +776,19 @@ module Clacky
 
       # Handle key input for InlineInput
       def handle_inline_input_key(key)
+        # Get old line count BEFORE modification
+        old_line_count = @inline_input.line_count
+
         result = @inline_input.handle_key(key)
 
         case result[:action]
         when :update
-          # Update the last line of output with current input (use layout to track position)
-          @layout.update_last_line(@inline_input.render)
+          # Update the output area with current input (considering wrapped lines)
+          @layout.update_last_line(@inline_input.render, old_line_count)
           # Position cursor for inline input
           @layout.position_inline_input_cursor(@inline_input)
         when :submit, :cancel
-          # InlineInput is done, will be cleaned up by request_confirmation
+          # InlineInput is done, will be cleaned up by request_confirmation after collect returns
           nil
         when :toggle_mode
           # Update mode and session bar info, but don't render yet

data/lib/clacky/utils/file_ignore_helper.rb

@@ -30,20 +30,18 @@ module Clacky
         /\.ini$/,
         /\.conf$/,
         /\.config$/,
-        /config\//,
-        /\.config\//
       ].freeze
 
       # Find .gitignore file in the search path or parent directories
       # Only searches within the search path and up to the current working directory
       def self.find_gitignore(path)
         search_path = File.directory?(path) ? path : File.dirname(path)
-        
+
         # Look for .gitignore in current and parent directories
         current = File.expand_path(search_path)
         cwd = File.expand_path(Dir.pwd)
         root = File.expand_path('/')
-        
+
         # Limit search: only go up to current working directory
         # This prevents finding .gitignore files from unrelated parent directories
         # when searching in temporary directories (like /tmp in tests)
@@ -52,16 +50,16 @@ module Clacky
                       else
                         current
                       end
-        
+
         loop do
           gitignore = File.join(current, '.gitignore')
           return gitignore if File.exist?(gitignore)
-          
+
           # Stop if we've reached the search limit or root
           break if current == search_limit || current == root
           current = File.dirname(current)
         end
-        
+
         nil
       end
 
@@ -71,10 +69,10 @@ module Clacky
         # Expand both paths to handle symlinks and relative paths correctly
         expanded_file = File.expand_path(file)
         expanded_base = File.expand_path(base_path)
-        
+
         # For files, use the directory as base
         expanded_base = File.dirname(expanded_base) if File.file?(expanded_base)
-        
+
         # Calculate relative path
         if expanded_file.start_with?(expanded_base)
           relative_path = expanded_file[(expanded_base.length + 1)..-1] || File.basename(expanded_file)
@@ -82,10 +80,10 @@ module Clacky
           # File is outside base path - use just the filename
           relative_path = File.basename(expanded_file)
         end
-        
+
         # Clean up relative path
         relative_path = relative_path.sub(/^\.\//, '') if relative_path
-        
+
         if gitignore
           # Use .gitignore rules
           gitignore.ignored?(relative_path)
@@ -96,7 +94,7 @@ module Clacky
               File.fnmatch(pattern, relative_path, File::FNM_PATHNAME | File::FNM_DOTMATCH)
             else
               # Match pattern as a path component (not substring of absolute path)
-              relative_path.start_with?("#{pattern}/") || 
+              relative_path.start_with?("#{pattern}/") ||
               relative_path.include?("/#{pattern}/") ||
               relative_path == pattern ||
               File.basename(relative_path) == pattern

data/lib/clacky/version.rb

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

data/lib/clacky.rb

@@ -3,6 +3,8 @@
 require_relative "clacky/version"
 require_relative "clacky/config"
 require_relative "clacky/client"
+require_relative "clacky/skill"
+require_relative "clacky/skill_loader"
 
 # Agent system
 require_relative "clacky/model_pricing"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - windy
@@ -167,11 +167,14 @@ files:
 - lib/clacky/cli.rb
 - lib/clacky/client.rb
 - lib/clacky/config.rb
+- lib/clacky/default_skills/skill-add/SKILL.md
 - lib/clacky/gitignore_parser.rb
 - lib/clacky/hook_manager.rb
 - lib/clacky/model_pricing.rb
 - lib/clacky/progress_indicator.rb
 - lib/clacky/session_manager.rb
+- lib/clacky/skill.rb
+- lib/clacky/skill_loader.rb
 - lib/clacky/thinking_verbs.rb
 - lib/clacky/tool_registry.rb
 - lib/clacky/tools/base.rb
@@ -191,6 +194,7 @@ files:
 - lib/clacky/ui2.rb
 - lib/clacky/ui2/README.md
 - lib/clacky/ui2/components/base_component.rb
+- lib/clacky/ui2/components/command_suggestions.rb
 - lib/clacky/ui2/components/common_component.rb
 - lib/clacky/ui2/components/inline_input.rb
 - lib/clacky/ui2/components/input_area.rb