htm 0.0.18 → 0.0.30

data/lib/htm/mcp/cli.rb

@@ -21,6 +21,7 @@ class HTM
             verify    Verify database connection and extensions
             stats     Show memory statistics
             config    Output default configuration to STDOUT
+            rake      Run HTM rake tasks (use -T [pattern] to list)
             version   Show HTM version
             help      Show this help message
 
@@ -107,6 +108,19 @@ class HTM
             # Start MCP server (for Claude Desktop)
             htm_mcp
 
+            # List available rake tasks
+            htm_mcp rake -T
+            htm_mcp rake --tasks
+
+            # List tasks matching a pattern
+            htm_mcp rake -T htm:jobs
+            htm_mcp rake -T db
+
+            # Run rake tasks
+            htm_mcp rake htm:db:stats
+            htm_mcp rake htm:tags:tree
+            htm_mcp rake 'htm:tags:tree[database]'
+
           CLAUDE DESKTOP CONFIGURATION:
             Add to ~/.config/claude/claude_desktop_config.json:
 
@@ -243,13 +257,13 @@ class HTM
           }
         end.sort_by { |m| m[:version] }
 
-        # Ensure ActiveRecord connection for migration check
-        HTM::ActiveRecordConfig.establish_connection!
+        # Ensure Sequel connection for migration check
+        HTM::SequelConfig.establish_connection!
 
         # Get applied migrations from database
         applied_versions = begin
-          ActiveRecord::Base.connection.select_values('SELECT version FROM schema_migrations ORDER BY version')
-        rescue ActiveRecord::StatementInvalid
+          HTM.db[:schema_migrations].select_order_map(:version)
+        rescue Sequel::DatabaseError
           []
         end
 
@@ -379,7 +393,7 @@ class HTM
         check_database_config!
 
         begin
-          HTM::ActiveRecordConfig.establish_connection!
+          HTM::SequelConfig.establish_connection!
 
           total_nodes     = HTM::Models::Node.count
           deleted_nodes   = HTM::Models::Node.deleted.count
@@ -389,9 +403,9 @@ class HTM
           total_files     = HTM::Models::FileSource.count
 
           # Get database size
-          db_size = ActiveRecord::Base.connection.execute(
+          db_size = HTM.db.fetch(
             "SELECT pg_size_pretty(pg_database_size(current_database())) AS size"
-          ).first['size']
+          ).first[:size]
 
           puts "Nodes:   #{total_nodes} active, #{deleted_nodes} deleted, #{with_embeddings} with embeddings"
           puts "Tags:    #{total_tags}"
@@ -427,6 +441,8 @@ class HTM
           run_stats
         when 'config'
           output_default_config
+        when 'rake'
+          run_rake(args[1..] || [])
         when 'server', 'stdio', nil
           # Return false to indicate server should start
           # 'stdio' is accepted for compatibility with MCP clients that pass it as an argument
@@ -468,7 +484,98 @@ class HTM
       end
 
       def command?(arg)
