llm.rb 12.5.1 → 13.0.0

data/lib/llm/repl/input.rb

@@ -12,16 +12,30 @@ class LLM::Repl
       F: Curses::KEY_CTRL_F,
       K: Curses::KEY_CTRL_K,
       Y: Curses::KEY_CTRL_Y,
-      D: Curses::KEY_CTRL_D
+      D: Curses::KEY_CTRL_D,
+      P: Curses::KEY_CTRL_P,
+      N: Curses::KEY_CTRL_N
     }
 
+    ##
+    # This hash tracks how many times a given key
+    # was pressed repeatedly without being
+    # interrupted by another key. The previous key
+    # is reset to 0 when a different key is pressed.
+    REPEATS = {}
+    REPEATS.default = 0
+
     UP        = Curses::Key::UP
     DOWN      = Curses::Key::DOWN
     LEFT      = Curses::Key::LEFT
     RIGHT     = Curses::Key::RIGHT
+    PGUP      = Curses::KEY_PPAGE
+    PGDOWN    = Curses::KEY_NPAGE
+
+    TAB       = 9
     ESC       = 27
-    ENTER     = [Curses::Key::ENTER, 10, 13]
-    BACKSPACE = [Curses::Key::BACKSPACE, 127]
+    ENTER     = 10
+    BACKSPACE = 127
 
     ##
     # Threshold in seconds. If characters arrive faster than
@@ -35,21 +49,24 @@ class LLM::Repl
     attr_reader :buffer
 
     ##
-    # @param [Boolean] bool
+    # @param [Boolean] value
     # @return [void]
     attr_writer :paste
 
     ##
-    # @param [LLM::Agent] agent
+    # @param [LLM::Repl] repl
     # @return [LLM::Repl::Input]
-    def initialize(agent, options = {})
-      @agent = agent
-      @provider = agent.llm.name
+    def initialize(repl, options = {})
+      @name = repl.name
+      @agent = repl.agent
+      @provider = @agent.llm.name
       @buffer = +""
       @cursor = 0
       @scroll = 0
       @height = options.fetch(:height, 3)
       @last_char_at = nil
+      @memory = @agent.messages.select(&:user?).map(&:content)
+      @walker = Walker.new(@memory)
       @paste = false
     end
 
@@ -59,8 +76,28 @@ class LLM::Repl
     # @return [Symbol, nil]
     def on_char(window, char, now)
       is_paste = lambda { @last_char_at and (now - @last_char_at) < PASTE_THRESHOLD }
-      if ESC == char
+      if char and @char != char
+        REPEATS[@char] = 0
+      end
+      if PGUP == char
+        (window.rows - 3).times { window.scroll_up }
+        :pageup
+      elsif PGDOWN == char
+        (window.rows - 3).times { window.scroll_down }
+        :pagedown
+      elsif TAB == char
+        autocomplete
+        :tab
+      elsif ESC == char
         @agent.cancel!
+      elsif CTRL[:P] == char
+        @buffer = @walker.prev.dup
+        @cursor = @buffer.size
+        :ctrl_p
+      elsif CTRL[:N] == char
+        @buffer = @walker.next.dup
+        @cursor = @buffer.size
+        :ctrl_n
       elsif CTRL[:D] == char
         delete
         :ctrl_d
@@ -85,14 +122,16 @@ class LLM::Repl
       elsif char == RIGHT
         move_right
         :right
-      elsif BACKSPACE.include?(char)
+      elsif BACKSPACE == char
         backspace
         :backspace
-      elsif ENTER.include?(char)
+      elsif ENTER == char
         if @paste = is_paste.()
           insert("\n")
           :char
         else
+          @memory.push(@buffer.dup)
+          @walker.cursor = @memory.size
           :submit
         end
       elsif char == UP
@@ -108,19 +147,23 @@ class LLM::Repl
         nil
       end
     ensure
