openclacky 0.5.6 → 0.6.1

data/lib/clacky/ui2/view_renderer.rb

@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require_relative "components/message_component"
+require_relative "components/tool_component"
+require_relative "components/common_component"
+require_relative "markdown_renderer"
+
+module Clacky
+  module UI2
+    # ViewRenderer coordinates all UI components and provides a unified rendering interface
+    class ViewRenderer
+      def initialize
+        @message_component = Components::MessageComponent.new
+        @tool_component = Components::ToolComponent.new
+        @common_component = Components::CommonComponent.new
+      end
+
+      # Render a user message
+      # @param content [String] Message content
+      # @param timestamp [Time, nil] Optional timestamp
+      # @return [String] Rendered message
+      def render_user_message(content, timestamp: nil)
+        @message_component.render(
+          role: "user",
+          content: content,
+          timestamp: timestamp
+        )
+      end
+
+      # Render an assistant message
+      # @param content [String] Message content
+      # @param timestamp [Time, nil] Optional timestamp
+      # @return [String] Rendered message
+      def render_assistant_message(content, timestamp: nil)
+        # Render markdown if content contains markdown syntax
+        rendered_content = if MarkdownRenderer.markdown?(content)
+          MarkdownRenderer.render(content)
+        else
+          content
+        end
+
+        @message_component.render(
+          role: "assistant",
+          content: rendered_content,
+          timestamp: timestamp
+        )
+      end
+
+      # Render a system message
+      # @param content [String] Message content
+      # @param timestamp [Time, nil] Optional timestamp
+      # @param prefix_newline [Boolean] Whether to add newline before message
+      # @return [String] Rendered message
+      def render_system_message(content, timestamp: nil, prefix_newline: true)
+        @message_component.render(
+          role: "system",
+          content: content,
+          timestamp: timestamp,
+          prefix_newline: prefix_newline
+        )
+      end
+
+      # Render a tool call
+      # @param tool_name [String] Tool name
+      # @param formatted_call [String] Formatted call description
+      # @return [String] Rendered tool call
+      def render_tool_call(tool_name:, formatted_call:)
+        @tool_component.render(
+          type: :call,
+          tool_name: tool_name,
+          formatted_call: formatted_call
+        )
+      end
+
+      # Render a tool result
+      # @param result [String] Tool result
+      # @return [String] Rendered tool result
+      def render_tool_result(result:)
+        @tool_component.render(
+          type: :result,
+          result: result
+        )
+      end
+
+      # Render a tool error
+      # @param error [String] Error message
+      # @return [String] Rendered tool error
+      def render_tool_error(error:)
+        @tool_component.render(
+          type: :error,
+          error: error
+        )
+      end
+
+      # Render a tool denied message
+      # @param tool_name [String] Tool name
+      # @return [String] Rendered tool denied
+      def render_tool_denied(tool_name:)
+        @tool_component.render(
+          type: :denied,
+          tool_name: tool_name
+        )
+      end
+
+      # Render a tool planned message
+      # @param tool_name [String] Tool name
+      # @return [String] Rendered tool planned
+      def render_tool_planned(tool_name:)
+        @tool_component.render(
+          type: :planned,
+          tool_name: tool_name
+        )
+      end
+
+      # Render thinking indicator
+      # @return [String] Thinking indicator
+      def render_thinking
+        @common_component.render_thinking
+      end
+
+      # Render progress message (stopped state, gray)
+      # @param message [String] Progress message
+      # @return [String] Progress indicator
+      def render_progress(message)
+        @common_component.render_progress(message)
+      end
+
+      # Render working message (active state, yellow)
+      # @param message [String] Progress message
+      # @return [String] Working indicator
+      def render_working(message)
+        @common_component.render_working(message)
+      end
+
+      # Render success message
+      # @param message [String] Success message
+      # @return [String] Success message
+      def render_success(message)
+        @common_component.render_success(message)
+      end
+
+      # Render error message
+      # @param message [String] Error message
+      # @return [String] Error message
+      def render_error(message)
+        @common_component.render_error(message)
+      end
+
+      # Render warning message
+      # @param message [String] Warning message
+      # @return [String] Warning message
+      def render_warning(message)
+        @common_component.render_warning(message)
+      end
+
+      # Render task completion summary
+      # @param iterations [Integer] Number of iterations
+      # @param cost [Float] Cost in USD
+      # @param duration [Float] Duration in seconds
+      # @param cache_tokens [Integer] Cache read tokens
+      # @param cache_requests [Integer] Total cache requests count
+      # @param cache_hits [Integer] Cache hit requests count
+      # @return [String] Formatted completion summary
+      def render_task_complete(iterations:, cost:, duration: nil, cache_tokens: nil, cache_requests: nil, cache_hits: nil)
+        @common_component.render_task_complete(
+          iterations: iterations,
+          cost: cost,
+          duration: duration,
+          cache_tokens: cache_tokens,
+          cache_requests: cache_requests,
+          cache_hits: cache_hits
+        )
+      end
+
+    end
+  end
+end

