openclacky 0.6.0 → 0.6.2

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
 
@@ -69,8 +84,15 @@ module Clacky
           # When paused (InlineInput active), don't take up any space
           return 0 if @paused
 
-          height = 1  # Session bar (top)
-          height += 1  # Separator after session bar
+          height = 0
+          
+          # Session bar - calculate actual wrapped height
+          height += calculate_sessionbar_height
+          
+          # Separator after session bar
+          height += 1
+          
+          # Images
           height += @images.size
           
           # Calculate height considering wrapped lines
@@ -86,8 +108,13 @@ module Clacky
             height += wrapped_segments.size
           end
           
-          height += 1  # Bottom separator
+          # Bottom separator
+          height += 1
+          
+          # Tips and user tips
           height += 1 if @tips_message
+          height += 1 if @user_tip
+          
           height
         end
 
@@ -186,49 +213,7 @@ module Clacky
           end
 
           # Input lines with auto-wrap support
-          @lines.each_with_index do |line, idx|
-            prefix = if idx == 0
-              prompt_text = theme.format_symbol(:user) + " "
-              prompt_text
-            else
-              " " * prompt.length
-            end
-
-            # Calculate available width for text (excluding prefix)
-            prefix_width = calculate_display_width(strip_ansi_codes(prefix))
-            available_width = @width - prefix_width
-
-            # Wrap line if needed
-            wrapped_segments = wrap_line(line, available_width)
-
-            wrapped_segments.each_with_index do |segment_info, wrap_idx|
-              move_cursor(current_row, 0)
-
-              segment_text = segment_info[:text]
-              segment_start = segment_info[:start]
-              segment_end = segment_info[:end]
-
-              content = if wrap_idx == 0
-                # First wrapped line includes prefix
-                if idx == @line_index
-                  "#{prefix}#{render_line_segment_with_cursor(line, segment_start, segment_end)}"
-                else
-                  "#{prefix}#{theme.format_text(segment_text, :user)}"
-                end
-              else
-                # Continuation lines have indent matching prefix width
-                continuation_indent = " " * prefix_width
-                if idx == @line_index
-                  "#{continuation_indent}#{render_line_segment_with_cursor(line, segment_start, segment_end)}"
-                else
-                  "#{continuation_indent}#{theme.format_text(segment_text, :user)}"
-                end
-              end
-              
-              print_with_padding(content)
-              current_row += 1
-            end
-          end
+          current_row = render_input_lines(current_row)
 
           # Bottom separator
           render_separator(current_row)
@@ -242,6 +227,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 +327,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
@@ -485,6 +530,73 @@ module Clacky
 
         private
 
+        # Render all input lines with auto-wrap support
+        # @param start_row [Integer] Starting row position
+        # @return [Integer] Next available row after rendering all lines
+        def render_input_lines(start_row)
+          current_row = start_row
+          
+          @lines.each_with_index do |line, line_idx|
+            prefix = calculate_line_prefix(line_idx)
+            prefix_width = calculate_display_width(strip_ansi_codes(prefix))
+            available_width = @width - prefix_width
+            wrapped_segments = wrap_line(line, available_width)
+
+            wrapped_segments.each_with_index do |segment_info, wrap_idx|
+              content = render_line_segment(line, line_idx, segment_info, wrap_idx, prefix, prefix_width)
+              move_cursor(current_row, 0)
+              print_with_padding(content)
+              current_row += 1
+            end
+          end
+          
+          current_row
+        end
+
+        # Calculate the prefix (prompt or indent) for a given line index
+        # @param line_idx [Integer] Index of the line
+        # @return [String] Prefix string (with formatting)
+        private def calculate_line_prefix(line_idx)
+          if line_idx == 0
+            theme.format_symbol(:user) + " "
+          else
+            " " * prompt.length
+          end
+        end
+
+        # Render a single segment of a line (handling cursor and wrapping)
+        # @param line [String] Full line text
+        # @param line_idx [Integer] Index of the line in @lines
+        # @param segment_info [Hash] Segment information from wrap_line
+        # @param wrap_idx [Integer] Index of this segment in wrapped segments
+        # @param prefix [String] Line prefix (prompt or indent)
+        # @param prefix_width [Integer] Display width of the prefix
+        # @return [String] Formatted content for this segment
+        private def render_line_segment(line, line_idx, segment_info, wrap_idx, prefix, prefix_width)
+          segment_text = segment_info[:text]
+          segment_start = segment_info[:start]
+          segment_end = segment_info[:end]
+          
+          is_current_line = (line_idx == @line_index)
+          is_first_segment = (wrap_idx == 0)
+          
+          # Determine the line prefix
+          line_prefix = if is_first_segment
+            prefix
+          else
+            " " * prefix_width  # Continuation indent
+          end
+          
+          # Render the segment content (with or without cursor)
+          segment_content = if is_current_line
+            render_line_segment_with_cursor(line, segment_start, segment_end)
+          else
+            theme.format_text(segment_text, :user)
+          end
+          
+          "#{line_prefix}#{segment_content}"
+        end
+
         # Wrap a line into multiple segments based on available width
         # Considers display width of characters (multi-byte characters like Chinese)
         # @param line [String] The line to wrap
