relay.app 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3caa789124f0cee625277b4f1e3472e04c12d1aeeaa193ed6146ba593061d57d
-  data.tar.gz: 83e22033af1263c50c8746958d56e07836f5570a02399e894be48468de750c74
+  metadata.gz: 51b2db665dd9baa7f6003b0cdd360d07ab3e1cba08f451400d7063f4bce234d5
+  data.tar.gz: e058de42d7416b06df5e35c605c734d8b7af9f93d7fda9015b81f576cca7d286
 SHA512:
-  metadata.gz: 848201fc63074254365539657cd709eb60dd3fbe729d7b1421d4076e58bc6dcb82e437058c1fa8f6cb7ce1a887a6ba3583724abc044ce9e10179d76884f46f91
-  data.tar.gz: 347db524516e78944bce97e8ee6f96944190206fb057f85be65eada7a1fcd3449bb3001be17016ad2125a190600deb6e08f7fcbfff69d4fba77285203860dbb9
+  metadata.gz: 2efe61c19fb25fcbe28dfc94ad68bcae7fe6927950edf0ab617fe473166590491d465913d185ffa94f35d6e4458b2ed0534afddb71a160faba72445bcb36b674
+  data.tar.gz: 1185e1e81c2c8180ee17165579400a688fc146af4e40f2cb9d03ed2e149274ff2bbfd7fdd7125c638c995beab6e955b2c06ac63995bfb01d9d093d4bb9158e9d

data/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 ## Unreleased
 
+### Change
+
+* **Move the default Relay home to `~/.config/relay`** <br>
+  Change Relay's default writable home directory from `~/.relay` to
+  `~/.config/relay`, and update the README examples for user-installed
+  tools to match the new location.
+
+* **Add `relay console`** <br>
+  Add a console command that boots Relay and starts IRB in the loaded
+  application process for interactive debugging.
+
+* **Add AWS Bedrock provider support** <br>
+  Add Bedrock to Relay's provider registry and persisted context
+  initialization, and extend `relay configure` to prompt for AWS access
+  key credentials.
+
+* **Prepopulate provider API key prompts from environment** <br>
+  Let `relay configure` reuse existing provider secrets from process
+  environment variables such as `OPENAI_API_KEY` and
+  `DEEPSEEK_API_KEY`, while still writing Relay's canonical `*_SECRET`
+  keys to `~/.relay/env`.
+
+### Fix
+
+* **Launch Falcon with the current Ruby interpreter** <br>
+  Change `relay start` to exec Falcon through `RbConfig.ruby -S` so the
+  server process uses the same Ruby and gem environment as Relay instead
+  of whichever `falcon` binary appears first on `PATH`.
+
+* **Load user-installed tools through Zeitwerk** <br>
+  Replace manual loading of `~/.config/relay/tools/*.rb` with a dedicated
+  Zeitwerk loader so development reloads unload and recreate user tools
+  instead of reopening existing classes.
+
+* **Activate the `llm.rb` gem before `require "llm"`** <br>
+  Avoid RubyGems loading the unrelated `llm` gem when both gems are
+  installed by explicitly activating `llm.rb` before requiring its
+  `llm` entrypoint.
+
 ## v0.5.0
 
 Model catalog workflow release.

data/README.md