data/lib/clacky/ui2.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# UI2 - MVC-based terminal UI system for Clacky
+# Provides split-screen interface with scrollable output and fixed input
+
+require_relative "ui2/theme_manager"
+require_relative "ui2/screen_buffer"
+require_relative "ui2/layout_manager"
+require_relative "ui2/view_renderer"
+require_relative "ui2/ui_controller"
+
+require_relative "ui2/components/base_component"
+require_relative "ui2/components/output_area"
+require_relative "ui2/components/input_area"
+require_relative "ui2/components/message_component"
+require_relative "ui2/components/tool_component"
+require_relative "ui2/components/common_component"
+require_relative "ui2/components/welcome_banner"
+
+module Clacky
+  module UI2
+    # Version of the UI2 system
+    VERSION = "1.0.0"
+
+    # Quick start: Create a UI controller and run
+    # @param config [Hash] Optional configuration (working_dir, mode, model)
+    # @example
+    #   controller = Clacky::UI2::UIController.new
+    #   controller.on_input { |input| puts "Got: #{input}" }
+    #   controller.start
+    def self.start(config = {}, &block)
+      controller = UIController.new(config)
+      controller.on_input(&block) if block_given?
+      controller.start
+    end
+  end
+end

data/lib/clacky/utils/file_ignore_helper.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module Clacky
+  module Utils
+    # Helper module for file ignoring functionality shared between tools
+    module FileIgnoreHelper
+      # Default patterns to ignore when .gitignore is not available
+      DEFAULT_IGNORED_PATTERNS = [
+        'node_modules',
+        'vendor/bundle',
+        '.git',
+        '.svn',
+        'tmp',
+        'log',
+        'coverage',
+        'dist',
+        'build',
+        '.bundle',
+        '.sass-cache',
+        '.DS_Store',
+        '*.log'
+      ].freeze
+
+      # Config file patterns that should always be searchable/visible
+      CONFIG_FILE_PATTERNS = [
+        /\.env/,
+        /\.ya?ml$/,
+        /\.json$/,
+        /\.toml$/,
+        /\.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)
+        search_limit = if current.start_with?(cwd)
+                        cwd
+                      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
+
+      # Check if file should be ignored based on .gitignore or default patterns
+      def self.should_ignore_file?(file, base_path, gitignore)
+        # Always calculate path relative to base_path for consistency
+        # 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)
+        else
+          # 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)
+        else
+          # Use default ignore patterns - only match against relative path components
+          DEFAULT_IGNORED_PATTERNS.any? do |pattern|
+            if pattern.include?('*')
+              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.include?("/#{pattern}/") ||
+              relative_path == pattern ||
+              File.basename(relative_path) == pattern
+            end
+          end
+        end
+      end
+
+      # Check if file is a config file (should not be ignored even if in .gitignore)
+      def self.is_config_file?(file)
+        CONFIG_FILE_PATTERNS.any? { |pattern| file.match?(pattern) }
+      end
+
+      # Check if file is binary (contains null bytes)
+      def self.binary_file?(file)
+        # Simple heuristic: check if file contains null bytes in first 8KB
+        return false unless File.exist?(file)
+        return false if File.size(file).zero?
+
+        sample = File.read(file, 8192, encoding: "ASCII-8BIT")
+        sample.include?("\x00")
+      rescue StandardError
+        true
+      end
+    end
+  end
+end

data/lib/clacky/version.rb

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

data/lib/clacky.rb

@@ -15,6 +15,7 @@ require_relative "clacky/session_manager"
 require_relative "clacky/gitignore_parser"
 require_relative "clacky/utils/limit_stack"
 require_relative "clacky/utils/path_helper"
+require_relative "clacky/utils/file_ignore_helper"
 require_relative "clacky/tools/base"
 
 require_relative "clacky/tools/shell"