@@ -570,12 +682,29 @@ module Clacky
           visible_content = content.gsub(/\e\[[0-9;]*m/, '')
           visible_width = calculate_display_width(visible_content)
           
-          # Print content
-          print content
-          
-          # Pad with spaces if needed to clear old content
-          remaining = @width - visible_width
-          print " " * remaining if remaining > 0
+          # IMPORTANT: If content exceeds screen width, truncate to prevent terminal auto-wrap
+          if visible_width > @width
+            # Content too long - truncate to fit (loses ANSI colors but prevents wrapping)
+            truncate_at = 0
+            current_width = 0
+            visible_content.each_char.with_index do |char, idx|
+              char_width = char_display_width(char)
+              break if current_width + char_width + 3 > @width  # Reserve 3 for "..."
+              current_width += char_width
+              truncate_at = idx + 1
+            end
+            print visible_content[0...truncate_at]
+            print "..."
+            # Pad remaining
+            remaining = @width - current_width - 3
+            print " " * remaining if remaining > 0
+          else
+            # Content fits - print normally
+            print content
+            # Pad with spaces if needed to clear old content
+            remaining = @width - visible_width
+            print " " * remaining if remaining > 0
+          end
         end
 
         def handle_enter
@@ -583,18 +712,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'
@@ -867,36 +1001,60 @@ module Clacky
           end
         end
 
+        # Render a separator line (ensures it doesn't exceed screen width)
+        # @param row [Integer] Row position to render
         def render_separator(row)
           move_cursor(row, 0)
-          content = @pastel.dim("─" * @width)
-          print_with_padding(content)
+          # Ensure separator doesn't exceed screen width to prevent wrapping
+          separator_width = [@width, 1].max
+          content = @pastel.dim("─" * separator_width)
+          print content
+          # Clear any remaining space
+          remaining = @width - separator_width
+          print " " * remaining if remaining > 0
         end
 
+        # Render session bar with wrapping support
+        # @param row [Integer] Starting row position
+        # @return [Integer] Number of rows actually used
         def render_sessionbar(row)
           move_cursor(row, 0)
 
           # If no sessionbar info, just render a separator
           unless @sessionbar_info[:working_dir]
-            content = @pastel.dim("─" * @width)
-            print_with_padding(content)
-            return
+            separator_width = [@width, 1].max
+            content = @pastel.dim("─" * separator_width)
+            print content
+            remaining = @width - separator_width
+            print " " * remaining if remaining > 0
+            return 1
           end
 
+          session_line = build_sessionbar_content
+          
+          # IMPORTANT: Always use print_with_padding which handles truncation
+          # to prevent terminal auto-wrap
+          print_with_padding(session_line)
+          1
+        end
+        
+        # Build the session bar content string
+        # @return [String] Formatted session bar content
+        private def build_sessionbar_content
           parts = []
           separator = @pastel.dim(" │ ")
 
           # 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,18 +1065,57 @@ 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)
-
-          session_line = " " + parts.join(separator)
-          print_with_padding(session_line)
+          parts << @pastel.dim(@pastel.white(cost_display))
+
+          " " + parts.join(separator)
+        end
+        
+        # Truncate session bar content to fit within max length
+        # @param content [String] Full session bar content with ANSI codes
+        # @param max_length [Integer] Maximum visible length
+        # @return [String] Truncated content
+        private def truncate_sessionbar_content(content, max_length)
+          # Strip ANSI codes to calculate visible length
+          visible_content = strip_ansi_codes(content)
+          visible_width = calculate_display_width(visible_content)
+          
+          return content if visible_width <= max_length
+          
+          # Truncate from the end with "..." indicator
+          chars = visible_content.chars
+          current_width = 0
+          truncate_at = 0
+          
+          chars.each_with_index do |char, idx|
+            char_width = char_display_width(char)
+            if current_width + char_width + 3 > max_length  # Reserve 3 for "..."
+              truncate_at = idx
+              break
+            end
+            current_width += char_width
+            truncate_at = idx + 1
+          end
+          
+          # For simplicity with ANSI codes, just show first part + ...
+          # This is a simplified version - proper implementation would preserve ANSI codes
+          visible_content[0...truncate_at] + "..."
+        end
+        
+        # Calculate how many rows the session bar will occupy
+        # @return [Integer] Number of rows needed
+        private def calculate_sessionbar_height
+          return 1 unless @sessionbar_info[:working_dir]
+          
+          # Session bar always renders on one line (we truncate if needed)
+          1
         end
 
         def shorten_path(path)
@@ -946,30 +1143,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 +1175,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 +1209,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