openclacky 0.7.2 → 0.7.4

data/lib/clacky/ui2/ui_controller.rb

@@ -446,7 +446,8 @@ module Clacky
       # Show progress indicator with dynamic elapsed time
       # @param message [String] Progress message (optional, will use random thinking verb if nil)
       # @param prefix_newline [Boolean] Whether to add a blank line before progress (default: true)
-      def show_progress(message = nil, prefix_newline: true)
+      # @param output_buffer [Hash, nil] Shared output buffer for real-time command output (optional)
+      def show_progress(message = nil, prefix_newline: true, output_buffer: nil)
         # Stop any existing progress thread
         stop_progress_thread
 
@@ -455,10 +456,12 @@ module Clacky
 
         @progress_message = message || Clacky::THINKING_VERBS.sample
         @progress_start_time = Time.now
+        @progress_output_buffer = output_buffer
 
         # Show initial progress (yellow, active)
         append_output("") if prefix_newline
-        output = @renderer.render_working("#{@progress_message}… (ctrl+c to interrupt)")
+        hint = output_buffer ? "(Ctrl+C to interrupt · Ctrl+O to view output)" : "(Ctrl+C to interrupt)"
+        output = @renderer.render_working("#{@progress_message}… #{hint}")
         append_output(output)
 
         # Start background thread to update elapsed time
@@ -468,7 +471,8 @@ module Clacky
             next unless @progress_start_time
 
             elapsed = (Time.now - @progress_start_time).to_i
-            update_progress_line(@renderer.render_working("#{@progress_message}… (ctrl+c to interrupt · #{elapsed}s)"))
+            hint = output_buffer ? "(Ctrl+C to interrupt · Ctrl+O to view output · #{elapsed}s)" : "(Ctrl+C to interrupt · #{elapsed}s)"
+            update_progress_line(@renderer.render_working("#{@progress_message}… #{hint}"))
           end
         rescue => e
           # Silently handle thread errors
@@ -495,6 +499,7 @@ module Clacky
       # Stop the progress update thread
       def stop_progress_thread
         @progress_start_time = nil
+        @progress_output_buffer = nil  # Clear output buffer reference
         if @progress_thread&.alive?
           @progress_thread.kill
           @progress_thread = nil
@@ -583,7 +588,7 @@ module Clacky
         # Show question in output with theme styling
         theme = ThemeManager.current_theme
         question_symbol = theme.format_symbol(:info)
-        append_output("\n#{question_symbol} #{message}")
+        append_output("#{question_symbol} #{message}")
 
         # Pause InputArea
         @input_area.pause
@@ -671,6 +676,32 @@ module Clacky
         @layout.enter_fullscreen(@last_diff_lines, hint: "Press Ctrl+O to return")
       end
 
+      # Show fullscreen command output view
+      def show_command_output
+        return unless @progress_output_buffer
+        return if @layout.fullscreen_mode?  # Already in fullscreen, ignore
+
+        # Get lines from LimitStack
+        stdout_lines = @progress_output_buffer[:stdout_lines]&.to_a || []
+        stderr_lines = @progress_output_buffer[:stderr_lines]&.to_a || []
+        
+        lines = stdout_lines.map(&:chomp)
+        
+        # Add stderr section if present
+        unless stderr_lines.empty?
+          lines << ""
+          lines << "--- STDERR ---"
+          lines += stderr_lines.map(&:chomp)
+        end
+        
+        if lines.empty?
+          lines = ["(No output yet)"]
+        end
+
+        # Enter fullscreen mode to display command output
+        @layout.enter_fullscreen(lines, hint: "Press Ctrl+O to return · Output updates in real-time")
+      end
+
       private
 
       # Format tool call for display
@@ -718,7 +749,8 @@ module Clacky
       def display_welcome_banner
         content = @welcome_banner.render_full(
           working_dir: @config[:working_dir],
-          mode: @config[:mode]
+          mode: @config[:mode],
+          width: @layout.screen.width
         )
         append_output(content)
 
@@ -743,7 +775,7 @@ module Clacky
         theme = ThemeManager.current_theme
 
         # Show logo banner only
-        append_output(@welcome_banner.render_logo)
+        append_output(@welcome_banner.render_logo(width: @layout.screen.width))
 
         # Show simple header
         append_output(theme.format_text("Recent conversation:", :info))
@@ -771,6 +803,9 @@ module Clacky
         @layout.screen.enable_raw_mode
 
         while @running
