activematrix 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763fcbfe5b98eb8dcddb9e512f782ce3c8ff994f2581e0b5a18767a52e109515
-  data.tar.gz: cf71a8ec3f33ea722e6c3b0217e05585d2c70b07816875f602ad1bf74f054cc8
+  metadata.gz: bd316a48de85336049741c73b39c6876ac20b5366f4e680d4507cafe734c8300
+  data.tar.gz: 6a80ba9a3dc0096f2a0ce9634def8f0b74f8763819f021bbca32fb875e8b3ff1
 SHA512:
-  metadata.gz: e6e3925d13d2708cd4b6e7e1280a3c1bfc275ad8accb353f37b7f9ea73e4886e7d69622c52bd984d307f592cdbd93482707892f5a7e64deed369296ef3b91be2
-  data.tar.gz: c61243b17caafb3a3752b1381526ebba8995b0b6033bbc1e84584b4785cc4dcc5acb59bc5a5352ee725380721fc50fbe15ab4b1bfd69f2f2e764a61c627d9d89
+  metadata.gz: 305ffacaf0e9830f9c84c77d69c12ea8548831a0d03095650bb4a25a0de7322f4b2f5565b18c4cf04b65f0f43b9b7ef08a88d4a3e56ccd98da66e3bdae6130a3
+  data.tar.gz: 5e6005ff8af8e50e5b0865a9b0757372d6cfe3ea197db1fea13005f07d35068fb524183864ae4ac4ea8b8f43391d4a98cb1f0bcb3bcc255fad889bfc89eed9fd

data/app/models/active_matrix/agent.rb

@@ -43,12 +43,14 @@ module ActiveMatrix
     has_many :agent_stores, class_name: 'ActiveMatrix::AgentStore', dependent: :destroy
     has_many :chat_sessions, class_name: 'ActiveMatrix::ChatSession', dependent: :destroy
 
+    # Encrypt access_token for user-uploaded credentials
+    encrypts :access_token, deterministic: true
+
     # Validations
     validates :name, presence: true, uniqueness: true
-    validates :homeserver, presence: true
-    validates :username, presence: true
     validates :bot_class, presence: true
     validate :valid_bot_class?
+    validate :valid_connection_config?
 
     # Scopes
     scope :active, -> { where.not(state: %i[offline error]) }
@@ -109,12 +111,26 @@ module ActiveMatrix
       @bot_instance ||= bot_class.constantize.new(client) if running?
     end
 
+    # Returns a Matrix client using resolved connection config
+    # Resolution order:
+    #   1. matrix_connection → lookup from config/active_matrix.yml
+    #   2. Inline credentials (homeserver, access_token) → user-uploaded bots
     def client
-      @client ||= if access_token.present?
-                    ActiveMatrix::Client.new(homeserver, access_token: access_token)
-                  else
-                    ActiveMatrix::Client.new(homeserver)
-                  end
+      @client ||= build_client
+    end
+
+    # Returns the resolved connection configuration
+    # @return [Hash] with :homeserver_url and :access_token keys
+    def connection_config
+      if matrix_connection.present?
+        ActiveMatrix.connection(matrix_connection)
+      else
+        {
+          homeserver_url: homeserver,
+          access_token: access_token,
+          username: username
+        }.compact
+      end
     end
 
     def running?
@@ -162,5 +178,35 @@ module ActiveMatrix
         errors.add(:bot_class, 'must be a valid class name')
       end
     end
+
+    def valid_connection_config?
+      if matrix_connection.present?
+        # Validate connection exists in YAML
+        errors.add(:matrix_connection, "connection '#{matrix_connection}' not found in config/active_matrix.yml") unless ActiveMatrix.connection_exists?(matrix_connection)
+      elsif homeserver.blank?
+        # Require inline credentials when no matrix_connection
+        errors.add(:homeserver, "can't be blank without matrix_connection")
+      end
+    end
+
+    def build_client
+      config = connection_config
+      homeserver_url = config[:homeserver_url] || config[:homeserver]
+
+      client = ActiveMatrix::Client.new(
+        homeserver_url,
+        client_cache: :some,
+        sync_filter_limit: config[:sync_filter_limit] || 20
+      )
+
+      # Authenticate
+      if config[:access_token].present?
+        client.access_token = config[:access_token]
+      elsif config[:username].present? && encrypted_password.present?
+        client.login(config[:username], BCrypt::Password.new(encrypted_password).to_s, no_sync: true)
+      end
+
+      client
+    end
   end
 end