@@ -31,12 +32,6 @@ require_relative "clacky/tools/safe_shell"
 require_relative "clacky/tools/trash_manager"
 require_relative "clacky/agent"
 
-# UI components
-require_relative "clacky/ui/banner"
-require_relative "clacky/ui/enhanced_prompt"
-require_relative "clacky/ui/statusbar"
-require_relative "clacky/ui/formatter"
-
 require_relative "clacky/cli"
 
 module Clacky

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - windy
@@ -107,6 +107,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: tty-markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: OpenClacky is a Ruby CLI tool for interacting with AI models via OpenAI-compatible
   APIs. It provides chat functionality and autonomous AI agent capabilities with tool
   use.
@@ -130,6 +158,7 @@ files:
 - bin/openclacky
 - clacky-legacy/clacky.gemspec
 - clacky-legacy/clarky.gemspec
+- docs/ui2-architecture.md
 - lib/clacky.rb
 - lib/clacky/agent.rb
 - lib/clacky/agent_config.rb
@@ -157,11 +186,29 @@ files:
 - lib/clacky/tools/web_search.rb
 - lib/clacky/tools/write.rb
 - lib/clacky/trash_directory.rb
-- lib/clacky/ui/banner.rb
-- lib/clacky/ui/enhanced_prompt.rb
-- lib/clacky/ui/formatter.rb
-- lib/clacky/ui/statusbar.rb
+- lib/clacky/ui2.rb
+- lib/clacky/ui2/README.md
+- lib/clacky/ui2/components/base_component.rb
+- lib/clacky/ui2/components/common_component.rb
+- lib/clacky/ui2/components/inline_input.rb
+- lib/clacky/ui2/components/input_area.rb
+- lib/clacky/ui2/components/message_component.rb
+- lib/clacky/ui2/components/output_area.rb
+- lib/clacky/ui2/components/todo_area.rb
+- lib/clacky/ui2/components/tool_component.rb
+- lib/clacky/ui2/components/welcome_banner.rb
+- lib/clacky/ui2/layout_manager.rb
+- lib/clacky/ui2/line_editor.rb
+- lib/clacky/ui2/markdown_renderer.rb
+- lib/clacky/ui2/screen_buffer.rb
+- lib/clacky/ui2/theme_manager.rb
+- lib/clacky/ui2/themes/base_theme.rb
+- lib/clacky/ui2/themes/hacker_theme.rb
+- lib/clacky/ui2/themes/minimal_theme.rb
+- lib/clacky/ui2/ui_controller.rb
+- lib/clacky/ui2/view_renderer.rb
 - lib/clacky/utils/arguments_parser.rb
+- lib/clacky/utils/file_ignore_helper.rb
 - lib/clacky/utils/limit_stack.rb
 - lib/clacky/utils/path_helper.rb
 - lib/clacky/version.rb
@@ -187,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.4
 specification_version: 4
 summary: A command-line interface for AI models (Claude, OpenAI, etc.)
 test_files: []

data/lib/clacky/ui/banner.rb

