swarm_cli 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76f2194c98896ffdd5f1c16a08e0ce0460d3430efc9c4f21adc4999c1af73f7
-  data.tar.gz: c004295295b56474ba2eafad610fb2804ae9e8d171d1103b08faa5d7e93881a0
+  metadata.gz: d5f6285a136ccf9bda4e010daf5062f38d2dc1fbe27ef0747dd7e08a0f794bfc
+  data.tar.gz: 54400709e283dce60b2422392a45f3ccc56b0876b41ccd919a17b12efbd19413
 SHA512:
-  metadata.gz: 8203e59b81a125b4d1ae7188e3a90e9158c228882e15237be1475e64a9ace7489ad0879f8a6507cdd1d0fba7f09ed448e574cbe5df424727f0ddafd06e4d4bd3
-  data.tar.gz: f433f4105c2adeec9e37b8d0539a81180ba5d66d0b979529acd604906fecb1c575f80c352c6620ce89faff6300d0e4ab40b76714c8af71b11e87f25f494da81e
+  metadata.gz: afbaa1d360f97e20167256ebfa6c6c68d377bac849a295197641443c7a59f306a132a1084a5bf89d8490b9d79dce67f4bb0a1b480642ce68dedeb758af0ef67e
+  data.tar.gz: b37a53f4855db437e74d2fd6a60245650a41496c603f5529371f5471a4e7d7889bd34f11c5b3764ddc0ae3f97a20777dc9a249da4659c11155a7e5ab7d7f29f8

data/lib/swarm_cli/cli.rb

@@ -4,7 +4,6 @@ module SwarmCLI
   class CLI
     class << self
       def start(args)
-        SwarmSDK.refresh_models_silently
         new(args).run
       end
     end

data/lib/swarm_cli/commands/mcp_tools.rb

@@ -14,7 +14,9 @@ module SwarmCLI
 
       def initialize(options)
         @options = options
-        @scratchpad = SwarmSDK::Scratchpad.new
+        # Create scratchpad with persistence for MCP server
+        scratchpad_path = File.join(Dir.pwd, ".swarm", "scratchpad.json")
+        @scratchpad = SwarmSDK::Scratchpad.new(persist_to: scratchpad_path)
       end
 
       def execute

data/lib/swarm_cli/formatters/human_formatter.rb

@@ -10,6 +10,8 @@ module SwarmCLI
     # - :non_interactive - Full headers, task prompt, complete summary (for single execution)
     # - :interactive - Minimal output for REPL (headers shown in welcome screen)
     class HumanFormatter
+      attr_reader :spinner_manager
+
       def initialize(output: $stdout, quiet: false, truncate: false, verbose: false, mode: :non_interactive)
         @output = output
         @quiet = quiet

data/lib/swarm_cli/interactive_repl.rb

@@ -5,6 +5,8 @@ require "tty-spinner"
 require "tty-markdown"
 require "tty-box"
 require "pastel"
+require "async"
+require "async/condition"
 
 module SwarmCLI
   # InteractiveREPL provides a professional, interactive terminal interface
@@ -67,6 +69,59 @@ module SwarmCLI
       exit(130)
     end
 
+    # Execute a message with Ctrl+C cancellation support
+    # Public for testing
+    #
+    # @param input [String] User input to execute
+    # @return [SwarmSDK::Result, nil] Result or nil if cancelled
+    def execute_with_cancellation(input, &log_callback)
+      cancelled = false
+      result = nil
+
+      # Execute in Async block to enable Ctrl+C cancellation
+      Async do |task|
+        # Use Async::Condition for trap-safe cancellation
+        # (Condition#signal uses Thread::Queue which is safe from trap context)
+        cancel_condition = Async::Condition.new
+
+        # Install trap ONLY during execution
+        # When Ctrl+C is pressed, signal the condition instead of calling task.stop
+        old_trap = trap("INT") do
+          cancel_condition.signal(:cancel)
+        end
+
+        begin
+          # Execute swarm in async task
+          llm_task = task.async do
+            @swarm.execute(input, &log_callback)
+          end
+
+          # Monitor task - watches for cancellation signal
+          # Must be created AFTER llm_task so it can reference it
+          monitor_task = task.async do
+            if cancel_condition.wait == :cancel
+              cancelled = true
+              llm_task.stop
+            end
+          end
+
+          result = llm_task.wait
+        rescue Async::Stop
+          # Task was stopped by Ctrl+C
+          cancelled = true
+        ensure
+          # Clean up monitor task
+          monitor_task&.stop if monitor_task&.alive?
+
+          # CRITICAL: Restore old trap when done
+          # This ensures Ctrl+C at the prompt still exits the REPL
+          trap("INT", old_trap)
+        end
+      end.wait
+
+      cancelled ? nil : result
+    end
+
     private
 
     def setup_ui_components
@@ -127,6 +182,7 @@ module SwarmCLI
       puts @colors[:system].call("Lead Agent: #{@swarm.lead_agent}")
       puts ""
       puts @colors[:system].call("Type your message and press Enter to submit")
+      puts @colors[:system].call("Press Option+Enter (or ESC then Enter) for multi-line input")
       puts @colors[:system].call("Type #{@colors[:code].call("/help")} for commands or #{@colors[:code].call("/exit")} to quit")
       puts ""
       puts divider
@@ -159,14 +215,17 @@ module SwarmCLI
       # Build the prompt indicator with colors
       prompt_indicator = build_prompt_indicator
 
