openclacky 0.6.0 → 0.6.1

data/lib/clacky/tools/trash_manager.rb

@@ -363,7 +363,7 @@ module Clacky
         when 'help'
           "❓ Help displayed"
         else
-          success ? "✓ #{action} completed" : "✗ #{action} failed"
+          success ? "[OK] #{action} completed" : "[Error] #{action} failed"
         end
       end
     end

data/lib/clacky/tools/web_fetch.rb

@@ -149,11 +149,11 @@ module Clacky
 
       def format_result(result)
         if result[:error]
-          "✗ #{result[:error]}"
+          "[Error] #{result[:error]}"
         else
           title = result[:title] || 'Untitled'
           display_title = title.length > 40 ? "#{title[0..37]}..." : title
-          "✓ Fetched: #{display_title}"
+          "[OK] Fetched: #{display_title}"
         end
       end
     end

data/lib/clacky/tools/web_search.rb

@@ -139,10 +139,10 @@ module Clacky
 
       def format_result(result)
         if result[:error]
-          "✗ #{result[:error]}"
+          "[Error] #{result[:error]}"
         else
           count = result[:count] || 0
-          "✓ Found #{count} results"
+          "[OK] Found #{count} results"
         end
       end
     end

data/lib/clacky/ui2/components/common_component.rb

@@ -15,7 +15,7 @@ module Clacky
           "#{symbol} #{text}"
         end
 
-        # Render progress indicator
+        # Render progress indicator (stopped state, gray)
         # @param message [String] Progress message
         # @return [String] Progress indicator
         def render_progress(message)
@@ -24,6 +24,15 @@ module Clacky
           "#{symbol} #{text}"
         end
 
+        # Render working indicator (active state, yellow)
+        # @param message [String] Progress message
+        # @return [String] Working indicator
+        def render_working(message)
+          symbol = format_symbol(:working)
+          text = format_text(message, :working)
+          "#{symbol} #{text}"
+        end
+
         # Render success message
         # @param message [String] Success message
         # @return [String] Success message
@@ -65,22 +74,22 @@ module Clacky
           lines << @pastel.dim("─" * 60)
           lines << render_success("Task Complete")
           lines << ""
-          
+
           # Display each stat on a separate line
           lines << "  Iterations: #{iterations}"
           lines << "  Cost: $#{cost.round(4)}"
           lines << "  Duration: #{duration.round(1)}s" if duration
-          
+
           # Display cache information if available
           if cache_tokens && cache_tokens > 0
             lines << "  Cache Tokens: #{cache_tokens} tokens"
           end
-          
+
           if cache_requests && cache_requests > 0
             hit_rate = cache_hits > 0 ? ((cache_hits.to_f / cache_requests) * 100).round(1) : 0
             lines << "  Cache Requests: #{cache_requests} (#{cache_hits} hits, #{hit_rate}% hit rate)"
           end
-          
+
           lines.join("\n")
         end
       end

data/lib/clacky/ui2/components/input_area.rb

@@ -13,6 +13,16 @@ module Clacky
       class InputArea
         include LineEditor
 
+        # User tips pool - can be extended with more tips over time
+        USER_TIPS = [
+          "Shift+Tab to toggle permission mode (confirm_safes ⇄ auto_approve)",
+          "Ctrl+C to interrupt AI execution or clear input",
+          "Shift+Enter to create multi-line input",
+          "Ctrl+V to paste images (supports up to 3 images)",
+          "Ctrl+D to delete pasted images",
+          "Use /clear to restart session, /help for commands"
+        ].freeze
+
         attr_accessor :row
         attr_reader :cursor_position, :line_index, :images, :tips_message, :tips_type
 
@@ -36,6 +46,11 @@ module Clacky
           @tips_timer = nil
           @last_render_row = nil
 
+          # User tip (usage suggestion) - separate from system tips
+          @user_tip = nil
+          @user_tip_timer = nil
+          @user_tip_count = 0
+
           # Paused state - when InlineInput is active
           @paused = false
 
@@ -88,6 +103,7 @@ module Clacky
           
           height += 1  # Bottom separator
           height += 1 if @tips_message
+          height += 1 if @user_tip
           height
         end
 
@@ -242,6 +258,14 @@ module Clacky
             current_row += 1
           end
 
+          # User tip (if any)
+          if @user_tip
+            move_cursor(current_row, 0)
+            content = format_user_tip(@user_tip)
+            print_with_padding(content)
+            current_row += 1
+          end
+
           # Position cursor at current edit position
           position_cursor(start_row)
           flush
