swarm_cli 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57ce5f511e43f8c520bf787d993cdcff34f3152870d496f72b5bbdee962c1a5
-  data.tar.gz: e21157d97dfce0fc71806683b6cb755c0e5ce9901c43c71764aab2b398d23fb1
+  metadata.gz: 0f2300451b3b37327ea450e9eebc57db327859aed5b87f7b84a8dc07b7cb1ec2
+  data.tar.gz: d6742156018f591a09f396b0e08f63295b6978bfa3a07a3ef76702c791820baa
 SHA512:
-  metadata.gz: e8702078d6573711ebe3c08c74571c0ce3d6b1de19810fa324cf6a38122573c7268c906b35e9f3446eb812dbad7d06ce4b61a01e24ff4c2ba5d56244f2b659d0
-  data.tar.gz: 252d1ee2ad3acb39f4302a558ec8633a5eba854522b6924362ecbee4db9f0dfdfe92020a531333d615f1402879b3d2ea8ed9ee4ee140ec668c59a6ad5254f20e
+  metadata.gz: e0a82b80722dab137f89a8249201216c3c112d1d235377e0cb17cc452526dd0c140a020f21b023f20c63ce7e1a3b3c1ae5375d88a8ef6defe0a98a5b6a0e569d
+  data.tar.gz: b824bf81f759bf1fd05378cbf6df259298ce6e4118150fc6598b2f3e19f5f17e10dea584a4b91e3348dd176af8423df93e07ab17049b5183747a65f614f4ef97

data/lib/swarm_cli/cli.rb

@@ -36,10 +36,15 @@ module SwarmCLI
       when "migrate"
         migrate_command(@args[1..])
       else
-        $stderr.puts "Unknown command: #{command}"
-        $stderr.puts
-        print_help
-        exit(1)
+        # Check if it's an extension command
+        if CommandRegistry.registered?(command)
+          extension_command(command, @args[1..])
+        else
+          $stderr.puts "Unknown command: #{command}"
+          $stderr.puts
+          print_help
+          exit(1)
+        end
       end
     rescue StandardError => e
       $stderr.puts "Fatal error: #{e.message}"
@@ -123,6 +128,14 @@ module SwarmCLI
       exit(1)
     end
 
+    def extension_command(command_name, args)
+      # Get extension command class from registry
+      command_class = CommandRegistry.get(command_name)
+
+      # Execute extension command
+      command_class.execute(args)
+    end
+
     def print_help
       puts
       puts "SwarmCLI v#{VERSION} - AI Agent Orchestration"
@@ -132,12 +145,24 @@ module SwarmCLI
       puts "  swarm migrate INPUT_FILE [--output OUTPUT_FILE]"
       puts "  swarm mcp serve CONFIG_FILE"
       puts "  swarm mcp tools [TOOL_NAMES...]"
+
+      # Show extension commands dynamically
+      CommandRegistry.commands.each do |cmd|
+        puts "  swarm #{cmd} ..."
+      end
+
       puts
       puts "Commands:"
       puts "  run           Execute a swarm with AI agents"
       puts "  migrate       Migrate Claude Swarm v1 config to SwarmSDK v2 format"
       puts "  mcp serve     Start an MCP server exposing swarm lead agent"
       puts "  mcp tools     Start an MCP server exposing SwarmSDK tools"
+
+      # Show extension command descriptions (if registered)
+      if CommandRegistry.registered?("memory")
+        puts "  memory        Manage SwarmMemory embeddings"
+      end
+
       puts
       puts "Options:"
       puts "  -p, --prompt PROMPT          Task prompt for the swarm"
@@ -159,6 +184,13 @@ module SwarmCLI
       puts "  swarm mcp tools                              # Expose all SwarmSDK tools"
       puts "  swarm mcp tools Bash Grep Read               # Space-separated tools"
       puts "  swarm mcp tools ScratchpadWrite,ScratchpadRead  # Comma-separated tools"
+
+      # Show extension command examples dynamically
+      if CommandRegistry.registered?("memory")
+        puts "  swarm memory setup                           # Setup embeddings (download model)"
+        puts "  swarm memory status                          # Check embedding status"
+      end
+
       puts
     end
 

