elelem 0.9.2 → 0.10.0

data/lib/elelem/toolbox.rb

@@ -16,17 +16,19 @@ module Elelem
       tool.aliases.each { |a| @aliases[a] = name }
     end
 
-    def before(tool_name, &block)
+    def before(tool_name = :*, &block)
       @hooks[:before][tool_name] << block
     end
 
-    def after(tool_name, &block)
+    def after(tool_name = :*, &block)
       @hooks[:after][tool_name] << block
     end
 
     def header(name, args, state: "+")
-      name = tool_for(name)&.name || "#{name}?"
-      "\n#{state} #{name}(#{args})"
+      tool = tool_for(name)
+      color = tool ? "36" : "33"
+      name = tool&.name || "#{name}?"
+      "\n#{state} \e[#{color}m#{name}\e[0m(#{args})"
     end
 
     def run(name, args)
@@ -36,14 +38,21 @@ module Elelem
       errors = tool.validate(args)
       return failure(error: errors.join(", ")) if errors.any?
 
+      @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[:error] ? failure(result) : success(result)
     rescue => e
       failure(error: e.message, name: name, args: args)
     end
 
+    def exec(*args)
+      command = args.flatten.map { |a| Shellwords.escape(a.to_s) }.join(" ")
+      run("execute", { "command" => command })
+    end
+
     def to_a
       tools.values.map(&:to_h)
     end

data/lib/elelem/version.rb

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

data/lib/elelem.rb

@@ -1,19 +1,30 @@
 # frozen_string_literal: true
 
+require "base64"
 require "date"
+require "digest"
 require "erb"
 require "fileutils"
 require "json"
 require "json_schemer"
+require "logger"
+require "net/hippie"
 require "open3"
+require "optparse"
 require "pathname"
 require "reline"
+require "securerandom"
 require "stringio"
 require "tempfile"
+require "uri"
+require "webrick"
 
 require_relative "elelem/agent"
+require_relative "elelem/commands"
+require_relative "elelem/conversation"
 require_relative "elelem/mcp"
 require_relative "elelem/net"
+require_relative "elelem/permissions"
 require_relative "elelem/plugins"
 require_relative "elelem/system_prompt"
 require_relative "elelem/terminal"
@@ -37,14 +48,94 @@ module Elelem
   end
 
   def self.start(client, toolbox: Toolbox.new)
-    Plugins.setup!(toolbox)
-    Agent.new(client, toolbox).repl
+    agent = Agent.new(client, toolbox: toolbox)
+    Plugins.setup!(agent)
+    agent.terminal = Terminal.new(commands: agent.commands.names)
+    agent.repl
   end
 
   def self.ask(client, prompt, toolbox: Toolbox.new)
-    Plugins.setup!(toolbox)
-    agent = Agent.new(client, toolbox, terminal: Terminal.new(quiet: true))
+    agent = Agent.new(client, toolbox: toolbox, terminal: Terminal.new(quiet: true))
+    Plugins.setup!(agent)
     agent.turn(prompt)
