elelem 0.1.2 → 0.2.0

data/lib/elelem/tools.rb

@@ -12,14 +12,15 @@ module Elelem
     end
 
     def execute(tool_call)
-      name = tool_call.dig("function", "name")
-      args = tool_call.dig("function", "arguments")
+      name, args = parse(tool_call)
 
       tool = tools.find { |tool| tool.name == name }
       return "Invalid function name: #{name}" if tool.nil?
       return "Invalid function arguments: #{args}" unless tool.valid?(args)
 
-      tool.call(args)
+      CLI::UI::Frame.open(name) do
+        tool.call(args)
+      end
     end
 
     def to_h
@@ -29,5 +30,12 @@ module Elelem
     private
 
     attr_reader :configuration, :tools
+
+    def parse(tool_call)
+      name = tool_call.dig("function", "name")
+      arguments = tool_call.dig("function", "arguments")
+
+      [name, arguments.is_a?(String) ? JSON.parse(arguments) : arguments]
+    end
   end
 end

data/lib/elelem/tui.rb

@@ -14,41 +14,30 @@ module Elelem
     end
 
     def say(message, colour: :default, newline: false)
-      formatted_message = colourize(message, colour: colour)
       if newline
-        stdout.puts(formatted_message)
+        stdout.puts(colourize(message, colour: colour))
       else
-        stdout.print(formatted_message)
+        stdout.print(colourize(message, colour: colour))
       end
       stdout.flush
     end
 
-    def show_progress(message, prefix = "[.]", colour: :gray)
-      timestamp = current_time_string
-      formatted_message = colourize("#{prefix} #{timestamp} #{message}", colour: colour)
-      stdout.print(formatted_message)
-      stdout.flush
+    def show_progress(message, icon = ".", colour: :gray)
+      timestamp = Time.now.strftime("%H:%M:%S")
+      say("\n[#{icon}] #{timestamp} #{message}", colour: colour, newline: true)
     end
 
     def clear_line
-      stdout.print("\r#{" " * 80}\r")
-      stdout.flush
+      say("\r#{" " * 80}\r", newline: false)
     end
 
     def complete_progress(message = "Completed")
       clear_line
-      timestamp = current_time_string
-      formatted_message = colourize("[✓] #{timestamp} #{message}", colour: :green)
-      stdout.puts(formatted_message)
-      stdout.flush
+      show_progress(message, "✓", colour: :green)
     end
 
     private
 
-    def current_time_string
-      Time.now.strftime("%H:%M:%S")
-    end
-
     def colourize(text, colour: :default)
       case colour
       when :black

data/lib/elelem/version.rb

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

data/lib/elelem.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
+require "cli/ui"
 require "erb"
 require "json"
 require "json-schema"
 require "logger"
-require "net/http"
+require "net/llm"
 require "open3"
 require "reline"
 require "thor"
-require "uri"
+require "timeout"
 
 require_relative "elelem/agent"
 require_relative "elelem/api"
@@ -16,12 +17,24 @@ require_relative "elelem/application"
 require_relative "elelem/configuration"
 require_relative "elelem/conversation"
 require_relative "elelem/mcp_client"
-require_relative "elelem/state"
+require_relative "elelem/states/idle"
+require_relative "elelem/states/working"
+require_relative "elelem/states/working/state"
+require_relative "elelem/states/working/error"
+require_relative "elelem/states/working/executing"
+require_relative "elelem/states/working/talking"
+require_relative "elelem/states/working/thinking"
+require_relative "elelem/states/working/waiting"
 require_relative "elelem/tool"
+require_relative "elelem/toolbox"
 require_relative "elelem/tools"
 require_relative "elelem/tui"
 require_relative "elelem/version"
 
+CLI::UI::StdoutRouter.enable
+Reline.input = $stdin
+Reline.output = $stdout
+
 module Elelem
   class Error < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elelem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mo khan
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cli-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erb
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http
+  name: net-llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uri
+  name: timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -155,13 +169,26 @@ files:
 - lib/elelem/configuration.rb
 - lib/elelem/conversation.rb
 - lib/elelem/mcp_client.rb
-- lib/elelem/state.rb
+- lib/elelem/states/idle.rb
+- lib/elelem/states/working.rb
+- lib/elelem/states/working/error.rb
+- lib/elelem/states/working/executing.rb
+- lib/elelem/states/working/state.rb
+- lib/elelem/states/working/talking.rb
+- lib/elelem/states/working/thinking.rb
+- lib/elelem/states/working/waiting.rb
 - lib/elelem/system_prompt.erb
 - lib/elelem/tool.rb
+- lib/elelem/toolbox.rb
+- lib/elelem/toolbox/exec.rb
+- lib/elelem/toolbox/file.rb
+- lib/elelem/toolbox/mcp.rb
+- lib/elelem/toolbox/memory.rb
+- lib/elelem/toolbox/prompt.rb
+- lib/elelem/toolbox/web.rb
 - lib/elelem/tools.rb
 - lib/elelem/tui.rb
 - lib/elelem/version.rb