data/lib/swarm_cli/command_registry.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module SwarmCLI
+  # Registry for CLI command extensions
+  #
+  # Allows gems (like swarm_memory) to register additional CLI commands
+  # that integrate seamlessly with the main swarm CLI.
+  #
+  # @example
+  #   # In swarm_memory gem
+  #   SwarmCLI::CommandRegistry.register(:memory, MyMemoryCommand)
+  #
+  #   # User runs:
+  #   swarm memory status
+  #
+  #   # SwarmCLI routes to MyMemoryCommand.execute(["status"])
+  class CommandRegistry
+    @extensions = {}
+
+    class << self
+      # Register a command extension
+      #
+      # @param command_name [Symbol, String] Command name (e.g., :memory)
+      # @param command_class [Class] Command class with execute(args) method
+      # @return [void]
+      #
+      # @example
+      #   CommandRegistry.register(:memory, SwarmMemory::CLI::Commands)
+      def register(command_name, command_class)
+        @extensions ||= {}
+        @extensions[command_name.to_s] = command_class
+      end
+
+      # Get command class by name
+      #
+      # @param command_name [String] Command name
+      # @return [Class, nil] Command class or nil if not found
+      def get(command_name)
+        @extensions ||= {}
+        @extensions[command_name.to_s]
+      end
+
+      # Check if a command is registered
+      #
+      # @param command_name [String] Command name
+      # @return [Boolean] True if command exists
+      def registered?(command_name)
+        @extensions ||= {}
+        @extensions.key?(command_name.to_s)
+      end
+
+      # Get all registered command names
+      #
+      # @return [Array<String>] Command names
+      def commands
+        @extensions ||= {}
+        @extensions.keys
+      end
+    end
+  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
@@ -262,6 +264,16 @@ module SwarmCLI
         agent = entry[:agent]
         @usage_tracker.track_tool_call(tool_call_id: entry[:tool_call_id], tool_name: entry[:tool])
 