@@ -334,6 +358,58 @@ module Clacky
           @tips_message = nil
         end
 
+        # Show a random user tip with probability and auto-rotation (max 3 tips)
+        # @param probability [Float] Probability of showing tip (0.0 to 1.0, default: 0.4)
+        # @param rotation_interval [Integer] Seconds between tip rotation (default: 12)
+        # @param max_tips [Integer] Maximum number of tips to show before stopping (default: 3)
+        def show_user_tip(probability: 0.4, rotation_interval: 12, max_tips: 3)
+          # Random chance to show tip
+          return unless rand < probability
+          
+          # Stop existing timer if any
+          stop_user_tip_timer
+          
+          # Reset counter and pick first random tip
+          @user_tip_count = 1
+          @user_tip = USER_TIPS.sample
+          
+          # Start rotation timer (will show max_tips total)
+          @user_tip_timer = Thread.new do
+            while @user_tip_count < max_tips
+              sleep rotation_interval
+              @user_tip_count += 1
+              
+              # Pick a different tip
+              old_tip = @user_tip
+              loop do
+                @user_tip = USER_TIPS.sample
+                break if @user_tip != old_tip || USER_TIPS.size == 1
+              end
+            end
+            
+            # After showing max_tips, wait then clear
+            sleep rotation_interval
+            @user_tip = nil
+            @user_tip_count = 0
+          rescue => e
+            # Silently handle thread errors
+          end
+        end
+
+        # Clear user tip and stop rotation
+        def clear_user_tip
+          stop_user_tip_timer
+          @user_tip = nil
+          @user_tip_count = 0
+        end
+
+        private def stop_user_tip_timer
+          if @user_tip_timer&.alive?
+            @user_tip_timer.kill
+            @user_tip_timer = nil
+          end
+        end
+
         # Pause input area (when InlineInput is active)
         def pause
           @paused = true
@@ -583,18 +659,23 @@ module Clacky
 
           # Handle commands (with or without slash)
           if text.start_with?('/')
-            case text
-            when '/clear'
-              clear
-              return { action: :clear_output }
-            when '/help'
-              return { action: :help }
-            when '/exit', '/quit'
-              return { action: :exit }
-            else
-              set_tips("Unknown command: #{text} (Available: /clear, /help, /exit)", type: :warning)
-              return { action: nil }
+            # Check if it's a command (single slash followed by English letters only)
+            # Paths like /xxx/xxxx should not be treated as commands
+            if text =~ /^\/([a-zA-Z]+)$/
+              case text
+              when '/clear'
+                clear
+                return { action: :clear_output }
+              when '/help'
+                return { action: :help }
+              when '/exit', '/quit'
+                return { action: :exit }
+              else
+                set_tips("Unknown command: #{text} (Available: /clear, /help, /exit)", type: :warning)
+                return { action: nil }
+              end
             end
+            # If it's not a command pattern (e.g., /xxx/xxxx), treat as normal input
           elsif text == '?'
             return { action: :help }
           elsif text == 'exit' || text == 'quit'
@@ -888,15 +969,15 @@ module Clacky
 
           # Workspace status with animation
           if @sessionbar_info[:status]
-            status_indicator = get_status_indicator(@sessionbar_info[:status])
-            status_theme_key = status_theme_key_for(@sessionbar_info[:status])
-            parts << "#{status_indicator} #{theme.format_text(@sessionbar_info[:status], status_theme_key)}"
+            status_color = status_color_for(@sessionbar_info[:status])
+            status_indicator = get_status_indicator(@sessionbar_info[:status], status_color)
+            parts << "#{status_indicator} #{@pastel.public_send(status_color, @sessionbar_info[:status])}"
           end
 
           # Working directory (shortened if too long)
           if @sessionbar_info[:working_dir]
             dir_display = shorten_path(@sessionbar_info[:working_dir])
-            parts << @pastel.bright_cyan(dir_display)
+            parts << @pastel.dim(@pastel.cyan(dir_display))
           end
 
           # Permission mode
@@ -907,15 +988,15 @@ module Clacky
 
           # Model
           if @sessionbar_info[:model]
-            parts << @pastel.bright_white(@sessionbar_info[:model])
+            parts << @pastel.dim(@pastel.white(@sessionbar_info[:model]))
           end
 
           # Tasks count
-          parts << @pastel.yellow("#{@sessionbar_info[:tasks]} tasks")
+          parts << @pastel.dim(@pastel.white("#{@sessionbar_info[:tasks]} tasks"))
 
           # Cost
           cost_display = format("$%.1f", @sessionbar_info[:cost])