@@ -7,9 +7,9 @@ set of dependencies - built on Roda, Sequel, Falcon, [llm.rb](https://github.com
 HTMX and web sockets.
 
 There is support for connecting to MCP servers too - both HTTP and stdio. You can
-add your own tools to `~/.relay/tools` which is a neat way to extend the environment
-with your own functionality. The database uses SQLite3 to keep things simple - the
-goal is to have something you can setup in under two minutes.
+add your own tools to `~/.config/relay/tools` which is a neat way to extend the
+environment with your own functionality. The database uses SQLite3 to keep things
+simple - the goal is to have something you can setup in under two minutes.
 
 ## Getting started
 
@@ -62,7 +62,7 @@ Very easy.
 
 ## How do I add my own tool?
 
-Before running `relay start` you should add a `~/.relay/tools/<yourtool>.rb`.
+Before running `relay start` you should add `~/.config/relay/tools/<yourtool>.rb`.
 The tool will be automatically made available to the LLM. This is how a tool
 might look - it is not very useful because it does not emit command output
 but it serves as a simple example that you can modify and change to meet

data/app/concerns/attachment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Relay::Concerns
   module Attachment
     def attachment

data/app/concerns/context.rb

@@ -55,9 +55,9 @@ module Relay::Concerns
     # @return [Array<Relay::Models::MCP>]
     #  Saved MCP servers for the current user, newest first.
     def mcps
-      @mcps ||= user ? Relay::Models::MCP.summary_dataset(user.mcps_dataset).
-        reverse_order(:created_at).
-        all : []
+      @mcps ||= user ? Relay::Models::MCP.summary_dataset(user.mcps_dataset)
+        .reverse_order(:created_at)
+        .all : []
     end
 
     ##
@@ -94,13 +94,7 @@ module Relay::Concerns
     # @return [Hash<String, LLM::Provider>]
     #  A map of initialized LLM providers.
     def llms
-      @llms ||= {
-        "openai" => LLM.openai(key: ENV["OPENAI_SECRET"]),
-        "google" => LLM.google(key: ENV["GOOGLE_SECRET"]),
-        "anthropic" => LLM.anthropic(key: ENV["ANTHROPIC_SECRET"]),
-        "deepseek" => LLM.deepseek(key: ENV["DEEPSEEK_SECRET"]),
-        "xai" => LLM.xai(key: ENV["XAI_SECRET"])
-      }.transform_values(&:persist!)
+      Relay.providers
     end
 
     ##
@@ -114,7 +108,7 @@ module Relay::Concerns
     # @return [String]
     #  Returns the default chat model for the current provider.
     def default_model
-      case (provider = llms.fetch(self.provider)).name
+      case (provider = llms[self.provider]).name
       when :deepseek then "deepseek-v4-flash"
       when :openai then "gpt-5.4"
       when :xai then "grok-3"
@@ -142,6 +136,5 @@ module Relay::Concerns
     def user
       @user ||= Relay::Models::User[session["user_id"]] if session["user_id"]
     end
-
   end
 end

data/app/hooks/require_user.rb

@@ -4,7 +4,7 @@ module Relay::Hooks
   module RequireUser
     def call(*args, **kwargs)
       @user = Relay::Models::User[session["user_id"]]
-      @user.nil? ? r.redirect("/sign-in") : super(*args, **kwargs)
+      @user.nil? ? r.redirect("/sign-in") : super
     end
   end
 end

data/app/init/database.rb

@@ -8,7 +8,7 @@ module Relay::Database
   # @param [String] env
   # @return [Hash]
   def load(env:)
-    erb = ERB.new(File.read(File.join(__dir__, "..", "..", "db", "config.yml")))
+    erb = ERB.new(File.read(File.join(Relay.home, "db", "config.yml")))
     config = YAML.safe_load(erb.result, aliases: true)
     config.fetch(env)
   end

data/app/init/router.rb

@@ -157,8 +157,6 @@ module Relay
           Routes::ClearAttachment.new(self).call
         end
       end
-
     end
-
   end
 end

data/app/init.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Relay
+  require_relative "../lib/relay"
+
   require "async"
   require "async/websocket"
   require "async/websocket/adapters/rack"
@@ -12,7 +14,6 @@ module Relay
   require "zeitwerk"
   require "sequel"
   require "yaml"
-  require "relay"
 
   loader = Zeitwerk::Loader.new
   loader.inflector.inflect(
@@ -25,7 +26,6 @@ module Relay
     File.join(__dir__, "init")
   )
   loader.push_dir(__dir__, namespace: self)
-
   loader.enable_reloading if development?
   loader.setup
 
@@ -37,14 +37,24 @@ module Relay
   end
   @loader = loader
 
-  FileUtils.mkdir_p Relay.home
-  FileUtils.mkdir_p File.join(Relay.home, "db")
-  FileUtils.mkdir_p Relay.images_dir
-  FileUtils.mkdir_p Relay.logs_dir
+  Relay.bootstrap!
+  user_tools_dir = File.join(home, "tools")
+  user_loader = Zeitwerk::Loader.new
+  user_loader.tag = "relay-user-tools"
+  user_loader.push_dir(user_tools_dir)
+  user_loader.enable_reloading if development?
+  user_loader.setup
+
+  ##
+  # Returns the Zeitwerk loader used for user-installed tools
+  # @return [Zeitwerk::Loader]
+  def self.user_loader
+    @user_loader
+  end
+  @user_loader = user_loader
 
   require_relative "init/env"
   require_relative "init/database"
   require_relative "init/router"
-
   Relay.reload
 end

data/app/models/context.rb

@@ -44,13 +44,13 @@ module Relay::Models
 
     ##
     # @note
-    #  This method excludes tool calls and system messages.
+    #  This method excludes tool calls, tool returns, and system messages.
     #  It is safe to render in the UI.
     # @return [Array<Hash>]
     #  Returns persisted user and assistant messages
     def messages
       ctx.messages.filter_map do |message|
-        next if message.tool_call? || message.compaction?
+        next if message.tool_call? || message.tool_return? || message.compaction?
         next unless message.user? || message.assistant?
         {role: message.role.to_sym, content: message.content.to_s}
       end
@@ -67,11 +67,20 @@ module Relay::Models
     private
 
     def set_provider
-      LLM.method(provider).call(key: ENV["#{provider.upcase}_SECRET"], persistent: true)
+      case provider
+      when "bedrock"
+        LLM.bedrock(
+          access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+          secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
+          persistent: true
+        )
+      else
+        LLM.method(provider).call(key: ENV["#{provider.upcase}_SECRET"], persistent: true)
+      end
     end
 
     def set_context
-      { model: self[:model], compactor: { retention_window: 8, token_threshold: "95%" } }
+      {model: self[:model], compactor: {retention_window: 8, token_threshold: "95%"}}
     end
 
     def set_tracer

data/app/pages/base.rb

@@ -20,6 +20,5 @@ module Relay::Pages
     def page(name, **locals)
       view(File.join("pages", name), locals:, layout_opts: {locals:})
     end
-
   end
 end

data/app/routes/base.rb

@@ -31,6 +31,5 @@ module Relay::Routes
     def htmx?
       request.env["HTTP_HX_REQUEST"] == "true"
     end
-
   end
 end

data/app/routes/mcp/base.rb

@@ -8,7 +8,7 @@ module Relay::Routes
       Relay::Models::MCP.where(id:, user_id: user.id).first || raise(Sequel::NoMatchingRow)
     end
 
-    def workspace(selected_id: nil, form:)
+    def workspace(form:, selected_id: nil)
       partial("fragments/mcp/workspace", locals: {mcps:, selected_id:, form:}) +
         partial("fragments/mcp_settings", locals: {servers: mcps, show_label: false, swap_oob: true})
     end

data/app/routes/websocket/connection.rb

@@ -37,9 +37,9 @@ class Relay::Routes::Websocket
     #  The mutable request params for the current turn
     # @return [void]
     def dispatch(conn, ctx, payload, params)
-      case
-      when interrupt?(payload) then interrupt!(conn, ctx)
-      when request_in_flight?
+      if interrupt?(payload)
+        interrupt!(conn, ctx)
+      elsif request_in_flight?
         write(conn, fragment(:status, status_bar(status: "Busy", ctx:)))
       else
         @task = Async { on_message(conn, ctx, payload, params) }

data/app/tools/juke_box.rb

@@ -19,7 +19,7 @@ module Relay::Tools
           title: entry["title"],
           track: entry["track"],
           html: Relay.erb("fragments/_iframe.erb", {entry:}),
-          directions:,
+          directions:
         }
       end
     end

