rails_console_ai 0.30.0 → 0.32.0

data/lib/rails_console_ai.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 require 'rails_console_ai/version'
 require 'rails_console_ai/configuration'
 
@@ -57,8 +59,17 @@ module RailsConsoleAi
 
     # Enqueue an agent run. Returns the Integer session id immediately;
     # the actual work is picked up by `rake rails_console_ai:agents`.
-    def run_agent(query, name: nil, user_name: nil)
+    #
+    # use_thinking_model:     run on the configured thinking-tier model
+    # max_wall_clock_seconds: hard kill the run after N seconds (nil = no cap)
+    def run_agent(query, name: nil, user_name: nil,
+                  use_thinking_model: false,
+                  max_wall_clock_seconds: 600)
       require 'rails_console_ai/session_logger'
+      options = {
+        'use_thinking_model'     => !!use_thinking_model,
+        'max_wall_clock_seconds' => max_wall_clock_seconds
+      }
       id = SessionLogger.log(
         query: query,
         conversation: [],
@@ -66,7 +77,8 @@ module RailsConsoleAi
         name: name,
         user_name: user_name,
         status: 'queued',
-        executed: false
+        executed: false,
+        options: options
       )
       raise 'Failed to enqueue agent run (session logging disabled or table missing)' unless id
       id
@@ -74,7 +86,7 @@ module RailsConsoleAi
 
     # Returns the current status string for an enqueued agent run, or nil
     # if the session id is not found. Status is one of:
-    # 'queued' | 'running' | 'ready' | 'failed'.
+    # 'queued' | 'running' | 'ready' | 'failed' | 'aborted'.
     def check_agent(session_id)
       Session.where(id: session_id).pluck(:status).first
     end
@@ -88,6 +100,16 @@ module RailsConsoleAi
       { status: row.status, result: row.result, error: row.error_message }
     end
 
+    # Abort a queued or running agent run. Returns true if the run was
+    # aborted, false if it had already finished (or doesn't exist).
+    # Queued runs are never picked up; a run already executing keeps
+    # going but its result is discarded when it completes.
+    def abort_agent(session_id)
+      n = Session.where(id: session_id, status: %w[queued running])
+                 .update_all(status: 'aborted', error_message: 'Aborted')
+      n == 1
+    end
+
     def status
       c = configuration
       key = c.resolved_api_key
@@ -145,6 +167,7 @@ module RailsConsoleAi
           t.string  :slack_thread_ts, limit: 255
           t.string  :slack_channel_name, limit: 255
           t.integer :duration_ms
+          t.text    :options
           t.datetime :created_at,   null: false
         end
 
@@ -169,13 +192,22 @@ module RailsConsoleAi
       skills_table   = 'rails_console_ai_skills'
       versions_table = 'rails_console_ai_skill_versions'
 