data/db/migrate/20251201000000_create_active_matrix_tables.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+# PostgreSQL 18+ required for UUIDv7 and other features
+class CreateActiveMatrixTables < ActiveRecord::Migration[8.0]
+  def change
+    # Enable UUID extension
+    enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
+
+    # Agents table - main agent records with state machine
+    # Uses UUIDv7 for timestamp-sortable primary keys (PG18 feature)
+    create_table :active_matrix_agents, id: :uuid, default: -> { 'uuidv7()' } do |t|
+      t.string :name, null: false, index: { unique: true }
+      t.string :homeserver, null: false
+      t.string :username, null: false
+      t.string :bot_class, null: false
+      t.string :state, default: 'offline', null: false
+      t.string :access_token
+      t.string :encrypted_password
+      t.jsonb :settings, default: {} # JSONB for better indexing/querying
+      t.string :last_sync_token
+      t.datetime :last_active_at
+      t.integer :messages_handled, default: 0, null: false
+      t.timestamps
+    end
+
+    add_index :active_matrix_agents, :state
+    add_index :active_matrix_agents, :homeserver
+    add_index :active_matrix_agents, :settings, using: :gin # GIN index for JSONB queries
+
+    # Agent Store table - per-agent key-value storage
+    create_table :active_matrix_agent_stores, id: :uuid, default: -> { 'uuidv7()' } do |t|
+      t.references :agent, null: false, foreign_key: { to_table: :active_matrix_agents }, type: :uuid
+      t.string :key, null: false
+      t.jsonb :value, default: {}
+      t.datetime :expires_at
+      t.timestamps
+    end
+
+    add_index :active_matrix_agent_stores, %i[agent_id key], unique: true
+    add_index :active_matrix_agent_stores, :expires_at, where: 'expires_at IS NOT NULL'
+
+    # Chat Session table - per-user/room conversation state
+    create_table :active_matrix_chat_sessions, id: :uuid, default: -> { 'uuidv7()' } do |t|
+      t.references :agent, null: false, foreign_key: { to_table: :active_matrix_agents }, type: :uuid
+      t.string :user_id, null: false
+      t.string :room_id, null: false
+      t.jsonb :context, default: {}
+      t.jsonb :message_history, default: { 'messages' => [] }
+      t.datetime :last_message_at
+      t.integer :message_count, default: 0, null: false
+      t.timestamps
+    end
+
+    add_index :active_matrix_chat_sessions, %i[agent_id user_id room_id],
+              unique: true, name: 'index_chat_sessions_on_agent_user_room'
+    add_index :active_matrix_chat_sessions, :last_message_at
+    add_index :active_matrix_chat_sessions, :room_id
+
+    # Knowledge Base table - shared storage across all agents
+    create_table :active_matrix_knowledge_bases, id: :uuid, default: -> { 'uuidv7()' } do |t|
+      t.string :key, null: false, index: { unique: true }
+      t.jsonb :value, default: {}
+      t.string :category
+      t.datetime :expires_at
+      t.boolean :public_read, default: true, null: false
+      t.boolean :public_write, default: false, null: false
+      t.timestamps
+    end
+
+    add_index :active_matrix_knowledge_bases, :category
+    add_index :active_matrix_knowledge_bases, :expires_at, where: 'expires_at IS NOT NULL'
+  end
+end

data/db/migrate/20251229000000_add_matrix_connection_to_agents.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddMatrixConnectionToAgents < ActiveRecord::Migration[8.0]
+  def change
+    # Add matrix_connection to reference YAML-configured connections
+    # When set, credentials come from config/active_matrix.yml
+    # When nil, uses inline homeserver/access_token columns (for user-uploaded bots)
+    add_column :active_matrix_agents, :matrix_connection, :string
+
+    # Make credential columns nullable - they're optional when using matrix_connection
+    change_column_null :active_matrix_agents, :homeserver, true
+    change_column_null :active_matrix_agents, :username, true
+
+    add_index :active_matrix_agents, :matrix_connection
+  end
+end

