elelem 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a92bbacb94cf0c5d56ce42a83f48efc0079f59cbafb066a7fdd3a8c382cadc1
-  data.tar.gz: 8bdf5148c6e082a070dd528bde2165093cb0e34a82d5c9e7260e24eef0c5b9ca
+  metadata.gz: 5358e2fd855f1b8848a191c4db7160cc7eb296a73451d56f69da7e67b1b83313
+  data.tar.gz: 728dcd83f11d131af93a99cc08b68c3141b57c7ee36d69fb038736220e628eb1
 SHA512:
-  metadata.gz: f9f80b2af42fc637d70dc1fbffc72af9fdb1e1465c7db4a54adf789ae02861e8c306319cb35ebe3152a28bd22fed9202fdd21dba54415492593ea98cfb5fed4d
-  data.tar.gz: 6fb3ea9891e2ae9f9e5377791bae7ac46d89303134d8a1d65de87e550be7ddb38f1f12d83cc3e257b32623e232317eb2fc4b48ed3a2d92adf6e2d402d80ae04b
+  metadata.gz: 2bcc2bb0271cb1188a68d390922b59a0c1007aaf8f8980c0981c26d60b75d6cb666c481702d72db92d61db4824402d88a9bbfffce0623b73ba133ca8557270df
+  data.tar.gz: 1b36b16c23223f574942de9bf72ea46f34d5e090eae8523c53baeccbd64ce26239de21938f80adf673f76326e87c9344e011723cb53407ed5f3df7d9647a1c3c

data/CHANGELOG.md

@@ -1,9 +1,38 @@
 ## [Unreleased]
 
+## [0.5.0] - 2025-01-07
+
+### Added
+- Multi-provider support: Ollama, Anthropic, OpenAI, and VertexAI
+- `--provider` CLI option to select LLM provider (default: ollama)
+- `--model` CLI option to override default model
+- Tool aliases (`bash` also accepts `exec`, `shell`, `command`, `terminal`, `run`)
+- Thinking text output for models that support extended thinking
+
+### Changed
+- Requires net-llm >= 0.5.0 with unified fetch interface
+- Updated gem description to reflect multi-provider support
+
+## [0.4.2] - 2025-12-01
+
+### Changed
+- Renamed `exec` tool to `bash` for clarity
+- Improved system prompt with iterative refinements
+- Added environment context variables to system prompt
+
 ## [0.4.1] - 2025-11-26
 
 ### Added
-- Updated version to 0.4.1
+- `elelem files` subcommand: generates Claude‑compatible XML file listings.
+- Rake task `files:prompt` to output a ready‑to‑copy list of files for prompts.
+
+### Changed
+- Refactor tool‑call formatting to a more compact JSON payload for better LLM parsing.
+- Updated CI and documentation to use GitHub instead of previous hosting.
+- Runtime validation of command‑line parameters against a JSON schema.
+
+### Fixed
+- Minor documentation and CI workflow adjustments.
 
 ## [0.4.0] - 2025-11-10
 
@@ -122,16 +151,3 @@
 
 - Initial release
 
-## [0.4.2] - 2025-11-27
-
-### Added
-- `elelem files` subcommand: generates Claude‑compatible XML file listings.
-- Rake task `files:prompt` to output a ready‑to‑copy list of files for prompts.
-
-### Changed
-- Refactor tool‑call formatting to a more compact JSON payload for better LLM parsing.
-- Updated CI and documentation to use GitHub instead of previous hosting.
-- Runtime validation of command‑line parameters against a JSON schema.
-
-### Fixed
-- Minor documentation and CI workflow adjustments.

data/README.md

@@ -63,7 +63,7 @@ gem install elelem
 
 ## Usage
 
-Start an interactive chat session with an Ollama model:
+Start an interactive chat session:
 
 ```bash
 elelem chat
@@ -71,20 +71,36 @@ elelem chat
 
 ### Options
 
-* `--host` – Ollama host (default: `localhost:11434`).
-* `--model` – Ollama model (default: `gpt-oss`).
-* `--token` – Authentication token.
+* `--provider` – LLM provider: `ollama`, `anthropic`, `openai`, or `vertex-ai` (default: `ollama`).
+* `--model` – Override the default model for the selected provider.
 
 ### Examples
 
 ```bash
-# Default model
+# Default (Ollama)
 elelem chat
 