-      @last_char_at = now if char
+      if char
+        REPEATS[char] += 1
+        @last_char_at = now
+        @char = char
+      end
     end
 
     ##
     # @return [String]
     def to_s
-      "#{@provider}> #{@buffer}"
+      "#{prompt}#{@buffer}"
     end
 
     ##
     # @return [Integer]
     def cursor
-      prompt.length + @cursor
+      prompt.size + @cursor
     end
 
     ##
@@ -182,6 +225,28 @@ class LLM::Repl
       @cursor = [0, @cursor + 1].max
     end
 
+    ##
+    # @return [void]
+    def autocomplete
+      return unless @buffer[0] == "/"
+      ##
+      # This method implements a simple autocomplete
+      # that supports cycling through all known
+      # commands. When given tab in quick succession,
+      # we cycle to the nearest neighbour for the last
+      # full match. However, it's not based on similarity,
+      # it's just the next element in the array.
+      keys = LLM::Command.registry.keys
+      candidates = LLM::Command.complete(@buffer)
+      if REPEATS[TAB] >= 1
+        candidate = keys[keys.index(candidates[0]) + 1] || keys[0]
+      else
+        candidate = candidates[0]
+      end
+      @buffer = "/#{candidate}"
+      @cursor = @buffer.size
+    end
+
     ##
     # @return [void]
     def kill
@@ -238,7 +303,7 @@ class LLM::Repl
     end
 
     def prompt
-      "#{@provider}> "
+      "#{@provider}(#{@name})> "
     end
 
     def insert(char)

data/lib/llm/repl/markdown/table.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+class LLM::Repl::Markdown
+  ##
+  # Renders Kramdown `:table` nodes as aligned columns.
+  module Table
+    ##
+    # Renders a table node by collecting all cells first to
+    # compute column widths, then emitting each row with
+    # padded text.
+    def walk_table(node, attrs)
+      rows = collect_rows(node, attrs)
+      return if rows.empty?
+      widths = column_widths(rows)
+      rows.each do |row|
+        emit("| ", attrs)
+        row.each_with_index do |chunks, i|
+          text = chunks.map { _1[:text] }.join
+          width = widths[i]
+          chunks.each { |c| emit(c[:text].ljust(width), c[:attrs]) }
+          emit(" | ", attrs) unless i == row.size - 1
+        end
+        emit(" |", attrs)
+        emit("\n", attrs)
+      end
+      emit("\n", attrs)
+    end
+
+    private
+
+    def collect_rows(node, attrs)
+      node.children.each_with_object([]) do |section, rows|
+        next unless [:thead, :tbody].include?(section.type)
+        section.children.each do |tr|
+          next unless tr.type == :tr
+          cells = tr.children.filter_map do |td|
+            next unless [:td, :th].include?(td.type)
+            collect_chunks(td, attrs)
+          end
+          rows << cells
+        end
+      end
+    end
+
+    def collect_chunks(node, attrs)
+      [].tap do |chunks|
+        walk_collect(node, attrs, chunks)
+      end
+    end
+
+    def walk_collect(node, attrs, chunks)
+      case node.type
+      when :text
+        chunks << {text: node.value.to_s, attrs:}
+      when :strong
+        node.children.each { walk_collect(_1, Curses::A_BOLD, chunks) }
+      when :em
+        node.children.each { walk_collect(_1, Curses::A_UNDERLINE, chunks) }
+      when :codespan
+        chunks << {text: node.value, attrs: Curses::A_REVERSE}
+      when :a
+        node.children.each { walk_collect(_1, Curses::A_UNDERLINE, chunks) }
+      else
+        node.children.each { walk_collect(_1, attrs, chunks) }
+      end
+    end
+
+    def column_widths(rows)
+      return [] if rows.empty?
+      cols = rows.first.size
+      (0...cols).map do |i|
+        rows.map { |r| r[i].map { _1[:text] }.join.length }.max
+      end
+    end
+  end
+end

data/lib/llm/repl/markdown.rb