-- sig/elelem.rbs
 homepage: https://www.mokhan.ca
 licenses:
 - MIT
@@ -184,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.11
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A REPL for Ollama.
 test_files: []

data/lib/elelem/state.rb

@@ -1,162 +0,0 @@
-# frozen_string_literal: true
-
-module Elelem
-  class Idle
-    def run(agent)
-      agent.logger.debug("Idling...")
-      agent.say("#{Dir.pwd} (#{agent.model}) [#{git_branch}]", colour: :magenta, newline: true)
-      input = agent.prompt("モ ")
-      agent.quit if input.nil? || input.empty? || input == "exit" || input == "quit"
-
-      agent.conversation.add(role: :user, content: input)
-      agent.transition_to(Working.new)
-    end
-
-    private
-
-    def git_branch
-      `git branch --no-color --show-current --no-abbrev`.strip
-    end
-  end
-
-  class Working
-    class State
-      attr_reader :agent
-
-      def initialize(agent)
-        @agent = agent
-      end
-
-      def display_name
-        self.class.name.split("::").last
-      end
-    end
-
-    class Waiting < State
-      def process(message)
-        state_for(message)&.process(message)
-      end
-
-      private
-
-      def state_for(message)
-        if message["thinking"] && !message["thinking"].empty?
-          Thinking.new(agent)
-        elsif message["tool_calls"]&.any?
-          Executing.new(agent)
-        elsif message["content"] && !message["content"].empty?
-          Talking.new(agent)
-        end
-      end
-    end
-
-    class Thinking < State
-      def initialize(agent)
-        super(agent)
-        @progress_shown = false
-      end
-
-      def process(message)
-        if message["thinking"] && !message["thinking"]&.empty?
-          unless @progress_shown
-            agent.show_progress("Thinking...", "[*]", colour: :yellow)
-            agent.say("\n\n", newline: false)
-            @progress_shown = true
-          end
-          agent.say(message["thinking"], colour: :gray, newline: false)
-          self
-        else
-          agent.say("\n\n", newline: false)
-          Waiting.new(agent).process(message)
-        end
-      end
-    end
-
-    class Executing < State
-      def process(message)
-        if message["tool_calls"]&.any?
-          message["tool_calls"].each do |tool_call|
-            tool_name = tool_call.dig("function", "name") || "unknown"
-            agent.show_progress(tool_name, "[>]", colour: :magenta)
-            agent.say("\n\n", newline: false)
-
-            output = agent.execute(tool_call)
-            agent.conversation.add(role: :tool, content: output)
-
-            agent.say("\n", newline: false)
-            agent.complete_progress("#{tool_name} completed")
-          end
-        end
-
-        Waiting.new(agent)
-      end
-    end
-
-    class Error < State
-      def initialize(agent, error_message)
-        super(agent)
-        @error_message = error_message
-      end
-
-      def process(_message)
-        agent.say("\nTool execution failed: #{@error_message}", colour: :red)
-        agent.say("Returning to idle state.\n\n", colour: :yellow)
-        Waiting.new(agent)
-      end
-    end
-
-    class Talking < State
-      def initialize(agent)
-        super(agent)
-        @progress_shown = false
-      end
-
-      def process(message)
-        if message["content"] && !message["content"]&.empty?
-          unless @progress_shown
-            agent.show_progress("Responding...", "[~]", colour: :white)
-            agent.say("\n", newline: false)
-            @progress_shown = true
-          end
-          agent.conversation.add(role: message["role"], content: message["content"])
-          agent.say(message["content"], colour: :default, newline: false)
-          self
-        else
-          agent.say("\n\n", newline: false)
-          Waiting.new(agent).process(message)
-        end
-      end
-    end
-
-    def run(agent)
-      agent.logger.debug("Working...")
-      agent.show_progress("Processing...", "[.]", colour: :cyan)
-      agent.say("\n\n", newline: false)
-
-      state = Waiting.new(agent)
-      done = false
-
-      loop do
-        agent.api.chat(agent.conversation.history) do |chunk|
-          response = JSON.parse(chunk)
-          message = normalize(response["message"] || {})
-          done = response["done"]
-
-          agent.logger.debug("#{state.display_name}: #{message}")
-          state = state.process(message)
-        end
-
-        break if state.nil?
-        break if done && agent.conversation.history.last[:role] != :tool
-      end
-
-      agent.transition_to(Idle.new)
-    end
-
-    private
-
-    def normalize(message)
-      message.reject { |_key, value| value.empty? }
-    end
-  end
-end

data/sig/elelem.rbs

@@ -1,4 +0,0 @@
-module Elelem
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end