data/app/views/fragments/_input.erb

@@ -22,6 +22,9 @@
     <form
       id="chat-composer"
       class="flex min-w-0 flex-1 items-end gap-3"
+      data-context-id="<%= ctx.id %>"
+      data-provider="<%= provider %>"
+      data-model="<%= model %>"
       hx-on::after-settle="this.querySelector('textarea')?.focus()"
       ws-send
     >

data/app/views/fragments/_providers.erb

@@ -12,8 +12,7 @@
       hx-swap="outerHTML"
       hx-trigger="change"
     >
-      <% Relay.providers.each do |_, builder| %>
-        <% llm = builder.call %>
+      <% Relay.providers.each do |_, llm| %>
         <option
           <%= "selected" if llm.name.to_s == provider.to_s %>
           value="<%= llm.name %>">

data/bin/relay

@@ -13,27 +13,19 @@ end
 
 def main(argv)
   case argv[0]
-  when "setup"
-    Process.spawn File.join(libexec, "setup"), *argv[1..]
-    Process.wait
-  when "download-models"
-    Process.spawn File.join(libexec, "download-models"), *argv[1..]
-    Process.wait
-  when "migrate"
-    Process.spawn File.join(libexec, "migrate"), *argv[1..]
-    Process.wait
-  when "start"
-    Process.spawn File.join(libexec, "start"), *argv[1..]
+  when "start", "setup", "download-models", "migrate", "bootstrap", "console"
+    Process.spawn File.join(libexec, argv[0]), *argv[1..]
     Process.wait
   else
-    require "relay"
+    require_relative "../lib/relay"
     warn Relay.banner
     warn "Usage: relay [COMMAND] [OPTIONS]\n\n" \