data/lib/active_matrix/connection_registry.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'erb'
+require 'singleton'
+
+module ActiveMatrix
+  # Registry for named Matrix connections loaded from config/active_matrix.yml
+  #
+  # Connections are defined in YAML with ERB support for secrets:
+  #
+  #   primary:
+  #     homeserver_url: <%= ENV['MATRIX_HOMESERVER_URL'] %>
+  #     access_token: <%= ENV['MATRIX_ACCESS_TOKEN'] %>
+  #
+  # Usage:
+  #   ActiveMatrix.connection(:primary)  # Returns connection config hash
+  #   ActiveMatrix.client(:primary)      # Returns authenticated Client
+  #
+  class ConnectionRegistry
+    include Singleton
+
+    class ConnectionNotFound < StandardError; end
+
+    def initialize
+      @connections = {}
+      @clients = {}
+      @mutex = Mutex.new
+    end
+
+    # Load connections from YAML file
+    # @param path [String, Pathname] path to YAML config file
+    def load!(path)
+      @mutex.synchronize do
+        @connections = load_yaml(path)
+        @clients.clear # Clear cached clients when config reloads
+      end
+    end
+
+    # Get connection configuration by name
+    # @param name [Symbol, String] connection name (default: :primary)
+    # @return [Hash] connection configuration
+    # @raise [ConnectionNotFound] if connection doesn't exist
+    def connection(name = :primary)
+      name = name.to_s
+      config = @connections[name]
+      raise ConnectionNotFound, "Connection '#{name}' not found in config/active_matrix.yml" unless config
+
+      config.symbolize_keys
+    end
+
+    # Get or create a client for a named connection
+    # @param name [Symbol, String] connection name (default: :primary)
+    # @return [ActiveMatrix::Client] authenticated client
+    def client(name = :primary)
+      name = name.to_s
+
+      @mutex.synchronize do
+        @clients[name] ||= build_client(name)
+      end
+    end
+
+    # Check if a connection exists
+    # @param name [Symbol, String] connection name
+    # @return [Boolean]
+    def connection_exists?(name)
+      @connections.key?(name.to_s)
+    end
+
+    # List all available connection names
+    # @return [Array<String>]
+    def connection_names
+      @connections.keys - ['default']
+    end
+
+    # Clear all cached clients (useful for testing)
+    def clear_clients!
+      @mutex.synchronize do
+        @clients.each_value do |client|
+          client.logout if client.logged_in?
+        rescue StandardError
+          # Ignore cleanup errors
+        end
+        @clients.clear
+      end
+    end
+
+    # Reload configuration from file
+    # @param path [String, Pathname] path to YAML config file
+    def reload!(path = nil)
+      path ||= default_config_path
+      clear_clients!
+      load!(path)
+    end
+
+    private
+
+    def load_yaml(path)
+      return {} unless File.exist?(path)
+
+      yaml_content = File.read(path)
+      erb_result = ERB.new(yaml_content).result
+      config = YAML.safe_load(erb_result, permitted_classes: [], permitted_symbols: [], aliases: true) || {}
+
+      # Filter out 'default' key which is just for YAML anchors
+      config.except('default')
+    end
+
+    def build_client(name)
+      config = connection(name)
+
+      raise ConnectionNotFound, "Connection '#{name}' missing homeserver_url" unless config[:homeserver_url]
+
+      client = ActiveMatrix::Client.new(
+        config[:homeserver_url],
+        client_cache: :some,
+        sync_filter_limit: config[:sync_filter_limit] || 20
+      )
+
+      # Authenticate if access_token provided
+      if config[:access_token]
+        client.access_token = config[:access_token]
+      elsif config[:username] && config[:password]
+        client.login(config[:username], config[:password], no_sync: true)
+      end
+
+      client
+    end
+
+    def default_config_path
+      return Rails.root.join('config/active_matrix.yml') if defined?(Rails)
+
+      File.join(Dir.pwd, 'config', 'active_matrix.yml')
+    end
+  end
+end

data/lib/active_matrix/railtie.rb

@@ -4,17 +4,22 @@ require 'rails/railtie'
 
 module ActiveMatrix
   class Railtie < Rails::Railtie
-    Rails.logger.debug 'ActiveMatrix::Railtie: Loading...'
-
-    initializer 'activematrix.configure_rails_initialization' do
+    initializer 'active_matrix.configure_rails_initialization' do
       Rails.logger.debug 'ActiveMatrix::Railtie: Initializer running'
-      # Configure Rails.logger as the default logger
       ActiveMatrix.logger = Rails.logger
-      Rails.logger.debug 'ActiveMatrix::Railtie: Logger configured'
+    end
+
+    # Load connection config after application initializers run
+    # This ensures user's initializer can set config.default_connection
+    config.after_initialize do
+      config_path = Rails.root.join('config/active_matrix.yml')
 