@@ -8,11 +8,16 @@ class LLM::Repl
   # of text, and also optional style information for
   # that text (eg bold, underscore, ...)
   class Markdown
+    require_relative "markdown/table"
+    include Table
+
     ##
     # @param [String] text
+    # @param [Integer] width
     # @return [LLM::Repl::Markdown]
-    def initialize(text)
+    def initialize(text, width)
       @doc = Kramdown::Document.new(text)
+      @width = width
       @ast = []
     end
 
@@ -73,6 +78,31 @@ class LLM::Repl
         emit("\n\n", attrs)
       when :br
         emit("\n", attrs)
+      when :ul, :ol
+        node.children.each { walk(_1, attrs) }
+      when :li
+        node.children.each { walk(_1, attrs) }
+      when :table
+        walk_table(node, attrs)
+      when :thead, :tbody
+        node.children.each { walk(_1, attrs) }
+      when :tr
+        emit("| ", attrs)
+        node.children.each { walk(_1, attrs) }
+        emit("\n", attrs)
+      when :td, :th
+        node.children.each { walk(_1, attrs) }
+        emit(" | ", attrs)
+      when :blockquote
+        emit("> ", attrs)
+        node.children.each { walk(_1, attrs) }
+      when :hr
+        emit("─" * @width, attrs)
+        emit("\n\n", attrs)
+      when :a
+        node.children.each { walk(_1, Curses::A_UNDERLINE) }
+      when :img
+        emit("[image: #{node.attr['alt']}]", attrs)
       else
         node.children.each { walk(_1, attrs) }
       end

data/lib/llm/repl/status.rb

@@ -7,7 +7,7 @@ class LLM::Repl
   # @api private
   class Status
     ##
-    # @param [String, Symbol] provider
+    # @param [LLM::Agent] agent
     # @return [LLM::Repl::Status]
     def initialize(agent)
       @agent = agent

data/lib/llm/repl/stream.rb

@@ -60,9 +60,16 @@ class LLM::Repl
     # @param [Integer] max
     # @return [String]
     def format_args(tool, max: 50)
-      args = tool.arguments
-      pairs = args.to_h.map { "#{_1}: #{format_value(_2)}" }
-      result = pairs.join(", ")
+      ##
+      # 'tool.arguments' might be returned
+      # (by the model) in a different order
+      # than the tool definition - this code
+      # handles re-sorting.
+      args   = tool.arguments
+      props  = tool.params.properties.keys
+      props  = props.sort_by { tool.params.properties[_1].index }
+      props  = props.filter_map { args[_1] ? "#{_1}: #{format_value(args[_1])}" : nil }
+      result = props.join(", ")
       result.size > max ? "#{result[0...max - 1]}…" : result
     end
 

data/lib/llm/repl/transcript.rb

@@ -42,7 +42,7 @@ class LLM::Repl
     # @param [Symbol] method
     # @return [void]
     def markdown(chars, method: :append)
-      chunks = LLM::Repl::Markdown.new(chars).ast
+      chunks = LLM::Repl::Markdown.new(chars, WIDTH).ast
       self.method(method).call(chunks)
     end
 

data/lib/llm/repl/walker.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class LLM::Repl
+  ##
+  # Walks through an array from the last element backward,
+  # one step at a time. {#next} moves forward toward the end.
+  # Both methods clamp at the array boundaries.
+  class Walker
+    ##
+    # Sets the cursor position
+    attr_writer :cursor
+
+    ##
+    # @param [Array] items
+    def initialize(items)
+      @items = items
+      @cursor = items.size
+    end
+
+    ##
+    # @return [Object, nil]
+    def next
+      if @items.empty?
+        nil
+      elsif @cursor >= @items.size - 1
+        @items[@cursor]
+      else
+        @cursor += 1
+        @items[@cursor]
+      end
+    end
+
+    ##
+    # @return [Object, nil]
+    def prev
+      if @items.empty?
+        nil
+      elsif @cursor <= 0
+        @items[@cursor]
+      else
+        @cursor -= 1
+        @items[@cursor]
+      end
+    end
+  end
+end