-# Specific model and host
-elelem chat --model llama2 --host remote-host:11434
+# Anthropic Claude
+ANTHROPIC_API_KEY=sk-... elelem chat --provider anthropic
+
+# OpenAI
+OPENAI_API_KEY=sk-... elelem chat --provider openai
+
+# VertexAI (uses gcloud ADC)
+elelem chat --provider vertex-ai --model claude-sonnet-4@20250514
 ```
 
+### Provider Configuration
+
+Each provider reads its configuration from environment variables:
+
+| Provider    | Environment Variables                              |
+|-------------|---------------------------------------------------|
+| ollama      | `OLLAMA_HOST` (default: localhost:11434)          |
+| anthropic   | `ANTHROPIC_API_KEY`                               |
+| openai      | `OPENAI_API_KEY`, `OPENAI_BASE_URL`               |
+| vertex-ai   | `GOOGLE_CLOUD_PROJECT`, `GOOGLE_CLOUD_REGION`     |
+
 ## Mode System
 
 The agent exposes seven built‑in tools. You can switch which ones are
@@ -125,13 +141,13 @@ seven tools, each represented by a JSON schema that the LLM can call.
 
 | Tool      | Purpose                              | Parameters                           |
 | ----      | -------                              | ----------                           |
+| `bash`    | Run shell commands                   | `cmd`, `args`, `env`, `cwd`, `stdin` |
 | `eval`    | Dynamically create new tools         | `code`                               |
 | `grep`    | Search Git‑tracked files             | `query`                              |
 | `list`    | List tracked files                   | `path` (optional)                    |
+| `patch`   | Apply a unified diff via `git apply` | `diff`                               |
 | `read`    | Read file contents                   | `path`                               |
 | `write`   | Overwrite a file                     | `path`, `content`                    |
-| `patch`   | Apply a unified diff via `git apply` | `diff`                               |
-| `execute` | Run shell commands                   | `cmd`, `args`, `env`, `cwd`, `stdin` |
 
 ## Tool Definition
 
@@ -148,8 +164,7 @@ arguments as a hash.
 
 ## Contributing
 
-Feel free to open issues or pull requests. The repository follows the
-GitHub Flow.
+Send me an email. For instructions see https://git-send-email.io/.
 
 ## License
 

data/lib/elelem/agent.rb

@@ -66,6 +66,7 @@ module Elelem
     end
 
     def format_tool_call_result(result)
+      return if result.nil?
       return result["stdout"] if result["stdout"]
       return result["stderr"] if result["stderr"]
       return result[:error] if result[:error]
@@ -73,6 +74,21 @@ module Elelem
       ""
     end
 
+    def format_tool_calls_for_api(tool_calls)
+      tool_calls.map do |tc|
+        args = openai_client? ? JSON.dump(tc[:arguments]) : tc[:arguments]
+        {
+          id: tc[:id],
+          type: "function",
+          function: { name: tc[:name], arguments: args }
+        }
+      end
+    end
+
+    def openai_client?
+      client.is_a?(Net::Llm::OpenAI)
+    end
+
     def execute_turn(messages, tools:)
       turn_context = []
 
@@ -80,32 +96,31 @@ module Elelem
         content = ""
         tool_calls = []
 
-        print "Thinking..."
-        client.chat(messages + turn_context, tools) do |chunk|
-          msg = chunk["message"]
-          if msg
-            if msg["content"] && !msg["content"].empty?
-              print "\r\e[K" if content.empty?
-              print msg["content"]
-              content += msg["content"]
-            end
-
-            tool_calls += msg["tool_calls"] if msg["tool_calls"]
+        print "Thinking> "
+        client.fetch(messages + turn_context, tools) do |chunk|
+          case chunk[:type]
+          when :delta
+            print chunk[:thinking] if chunk[:thinking]
+            content += chunk[:content] if chunk[:content]
+          when :complete
+            content = chunk[:content] if chunk[:content]
+            tool_calls = chunk[:tool_calls] || []
           end
         end
 
-        puts
-        turn_context << { role: "assistant", content: content, tool_calls: tool_calls }.compact
+        puts "\nAssistant> #{content}" unless content.to_s.empty?
+        api_tool_calls = tool_calls.any? ? format_tool_calls_for_api(tool_calls) : nil
+        turn_context << { role: "assistant", content: content, tool_calls: api_tool_calls }.compact
 
         if tool_calls.any?
           tool_calls.each do |call|
-            name = call.dig("function", "name")
-            args = call.dig("function", "arguments")
+            name = call[:name]
+            args = call[:arguments]
 
-            puts "Tool> #{name}(#{args})"
+            puts "\nTool> #{name}(#{args})"
             result = toolbox.run_tool(name, args)
             puts format_tool_call_result(result)
-            turn_context << { role: "tool", content: JSON.dump(result) }
+            turn_context << { role: "tool", tool_call_id: call[:id], content: JSON.dump(result) }
           end
 
           tool_calls = []

data/lib/elelem/application.rb

@@ -2,27 +2,40 @@
 
 module Elelem
   class Application < Thor
+    PROVIDERS = %w[ollama anthropic openai vertex-ai].freeze
+
     desc "chat", "Start the REPL"
-    method_option :host,
-                  aliases: "--host",
+    method_option :provider,
+                  aliases: "-p",
                   type: :string,
-                  desc: "Ollama host",
-                  default: ENV.fetch("OLLAMA_HOST", "localhost:11434")
+                  desc: "LLM provider (#{PROVIDERS.join(', ')})",
+                  default: ENV.fetch("ELELEM_PROVIDER", "ollama")
     method_option :model,
-                  aliases: "--model",
+                  aliases: "-m",
                   type: :string,
-                  desc: "Ollama model",
-                  default: ENV.fetch("OLLAMA_MODEL", "gpt-oss")
+                  desc: "Model name (uses provider default if not specified)"
     def chat(*)
-      client = Net::Llm::Ollama.new(
-        host: options[:host],
-        model: options[:model],
-      )
-      say "Agent (#{options[:model]})", :green
+      client = build_client
+      say "Agent (#{options[:provider]}/#{client.model})", :green
       agent = Agent.new(client, Toolbox.new)
       agent.repl
     end
 
+    private
+
+    def build_client
+      model_opts = options[:model] ? { model: options[:model] } : {}
+
+      case options[:provider]
+      when "ollama"     then Net::Llm::Ollama.new(**model_opts)
+      when "anthropic"  then Net::Llm::Anthropic.new(**model_opts)
+      when "openai"     then Net::Llm::OpenAI.new(**model_opts)
+      when "vertex-ai"  then Net::Llm::VertexAI.new(**model_opts)
+      else
+        raise Error, "Unknown provider: #{options[:provider]}. Use: #{PROVIDERS.join(', ')}"
+      end
+    end
+
     desc "files", "Generate CXML of the files"
     def files
       puts '<documents>'

data/lib/elelem/conversation.rb

@@ -45,19 +45,19 @@ module Elelem
 
       case mode.sort
       when [:read]
-        "#{base}\n\nRead and analyze. Understand before suggesting action."
+        "#{base}\n\nYou may read files on the system."
       when [:write]
-        "#{base}\n\nWrite clean, thoughtful code."
+        "#{base}\n\nYou may write files on the system."
       when [:execute]
-        "#{base}\n\nUse shell commands creatively to understand and manipulate the system."
+        "#{base}\n\nYou may execute shell commands on the system."
       when [:read, :write]
-        "#{base}\n\nFirst understand, then build solutions that integrate well."
+        "#{base}\n\nYou may read and write files on the system."
       when [:execute, :read]
-        "#{base}\n\nUse commands to deeply understand the system."
+        "#{base}\n\nYou may execute shell commands and read files on the system."
       when [:execute, :write]
-        "#{base}\n\nCreate and execute freely. Have fun. Be kind."
+        "#{base}\n\nYou may execute shell commands and write files on the system."
       when [:execute, :read, :write]
-        "#{base}\n\nYou have all tools. Use them wisely."
+        "#{base}\n\nYou may read files, write files and execute shell commands on the system."
       else
         base
       end

data/lib/elelem/system_prompt.erb

@@ -1,5 +1,15 @@
-You are a reasoning coding and system agent working from: <%= Dir.pwd %>.
+You are a reasoning coding and system agent.
 
-- Less is more
-- No code comments
-- No trailing whitespace
+## System
+
+Operating System: <%= `uname -a` %>
+USER: <%= ENV['USER'] %>
+HOME: <%= ENV['HOME'] %>
+SHELL: <%= ENV['SHELL'] %>
+PATH: <%= ENV['PATH'] %>
+PWD: <%= ENV['PWD'] %>
+LANG: <%= ENV['LANG'] %>
+EDITOR: <%= ENV['EDITOR'] %>
+LOGNAME: <%= ENV['LOGNAME'] %>
+TERM: <%= ENV['TERM'] %>
+MAIL: <%= ENV['MAIL'] %>

data/lib/elelem/tool.rb

@@ -11,7 +11,9 @@ module Elelem
     end
 
     def call(args)
-      return ArgumentError.new(args) unless valid?(args)
+      unless valid?(args)
+        return { error: "Invalid args for #{@name}", received: args.keys, expected: @schema.dig(:function, :parameters, :required) }
+      end
 
       @block.call(args)
     end

data/lib/elelem/toolbox.rb

@@ -2,13 +2,14 @@
 
 module Elelem
   class Toolbox
+
     READ_TOOL = Tool.build("read", "Read complete contents of a file. Requires exact file path.", { path: { type: "string" } }, ["path"]) do |args|
       path = args["path"]
       full_path = Pathname.new(path).expand_path
       full_path.exist? ? { content: full_path.read } : { error: "File not found: #{path}" }
     end
 
-    EXEC_TOOL = Tool.build("execute", "Run shell commands. For git: execute({\"cmd\": \"git\", \"args\": [\"log\", \"--oneline\"]}). Returns stdout/stderr/exit_status.", { cmd: { type: "string" }, args: { type: "array", items: { type: "string" } }, env: { type: "object", additionalProperties: { type: "string" } }, cwd: { type: "string", description: "Working directory (defaults to current)" }, stdin: { type: "string" } }, ["cmd"]) do |args|
+    BASH_TOOL = Tool.build("bash", "Run shell commands. For git: bash({\"cmd\": \"git\", \"args\": [\"log\", \"--oneline\"]}). Returns stdout/stderr/exit_status.", { cmd: { type: "string" }, args: { type: "array", items: { type: "string" } }, env: { type: "object", additionalProperties: { type: "string" } }, cwd: { type: "string", description: "Working directory (defaults to current)" }, stdin: { type: "string" } }, ["cmd"]) do |args|
       Elelem.shell.execute(
         args["cmd"],
         args: args["args"] || [],
@@ -36,13 +37,20 @@ module Elelem
       { bytes_written: full_path.write(args["content"]) }
     end
 
+    TOOL_ALIASES = {
+      "exec" => "bash",
+      "execute" => "bash",
+      "open" => "read",
+      "search" => "grep",
+    }
+
     attr_reader :tools
 
     def initialize
       @tools_by_name = {}
       @tools = { read: [], write: [], execute: [] }
       add_tool(eval_tool(binding), :execute)
-      add_tool(EXEC_TOOL, :execute)
+      add_tool(BASH_TOOL, :execute)
       add_tool(GREP_TOOL, :read)
       add_tool(LIST_TOOL, :read)
       add_tool(PATCH_TOOL, :write)
@@ -64,7 +72,8 @@ module Elelem
     end
 
     def run_tool(name, args)
-      @tools_by_name[name]&.call(args) || { error: "Unknown tool", name: name, args: args }
+      resolved_name = TOOL_ALIASES.fetch(name, name)
+      @tools_by_name[resolved_name]&.call(args) || { error: "Unknown tool", name: name, args: args }
     rescue => error
       { error: error.message, name: name, args: args, backtrace: error.backtrace.first(5) }
     end

data/lib/elelem/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elelem
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - mo khan
@@ -13,171 +13,177 @@ dependencies:
   name: erb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: open3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pathname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A REPL for Ollama.
+        version: '0.1'
+description: A minimal coding agent supporting Ollama, Anthropic, OpenAI, and VertexAI.
 email:
 - mo@mokhan.ca
 executables:
@@ -198,14 +204,14 @@ files:
 - lib/elelem/tool.rb
 - lib/elelem/toolbox.rb
 - lib/elelem/version.rb
-homepage: https://github.com/xlgmokha/elelem
+homepage: https://src.mokhan.ca/xlgmokha/elelem
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/xlgmokha/elelem
-  source_code_uri: https://github.com/xlgmokha/elelem
-  changelog_uri: https://github.com/xlgmokha/elelem/blob/main/CHANGELOG.md
+  homepage_uri: https://src.mokhan.ca/xlgmokha/elelem
+  source_code_uri: https://src.mokhan.ca/xlgmokha/elelem
+  changelog_uri: https://src.mokhan.ca/xlgmokha/elelem/blob/main/CHANGELOG.md.html
 rdoc_options: []
 require_paths:
 - lib
@@ -222,5 +228,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.7.2
 specification_version: 4
-summary: A REPL for Ollama.
+summary: A minimal coding agent for LLMs.
 test_files: []