+      # Old shape had per-field columns (body, tags, bypass_guards_for_methods,
+      # description). New shape stores the raw .md in `content`. Pre-production,
+      # so we drop and recreate when the old shape is detected.
+      if conn.table_exists?(skills_table) && !conn.column_exists?(skills_table, :content)
+        conn.drop_table(skills_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{skills_table} (replaced with single-content schema).\e[0m"
+      end
+      if conn.table_exists?(versions_table) && !conn.column_exists?(versions_table, :content)
+        conn.drop_table(versions_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{versions_table}.\e[0m"
+      end
+
       unless conn.table_exists?(skills_table)
         conn.create_table(skills_table) do |t|
           t.string   :name,        limit: 255, null: false
-          t.text     :description
-          t.text     :body
-          t.text     :tags
-          t.text     :bypass_guards_for_methods
+          t.text     :content,     null: false
           t.string   :status,      limit: 20,  default: 'proposed', null: false
           t.string   :approved_by, limit: 255
           t.datetime :approved_at
@@ -187,34 +219,13 @@ module RailsConsoleAi
         conn.add_index(skills_table, :name, unique: true)
         conn.add_index(skills_table, :status)
         $stdout.puts "\e[32mRailsConsoleAi: created #{skills_table} table.\e[0m"
-      else
-        # Idempotent column-add probes for existing installs.
-        unless conn.column_exists?(skills_table, :status)
-          conn.add_column(skills_table, :status, :string, limit: 20, default: 'proposed', null: false)
-          conn.add_index(skills_table, :status) unless conn.index_exists?(skills_table, :status)
-        end
-        unless conn.column_exists?(skills_table, :approved_by)
-          conn.add_column(skills_table, :approved_by, :string, limit: 255)
-        end
-        unless conn.column_exists?(skills_table, :approved_at)
-          conn.add_column(skills_table, :approved_at, :datetime)
-        end
-        unless conn.column_exists?(skills_table, :use_count)
-          conn.add_column(skills_table, :use_count, :integer, default: 0, null: false)
-        end
-        unless conn.column_exists?(skills_table, :last_used_at)
-          conn.add_column(skills_table, :last_used_at, :datetime)
-        end
       end
 
       unless conn.table_exists?(versions_table)
         conn.create_table(versions_table) do |t|
           t.integer  :skill_id
           t.string   :name,        limit: 255
-          t.text     :description
-          t.text     :body
-          t.text     :tags
-          t.text     :bypass_guards_for_methods
+          t.text     :content
           t.string   :status,      limit: 20
           t.string   :edited_by,   limit: 255
           t.text     :change_note
@@ -223,10 +234,6 @@ module RailsConsoleAi
         conn.add_index(versions_table, :skill_id)
         conn.add_index(versions_table, :created_at)
         $stdout.puts "\e[32mRailsConsoleAi: created #{versions_table} table.\e[0m"
-      else
-        unless conn.column_exists?(versions_table, :status)
-          conn.add_column(versions_table, :status, :string, limit: 20)
-        end
       end
     end
 
@@ -234,33 +241,54 @@ module RailsConsoleAi
       memories_table = 'rails_console_ai_memories'
       versions_table = 'rails_console_ai_memory_versions'
 
+      if conn.table_exists?(memories_table) && !conn.column_exists?(memories_table, :content)
+        conn.drop_table(memories_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{memories_table}.\e[0m"
+      end
+      if conn.table_exists?(versions_table) && !conn.column_exists?(versions_table, :content)
+        conn.drop_table(versions_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{versions_table}.\e[0m"
+      end
+
       unless conn.table_exists?(memories_table)
         conn.create_table(memories_table) do |t|
           t.string   :name,        limit: 255, null: false
-          t.text     :description
-          t.text     :tags
+          t.text     :content,     null: false
+          t.string   :status,      limit: 20,  default: 'proposed', null: false
+          t.string   :approved_by, limit: 255
+          t.datetime :approved_at
           t.integer  :use_count,   default: 0, null: false
           t.datetime :last_used_at
           t.datetime :created_at,  null: false
           t.datetime :updated_at,  null: false
         end
         conn.add_index(memories_table, :name, unique: true)
+        conn.add_index(memories_table, :status)
         $stdout.puts "\e[32mRailsConsoleAi: created #{memories_table} table.\e[0m"
-      else
-        unless conn.column_exists?(memories_table, :use_count)
-          conn.add_column(memories_table, :use_count, :integer, default: 0, null: false)
-        end
-        unless conn.column_exists?(memories_table, :last_used_at)
-          conn.add_column(memories_table, :last_used_at, :datetime)
-        end
+      end
+
+      # Existing installs have the content-based memories table but predate the
+      # approval columns — the drop-on-missing-content guard above won't fire for
+      # them, so add the columns in place. Memories created before approval existed
+      # were trusted under the old no-approval regime, so grandfather them to
+      # "approved" rather than yanking them out from under the AI; only memories
+      # created from now on start in "proposed".
+      if conn.table_exists?(memories_table) && !conn.column_exists?(memories_table, :status)
+        conn.add_column(memories_table, :status, :string, limit: 20, default: 'proposed', null: false)
+        conn.execute("UPDATE #{conn.quote_table_name(memories_table)} SET status = 'approved'")
+      end
+      if conn.table_exists?(memories_table)
+        conn.add_column(memories_table, :approved_by, :string, limit: 255) unless conn.column_exists?(memories_table, :approved_by)
+        conn.add_column(memories_table, :approved_at, :datetime) unless conn.column_exists?(memories_table, :approved_at)
+        conn.add_index(memories_table, :status) unless conn.index_exists?(memories_table, :status)
       end
 
       unless conn.table_exists?(versions_table)
         conn.create_table(versions_table) do |t|
           t.integer  :memory_id
           t.string   :name,        limit: 255
-          t.text     :description
-          t.text     :tags
+          t.text     :content
+          t.string   :status,      limit: 20
           t.string   :edited_by,   limit: 255
           t.text     :change_note
           t.datetime :created_at,  null: false
@@ -269,20 +297,29 @@ module RailsConsoleAi
         conn.add_index(versions_table, :created_at)
         $stdout.puts "\e[32mRailsConsoleAi: created #{versions_table} table.\e[0m"
       end
+
+      if conn.table_exists?(versions_table) && !conn.column_exists?(versions_table, :status)
+        conn.add_column(versions_table, :status, :string, limit: 20)
+      end
     end
 
     def setup_agents_tables!(conn)
       agents_table   = 'rails_console_ai_agents'
       versions_table = 'rails_console_ai_agent_versions'
 
+      if conn.table_exists?(agents_table) && !conn.column_exists?(agents_table, :content)
+        conn.drop_table(agents_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{agents_table}.\e[0m"
+      end
+      if conn.table_exists?(versions_table) && !conn.column_exists?(versions_table, :content)
+        conn.drop_table(versions_table)
+        $stdout.puts "\e[33mRailsConsoleAi: dropped legacy #{versions_table}.\e[0m"
+      end
+
       unless conn.table_exists?(agents_table)
         conn.create_table(agents_table) do |t|
           t.string   :name,        limit: 255, null: false
-          t.text     :description
-          t.text     :body
-          t.integer  :max_rounds
-          t.string   :model,       limit: 100
-          t.text     :tools
+          t.text     :content,     null: false
           t.string   :status,      limit: 20,  default: 'proposed', null: false
           t.string   :approved_by, limit: 255
           t.datetime :approved_at
@@ -294,34 +331,13 @@ module RailsConsoleAi
         conn.add_index(agents_table, :name, unique: true)
         conn.add_index(agents_table, :status)
         $stdout.puts "\e[32mRailsConsoleAi: created #{agents_table} table.\e[0m"
-      else
-        unless conn.column_exists?(agents_table, :status)
-          conn.add_column(agents_table, :status, :string, limit: 20, default: 'proposed', null: false)
-          conn.add_index(agents_table, :status) unless conn.index_exists?(agents_table, :status)
-        end
-        unless conn.column_exists?(agents_table, :approved_by)
-          conn.add_column(agents_table, :approved_by, :string, limit: 255)
-        end
-        unless conn.column_exists?(agents_table, :approved_at)
-          conn.add_column(agents_table, :approved_at, :datetime)
-        end
-        unless conn.column_exists?(agents_table, :use_count)
-          conn.add_column(agents_table, :use_count, :integer, default: 0, null: false)
-        end
-        unless conn.column_exists?(agents_table, :last_used_at)
-          conn.add_column(agents_table, :last_used_at, :datetime)
-        end
       end
 
       unless conn.table_exists?(versions_table)
         conn.create_table(versions_table) do |t|
           t.integer  :agent_id
           t.string   :name,        limit: 255
-          t.text     :description
-          t.text     :body
-          t.integer  :max_rounds
-          t.string   :model,       limit: 100
-          t.text     :tools
+          t.text     :content
           t.string   :status,      limit: 20
           t.string   :edited_by,   limit: 255
           t.text     :change_note
@@ -376,6 +392,11 @@ module RailsConsoleAi
         migrations << 'error_message'
       end
 
+      unless conn.column_exists?(table, :options)
+        conn.add_column(table, :options, :text)
+        migrations << 'options'
+      end
+
       unless conn.index_exists?(table, [:mode, :status], name: 'idx_rca_sessions_mode_status')
         conn.add_index(table, [:mode, :status], name: 'idx_rca_sessions_mode_status')
         migrations << 'idx_rca_sessions_mode_status'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_console_ai
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Cortfr