-         "Commands:\n" \
-         "  setup             Setup Relay for the first time\n" \
-         "  download-models   Download provider model catalogs\n" \
-         "  start             Start Relay\n" \
-         "  migrate           Run database migrations\n"
+        "Commands:\n" \
+        "  setup             Setup Relay for the first time\n" \
+        "  download-models   Download provider model catalogs\n" \
+        "  start             Start Relay\n" \
+        "  migrate           Run database migrations\n" \
+        "  console           Start an IRB console with Relay booted\n"
   end
 rescue Interrupt
   wait

data/config.ru

@@ -4,7 +4,7 @@ ENV["RACK_MULTIPART_BUFFERED_UPLOAD_BYTESIZE_LIMIT"] ||= (64 * 1024 * 1024).to_s
 
 require_relative "app/init"
 
-use Rack::Static, urls: ["/g"], root: Relay.home
+use Rack::Static, urls: ["/g"], root: Relay.public_dir
 use Rack::Static, urls: ["/images", "/stylesheets", "/js"], root: Relay.public_dir
 case Relay.environment
 when "development"

data/lib/relay/version.rb

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

data/lib/relay.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 module Relay
+  require "fileutils"
+  gem "llm.rb", "= 8.1.0"
+
   require_relative "relay/version"
   require_relative "relay/cache"
   require_relative "relay/attachment"
@@ -18,7 +21,8 @@ module Relay
     "deepseek" => -> { LLM.deepseek(key: ENV["DEEPSEEK_SECRET"]) },
     "google" => -> { LLM.google(key: ENV["GOOGLE_SECRET"]) },
     "openai" => -> { LLM.openai(key: ENV["OPENAI_SECRET"]) },
-    "xai" => -> { LLM.xai(key: ENV["XAI_SECRET"]) }
+    "xai" => -> { LLM.xai(key: ENV["XAI_SECRET"]) },
+    "bedrock" => -> { LLM.bedrock(access_key_id: ENV["AWS_ACCESS_KEY_ID"], secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]) }
   }.freeze
   private_constant :PROVIDERS
 
@@ -37,7 +41,7 @@ module Relay
   # Returns all known providers
   # @return [LLM::Object]
   def self.providers
-    @providers ||= LLM::Object.from(PROVIDERS)
+    @providers ||= LLM::Object.from(PROVIDERS).transform_values!(&:call)
   end
 
   ##
@@ -81,7 +85,7 @@ module Relay
   # Returns the writable Relay home directory
   # @return [String]
   def self.home
-    @home ||= ENV["RELAY_HOME"] || File.join(Dir.home, ".relay")
+    @home ||= ENV["RELAY_HOME"] || File.join(Dir.home, ".config", "relay")
   end
 
   ##
@@ -91,6 +95,21 @@ module Relay
     @env_path ||= File.join(home, "env")
   end
 
+  ##
+  # Creates the Relay home layout and copies bundled defaults into it.
+  # @return [String]
+  def self.bootstrap!
+    FileUtils.mkdir_p home
+    FileUtils.mkdir_p File.join(home, "db")
+    FileUtils.mkdir_p File.join(home, "tools")
+    FileUtils.mkdir_p images_dir
+    FileUtils.mkdir_p logs_dir
+    source = File.join(root, "db", "config.yml")
+    destination = File.join(home, "db", "config.yml")
+    FileUtils.cp(source, destination) if File.exist?(source) && !File.exist?(destination)
+    home
+  end
+
   ##
   # @return [Array<String>]
   #  Returns the tools directory
@@ -109,7 +128,7 @@ module Relay
   # Returns the path to generated images
   # @return [String]
   def self.images_dir
-    @images_dir ||= File.join(home, "g")
+    @images_dir ||= File.join(public_dir, "g")
   end
 
   ##
@@ -170,14 +189,8 @@ module Relay
   def self.reload
     LLM::Tool.clear_registry!
     Relay.loader.reload if development?
-    paths = Dir[File.join(tools_dir, "*.rb")]
-    paths.concat Dir[File.join(home, "tools", "*.rb")]
-    paths.sort.each do
-      load(_1)
-    rescue => ex
-      warn "tool error\n"
-            "#{ex.class}: #{ex.message}\n"
-            "#{ex.backtrace.join("\n")}"
-    end
+    Relay.user_loader.reload if development?
+    Relay.user_loader.eager_load
+    Relay.loader.eager_load_dir(tools_dir)
   end
 end

data/libexec/relay/bootstrap

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+Relay.bootstrap!
 require File.join(Relay.root, "app", "init")
 warn "relay: bootstrap the database"
 Sequel.extension :migration

data/libexec/relay/configure

