llm.rb 12.4.0 → 12.5.0

data/lib/llm/repl.rb

@@ -33,7 +33,7 @@ module LLM
     # @param [Array<String>] skills
     #  Zero or more skills
     # @return [LLM::Repl]
-    def initialize(agent:, tools:, skills:, path:)
+    def initialize(agent:, tools: [], skills: [], path: nil)
       @path  = path
       @agent = configure(agent:, path:)
       @provider = agent.llm.name
@@ -101,6 +101,12 @@ module LLM
       window.redraw
     end
 
+    ##
+    # @return [String]
+    def thinking_text
+      "thinking • Esc to cancel"
+    end
+
     private
 
     ##
@@ -112,9 +118,12 @@ module LLM
     #  When given an unusable path
     # @return [LLM::Agent]
     def configure(agent:, path:)
-      if path.nil? or !File.exist?(path)
+      if path.nil?
         agent
-      elsif path?
+      elsif !File.exist?(path)
+        File.write path, "{}"
+        agent
+      elsif restore?
         agent.restore(path:)
       else
         raise LLM::Error, "I can't use '#{path}' - " \
@@ -131,19 +140,24 @@ module LLM
     def submit
       return if thread&.alive? || (text = input.take).empty?
       case on_text(text)
-      in [:command, Command => command]
-        command.call
+      in [:command, Command => command, Hash => parameters]
+        command.call(**parameters)
+      in [:error, String => who, String => text]
+        write(who, Curses::A_BOLD)
+        write(text)
       in [:input, String => text]
         window.scroll_to_bottom
-        status.text = "thinking"
+        status.text = thinking_text
         write("user: ", Curses::A_BOLD)
         markdown(text)
         write("\nagent: ", Curses::A_BOLD)
         @thread = Thread.new do
           @queue << [:start]
           agent.talk(text, tools:, stream:)
-          agent.save(path:) if path?
+          agent.save(path:) if save?
           @queue << [:done]
+        rescue LLM::Interrupt => e
+          @queue << [:cancel, e]
         rescue => e
           @queue << [:error, e]
         end
@@ -158,7 +172,25 @@ module LLM
     # @return [[Symbol, Command|String]]
     def on_text(text)
       command = Command.find_by(input: text)
-      command ? [:command, command.new] : [:input, text]
+      if command
+        parameters = command.parameters.map { [_1, _2.dup] }.to_h
+        args = text.split(" ")[1..].reject(&:empty?)
+        reqc = parameters.values.count(&:required?)
+        if args.size < reqc
+          [:error,
+           "command(#{command.name}): ",
+           "too few arguments: expected #{reqc} but got #{args.size}\n\n"]
+        else
+          parameters.each_value do |parameter|
+            if args[parameter.index]
+              parameter.value = args[parameter.index]
+            end
+          end
+          [:command, command.new(self), parameters.transform_values(&:value)]
+        end
+      else
+        [:input, text]
+      end
     end
 
     ##
@@ -179,14 +211,21 @@ module LLM
           self.status = value
         when :done
           status.text = "idle"
-          @thread = nil
+          write("\n\n")
           transcript.finish
+          @thread = nil
+        when :cancel
+          status.text = "Idle"
+          write("\n\nagent: ", Curses::A_BOLD)
+          write("request cancelled!")
           write("\n\n")
+          transcript.finish
+          @thread = nil
         when :error
           # Do this better
           status.text = "error"
-          transcript.finish
           write("\nerror: #{value.message}\n", Curses::A_BOLD)
+          transcript.finish
           @thread = nil
         end
       end
@@ -195,9 +234,16 @@ module LLM
 
     ##
     # @return [Boolean]
-    def path?
+    def restore?
+      return false if path.nil?
+      File.writable?(path)
+    end
+
+    ##
+    # @return [Boolean]
+    def save?
       return false if path.nil?
-      File.readable?(path) and File.writable?(path)
+      File.readable?(path)
     end
 
     attr_reader :agent, :provider, :stream,

data/lib/llm/stream.rb

@@ -114,20 +114,15 @@ module LLM
     #   `ctx.spawn(tool, :fiber)`, or `ctx.spawn(tool, :task)` onto {#queue}.
     #   Mixed strategies can also be selected per tool, such as
     #   `tool.mcp? ? ctx.spawn(tool, :task) : ctx.spawn(tool, :ractor)`.
-    #   When a streamed tool cannot be resolved, `error` is passed as an
-    #   {LLM::Function::Return}. It can be sent back to the model, allowing
-    #   the tool-call path to recover and the session to continue. Streamed
-    #   tool resolution now prefers the current request tools, so
+    #   Streamed tool resolution now prefers the current request tools, so
     #   {LLM.function}, MCP tools, bound tool instances, and normal
     #   {LLM::Tool LLM::Tool} classes can all resolve through the same
     #   request-local path. The current `:ractor` mode is for class-based
     #   tools and does not support MCP tools.
     # @param [LLM::Function] tool
     #  The parsed tool call.
-    # @param [LLM::Function::Return, nil] error
-    #  An in-band tool error for unresolved tool calls.
     # @return [nil]
-    def on_tool_call(tool, error)
+    def on_tool_call(tool)
       nil
     end
 

data/lib/llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LLM
-  VERSION = "12.4.0"
+  VERSION = "12.5.0"
 end

data/resources/deepdive.md

@@ -563,7 +563,7 @@ class Stream < LLM::Stream
     puts content
   end
 
-  def on_tool_call(tool, error)
+  def on_tool_call(tool)
     # this callback can be used to either log a tool call,
     # or execute a tool call during a stream.
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 12.4.0
+  version: 12.5.0
 platform: ruby
 authors:
 - robert
@@ -470,6 +470,7 @@ files:
 - lib/llm/repl/bar.rb
 - lib/llm/repl/command.rb
 - lib/llm/repl/commands/exit.rb
+- lib/llm/repl/commands/help.rb
 - lib/llm/repl/input.rb
 - lib/llm/repl/markdown.rb
 - lib/llm/repl/status.rb