-    agent.history.last[:content]
+    agent.conversation.last[:content]
+  end
+
+  class CLI
+    MODELS = {
+      "ollama" => "gpt-oss:latest",
+      "anthropic" => "claude-opus-4-5-20250514",
+      "vertex" => "claude-opus-4-5@20251101",
+      "openai" => "gpt-4o"
+    }.freeze
+
+    PROVIDERS = {
+      "ollama" => ->(model) { Elelem::Net::Ollama.new(model: model, host: ENV.fetch("OLLAMA_HOST", "localhost:11434")) },
+      "anthropic" => ->(model) { Elelem::Net::Claude.anthropic(model: model, api_key: ENV.fetch("ANTHROPIC_API_KEY")) },
+      "vertex" => ->(model) { Elelem::Net::Claude.vertex(model: model, project: ENV.fetch("GOOGLE_CLOUD_PROJECT"), region: ENV.fetch("GOOGLE_CLOUD_REGION", "us-east5")) },
+      "openai" => ->(model) { Elelem::Net::OpenAI.new(model: model, api_key: ENV.fetch("OPENAI_API_KEY")) }
+    }.freeze
+
+    def initialize(args)
+      @provider = "ollama"
+      @model = nil
+      @args = parse(args)
+    end
+
+    def run
+      command = @args.shift || "chat"
+      send(command.tr("-", "_"))
+    rescue NoMethodError
+      abort "Unknown command: #{command}"
+    end
+
+    private
+
+    def parse(args)
+      @parser = OptionParser.new do |o|
+        o.banner = "Usage: elelem [command] [options] [args]"
+        o.separator "\nCommands:"
+        o.separator "  chat              Interactive REPL (default)"
+        o.separator "  ask <prompt>      One-shot query (reads stdin if piped)"
+        o.separator "  files             Output files as XML (no options)"
+        o.separator "  help              Show this help"
+        o.separator "\nOptions:"
+        o.on("-p", "--provider NAME", "ollama, anthropic, vertex, openai") { |p| @provider = p }
+        o.on("-m", "--model NAME", "Override default model") { |m| @model = m }
+        o.on("-h", "--help") { puts o; exit }
+      end
+      @parser.parse!(args)
+    end
+
+    def help
+      puts @parser
+    end
+
+    def client
+      model = @model || MODELS.fetch(@provider)
+      PROVIDERS.fetch(@provider).call(model)
+    end
+
+    def chat
+      Elelem.start(client)
+    end
+
+    def ask
+      abort "Usage: elelem ask <prompt>" if @args.empty?
+      prompt = @args.join(" ")
+      prompt = "#{prompt}\n\n```\n#{$stdin.read}\n```" if $stdin.stat.pipe?
+      Elelem::Terminal.new.markdown Elelem.ask(client, prompt)
+    end
+
+    def files
+      files = $stdin.stat.pipe? ? $stdin.readlines : `git ls-files`.lines
+      puts "<documents>"
+      files.each_with_index do |line, i|
+        path = line.strip
+        next if path.empty? || !File.file?(path)
+        puts %Q{<document index="#{i + 1}"><source>#{path}</source><content><![CDATA[#{File.read(path)}]]></content></document>}
+      end
+      puts "</documents>"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elelem
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.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: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: date
   requirement: !ruby/object:Gem::Requirement
@@ -23,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: digest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: erb
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +107,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-hippie
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +191,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: securerandom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: shellwords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: stringio
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +261,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: A minimal coding agent supporting Ollama, Anthropic, OpenAI, and VertexAI.
 email:
 - mo@mokhan.ca
@@ -206,22 +290,34 @@ files:
 - exe/elelem
 - lib/elelem.rb
 - lib/elelem/agent.rb
+- lib/elelem/commands.rb
+- lib/elelem/conversation.rb
 - lib/elelem/mcp.rb
+- lib/elelem/mcp/oauth.rb
+- lib/elelem/mcp/token_storage.rb
 - lib/elelem/net.rb
 - lib/elelem/net/claude.rb
 - lib/elelem/net/ollama.rb
 - lib/elelem/net/openai.rb
+- lib/elelem/permissions.rb
 - lib/elelem/plugins.rb
-- lib/elelem/plugins/confirm.rb
+- lib/elelem/plugins/builtins.rb
 - lib/elelem/plugins/edit.rb
 - lib/elelem/plugins/eval.rb
 - lib/elelem/plugins/execute.rb
+- lib/elelem/plugins/git.rb
+- lib/elelem/plugins/glob.rb
+- lib/elelem/plugins/grep.rb
+- lib/elelem/plugins/list.rb
 - lib/elelem/plugins/mcp.rb
+- lib/elelem/plugins/permissions.json
 - lib/elelem/plugins/read.rb
+- lib/elelem/plugins/task.rb
+- lib/elelem/plugins/tools.rb
 - lib/elelem/plugins/verify.rb
 - lib/elelem/plugins/write.rb
+- lib/elelem/plugins/zz_confirm.rb
 - lib/elelem/system_prompt.rb
-- lib/elelem/templates/system_prompt.erb
 - lib/elelem/terminal.rb
 - lib/elelem/tool.rb
 - lib/elelem/toolbox.rb

data/lib/elelem/plugins/confirm.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-Elelem::Plugins.register(:confirm) do |toolbox|
-  toolbox.before("execute") do |args|
-    next unless $stdin.tty?
-
-    cmd = args["command"]
-    $stdout.print "  Allow? [Y/n] > "
-    answer = $stdin.gets&.strip&.downcase
-    raise "User denied permission to execute: #{cmd}" if answer == "n"
-  end
-end

data/lib/elelem/templates/system_prompt.erb

@@ -1,53 +0,0 @@
-Terminal coding agent. Be concise. Verify your work.
-
-# Tools
-- read(path): file contents
-- write(path, content): create/overwrite file
-- execute(command): shell command
-- eval(ruby): execute Ruby code; use to create tools for repetitive tasks
-- task(prompt): delegate complex searches or multi-file analysis to a focused subagent
-
-# Editing
-Use execute(`patch -p1`) for multi-line changes: `echo "DIFF" | patch -p1`
-Use execute(`sed`) for single-line changes: `sed -i'' 's/old/new/' file`
-Use write for new files or full rewrites
-
-# Search
-Use execute(`rg`) for text search: `rg -n "pattern" .`
-Use execute(`fd`) for file discovery: `fd -e rb .`
-Use execute(`sg`) (ast-grep) for structural search: `sg -p 'def $NAME' -l ruby`
-
-# Task Management
-For complex tasks:
-1. State plan before acting
-2. Work through steps one at a time
-3. Summarize what was done
-
-# Long Tasks
-For complex multi-step work, write notes to .elelem/scratch.md
-
-# Policy
-- Explain before non-trivial commands
-- Verify changes (read file, run tests)
-- No interactive flags (-i, -p)
-- Use `man` when you need to understand how to execute a program
-
-# Environment
-pwd: <%= pwd %>
-platform: <%= platform %>
-date: <%= date %>
-self (this agent's source): <%= elelem_source %>
-<%= git_branch %>
-
-# Codebase
-<%= repo_map %>
-<% if agents_md %>
-
-# Project Instructions
-<%= agents_md %>
-<% end %>
-<% if memory %>
-
-# Earlier Context
-<%= memory %>
-<% end %>