@@ -1,17 +1,44 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+require "llm"
 require "fileutils"
 require "io/console"
 
-PROVIDER_KEYS = {
-  "OPENAI_SECRET" => "OpenAI API key",
-  "GOOGLE_SECRET" => "Google API key",
-  "ANTHROPIC_SECRET" => "Anthropic API key",
-  "DEEPSEEK_SECRET" => "DeepSeek API key",
-  "XAI_SECRET" => "xAI API key"
-}.freeze
+PROVIDERS = [
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "OpenAI API key", key: "OPENAI_SECRET", aliases: ["OPENAI_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "Google API key", key: "GOOGLE_SECRET", aliases: ["GOOGLE_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "Anthropic API key", key: "ANTHROPIC_SECRET", aliases: ["ANTHROPIC_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "DeepSeek API key", key: "DEEPSEEK_SECRET", aliases: ["DEEPSEEK_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "xAI API key", key: "XAI_SECRET", aliases: ["XAI_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "AWS access key ID", key: "AWS_ACCESS_KEY_ID", aliases: [], secret: false),
+      LLM::Object.from(label: "AWS secret access key", key: "AWS_SECRET_ACCESS_KEY", aliases: [], secret: true)
+    ]
+  )
+].freeze
 
 ##
 # utils
@@ -36,15 +63,24 @@ end
 def prompt(label, current: nil, secret: false)
   suffix = current.to_s.empty? ? "" : " [configured]"
   print "#{label}#{suffix}: "
-  value = secret ? STDIN.noecho(&:gets).to_s.chomp : STDIN.gets.to_s.chomp
+  value = secret ? $stdin.noecho(&:gets).to_s.chomp : $stdin.gets.to_s.chomp
   puts if secret
   value.empty? ? current.to_s : value
 end
 
+def prompt_provider(env, provider)
+  provider.fields.each do |field|
+    key = field.key
+    aliases = Array(field.aliases)
+    current = env[key] || aliases.filter_map { ENV[_1] }.first || ENV[key]
+    env[key] = prompt(field.label, current:, secret: field.secret)
+  end
+end
+
 def prompt_required(label)
   loop do
     print "#{label}: "
-    value = STDIN.gets.to_s.strip
+    value = $stdin.gets.to_s.strip
     return value unless value.empty?
     warn "#{label} is required."
   end
@@ -53,10 +89,10 @@ end
 def prompt_password
   loop do
     print "Password: "
-    password = STDIN.noecho(&:gets).to_s.chomp
+    password = $stdin.noecho(&:gets).to_s.chomp
     puts
     print "Confirm password: "
-    confirm = STDIN.noecho(&:gets).to_s.chomp
+    confirm = $stdin.noecho(&:gets).to_s.chomp
     puts
     return password unless password.empty? || password != confirm
     warn "Passwords must match and cannot be empty."
@@ -66,15 +102,15 @@ end
 ##
 # main
 def main
-  unless STDIN.tty? && $stdout.tty?
+  unless $stdin.tty? && $stdout.tty?
     warn "relay configure requires an interactive terminal"
     throw(:exit, 1)
   end
   env = load_env
   puts Relay.banner
   puts "Relay configuration\n"
-  PROVIDER_KEYS.each do |key, label|
-    env[key] = prompt(label, current: env[key], secret: true)
+  PROVIDERS.each do |provider|
+    prompt_provider(env, provider)
   end
   name = prompt_required("Name")
   email = prompt_required("Email")

data/libexec/relay/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../../lib/relay"
+require File.join(Relay.root, "app", "init")
+require "irb"
+
+IRB.start(__FILE__)

data/libexec/relay/download-models

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 require File.join(Relay.root, "app", "init")
 
 warn "relay: download models"

data/libexec/relay/migrate

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+Relay.bootstrap!
 require File.join(Relay.root, "app", "init")
 Sequel.extension :migration
 Sequel::Migrator.run(Relay::DB, Relay.migrations_dir)

data/libexec/relay/setup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 
 bootstrap = File.join(Relay.root, "libexec", "relay", "bootstrap")
 configure = File.join(Relay.root, "libexec", "relay", "configure")

data/libexec/relay/start

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 require "optparse"
+require "rbconfig"
 
 DEFAULT_BIND = "http://0.0.0.0:9292"
 
@@ -22,7 +23,7 @@ def main(argv)
   option_parser(bind).parse!(argv)
   bind = argv.shift || bind
   Dir.chdir(Relay.root) do
-    exec "falcon", "serve", "--bind", bind
+    exec RbConfig.ruby, "-S", "falcon", "serve", "--bind", bind
   end
 end