-          parts << @pastel.yellow(cost_display)
+          parts << @pastel.dim(@pastel.white(cost_display))
 
           session_line = " " + parts.join(separator)
           print_with_padding(session_line)
@@ -946,30 +1027,30 @@ module Clacky
         def mode_color_for(mode)
           case mode.to_s
           when /auto_approve/
-            :bright_magenta
+            :magenta
           when /confirm_safes/
-            :bright_yellow
+            :cyan
           when /confirm_edits/
-            :bright_green
+            :green
           when /plan_only/
-            :bright_blue
+            :blue
           else
             :white
           end
         end
 
-        def status_theme_key_for(status)
+        def status_color_for(status)
           case status.to_s.downcase
           when 'idle'
-            :info  # Use info color for idle state
+            :cyan  # Use darker cyan for idle state
           when 'working'
-            :progress  # Use progress color for working state
+            :yellow  # Use yellow to highlight working state
           else
-            :info
+            :cyan
           end
         end
 
-        def get_status_indicator(status)
+        def get_status_indicator(status, color)
           case status.to_s.downcase
           when 'working'
             # Update animation frame if enough time has passed
@@ -978,9 +1059,9 @@ module Clacky
               @animation_frame = (@animation_frame + 1) % @working_frames.length
               @last_animation_update = now
             end
-            @working_frames[@animation_frame]
+            @pastel.public_send(color, @working_frames[@animation_frame])
           else
-            "●"  # Idle indicator
+            @pastel.public_send(color, "●")  # Idle indicator with same color as text
           end
         end
 
@@ -1012,6 +1093,20 @@ module Clacky
           end
         end
 
+        # Format user tip (usage suggestion) with lightbulb icon
+        # @param tip [String] Tip message
+        # @return [String] Formatted tip with styling
+        def format_user_tip(tip)
+          # Limit message length to prevent line wrapping
+          max_length = @width - 5  # Reserve space for icon and margins
+          if tip.length > max_length
+            tip = tip[0...(max_length - 3)] + "..."
+          end
+          
+          # Use lightbulb icon and dim cyan color for subtle appearance
+          @pastel.dim(@pastel.cyan("💡 #{tip}"))
+        end
+
         def move_cursor(row, col)
           print "\e[#{row + 1};#{col + 1}H"
         end

data/lib/clacky/ui2/components/message_component.rb

@@ -13,12 +13,14 @@ module Clacky
         #   - :content [String] Message content
         #   - :timestamp [Time, nil] Optional timestamp
         #   - :images [Array<String>] Optional image paths (for user messages)
+        #   - :prefix_newline [Boolean] Whether to add newline before message (for system messages)
         # @return [String] Rendered message
         def render(data)
           role = data[:role]
           content = data[:content]
           timestamp = data[:timestamp]
           images = data[:images] || []
+          prefix_newline = data.fetch(:prefix_newline, true)
           
           case role
           when "user"
@@ -26,7 +28,7 @@ module Clacky
           when "assistant"
             render_assistant_message(content, timestamp)
           else
-            render_system_message(content, timestamp)
+            render_system_message(content, timestamp, prefix_newline)
           end
         end
 
@@ -62,13 +64,15 @@ module Clacky
         # Render 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)
+        private def render_system_message(content, timestamp = nil, prefix_newline = true)
           symbol = format_symbol(:info)
           text = format_text(content, :info)
           time_str = timestamp ? @pastel.dim("[#{format_timestamp(timestamp)}]") : ""
 
-          "\n#{symbol} #{text} #{time_str}".rstrip
+          prefix = prefix_newline ? "\n" : ""
+          "#{prefix}#{symbol} #{text} #{time_str}".rstrip
         end
       end
     end

data/lib/clacky/ui2/components/output_area.rb

@@ -21,7 +21,7 @@ module Clacky
         # Multi-line handling is done by LayoutManager
         # @param content [String] Single line content to append
         def append(content)
-          return if content.nil? || content.empty?
+          return if content.nil?
 
           update_width
           print wrap_line(content)

data/lib/clacky/ui2/components/todo_area.rb

@@ -10,7 +10,7 @@ module Clacky
         attr_accessor :height
         attr_reader :todos
 
-        MAX_DISPLAY_TASKS = 2  # Show at most 2 tasks (Next + After)
+        MAX_DISPLAY_TASKS = 3  # Show current + next 2 tasks
 
         def initialize
           @todos = []