-      # Debug autoload paths
-      Rails.logger.debug { "ActiveMatrix::Railtie: Autoload paths = #{Rails.application.config.autoload_paths}" }
-      Rails.logger.debug { "ActiveMatrix::Railtie: Eager load paths = #{Rails.application.config.eager_load_paths}" }
+      if File.exist?(config_path)
+        Rails.logger.debug 'ActiveMatrix::Railtie: Loading connection config'
+        ActiveMatrix::ConnectionRegistry.instance.load!(config_path)
+      else
+        Rails.logger.debug 'ActiveMatrix::Railtie: No config/active_matrix.yml found'
+      end
     end
   end
 end

data/lib/active_matrix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveMatrix
-  VERSION = '0.0.9'
+  VERSION = '0.0.11'
 end

data/lib/active_matrix.rb

@@ -78,6 +78,36 @@ module ActiveMatrix
     def global_logger?
       instance_variable_defined?(:@logger)
     end
+
+    # Get a client for a named connection
+    # @param name [Symbol, String] connection name (default: :primary)
+    # @return [ActiveMatrix::Client] authenticated client
+    # @example
+    #   ActiveMatrix.client.send_message(room_id, message)
+    #   ActiveMatrix.client(:notifications).send_notice(room_id, notice)
+    def client(name = :primary)
+      ConnectionRegistry.instance.client(name)
+    end
+
+    # Get connection configuration by name
+    # @param name [Symbol, String] connection name (default: :primary)
+    # @return [Hash] connection configuration
+    def connection(name = :primary)
+      ConnectionRegistry.instance.connection(name)
+    end
+
+    # Check if a connection exists
+    # @param name [Symbol, String] connection name
+    # @return [Boolean]
+    def connection_exists?(name)
+      ConnectionRegistry.instance.connection_exists?(name)
+    end
+
+    # List all available connection names
+    # @return [Array<String>]
+    def connection_names
+      ConnectionRegistry.instance.connection_names
+    end
   end
 
   # Set up Zeitwerk loader

data/lib/generators/active_matrix/bot/bot_generator.rb

@@ -11,28 +11,38 @@ module ActiveMatrix
 
       argument :commands, type: :array, default: [], banner: 'command1 command2'
 
+      check_class_collision suffix: 'Bot'
+
       def create_bot_file
         template 'bot.rb.erb', "app/bots/#{file_name}_bot.rb"
       end
 
-      def create_bot_spec
-        template 'bot_spec.rb.erb', "spec/bots/#{file_name}_bot_spec.rb"
+      def create_bot_test
+        template 'bot_test.rb.erb', "test/bots/#{file_name}_bot_test.rb"
       end
 
       def display_usage
         say "\nBot created! To use your bot:\n\n"
         say '1. Create an agent in Rails console:'
-        say '   agent = MatrixAgent.create!('
-        say "     name: '#{file_name}',"
-        say "     homeserver: 'https://matrix.org',"
-        say "     username: 'your_bot_username',"
-        say "     password: 'your_bot_password',"
+        say '   agent = ActiveMatrix::Agent.create!('
+        say "     name: '#{file_name.dasherize}',"
+        say "     matrix_connection: 'primary',"
         say "     bot_class: '#{class_name}Bot'"
         say '   )'
-        say "\n2. Start the agent:"
-        say '   ActiveMatrix::AgentManager.instance.start_agent(agent)'
+        say "\n2. Start the daemon:"
+        say '   bundle exec activematrix start'
         say "\n"
       end
+
+      private
+
+      def file_name
+        @_file_name ||= remove_possible_suffix(super)
+      end
+
+      def remove_possible_suffix(name)
+        name.sub(/_?bot$/i, '')
+      end
     end
   end
 end

data/lib/generators/active_matrix/bot/templates/bot_test.rb.erb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class <%= class_name %>BotTest < ActiveSupport::TestCase
+  setup do
+    @agent = ActiveMatrix::Agent.create!(
+      name: '<%= file_name %>_test',
+      homeserver: 'https://matrix.example.com',
+      username: 'test_bot',
+      bot_class: '<%= class_name %>Bot'
+    )
+  end
+
+  test 'bot class is valid' do
+    assert_equal '<%= class_name %>Bot', @agent.bot_class
+    assert @agent.valid?
+  end
+<% if commands.any? %>
+<% commands.each do |command| %>
+  test '<%= command %> command is defined' do
+    bot_class = @agent.bot_class.constantize
+    assert bot_class.commands.key?(:<%= command %>)
+  end
+<% end %>
+<% else %>
+  test 'hello command is defined' do
+    bot_class = @agent.bot_class.constantize
+    assert bot_class.commands.key?(:hello)
+  end
+
+  test 'broadcast command is defined' do
+    bot_class = @agent.bot_class.constantize
+    assert bot_class.commands.key?(:broadcast)
+  end
+<% end %>
+end