data/lib/llm/repl.rb

@@ -23,9 +23,17 @@ module LLM
     require_relative "repl/stream"
     require_relative "repl/markdown"
     require_relative "repl/command"
+    require_relative "repl/walker"
+
+    attr_reader :agent, :provider, :stream,
+                :status, :transcript, :input,
+                :window, :tools, :thread,
+                :name, :path
 
     ##
     # @param [LLM::Agent] agent
+    # @param [String, nil] name
+    #  The agent's name (optional)
     # @param [String, nil] path
     #  The path where to maintain runtime state
     # @param [Array<LLM::Tool>] tools
@@ -33,13 +41,14 @@ module LLM
     # @param [Array<String>] skills
     #  Zero or more skills
     # @return [LLM::Repl]
-    def initialize(agent:, tools: [], skills: [], path: nil)
-      @path  = path
+    def initialize(agent:, name: nil, tools: [], skills: [], path: nil)
+      @path = path
+      @name = name || "agent"
       @agent = configure(agent:, path:)
       @provider = agent.llm.name
       @status = Status.new(@agent)
       @transcript = Transcript.new
-      @input = Input.new(@agent, height: 3)
+      @input = Input.new(self, height: 3)
       @window = Window.new(@status, @transcript, @input)
       @thread = nil
       @queue = Queue.new
@@ -150,7 +159,7 @@ module LLM
         status.text = thinking_text
         write("user: ", Curses::A_BOLD)
         markdown(text)
-        write("\nagent: ", Curses::A_BOLD)
+        write("\n#{name}: ", Curses::A_BOLD)
         @thread = Thread.new do
           @queue << [:start]
           agent.talk(text, tools:, stream:)
@@ -181,12 +190,14 @@ module LLM
            "command(#{command.name}): ",
            "too few arguments: expected #{reqc} but got #{args.size}\n\n"]
         else
+          parameters = parameters.sort_by(&:index).to_h
+          kwargs = {}
           parameters.each_value do |parameter|
             if args[parameter.index]
-              parameter.value = args[parameter.index]
+              kwargs[parameter.name] = args[parameter.index]
             end
           end
-          [:command, command.new(self), parameters.transform_values(&:value)]
+          [:command, command.new(self), kwargs]
         end
       else
         [:input, text]
@@ -216,7 +227,7 @@ module LLM
           @thread = nil
         when :cancel
           status.text = "Idle"
-          write("\n\nagent: ", Curses::A_BOLD)
+          write("\n\n#{name}: ", Curses::A_BOLD)
           write("request cancelled!")
           write("\n\n")
           transcript.finish
@@ -246,11 +257,6 @@ module LLM
       File.readable?(path)
     end
 
-    attr_reader :agent, :provider, :stream,
-                :status, :transcript, :input,
-                :window, :tools, :thread,
-                :path
-
     File = ::File
     private_constant :File
   end

data/lib/llm/response.rb

@@ -10,12 +10,22 @@ module LLM
   # handling can share one common surface without flattening away
   # specialized behavior.
   #
+  # @example Accessing response data
+  #   res = agent.talk "Weather in Paris?", schema: Weather
+  #   res.content        # => raw text or structured data
+  #   res.content!       # => parsed JSON as LLM::Object
+  #   res.usage          # => token usage (input, output, cache, etc.)
+  #   res.messages       # => message history from this turn
+  #
   # The normalized response keeps the transport response available
   # through {#res}. When the default net/http transport is in use,
   # {LLM::Transport::Response::HTTP
   # LLM::Transport::Response::HTTP} keeps the
   # original `Net::HTTPResponse` available through
   # its own {LLM::Transport::Response::HTTP#res #res}.