@@ -27,12 +27,11 @@ module Clacky
           @completed_count = @todos.count { |t| t[:status] == "completed" }
           @total_count = @todos.size
 
-          # Height: 1 line for header + min(pending_count, MAX_DISPLAY_TASKS) lines for tasks
-          if @pending_todos.empty? && @completed_count == 0
+          # Calculate height: 0 if no pending, otherwise 1 line per task (up to MAX_DISPLAY_TASKS)
+          if @pending_todos.empty?
             @height = 0
           else
-            display_count = [@pending_todos.size, MAX_DISPLAY_TASKS].min
-            @height = 1 + display_count
+            @height = [@pending_todos.size, MAX_DISPLAY_TASKS].min
           end
         end
 
@@ -48,21 +47,37 @@ module Clacky
 
           update_width
 
-          # Render header: [##] Tasks [0/4]: ████
-          move_cursor(start_row, 0)
-          clear_line
-          header = render_header
-          print header
-
-          # Render tasks (Next and After)
-          @pending_todos.take(MAX_DISPLAY_TASKS).each_with_index do |todo, i|
-            move_cursor(start_row + i + 1, 0)
-            clear_line
-
-            label = i == 0 ? "Next" : "After"
-            task_text = truncate_text("##{todo[:id]} - #{todo[:task]}", @width - 12)
-            line = "  #{@pastel.dim("->")} #{@pastel.yellow(label)}: #{task_text}"
-            print line
+          # Render each task on separate line
+          tasks_to_show = @pending_todos.take(MAX_DISPLAY_TASKS)
+          
+          tasks_to_show.each_with_index do |task, index|
+            move_cursor(start_row + index, 0)
+            
+            # Build the line content
+            line_content = if index == 0
+              # First line: Task [2/4]: #3 - Current task description
+              progress = "#{@completed_count}/#{@total_count}"
+              prefix = "Task [#{progress}]: "
+              task_text = "##{task[:id]} - #{task[:task]}"
+              available_width = @width - prefix.length - 2
+              truncated_task = truncate_text(task_text, available_width)
+              
+              "#{@pastel.cyan(prefix)}#{truncated_task}"
+            else
+              # Subsequent lines: -> Next: #4 - Next task description
+              label = index == 1 ? "Next" : "After"
+              prefix = "-> #{label}: "
+              task_text = "##{task[:id]} - #{task[:task]}"
+              available_width = @width - prefix.length - 2
+              truncated_task = truncate_text(task_text, available_width)
+              
+              "#{@pastel.dim(prefix)}#{@pastel.dim(truncated_task)}"
+            end
+
+            # Use carriage return and print content directly (overwrite existing content)
+            print "\r#{line_content}"
+            # Clear any remaining characters from previous render if line is shorter
+            clear_to_end_of_line
           end
 
           flush
@@ -79,28 +94,6 @@ module Clacky
 
         private
 
-        # Render header line with progress bar
-        def render_header
-          progress = "#{@completed_count}/#{@total_count}"
-          progress_bar = render_progress_bar(@completed_count, @total_count)
-
-          "#{@pastel.cyan("[##]")} Tasks [#{progress}]: #{progress_bar}"
-        end
-
-        # Render a simple progress bar
-        def render_progress_bar(completed, total)
-          return "" if total == 0
-
-          bar_width = 10
-          filled = total > 0 ? (completed.to_f / total * bar_width).round : 0
-          empty = bar_width - filled
-
-          filled_bar = @pastel.green("█" * filled)
-          empty_bar = @pastel.dim("░" * empty)
-
-          "#{filled_bar}#{empty_bar}"
-        end
-
         # Truncate text to fit width
         def truncate_text(text, max_width)
           return "" if text.nil?
@@ -122,9 +115,9 @@ module Clacky
           print "\e[#{row + 1};#{col + 1}H"
         end
 
-        # Clear current line
-        def clear_line
-          print "\e[2K"
+        # Clear from cursor to end of line
+        def clear_to_end_of_line
+          print "\e[0K"
         end
 
         # Flush output

data/lib/clacky/ui2/components/welcome_banner.rb

@@ -29,6 +29,16 @@ module Clacky
           @pastel = Pastel.new
         end
 
+        # Render only the logo (ASCII art)
+        # @return [String] Formatted logo only
+        def render_logo
+          lines = []
+          lines << ""
+          lines << @pastel.bright_green(LOGO)
+          lines << ""
+          lines.join("\n")
+        end
+
         # Render startup banner
         # @return [String] Formatted startup banner
         def render_startup