-      # Use Reline for flicker-free input (same as IRB)
+      # Use Reline.readmultiline for multi-line input support
+      # - Option+ENTER (or ESC+ENTER): Adds a newline, continues editing
+      # - Regular ENTER: Always submits immediately
       # Second parameter true = add to history for arrow up/down
-      line = Reline.readline(prompt_indicator, true)
+      # Block always returns true = ENTER always submits
+      input = Reline.readmultiline(prompt_indicator, true) { |_lines| true }
 
-      return if line.nil? # Ctrl+D returns nil
+      return if input.nil? # Ctrl+D returns nil
 
-      # Reline doesn't include newline, just strip whitespace
-      line.strip
+      # Strip whitespace from the complete input
+      input.strip
     end
 
     def display_prompt_stats
@@ -279,8 +338,8 @@ module SwarmCLI
 
       puts ""
 
-      # Execute swarm with logging through formatter
-      result = @swarm.execute(input) do |log_entry|
+      # Execute with cancellation support
+      result = execute_with_cancellation(input) do |log_entry|
         # Skip model warnings - already emitted before first prompt
         next if log_entry[:type] == "model_lookup_warning"
 
@@ -292,6 +351,17 @@ module SwarmCLI
         end
       end
 
+      # Handle cancellation (result is nil when cancelled)
+      if result.nil?
+        # Stop all active spinners
+        @formatter.spinner_manager.stop_all
+
+        puts ""
+        puts @colors[:warning].call("✗ Request cancelled by user")
+        puts ""
+        return
+      end
+
       # Check for errors
       if result.failure?
         @formatter.on_error(error: result.error, duration: result.duration)
@@ -353,7 +423,9 @@ module SwarmCLI
         end,
         "",
         @colors[:system].call("Input Tips:"),
-        @colors[:system].call("  • Type your message and press Enter to submit"),
+        @colors[:system].call("  • Press Enter to submit your message"),
+        @colors[:system].call("  • Press Option+Enter (or ESC then Enter) for multi-line input"),
+        @colors[:system].call("  • Press Ctrl+C to cancel an ongoing request"),
         @colors[:system].call("  • Press Ctrl+D to exit"),
         @colors[:system].call("  • Use arrow keys for history and editing"),
         @colors[:system].call("  • Type / for commands or @ for file paths"),
@@ -496,6 +568,23 @@ module SwarmCLI
       # Capture COMMANDS for use in lambda
       commands = COMMANDS
 
+      # Capture file completion logic for use in lambda (since lambda runs in different context)
+      file_completions = lambda do |target|
+        has_at_prefix = target.start_with?("@")
+        query = has_at_prefix ? target[1..] : target
+
+        next Dir.glob("*").sort.first(20) if query.empty?
+
+        # Find files matching query anywhere in path
+        pattern = "**/*#{query}*"
+        found = Dir.glob(pattern, File::FNM_CASEFOLD).reject do |path|
+          path.split("/").any? { |part| part.start_with?(".") }
+        end.sort.first(20)
+
+        # Add @ prefix if needed
+        has_at_prefix ? found.map { |p| "@#{p}" } : found
+      end
+
       # Custom dialog proc for fuzzy file/command completion
       fuzzy_proc = lambda do
         # State: [pre, target, post, matches, pointer, navigating]
@@ -503,6 +592,20 @@ module SwarmCLI
         # Check if this is a navigation key press
         is_nav_key = key&.match?(dialog.name)
 
+        # If we were in navigation mode and user typed a regular key (not Tab), exit nav mode
+        if !context.empty? && context.size >= 6 && context[5] && !is_nav_key
+          context[5] = false # Exit navigation mode
+        end
+
+        # Early check: if user typed and current target has spaces, close dialog
+        unless is_nav_key || context.empty?
+          _, target_check, = retrieve_completion_block
+          if target_check.include?(" ")
+            context.clear
+            return
+          end
+        end
+
         # Detect if we should recalculate matches
         should_recalculate = if context.empty?
           true # First time - initialize
@@ -529,8 +632,8 @@ module SwarmCLI
               query.empty? || cmd.downcase.include?(query.downcase)
             end.sort
           elsif target.start_with?("@") || target.include?("/")
-            # File path completions - extract to reduce nesting
-            get_file_completions(target)
+            # File path completions - use captured lambda
+            file_completions.call(target)
           end
 
           return if matches.nil? || matches.empty?
@@ -605,23 +708,5 @@ module SwarmCLI
       # Register the custom fuzzy dialog
       Reline.add_dialog_proc(:fuzzy_complete, fuzzy_proc, [])
     end
-
-    # Get file path completions with fuzzy matching
-    # Extracted to reduce block nesting in the dialog lambda
-    def get_file_completions(target)
-      has_at_prefix = target.start_with?("@")
-      query = has_at_prefix ? target[1..] : target
-
-      return Dir.glob("*").sort.first(20) if query.empty?
-
-      # Find files matching query anywhere in path
-      pattern = "**/*#{query}*"
-      found = Dir.glob(pattern, File::FNM_CASEFOLD).reject do |path|
-        path.split("/").any? { |part| part.start_with?(".") }
-      end.sort.first(20)
-
-      # Add @ prefix if needed
-      has_at_prefix ? found.map { |p| "@#{p}" } : found
-    end
   end
 end

data/lib/swarm_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmCLI
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swarm_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Paulo Arruda