+  #
+  # @see LLM::Context Responses are returned by Context#talk
+  # @see LLM::Agent Responses are returned by Agent#talk
   class Response
     require "json"
 

data/lib/llm/schema/leaf.rb

@@ -8,12 +8,17 @@ class LLM::Schema
   # an example of how to create instances of {LLM::Schema::Leaf LLM::Schema::Leaf}
   # through its subclasses.
   class Leaf
+    ##
+    # @return [Integer, nil]
+    attr_accessor :index
+
     def initialize
       @description = nil
       @default = nil
       @enum = nil
       @required = nil
       @const = nil
+      @index = nil
     end
 
     ##

data/lib/llm/schema/object.rb

@@ -16,21 +16,22 @@ class LLM::Schema
     #  A hash of properties
     # @return [LLM::Schema::Object]
     def initialize(properties)
-      @properties = properties
+      @properties = LLM::Object.new
+      properties.each { set!(_1, _2) }
     end
 
     ##
     # Get a property
     # @return [LLM::Schema::Leaf]
     def [](key)
-      properties[key.to_s]
+      properties[key]
     end
 
     ##
     # Set a property
     # @return [void]
     def []=(key, val)
-      properties[key.to_s] = val
+      set!(key, val)
     end
 
     ##
@@ -46,7 +47,7 @@ class LLM::Schema
     #  Returns self
     def merge!(other)
       raise TypeError, "expected #{self.class} but got #{other.class}" unless self.class === other
-      @properties.merge!(other.properties)
+      other.properties.each { |key, val| self[key] = val }
       self
     end
 
@@ -64,8 +65,13 @@ class LLM::Schema
 
     private
 
+    def set!(key, val)
+      val.index = @properties.size
+      properties[key] = val
+    end
+
     def required_items
-      @properties.filter_map {  _2.required? ? _1 : nil }
+      @properties.filter_map { _2.required? ? _1 : nil }
     end
   end
 end

data/lib/llm/sequel/agent.rb

@@ -32,9 +32,41 @@ module LLM::Sequel
         @llm_agent_options || Agent::DEFAULTS
       end
 
+      ##
+      # @return [Class<LLM::Agent>]
       def agent
         @agent ||= Class.new(LLM::Agent)
       end
+
+      ##
+      # Bulk-assign class-level agent defaults.
+      #
+      # Each key is resolved by calling the corresponding class method on the
+      # internal agent subclass.
+      #
+      # @example
+      #   class Agent < Sequel::Model
+      #     plugin :llm_agent
+      #     set instructions: "You are a system administrator",
+      #         model: "gpt-4.1-nano",
+      #         tools: [Shell]
+      #   end
+      #
+      # @param [Hash] properties
+      # @option properties [String] :instructions
+      # @option properties [String] :model
+      # @option properties [Array<LLM::Function>] :tools
+      # @option properties [Array<String>] :skills
+      # @option properties [#to_json] :schema
+      # @option properties [Symbol, Array<Symbol>] :concurrency
+      # @option properties [LLM::Tracer, Proc] :tracer
+      # @option properties [Object, Proc] :stream
+      # @option properties [String, Symbol, Array<String, Symbol>, Proc] :confirm
+      # @raise [KeyError] when a property key does not match a class-level accessor
+      # @return [void]
+      def set(properties)
+        agent.set(properties)
+      end
     end
 
     module InstanceMethods

data/lib/llm/sequel/plugin.rb

@@ -204,17 +204,17 @@ module LLM::Sequel
     end
 
     ##
-    # @see LLM::Context#functions
+    # @see LLM::Context#pending_functions
     # @return [Array<LLM::Function>]
-    def functions
-      ctx.functions
+    def pending_functions
+      ctx.pending_functions
     end
 
     ##
-    # @see LLM::Context#functions?
+    # @see LLM::Context#pending_functions?
     # @return [Boolean]
-    def functions?
-      ctx.functions?
+    def pending_functions?
+      ctx.pending_functions?
     end
 
     ##