@@ -1,155 +0,0 @@
-# frozen_string_literal: true
-
-require "pastel"
-
-module Clacky
-  module UI
-    # ASCII art banner and startup screen with Matrix/hacker aesthetic
-    class Banner
-      LOGO = <<~'LOGO'
-         ██████╗ ██████╗ ███████╗███╗   ██╗ ██████╗██╗      █████╗  ██████╗██╗  ██╗██╗   ██╗
-        ██╔═══██╗██╔══██╗██╔════╝████╗  ██║██╔════╝██║     ██╔══██╗██╔════╝██║ ██╔╝╚██╗ ██╔╝
-        ██║   ██║██████╔╝█████╗  ██╔██╗ ██║██║     ██║     ███████║██║     █████╔╝  ╚████╔╝
-        ██║   ██║██╔═══╝ ██╔══╝  ██║╚██╗██║██║     ██║     ██╔══██║██║     ██╔═██╗   ╚██╔╝
-        ╚██████╔╝██║     ███████╗██║ ╚████║╚██████╗███████╗██║  ██║╚██████╗██║  ██╗   ██║
-         ╚═════╝ ╚═╝     ╚══════╝╚═╝  ╚═══╝ ╚═════╝╚══════╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝
-      LOGO
-
-      TAGLINE = "[>] AI Coding Assistant & Technical Co-founder"
-
-      TIPS = [
-        "[*] Ask questions, edit files, or run commands",
-        "[*] Be specific for the best results",
-        "[*] Create .clackyrules to customize interactions",
-        "[*] Type /help for more commands"
-      ]
-
-      def initialize
-        @pastel = Pastel.new
-      end
-
-      # Display full startup banner
-      def display_startup
-        puts
-        puts @pastel.bright_green(LOGO)
-        puts
-        puts @pastel.bright_cyan(TAGLINE)
-        puts
-        display_tips
-        puts
-      end
-
-      # Display welcome message for agent mode
-      def display_agent_welcome(working_dir:, mode:, max_iterations:, max_cost:)
-        puts
-        puts separator("=")
-        puts @pastel.bright_green("[+] AGENT MODE INITIALIZED")
-        puts separator("=")
-        puts
-        puts info_line("Working Directory", working_dir)
-        puts info_line("Permission Mode", mode)
-        puts info_line("Max Iterations", max_iterations)
-        puts info_line("Max Cost", "$#{max_cost}")
-        puts
-        puts @pastel.dim("[!] Type 'exit' or 'quit' to terminate session")
-        puts separator("-")
-        puts
-      end
-
-      # Display session continuation info
-      def display_session_continue(session_id:, created_at:, tasks:, cost:)
-        puts
-        puts separator("=")
-        puts @pastel.bright_yellow("[~] RESUMING SESSION")
-        puts separator("=")
-        puts
-        puts info_line("Session ID", session_id)
-        puts info_line("Started", created_at)
-        puts info_line("Tasks Completed", tasks)
-        puts info_line("Total Cost", "$#{cost}")
-        puts separator("-")
-        puts
-      end
-
-      # Display task completion summary
-      def display_task_complete(iterations:, cost:, total_tasks:, total_cost:, cost_source:, cache_stats: {})
-        puts
-        puts separator("-")
-        puts @pastel.bright_green("[✓] TASK COMPLETED")
-        puts info_line("Iterations", iterations)
-
-        # Add cost source indicator
-        cost_suffix = case cost_source
-                      when :api
-                        " (by API)"
-                      when :price
-                        " (by PRICE)"
-                      when :default
-                        " (by DEFAULT)"
-                      else
-                        " (estimated)"
-                      end
-        puts info_line("Cost", "$#{cost}#{cost_suffix}")
-        puts info_line("Session Total", "#{total_tasks} tasks, $#{total_cost}")
-
-        # Display cache statistics if available
-        if cache_stats[:total_requests] && cache_stats[:total_requests] > 0
-          puts
-          puts @pastel.cyan("    [Prompt Caching]")
-          puts info_line("  Cache Reads/Writes", "#{cache_stats[:cache_read_input_tokens]}/#{cache_stats[:cache_creation_input_tokens]} tokens")
-
-          hit_rate = (cache_stats[:cache_hit_requests].to_f / cache_stats[:total_requests] * 100).round(1)
-          puts info_line("  Cache Hit Rate", "#{hit_rate}% (#{cache_stats[:cache_hit_requests]}/#{cache_stats[:total_requests]} requests)")
-        end
-
-        puts separator("-")
-        puts
-      end
-
-      # Display error message
-      def display_error(message, details: nil)
-        puts
-        puts separator("-")
-        puts @pastel.bright_red("[✗] ERROR")
-        puts @pastel.red("    #{message}")
-        if details
-          puts @pastel.dim("    #{details}")
-        end
-        puts separator("-")
-        puts
-      end
-
-      # Display session end
-      def display_goodbye(total_tasks:, total_cost:)
-        puts
-        puts separator("=")
-        puts @pastel.bright_cyan("[#] SESSION TERMINATED")
-        puts separator("=")
-        puts
-        puts info_line("Total Tasks", total_tasks)
-        puts info_line("Total Cost", "$#{total_cost}")
-        puts
-        puts @pastel.dim("[*] All session data has been saved")
-        puts
-      end
-
-      private
-
-      def display_tips
-        TIPS.each do |tip|
-          puts @pastel.dim(tip)
-        end
-      end
-
-      def info_line(label, value)
-        label_text = @pastel.cyan("[#{label}]")
-        value_text = @pastel.white(value)
-        "    #{label_text} #{value_text}"
-      end
-
-      def separator(char = "-")
-        @pastel.dim(char * 80)
-      end
-    end
-  end
-end