data/lib/generators/active_matrix/install/install_generator.rb

@@ -7,12 +7,16 @@ module ActiveMatrix
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
 
-      desc 'Installs ActiveMatrix initializer and copies migrations'
+      desc 'Installs ActiveMatrix configuration and copies migrations'
 
       def copy_migrations
         rails_command 'active_matrix:install:migrations', inline: true
       end
 
+      def create_connection_config
+        template 'active_matrix.yml', 'config/active_matrix.yml'
+      end
+
       def create_initializer
         template 'active_matrix.rb', 'config/initializers/active_matrix.rb'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activematrix
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -420,6 +420,8 @@ files:
 - app/models/active_matrix/application_record.rb
 - app/models/active_matrix/chat_session.rb
 - app/models/active_matrix/knowledge_base.rb
+- db/migrate/20251201000000_create_active_matrix_tables.rb
+- db/migrate/20251229000000_add_matrix_connection_to_agents.rb
 - exe/activematrix
 - lib/active_matrix.rb
 - lib/active_matrix/account_data_cache.rb
@@ -436,6 +438,7 @@ files:
 - lib/active_matrix/cli.rb
 - lib/active_matrix/client.rb
 - lib/active_matrix/client_pool.rb
+- lib/active_matrix/connection_registry.rb
 - lib/active_matrix/daemon.rb
 - lib/active_matrix/daemon/probe_server.rb
 - lib/active_matrix/daemon/signal_handler.rb
@@ -473,7 +476,7 @@ files:
 - lib/activematrix.rb
 - lib/generators/active_matrix/bot/bot_generator.rb
 - lib/generators/active_matrix/bot/templates/bot.rb.erb
-- lib/generators/active_matrix/bot/templates/bot_spec.rb.erb
+- lib/generators/active_matrix/bot/templates/bot_test.rb.erb
 - lib/generators/active_matrix/install/install_generator.rb
 - lib/generators/active_matrix/install/templates/README
 - lib/generators/active_matrix/install/templates/active_matrix.rb

data/lib/generators/active_matrix/bot/templates/bot_spec.rb.erb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe <%= class_name %>Bot do
-  let(:agent) do
-    MatrixAgent.create!(
-      name: '<%= file_name %>_test',
-      homeserver: 'https://matrix.example.com',
-      username: 'test_bot',
-      password: 'password',
-      bot_class: '<%= class_name %>Bot'
-    )
-  end
-  
-  let(:client) { instance_double(ActiveMatrix::Client) }
-  let(:room) { instance_double(ActiveMatrix::Room) }
-  let(:bot) { described_class.new(agent) }
-  
-  before do
-    allow(agent).to receive(:client).and_return(client)
-    allow(client).to receive(:mxid).and_return('@test_bot:example.com')
-    allow(bot).to receive(:room).and_return(room)
-  end
-  
-  <% if commands.any? %>
-  <% commands.each do |command| %>
-  describe '#<%= command %>' do
-    it 'responds to the <%= command %> command' do
-      expect(room).to receive(:send_notice).twice
-      bot.send(:<%= command %>)
-    end
-  end
-  
-  <% end %>
-  <% else %>
-  describe '#hello' do
-    it 'responds with a greeting' do
-      expect(room).to receive(:send_notice).with('Hello there!')
-      bot.hello
-    end
-    
-    it 'greets by name when provided' do
-      expect(room).to receive(:send_notice).with('Hello, Alice!')
-      bot.hello('Alice')
-    end
-  end
-  <% end %>
-  
-  describe 'inter-agent communication' do
-    let(:other_bot) { instance_double(ActiveMatrix::Bot::MultiInstanceBase, agent_name: 'other_bot') }
-    
-    it 'responds to ping messages' do
-      expect(bot).to receive(:send_to_agent).with('other_bot', hash_including(type: 'pong'))
-      bot.receive_message({ type: 'ping' }, from: other_bot)
-    end
-  end
-  
-  describe 'memory access' do
-    it 'has access to agent memory' do
-      expect(bot.memory).to be_a(ActiveMatrix::Memory::AgentMemory)
-    end
-    
-    it 'has access to global memory' do
-      expect(bot.global_memory).to be_a(ActiveMatrix::Memory::GlobalMemory)
-    end
-  end
-end