elelem 0.11.0 → 0.13.0

data/lib/elelem/toolbox.rb

@@ -2,7 +2,7 @@
 
 module Elelem
   class Toolbox
-    attr_reader :tools, :hooks, :aliases
+    attr_reader :tools
 
     def initialize
       @tools = {}
@@ -11,16 +11,12 @@ module Elelem
     end
 
     def clear!
-      @tools.clear
-      @aliases.clear
-      @hooks[:before].clear
-      @hooks[:after].clear
+      [@tools, @aliases, @hooks[:before], @hooks[:after]].each(&:clear)
     end
 
-    def add(name, description:, params: {}, required: [], aliases: [], &fn)
-      tool = Tool.new(name, description: description, params: params, required: required, aliases: aliases, &fn)
-      @tools[name] = tool
-      tool.aliases.each { |a| @aliases[a] = name }
+    def add(name, description:, params: {}, required: [], aliases: [], &handler)
+      aliases.each { |a| @aliases[a] = name }
+      @tools[name] = Tool.new(name, description:, params:, required:, aliases:, &handler)
     end
 
     def before(tool_name = :*, &block)
@@ -31,19 +27,16 @@ module Elelem
       @hooks[:after][tool_name] << block
     end
 
+    # The tool by name, else by alias, so a real tool named like an alias wins.
     def tool_for(name)
-      tools.fetch(@aliases.fetch(name, name)) { NullTool.new(name, available: tools.keys) }
+      tools[name] || tools[@aliases[name]]
     end
 
     def run(name, args)
       tool = tool_for(name)
-      errors = tool.validate(args)
-      return Result.failure(error: errors.join(", ")) if errors.any?
-
-      result = dispatch(tool, args)
-      result[:error] ? Result.failure(result) : Result.success(result)
-    rescue => e
-      Elelem.logger.warn("toolbox: #{e.message}\n#{e.backtrace.join("\n")}")
+      invalid(name, tool, args) || to_result(dispatch(tool, args))
+    rescue StandardError, ScriptError => e
+      Elelem.logger.debug("toolbox: #{e.message}\n#{e.backtrace.join("\n")}")
       Result.failure(error: e.message, name: name, args: args)
     end
 
@@ -53,13 +46,25 @@ module Elelem
 
     private
 
+    def invalid(name, tool, args)
+      errors = tool ? tool.validate(args) : ["unknown tool: #{name.inspect}. Available: #{tools.keys.join(", ")}."]
+      Result.failure(error: errors.join(", ")) if errors.any?
+    end
+
+    # A tool fails by returning error:, or ok: false (as execute does for a
+    # non-zero exit).
+    def to_result(result)
+      result[:error] || result[:ok] == false ? Result.failure(result) : Result.success(result)
+    end
+
     def dispatch(tool, args)
-      @hooks[:before][:*].each { |h| h.call(args, tool_name: tool.name) }
-      @hooks[:before][tool.name].each { |h| h.call(args) }
-      result = tool.call(args)
-      @hooks[:after][:*].each { |h| h.call(args, result, tool_name: tool.name) }
-      @hooks[:after][tool.name].each { |h| h.call(args, result) }
-      result
+      run_hooks(:before, tool, args)
+      tool.call(args).tap { |result| run_hooks(:after, tool, args, result) }
+    end
+
+    def run_hooks(type, tool, *)
+      @hooks[type][:*].each { |h| h.call(*, tool_name: tool.name) }
+      @hooks[type][tool.name].each { |h| h.call(*) }
     end
   end
 end

data/lib/elelem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Elelem
-  VERSION = "0.11.0"
+  VERSION = "0.13.0"
 end

data/lib/elelem.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "erb"
+require "fileutils"
 require "forwardable"
 require "json"
 require "json_schemer"
@@ -8,38 +9,47 @@ require "logger"
 require "open3"
 require "pathname"
 require "shellwords"
+require "stringio"
+require "tempfile"
 
-require_relative "elelem/agent"
-require_relative "elelem/slash_command"
-require_relative "elelem/commands"
-require_relative "elelem/conversation"
-require_relative "elelem/input"
-require_relative "elelem/null_input"
+require_relative "elelem/version"
 require_relative "elelem/output"
 require_relative "elelem/null_output"
+require_relative "elelem/input"
+require_relative "elelem/null_input"
+require_relative "elelem/builtins"
+require_relative "elelem/builtins/terminal"
+require_relative "elelem/system_prompt"
+require_relative "elelem/conversation"
+require_relative "elelem/result"
+require_relative "elelem/tool"
+require_relative "elelem/toolbox"
+require_relative "elelem/commands"
+require_relative "elelem/agent"
+require_relative "elelem/session"
+require_relative "elelem/repl"
+require_relative "elelem/stub_provider"
 require_relative "elelem/plugins"
 require_relative "elelem/registration"
 require_relative "elelem/registry"
 require_relative "elelem/config"