-        %w[help version setup init verify stats config server stdio].include?(arg.downcase)
+        %w[help version setup init verify stats config server stdio rake].include?(arg.downcase)
+      end
+
+      def run_rake(args)
+        require 'rake'
+
+        # Handle --tasks / -T to list available tasks (with optional pattern)
+        if args.empty? || args.first == '--tasks' || args.first == '-T'
+          # Check for optional pattern after -T/--tasks
+          pattern = nil
+          if args.first == '--tasks' || args.first == '-T'
+            pattern = args[1] # May be nil if no pattern provided
+          end
+          list_rake_tasks(pattern: pattern)
+          return
+        end
+
+        task_name = args.shift
+
+        # Load HTM rake tasks
+        load_htm_rake_tasks
+
+        # Check if task exists
+        unless Rake::Task.task_defined?(task_name)
+          warn "Unknown rake task: #{task_name}"
+          warn "Run 'htm_mcp rake --tasks' to see available tasks."
+          exit 1
+        end
+
+        # Set remaining args as task arguments if any
+        # Rake tasks use ARGV for arguments in brackets like task[arg1,arg2]
+        begin
+          Rake::Task[task_name].invoke
+        rescue => e
+          warn "Rake task failed: #{e.message}"
+          warn e.backtrace.first(5).join("\n") if ENV['DEBUG']
+          exit 1
+        end
+      end
+
+      def load_htm_rake_tasks
+        # Clear any existing tasks to avoid conflicts
+        Rake::TaskManager.record_task_metadata = true
+        Rake.application = Rake::Application.new
+        Rake.application.init('htm_mcp')
+
+        # Load all HTM task files
+        tasks_dir = File.expand_path('../../tasks', __dir__)
+        Dir.glob(File.join(tasks_dir, '*.rake')).sort.each do |rake_file|
+          load rake_file
+        end
+      end
+
+      def list_rake_tasks(pattern: nil)
+        load_htm_rake_tasks
+
+        # Collect tasks with descriptions, sorted by name
+        tasks = Rake.application.tasks
+          .select { |t| t.comment && t.name.start_with?('htm:') }
+          .sort_by(&:name)
+
+        # Filter by pattern if provided (matches task name)
+        if pattern
+          tasks = tasks.select { |t| t.name.include?(pattern) }
+        end
+
+        if tasks.empty?
+          if pattern
+            puts "No HTM rake tasks matching '#{pattern}'"
+          else
+            puts "No HTM rake tasks found"
+          end
+          return
+        end
+
+        if pattern
+          puts "HTM rake tasks matching '#{pattern}':"
+        else
+          puts "Available HTM rake tasks:"
+        end
+        puts
+
+        # Find max task name length for alignment
+        max_len = tasks.map { |t| t.name.length }.max || 0
+
+        tasks.each do |task|
+          printf "  %-#{max_len}s  # %s\n", task.name, task.comment
+        end
+
+        puts
+        puts "Run with: htm_mcp rake <task_name>"
+        puts "Example:  htm_mcp rake htm:db:stats"
       end
     end
   end

data/lib/htm/mcp/resources.rb

@@ -51,7 +51,7 @@ class HTM
       mime_type "text/plain"
 
       def content
-        HTM::Models::Tag.all.tree_string
+        HTM::Models::Tag.tree_string
       end
     end
 
@@ -62,9 +62,10 @@ class HTM
       mime_type     "application/json"
 
       def content
-        recent = HTM::Models::Node.includes(:tags)
-                                  .order(created_at: :desc)
+        recent = HTM::Models::Node.eager(:tags)
+                                  .order(Sequel.desc(:created_at))
                                   .limit(20)