+          # Process any pending resize events
+          @layout.process_pending_resize
+          
           key = @layout.screen.read_key(timeout: 0.1)
           next unless key
 
@@ -836,8 +871,12 @@ module Clacky
         when :toggle_mode
           toggle_mode
         when :toggle_expand
-          # Enter fullscreen diff view
-          redisplay_diff
+          # If there's command output available, show it; otherwise show diff
+          if @progress_output_buffer
+            show_command_output
+          else
+            redisplay_diff
+          end
         when :time_machine
           # Trigger time machine callback
           @time_machine_callback&.call
@@ -862,10 +901,15 @@ module Clacky
           @layout.position_inline_input_cursor(@inline_input)
         when :submit, :cancel
           # InlineInput is done, will be cleaned up by request_confirmation after collect returns
-          nil
+          # Don't render anything here - let request_confirmation handle cleanup
+          return
         when :toggle_expand
-          # Enter fullscreen diff view (will return when user presses Ctrl+O)
-          redisplay_diff
+          # If there's command output available, show it; otherwise show diff
+          if @progress_output_buffer
+            show_command_output
+          else
+            redisplay_diff
+          end
         when :toggle_mode
           # Update mode and session bar info, but don't render yet
           current_mode = @config[:mode]
@@ -939,7 +983,11 @@ module Clacky
           choices << { name: "[X] Close", value: { action: :close } }
           
           # Show menu
-          result = modal.show(title: "Model Configuration", choices: choices)
+          result = modal.show(
+            title: "Model Configuration", 
+            choices: choices,
+            on_close: -> { @layout.rerender_all }
+          )
           
           return nil if result.nil?
           
@@ -1037,7 +1085,8 @@ module Clacky
         # Show modal
         result = modal.show(
           title: "Time Machine - Select Task to Navigate",
-          choices: choices
+          choices: choices,
+          on_close: -> { @layout.rerender_all }
         )
         
         result # Return selected task_id or nil
@@ -1065,7 +1114,8 @@ module Clacky
           # Show provider selection
           selected_provider = modal.show(
             title: "Select Provider",
-            choices: provider_choices
+            choices: provider_choices,
+            on_close: -> { @layout.rerender_all }
           )
           
           # User cancelled
@@ -1157,7 +1207,8 @@ module Clacky
         result = modal.show(
           title: modal_title,
           fields: fields,
-          validator: validator
+          validator: validator,
+          on_close: -> { @layout.rerender_all }
         )
         
         return nil if result.nil?

data/lib/clacky/ui2.rb

@@ -5,6 +5,7 @@
 
 require_relative "ui2/thinking_verbs"
 require_relative "ui2/progress_indicator"
+require_relative "ui2/terminal_detector"
 require_relative "ui2/theme_manager"
 require_relative "ui2/screen_buffer"
 require_relative "ui2/layout_manager"

data/lib/clacky/utils/limit_stack.rb

@@ -31,6 +31,11 @@ module Clacky
         self
       end
 
+      # Remove and return the last element
+      def pop
+        @items.pop
+      end
+
       # Get last N elements
       def last(n = nil)
         n ? @items.last(n) : @items.last

data/lib/clacky/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - windy
@@ -198,7 +198,10 @@ files:
 - lib/clacky/default_skills/deploy/tools/report_deploy_status.rb
 - lib/clacky/default_skills/deploy/tools/set_deploy_variables.rb
 - lib/clacky/default_skills/new/SKILL.md
+- lib/clacky/default_skills/new/scripts/create_rails_project.sh
+- lib/clacky/default_skills/new/scripts/rails_env_checker.sh
 - lib/clacky/default_skills/skill-add/SKILL.md
+- lib/clacky/default_skills/skill-add/scripts/install_from_github.rb
 - lib/clacky/json_ui_controller.rb
 - lib/clacky/providers.rb
 - lib/clacky/session_manager.rb
@@ -239,6 +242,7 @@ files:
 - lib/clacky/ui2/markdown_renderer.rb
 - lib/clacky/ui2/progress_indicator.rb
 - lib/clacky/ui2/screen_buffer.rb
+- lib/clacky/ui2/terminal_detector.rb
 - lib/clacky/ui2/theme_manager.rb
 - lib/clacky/ui2/themes/base_theme.rb
 - lib/clacky/ui2/themes/hacker_theme.rb