-require_relative "elelem/result"
-require_relative "elelem/stub_provider"
-require_relative "elelem/system_prompt"
-require_relative "elelem/tool"
-require_relative "elelem/null_tool"
-require_relative "elelem/toolbox"
-require_relative "elelem/version"
 
 module Elelem
-  def self.start(provider: "stub", toolbox: Toolbox.new)
-    self.build(provider: provider, toolbox: toolbox).repl
+  def self.start(provider: "stub", toolbox: Toolbox.new, provider_options: {}, template: nil, system_prompt: nil)
+    Repl.new(build(provider: provider, toolbox: toolbox, provider_options: provider_options, template: template,
+                   system_prompt: system_prompt)).run
   end
 
-  def self.ask(prompt, provider: "stub", toolbox: Toolbox.new, output: NullOutput.new)
-    self.build(provider: provider, toolbox: toolbox, input: NullInput.new, output: output).turn(prompt)
+  def self.ask(prompt, provider: "stub", toolbox: Toolbox.new, output: NullOutput.new, provider_options: {},
+               template: nil, system_prompt: nil)
+    build(provider: provider, toolbox: toolbox, input: NullInput.new, output: output,
+          provider_options: provider_options, template: template, system_prompt: system_prompt).turn(prompt)
   end
 
-  def self.build(provider: "stub", toolbox: Toolbox.new, input: nil, output: nil)
-    Config.build_agent(provider, toolbox: toolbox, input: input, output: output)
+  def self.build(provider: "stub", toolbox: Toolbox.new, input: nil, output: nil, provider_options: {},
+                 template: nil, system_prompt: nil)
+    Config.build_session(provider, toolbox: toolbox, input: input, output: output,
+                                   provider_options: provider_options, template: template, system_prompt: system_prompt)
   end
 
   def self.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elelem
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - mo khan
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: forwardable
   requirement: !ruby/object:Gem::Requirement
@@ -164,19 +178,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: uri
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: tempfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 description: A minimal coding harness.
 email:
 - mo@mokhan.ca
@@ -191,6 +219,8 @@ files:
 - exe/elelem
 - lib/elelem.rb
 - lib/elelem/agent.rb
+- lib/elelem/builtins.rb
+- lib/elelem/builtins/terminal.rb
 - lib/elelem/cli.rb
 - lib/elelem/commands.rb
 - lib/elelem/config.rb
@@ -198,26 +228,36 @@ files:
 - lib/elelem/input.rb
 - lib/elelem/null_input.rb
 - lib/elelem/null_output.rb
-- lib/elelem/null_tool.rb
 - lib/elelem/output.rb
 - lib/elelem/plugins.rb
+- lib/elelem/plugins/builtins.rb
+- lib/elelem/plugins/context.rb
+- lib/elelem/plugins/execute.rb
+- lib/elelem/plugins/provider.rb
+- lib/elelem/plugins/read.rb
+- lib/elelem/plugins/reload.rb
+- lib/elelem/plugins/terminal.rb
+- lib/elelem/plugins/tools.rb
+- lib/elelem/plugins/write.rb
 - lib/elelem/prompts/default.erb
 - lib/elelem/registration.rb
 - lib/elelem/registry.rb
+- lib/elelem/repl.rb
 - lib/elelem/result.rb
-- lib/elelem/slash_command.rb
+- lib/elelem/session.rb
 - lib/elelem/stub_provider.rb
 - lib/elelem/system_prompt.rb
 - lib/elelem/tool.rb
 - lib/elelem/toolbox.rb
 - lib/elelem/version.rb
-homepage: https://src.mokhan.ca/elelem/elelem
+homepage: https://elelem.sh
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://src.mokhan.ca/elelem/elelem
-  source_code_uri: https://src.mokhan.ca/elelem/elelem
+  homepage_uri: https://elelem.sh
+  source_code_uri: https://github.com/elelem-sh/elelem
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -232,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 4.0.0
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A minimal coding harness for LLMs.
 test_files: []

data/lib/elelem/null_tool.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Elelem
-  class NullTool
-    def initialize(name, available: [])
-      @name = name
-      @available = available
-    end
-
-    def name
-      "#{@name}?"
-    end
-
-    def validate(_args)
-      ["unknown tool: #{@name.inspect}. Available: #{@available.join(", ")}."]
-    end
-  end
-end

data/lib/elelem/slash_command.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Elelem
-  class SlashCommand
-    attr_reader :name, :description, :completions
-
-    def initialize(name, description = "", completions = nil, &handler)
-      @name = name
-      @description = description
-      @completions = completions
-      @handler = handler
-    end
-
-    def call(args)
-      @handler.call(args)
-    end
-  end
-end