+                                  .all
                                   .map do |node|
           {
             id:         node.id,

data/lib/htm/mcp/server.rb

@@ -37,9 +37,9 @@ class HTM
       end
 
       def verify_database_connection!
-        HTM::ActiveRecordConfig.establish_connection!
+        HTM::SequelConfig.establish_connection!
         # Quick connectivity test
-        ActiveRecord::Base.connection.execute("SELECT 1")
+        HTM.db.execute("SELECT 1")
       rescue => e
         warn "Error: Cannot connect to database."
         warn e.message
@@ -70,8 +70,9 @@ class HTM
 
       def configure_htm!
         HTM.configure do |config|
-          config.job.backend = :inline  # Synchronous for MCP responses
-          config.logger = @silent_logger    # Silent logging for MCP
+          # Job backend now comes from config (defaults to :fiber)
+          # Use HTM_JOB__BACKEND=inline or config file to override
+          config.logger = @silent_logger  # Silent logging for MCP
         end
       end
 

data/lib/htm/mcp/tools.rb

@@ -45,7 +45,7 @@ class HTM
         Session.logger&.info "SetRobotTool called: name=#{name.inspect}"
 
         htm   = Session.set_robot(name)
-        robot = HTM::Models::Robot.find(htm.robot_id)
+        robot = HTM::Models::Robot[htm.robot_id]
 
         {
           success:    true,
@@ -68,7 +68,7 @@ class HTM
         Session.logger&.info "GetRobotTool called"
 
         htm   = Session.htm_instance
-        robot = HTM::Models::Robot.find(htm.robot_id)
+        robot = HTM::Models::Robot[htm.robot_id]
 
         {
           success:        true,
@@ -89,26 +89,27 @@ class HTM
 
       def call
         htm = Session.htm_instance
-        robot = HTM::Models::Robot.find(htm.robot_id)
+        robot = HTM::Models::Robot[htm.robot_id]
         Session.logger&.info "GetWorkingMemoryTool called for robot=#{htm.robot_name}"
 
         # Get all nodes in working memory with their metadata
-        # Filter out any robot_nodes where the node has been deleted (node uses default_scope)
-        working_memory_nodes = robot.robot_nodes
+        # Filter out any robot_nodes where the node has been deleted
+        working_memory_nodes = robot.robot_nodes_dataset
                                     .in_working_memory
-                                    .joins(:node)  # Inner join excludes deleted nodes
-                                    .includes(node: :tags)
-                                    .order(last_remembered_at: :desc)
+                                    .eager(node: :tags)
+                                    .order(Sequel.desc(:last_remembered_at))
+                                    .all
                                     .filter_map do |rn|
-          next unless rn.node  # Extra safety check
+          node = rn.node
+          next unless node  # Exclude if node is nil (was deleted)
 
           {
-            id: rn.node.id,
-            content:            rn.node.content,
-            tags:               rn.node.tags.map(&:name),
+            id:                 node.id,
+            content:            node.content,
+            tags:               node.tags.map(&:name),
             remember_count:     rn.remember_count,
             last_remembered_at: rn.last_remembered_at&.iso8601,
-            created_at:         rn.node.created_at.iso8601
+            created_at:         node.created_at.iso8601
           }
         end
 
@@ -142,7 +143,7 @@ class HTM
 
         htm = Session.htm_instance
         node_id = htm.remember(content, tags: tags, metadata: metadata)
-        node = HTM::Models::Node.includes(:tags).find(node_id)
+        node = HTM::Models::Node.eager(:tags).first!(id: node_id)
 
         Session.logger&.info "Memory stored: node_id=#{node_id}, robot=#{htm.robot_name}, tags=#{node.tags.map(&:name)}"
 
@@ -187,7 +188,8 @@ class HTM
         memories = htm.recall(query, **recall_opts)
 
         results = memories.map do |memory|
-          node = HTM::Models::Node.includes(:tags).find(memory['id'])
+          node = HTM::Models::Node.eager(:tags).first(id: memory['id'])
+          next unless node
           {
             id:         memory['id'],
             content:    memory['content'],
@@ -195,7 +197,7 @@ class HTM
             created_at: memory['created_at'],
             score:      memory['combined_score'] || memory['similarity']
           }
-        end
+        end.compact
 
         Session.logger&.info "Recall complete: found #{results.length} memories"
 
@@ -212,13 +214,17 @@ class HTM
       private
 
       def parse_timeframe(timeframe)
+        now = Time.now
         case timeframe.downcase
         when 'today'
-          Time.now.beginning_of_day..Time.now
+          # Beginning of today
+          Time.new(now.year, now.month, now.day)..now
         when 'this week'
-          1.week.ago..Time.now
+          # 7 days ago
+          (now - 7 * 24 * 60 * 60)..now
         when 'this month'
-          1.month.ago..Time.now
+          # 30 days ago
+          (now - 30 * 24 * 60 * 60)..now
         else
           # Try to parse as ISO8601 range (start..end)
           if timeframe.include?('..')
@@ -226,7 +232,7 @@ class HTM
             Time.parse(parts[0])..Time.parse(parts[1])
           else
             # Single date - from that date to now
-            Time.parse(timeframe)..Time.now
+            Time.parse(timeframe)..now
           end
         end
       rescue ArgumentError
@@ -256,7 +262,7 @@ class HTM
           robot_name: htm.robot_name,
           message:    "Memory soft-deleted. Use restore to recover."
         }.to_json
-      rescue HTM::NotFoundError, ActiveRecord::RecordNotFound
+      rescue HTM::NotFoundError, Sequel::NoMatchingRow
         Session.logger&.warn "ForgetTool failed: node #{node_id} not found"
         {
           success: false,
@@ -287,7 +293,7 @@ class HTM
           robot_name: htm.robot_name,
           message:    "Memory restored successfully"
         }.to_json
-      rescue HTM::NotFoundError, ActiveRecord::RecordNotFound
+      rescue HTM::NotFoundError, Sequel::NoMatchingRow
         Session.logger&.warn "RestoreTool failed: node #{node_id} not found"
         {
           success: false,
@@ -308,7 +314,7 @@ class HTM
         Session.logger&.info "ListTagsTool called: prefix=#{prefix.inspect}"
 
         tags_query = HTM::Models::Tag.order(:name)
-        tags_query = tags_query.where("name LIKE ?", "#{prefix}%") if prefix
+        tags_query = tags_query.where(Sequel.like(:name, "#{prefix}%")) if prefix
 
         tags = tags_query.map do |tag|
           {
@@ -348,7 +354,7 @@ class HTM
 
         # Enrich with node counts
         tags = results.map do |result|
-          tag = HTM::Models::Tag.find_by(name: result[:name])
+          tag = HTM::Models::Tag.first(name: result[:name])
           {
             name: result[:name],
             similarity: result[:similarity].round(3),
@@ -396,7 +402,7 @@ class HTM
 
         # Enrich with tags
         results = nodes.map do |node_attrs|
-          node = HTM::Models::Node.includes(:tags).find_by(id: node_attrs['id'])
+          node = HTM::Models::Node.eager(:tags).first(id: node_attrs['id'])
           next unless node
 
           {
@@ -429,14 +435,17 @@ class HTM
 
       def call
         htm = Session.htm_instance
-        robot = HTM::Models::Robot.find(htm.robot_id)
+        robot = HTM::Models::Robot[htm.robot_id]
         Session.logger&.info "StatsTool called for robot=#{htm.robot_name}"
 
-        # Note: Node uses default_scope to exclude deleted, so .count returns active nodes
+        # Note: Node uses set_dataset to exclude deleted, so .count returns active nodes
         total_nodes           = HTM::Models::Node.count
         deleted_nodes         = HTM::Models::Node.deleted.count
         nodes_with_embeddings = HTM::Models::Node.with_embeddings.count
-        nodes_with_tags       = HTM::Models::Node.joins(:tags).distinct.count
+        nodes_with_tags       = HTM::Models::Node
+                                  .join(:node_tags, node_id: :id)
+                                  .distinct
+                                  .count
         total_tags            = HTM::Models::Tag.count
         total_robots          = HTM::Models::Robot.count
 

data/lib/htm/migration.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+class HTM
+  # Base class for Sequel migrations
+  #
+  # Provides a simple interface for writing migrations compatible with
+  # HTM's migration runner.
+  #
+  # @example
+  #   class CreateUsers < HTM::Migration
+  #     def up
+  #       create_table(:users) do
+  #         primary_key :id
+  #         String :name, null: false
+  #         DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+  #       end
+  #     end
+  #
+  #     def down
+  #       drop_table(:users)
+  #     end
+  #   end
+  #
+  class Migration
+    attr_reader :db
+
+    def initialize(db)
+      @db = db
+    end
+
+    # Override in subclass
+    def up
+      raise NotImplementedError, "#{self.class}#up must be implemented"
+    end
+
+    # Override in subclass (optional for irreversible migrations)
+    def down
+      raise NotImplementedError, "#{self.class}#down must be implemented"
+    end
+
+    private
+
+    # Delegate common methods to db
+    def create_table(name, **options, &block)
+      db.create_table(name, **options, &block)
+    end
+
+    def drop_table(name, **options)
+      db.drop_table(name, **options)
+    end
+
+    def alter_table(name, &block)
+      db.alter_table(name, &block)
+    end
+
+    def add_index(table, columns, **options)
+      db.add_index(table, columns, **options)
+    end
+
+    def drop_index(table, columns, **options)
+      db.drop_index(table, columns, **options)
+    end
+
+    def run(sql)
+      db.run(sql)
+    end
+
+    def execute(sql)
+      db.run(sql)
+    end
+  end
+end

data/lib/htm/models/file_source.rb

@@ -7,42 +7,44 @@ class HTM
     # Represents a file that has been loaded into HTM with its metadata.
     # Each file can have multiple associated nodes (chunks).
     #
-    # @example Find source by path
-    #   source = FileSource.by_path('/path/to/doc.md').first
-    #   source.chunks  # => [Node, Node, ...]
-    #
-    # @example Check if re-sync needed
-    #   current_mtime = File.mtime('/path/to/doc.md')
-    #   source.needs_sync?(current_mtime)  # => true/false
-    #
-    class FileSource < ActiveRecord::Base
-      self.table_name = 'file_sources'
-
+    class FileSource < Sequel::Model(:file_sources)
       # Tolerance for mtime comparison to avoid false positives from
       # precision differences between filesystem and database timestamps
       DELTA_TIME = 5  # seconds
 
       # Associations
-      has_many :nodes, class_name: 'HTM::Models::Node',
-               foreign_key: :source_id, dependent: :nullify
+      one_to_many :nodes, class: 'HTM::Models::Node', key: :source_id
+
+      # Plugins
+      plugin :validation_helpers
+      plugin :timestamps, update_on_create: true
 
       # Validations
-      validates :file_path, presence: true, uniqueness: true
+      def validate
+        super
+        validates_presence :file_path
+        validates_unique :file_path
+      end
 
-      # Scopes
-      scope :by_path, ->(path) { where(file_path: File.expand_path(path)) }
-      scope :stale, -> { where('mtime < last_synced_at') }
-      scope :recently_synced, -> { order(last_synced_at: :desc) }
+      # Dataset methods (scopes)
+      dataset_module do
+        def by_path(path)
+          where(file_path: File.expand_path(path))
+        end
+
+        def stale
+          where(Sequel.lit('mtime < last_synced_at'))
+        end
+
+        def recently_synced
+          order(Sequel.desc(:last_synced_at))
+        end
+      end
 
       # Check if file needs re-sync based on mtime
       #
-      # Uses DELTA_TIME tolerance to avoid false positives from:
-      # - Nanosecond/microsecond precision differences (filesystem vs PostgreSQL)
-      # - Floating-point rounding errors
-      # - Minor timestamp discrepancies across systems
-      #
-      # @param current_mtime [Time, nil] Current file modification time (defaults to reading from filesystem)
-      # @return [Boolean] true if file modification time differs by more than DELTA_TIME, or file doesn't exist
+      # @param current_mtime [Time, nil] Current file modification time
+      # @return [Boolean] true if file needs re-sync
       #
       def needs_sync?(current_mtime = nil)
         return true if mtime.nil?
@@ -54,10 +56,18 @@ class HTM
 
       # Get ordered chunks from this file
       #
-      # @return [ActiveRecord::Relation] Nodes ordered by chunk_position
+      # @return [Array<Node>] Nodes ordered by chunk_position
       #
       def chunks
-        nodes.order(:chunk_position)
+        nodes_dataset.order(:chunk_position).all
+      end
+
+      # Alias for nodes_dataset - used for consistency with "chunks" terminology
+      #
+      # @return [Sequel::Dataset] Dataset of nodes from this file
+      #
+      def chunks_dataset
+        nodes_dataset
       end
 
       # Extract tags from frontmatter
@@ -65,7 +75,7 @@ class HTM
       # @return [Array<String>] Tag names from frontmatter 'tags' field
       #
       def frontmatter_tags
-        return [] unless frontmatter.is_a?(Hash)
+        return [] unless frontmatter_hash?
 
         tags = frontmatter['tags'] || frontmatter[:tags] || []
         Array(tags).map(&:to_s)
@@ -76,7 +86,7 @@ class HTM
       # @return [String, nil] Title from frontmatter
       #
       def title
-        return nil unless frontmatter.is_a?(Hash)
+        return nil unless frontmatter_hash?
         frontmatter['title'] || frontmatter[:title]
       end
 
@@ -85,7 +95,7 @@ class HTM
       # @return [String, nil] Author from frontmatter
       #
       def author
-        return nil unless frontmatter.is_a?(Hash)
+        return nil unless frontmatter_hash?
         frontmatter['author'] || frontmatter[:author]
       end
 
@@ -94,7 +104,18 @@ class HTM
       # @return [Integer] Number of chunks soft-deleted
       #
       def soft_delete_chunks!
-        nodes.update_all(deleted_at: Time.current)
+        nodes_dataset.update(deleted_at: Time.now)
+      end
+
+      private
+
+      # Check if frontmatter is a hash-like object
+      # Sequel::Postgres::JSONBHash doesn't inherit from Hash but acts like one
+      #
+      # @return [Boolean]
+      #
+      def frontmatter_hash?
+        frontmatter.respond_to?(:[]) && frontmatter.respond_to?(:key?)
       end
     end
   end