+        # Special handling for Think tool - show as thoughts, not as a tool call
+        if entry[:tool] == "Think" && entry[:arguments] && entry[:arguments]["thoughts"]
+          thoughts = entry[:arguments]["thoughts"]
+          thinking = @event_renderer.thinking_text(thoughts, indent: @depth_tracker.get(agent))
+          @output.puts thinking unless thinking.empty?
+          @output.puts
+          # Don't show spinner for Think tool
+          return
+        end
+
         # Render tool call event
         @output.puts @event_renderer.tool_call(
           agent: agent,
@@ -295,6 +307,18 @@ module SwarmCLI
         agent = entry[:agent]
         tool_name = entry[:tool] || @usage_tracker.tool_name_for(entry[:tool_call_id])
 
+        # Special handling for Think tool - skip showing result (already shown as thoughts)
+        if tool_name == "Think"
+          # Don't show anything - thoughts were already displayed in handle_tool_call
+          # Start spinner for agent processing
+          unless @quiet
+            spinner_key = "agent_#{agent}".to_sym
+            indent = @depth_tracker.indent(agent)
+            @spinner_manager.start(spinner_key, "#{indent}#{agent} is processing...")
+          end
+          return
+        end
+
         # Stop tool spinner with success
         unless @quiet || tool_name == "TodoWrite"
           spinner_key = "tool_#{entry[:tool_call_id]}".to_sym

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
@@ -21,11 +23,23 @@ module SwarmCLI
   class InteractiveREPL
     COMMANDS = {
       "/help" => "Show available commands",
-      "/clear" => "Clear the screen",
+      "/clear" => "Clear the lead agent's conversation context",
+      "/tools" => "List the lead agent's available tools",
       "/history" => "Show conversation history",
+      "/defrag" => "Run memory defragmentation workflow (find and link related entries)",
       "/exit" => "Exit the REPL (or press Ctrl+D)",
     }.freeze
 
+    # History configuration
+    HISTORY_SIZE = 1000
+
+    class << self
+      # Get history file path (can be overridden with SWARM_HISTORY env var)
+      def history_file
+        ENV["SWARM_HISTORY"] || File.expand_path("~/.swarm/history")
+      end
+    end
+
     def initialize(swarm:, options:, initial_message: nil)
       @swarm = swarm
       @options = options
@@ -35,6 +49,7 @@ module SwarmCLI
       @validation_warnings_shown = false
 
       setup_ui_components
+      setup_persistent_history
 
       # Create formatter for swarm execution output (interactive mode)
       @formatter = Formatters::HumanFormatter.new(
@@ -65,6 +80,117 @@ module SwarmCLI
       display_goodbye
       display_session_summary
       exit(130)
+    ensure
+      # Save history on exit
+      save_persistent_history
+    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
+
+    # Handle slash commands
+    # Public for testing
+    #
+    # @param input [String] Command input (e.g., "/help", "/clear")
+    def handle_command(input)
+      command = input.split.first.downcase
+
+      case command
+      when "/help"
+        display_help
+      when "/clear"
+        clear_context
+      when "/tools"
+        list_tools
+      when "/history"
+        display_history
+      when "/defrag"
+        defrag_memory
+      when "/exit"
+        # Break from main loop to trigger session summary
+        throw(:exit_repl)
+      else
+        puts render_error("Unknown command: #{command}")
+        puts @colors[:system].call("Type /help for available commands")
+      end
+    end
+
+    # Save persistent history to file
+    # Public for testing
+    #
+    # @return [void]
+    def save_persistent_history
+      history_file = self.class.history_file
+      return unless history_file
+
+      history = Reline::HISTORY.to_a
+
+      # Limit to configured size
+      if HISTORY_SIZE.positive? && history.size > HISTORY_SIZE
+        history = history.last(HISTORY_SIZE)
+      end
+
+      # Write with secure permissions (owner read/write only)
+      File.open(history_file, "w", 0o600, encoding: Encoding::UTF_8) do |f|
+        # Handle multi-line entries by escaping newlines with backslash
+        history.each do |entry|
+          escaped = entry.scrub.split("\n").join("\\\n")
+          f.puts(escaped)
+        end
+      end
+    rescue Errno::EACCES, Errno::ENOENT
+      # Can't write history - continue anyway
+      nil
     end
 
     private
@@ -96,6 +222,9 @@ module SwarmCLI
       config.add_default_key_binding_by_keymap(:emacs, [9], :fuzzy_complete)
       config.add_default_key_binding_by_keymap(:vi_insert, [9], :fuzzy_complete)
 
+      # Configure history size
+      Reline.core.config.history_size = HISTORY_SIZE
+
       # Setup colors using detached styles for performance
       @colors = {
         prompt: @pastel.bright_cyan.bold.detach,
@@ -115,6 +244,33 @@ module SwarmCLI
       }
     end
 
+    def setup_persistent_history
+      history_file = self.class.history_file
+
+      # Ensure history directory exists
+      FileUtils.mkdir_p(File.dirname(history_file))
+
+      # Load history from file
+      return unless File.exist?(history_file)
+
+      File.open(history_file, "r:UTF-8") do |f|
+        f.each_line do |line|
+          line = line.chomp
+
+          # Handle multi-line entries (backslash continuation)
+          if Reline::HISTORY.last&.end_with?("\\")
+            Reline::HISTORY.last.delete_suffix!("\\")
+            Reline::HISTORY.last << "\n" << line
+          else
+            Reline::HISTORY << line unless line.empty?
+          end
+        end
+      end
+    rescue Errno::ENOENT, Errno::EACCES
+      # History file doesn't exist or can't be read - that's OK
+      nil
+    end
+
     def display_welcome
       divider = @colors[:divider].call("─" * 60)
 
@@ -127,6 +283,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 +316,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
@@ -253,34 +413,14 @@ module SwarmCLI
       end
     end
 
-    def handle_command(input)
-      command = input.split.first.downcase
-
-      case command
-      when "/help"
-        display_help
-      when "/clear"
-        system("clear") || system("cls")
-        display_welcome
-      when "/history"
-        display_history
-      when "/exit"
-        # Break from main loop to trigger session summary
-        throw(:exit_repl)
-      else
-        puts render_error("Unknown command: #{command}")
-        puts @colors[:system].call("Type /help for available commands")
-      end
-    end
-
     def handle_message(input)
       # Add to history
       @conversation_history << { role: "user", content: input }
 
       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 +432,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 +504,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"),
@@ -370,6 +523,111 @@ module SwarmCLI
       puts help_box
     end
 
+    def clear_context
+      # Get the lead agent
+      lead = @swarm.agent(@swarm.lead_agent)
+
+      # Clear the agent's conversation history
+      lead.reset_messages!
+
+      # Clear REPL conversation history
+      @conversation_history.clear
+
+      # Display confirmation
+      puts ""
+      puts @colors[:success].call("✓ Conversation context cleared for #{@swarm.lead_agent}")
+      puts @colors[:system].call("  Starting fresh - previous messages removed from context")
+      puts ""
+    end
+
+    def list_tools
+      # Get the lead agent
+      lead = @swarm.agent(@swarm.lead_agent)
+
+      # Get tools hash (tool_name => tool_instance)
+      tools_hash = lead.tools
+
+      puts ""
+      puts @colors[:header].call("Available Tools for #{@swarm.lead_agent}:")
+      puts @colors[:divider].call("─" * 60)
+      puts ""
+
+      if tools_hash.empty?
+        puts @colors[:system].call("No tools available")
+        return
+      end
+
+      # Group tools by category
+      memory_tools = []
+      standard_tools = []
+      delegation_tools = []
+      mcp_tools = []
+      other_tools = []
+
+      tools_hash.each_value do |tool|
+        tool_name = tool.name
+        case tool_name
+        when /^Memory/, "LoadSkill"
+          memory_tools << tool_name
+        when /^DelegateTaskTo/
+          delegation_tools << tool_name
+        when /^mcp__/
+          mcp_tools << tool_name
+        when "Read", "Write", "Edit", "MultiEdit", "Bash", "Grep", "Glob",
+             "TodoWrite", "Think", "Clock", "WebFetch",
+             "ScratchpadWrite", "ScratchpadRead", "ScratchpadList"
+          standard_tools << tool_name
+        else
+          other_tools << tool_name
+        end
+      end
+
+      # Display tools by category
+      if standard_tools.any?
+        puts @colors[:agent_label].call("Standard Tools:")
+        standard_tools.sort.each do |name|
+          puts @colors[:system].call("  • #{name}")
+        end
+        puts ""
+      end
+
+      if memory_tools.any?
+        puts @colors[:agent_label].call("Memory Tools:")
+        memory_tools.sort.each do |name|
+          puts @colors[:system].call("  • #{name}")
+        end
+        puts ""
+      end
+
+      if delegation_tools.any?
+        puts @colors[:agent_label].call("Delegation Tools:")
+        delegation_tools.sort.each do |name|
+          puts @colors[:system].call("  • #{name}")
+        end
+        puts ""
+      end
+
+      if mcp_tools.any?
+        puts @colors[:agent_label].call("MCP Tools:")
+        mcp_tools.sort.each do |name|
+          puts @colors[:system].call("  • #{name}")
+        end
+        puts ""
+      end
+
+      if other_tools.any?
+        puts @colors[:agent_label].call("Other Tools:")
+        other_tools.sort.each do |name|
+          puts @colors[:system].call("  • #{name}")
+        end
+        puts ""
+      end
+
+      puts @colors[:divider].call("─" * 60)
+      puts @colors[:system].call("Total: #{tools_hash.size} tools")
+      puts ""
+    end
+
     def display_history
       if @conversation_history.empty?
         puts @colors[:system].call("No conversation history yet")
@@ -402,6 +660,26 @@ module SwarmCLI
       puts @colors[:divider].call("─" * 60)
     end
 
+    def defrag_memory
+      puts ""
+      puts @colors[:header].call("🔧 Memory Defragmentation Workflow")
+      puts @colors[:divider].call("─" * 60)
+      puts ""
+
+      # Inject prompt to run find_related then link_related
+      prompt = <<~PROMPT.strip
+        Run memory defragmentation workflow:
+
+        1. First, run MemoryDefrag(action: "find_related") to discover related entries
+        2. Review the results carefully
+        3. Then run MemoryDefrag(action: "link_related", dry_run: false) to create bidirectional links
+
+        Report what you found and what links were created.
+      PROMPT
+
+      handle_message(prompt)
+    end
+
     def display_goodbye
       puts ""
       goodbye_text = @colors[:success].call("👋 Goodbye! Thanks for using Swarm CLI")

data/lib/swarm_cli/version.rb

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

data/lib/swarm_cli.rb

@@ -36,3 +36,10 @@ module SwarmCLI
   class ConfigurationError < Error; end
   class ExecutionError < Error; end
 end
+
+# Try to load swarm_memory gem if available (for CLI command extensions)
+begin
+  require "swarm_memory"
+rescue LoadError
+  # swarm_memory not installed - that's fine, memory commands won't be available
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swarm_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Paulo Arruda
@@ -205,6 +205,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,7 @@ files:
 - exe/swarm
 - lib/swarm_cli.rb
 - lib/swarm_cli/cli.rb
+- lib/swarm_cli/command_registry.rb
 - lib/swarm_cli/commands/mcp_serve.rb
 - lib/swarm_cli/commands/mcp_tools.rb
 - lib/swarm_cli/commands/migrate.rb
@@ -268,7 +283,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/parruda/claude-swarm
-  changelog_uri: https://github.com/parruda/claude-swarm/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/parruda/claude-swarm/blob/main/docs/v2/CHANGELOG.swarm_cli.md
 rdoc_options: []
 require_paths:
 - lib