rails_console_ai 0.30.0 → 0.32.0

data/app/views/rails_console_ai/agents/_form.html.erb

@@ -1,47 +1,23 @@
 <% if @agent.persisted? && @agent.respond_to?(:approved?) && @agent.approved? %>
   <div class="flash flash-alert" style="margin-bottom:16px;">
-    Heads up: this agent is currently <strong>approved</strong>. Editing it will revert its status to <strong>proposed</strong> and the AI won't be able to invoke it again until someone re-approves it.
+    Heads up: this agent is currently <strong>approved</strong>. Editing it will revert its status to <strong>proposed</strong>.
   </div>
 <% elsif !@agent.persisted? %>
   <div class="flash flash-notice" style="margin-bottom:16px;">
-    New DB agents start as <strong>proposed</strong>. After saving, an approver (likely you) needs to click the Approve button on the show page before the AI can invoke this agent via delegate_task.
+    New DB agents start as <strong>proposed</strong>. After saving, an approver (likely you) needs to click the Approve button before delegate_task can invoke it.
   </div>
 <% end %>
 
 <%= form_with model: @agent, url: form_url, method: form_method, local: true do |f| %>
   <div class="form-card">
     <div class="form-row">
-      <label>Name</label>
-      <%= f.text_field :name, value: @agent.name, required: true %>
-    </div>
-
-    <div class="form-row">
-      <label>Description</label>
-      <%= f.text_field :description, value: @agent.description, placeholder: 'One-line description of what this agent specializes in' %>
-    </div>
-
-    <div class="form-row">
-      <label>Body / system instructions (markdown)</label>
-      <%= f.text_area :body, value: @agent.body, rows: 18 %>
-      <div class="hint">Persona + strategy + rules. Be specific about what tools/approaches the sub-agent should use and what format its summary should take.</div>
-    </div>
-
-    <div class="form-row">
-      <label>Max rounds (optional)</label>
-      <%= f.number_field :max_rounds, value: @agent.max_rounds, min: 1, max: 100 %>
-      <div class="hint">Maximum tool-loop iterations for the sub-agent. Defaults to the global <code>config.sub_agent_max_rounds</code>. Smaller = tighter scope, fewer tokens.</div>
-    </div>
-
-    <div class="form-row">
-      <label>Model (optional)</label>
-      <%= f.text_field :model, value: @agent.model, placeholder: 'e.g. claude-haiku-4-5' %>
-      <div class="hint">Model override. Leave blank to use the global model. Useful for cheap/fast agents.</div>
-    </div>
-
-    <div class="form-row">
-      <label>Tool whitelist (one per line, optional)</label>
-      <%= f.text_area :tools, value: Array(@agent.tools).join("\n"), rows: 4 %>
-      <div class="hint">Tool names the sub-agent is allowed to call (e.g. <code>execute_code</code>, <code>search_code</code>, <code>read_file</code>). Leave blank to use the default tool set. Adding tools here can broaden what the sub-agent can do — this is why DB agents need approval.</div>
+      <label>Markdown (frontmatter + body)</label>
+      <%= f.text_area :content, value: @agent.content, rows: 28, required: true, style: 'font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px;' %>
+      <div class="hint">
+        YAML frontmatter between <code>---</code> lines, then the agent persona / instructions. Required:
+        <code>name</code>, <code>description</code>. Optional: <code>max_rounds</code>, <code>model</code>,
+        <code>tools</code> (whitelist; empty/omitted = default set).
+      </div>
     </div>
 
     <hr style="margin: 20px 0; border: 0; border-top: 1px solid #eee;">
@@ -49,7 +25,6 @@
     <div class="form-row">
       <label>Edited by</label>
       <input type="text" name="edited_by" value="<%= params[:edited_by] %>" placeholder="Your name or handle">
-      <div class="hint">Recorded with this version. Free text — the gem does not assume authentication beyond the admin login.</div>
     </div>
 
     <div class="form-row">

data/app/views/rails_console_ai/agents/diff.html.erb

@@ -5,11 +5,7 @@
   Version #<%= @from.id %> (<%= @from.created_at.strftime('%Y-%m-%d %H:%M') %>) → <%= @to_label %>
 </p>
 
-<h3 style="margin:16px 0 6px;">Body</h3>
-<%= render_text_diff(@from.body, @to_body, left_label: "v##{@from.id}", right_label: @to_label) %>
-
-<h3 style="margin:24px 0 6px;">Tool whitelist</h3>
-<%= render_json_diff(Array(@from.tools), @to_tools, left_label: "v##{@from.id}", right_label: @to_label) %>
+<%= render_text_diff(@from.content, @to_content, left_label: "v##{@from.id}", right_label: @to_label) %>
 
 <div class="btn-bar" style="margin-top:24px;">
   <% if @to.nil? %>

data/app/views/rails_console_ai/agents/new.html.erb

@@ -1,22 +1,6 @@
 <%= link_to '← All agents', agents_path, class: 'back-link' %>
 <h2 style="margin-bottom:16px;">New agent</h2>
 
-<%= form_with url: import_agents_path, method: :post, local: true do %>
-  <div class="form-card" style="background:#f8f9fa;">
-    <div class="form-row" style="margin-bottom:8px;">
-      <label>Paste a .md file (optional)</label>
-      <textarea name="content" rows="14" placeholder="---&#10;name: My agent&#10;description: What it specializes in&#10;max_rounds: 10&#10;model: claude-haiku-4-5&#10;tools: [execute_code, search_code]&#10;---&#10;&#10;Persona, strategy, rules …"></textarea>
-      <div class="hint">
-        Paste the full contents of a Markdown file (YAML frontmatter + body) — same
-        format as <code>.rails_console_ai/agents/*.md</code> or the built-in agents
-        shipped with the gem. Useful for moving an existing on-disk agent into the
-        versioned DB store.
-      </div>
-    </div>
-    <button type="submit" class="btn btn-secondary">Parse pasted content ↓</button>
-  </div>
-<% end %>
-
 <%= render 'form',
       form_url: agents_path,
       form_method: :post,

data/app/views/rails_console_ai/memories/_form.html.erb

@@ -1,19 +1,12 @@
 <%= form_with model: @memory, url: form_url, method: form_method, local: true do |f| %>
   <div class="form-card">
     <div class="form-row">
-      <label>Name</label>
-      <%= f.text_field :name, value: @memory.name, required: true %>
-    </div>
-
-    <div class="form-row">
-      <label>Description</label>
-      <%= f.text_area :description, value: @memory.description, rows: 14 %>
-      <div class="hint">The fact or pattern you're persisting. Markdown is fine.</div>
-    </div>
-
-    <div class="form-row">
-      <label>Tags (comma-separated)</label>
-      <%= f.text_field :tags, value: Array(@memory.tags).join(', '), placeholder: 'database, sharding' %>
+      <label>Markdown (frontmatter + body)</label>
+      <%= f.text_area :content, value: @memory.content, rows: 22, required: true, style: 'font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px;' %>
+      <div class="hint">
+        YAML frontmatter between <code>---</code> lines (required: <code>name</code>; optional: <code>tags</code>),
+        then the memory body — the fact or pattern you're persisting.
+      </div>
     </div>
 
     <hr style="margin: 20px 0; border: 0; border-top: 1px solid #eee;">

data/app/views/rails_console_ai/memories/diff.html.erb

@@ -5,11 +5,7 @@
   Version #<%= @from.id %> (<%= @from.created_at.strftime('%Y-%m-%d %H:%M') %>) → <%= @to_label %>
 </p>
 
-<h3 style="margin:16px 0 6px;">Description</h3>
-<%= render_text_diff(@from.description, @to_description, left_label: "v##{@from.id}", right_label: @to_label) %>
-
-<h3 style="margin:24px 0 6px;">Tags</h3>
-<%= render_json_diff(Array(@from.tags), @to_tags, left_label: "v##{@from.id}", right_label: @to_label) %>
+<%= render_text_diff(@from.content, @to_content, left_label: "v##{@from.id}", right_label: @to_label) %>
 
 <div class="btn-bar" style="margin-top:24px;">
   <% if @to.nil? %>

data/app/views/rails_console_ai/memories/index.html.erb

@@ -11,6 +11,13 @@
   </form>
 </div>
 
+<% proposed_count = @memories.count { |m| m['source'] == :db && m['status'] != 'approved' } %>
+<% if proposed_count > 0 %>
+  <div class="flash flash-alert" style="margin-bottom:16px;">
+    <strong><%= proposed_count %></strong> memor<%= proposed_count == 1 ? 'y' : 'ies' %> awaiting approval. The AI cannot recall them until a human approves.
+  </div>
+<% end %>
+
 <% if @memories.empty? %>
   <div class="meta-card">
     <p class="text-muted">No memories yet. <%= link_to 'Create one', new_memory_path %> or drop a Markdown file in <code>.rails_console_ai/memories/</code>.</p>
@@ -22,7 +29,7 @@
         <th>Name</th>
         <th>Description</th>
         <th>Tags</th>
-        <th>Source</th>
+        <th>Source / Status</th>
         <th title="Number of times the AI recalled this memory (DB only)">Uses</th>
         <th>Last used</th>
         <th></th>
@@ -40,6 +47,11 @@
           <td>
             <% if m['source'] == :db %>
               <span class="badge source-db">DB</span>
+              <% if m['status'] == 'approved' %>
+                <span class="badge status-approved">APPROVED</span>
+              <% else %>
+                <span class="badge status-proposed">PROPOSED</span>
+              <% end %>
             <% else %>
               <span class="badge source-file">FILE</span>
             <% end %>

data/app/views/rails_console_ai/memories/new.html.erb

@@ -1,21 +1,6 @@
 <%= link_to '← All memories', memories_path, class: 'back-link' %>
 <h2 style="margin-bottom:16px;">New memory</h2>
 
-<%= form_with url: import_memories_path, method: :post, local: true do %>
-  <div class="form-card" style="background:#f8f9fa;">
-    <div class="form-row" style="margin-bottom:8px;">
-      <label>Paste a .md file (optional)</label>
-      <textarea name="content" rows="12" placeholder="---&#10;name: My memory&#10;tags: [database]&#10;---&#10;&#10;The fact or pattern …"></textarea>
-      <div class="hint">
-        Paste the full contents of a Markdown file (YAML frontmatter + body) — same
-        format as <code>.rails_console_ai/memories/*.md</code>. The fields below will
-        be prefilled from the paste.
-      </div>
-    </div>
-    <button type="submit" class="btn btn-secondary">Parse pasted content ↓</button>
-  </div>
-<% end %>
-
 <%= render 'form',
       form_url: memories_path,
       form_method: :post,

data/app/views/rails_console_ai/memories/show.html.erb

@@ -8,11 +8,23 @@
 
 <%= link_to '← All memories', memories_path, class: 'back-link' %>
 
+<% if is_db && !@memory.approved? %>
+  <div class="flash flash-alert" style="margin-bottom:16px;">
+    <strong>Awaiting approval.</strong> The AI cannot recall this memory until a human approves it.
+    Review the content below, then click <strong>Approve</strong>.
+  </div>
+<% end %>
+
 <div class="meta-card">
   <h2 style="margin-bottom:8px;">
     <%= name %>
     <% if is_db %>
       <span class="badge source-db">DB</span>
+      <% if @memory.approved? %>
+        <span class="badge status-approved">APPROVED</span>
+      <% else %>
+        <span class="badge status-proposed">PROPOSED</span>
+      <% end %>
     <% else %>
       <span class="badge source-file">FILE</span>
     <% end %>
@@ -24,6 +36,10 @@
       <div class="meta-item"><label>Versions</label><span><%= @memory.versions.count %></span></div>
       <div class="meta-item"><label>Times recalled</label><span><%= @memory.use_count %></span></div>
       <div class="meta-item"><label>Last recalled</label><span><%= @memory.last_used_at&.strftime('%Y-%m-%d %H:%M') || 'never' %></span></div>
+      <% if @memory.approved? %>
+        <div class="meta-item"><label>Approved by</label><span><%= @memory.approved_by || '—' %></span></div>
+        <div class="meta-item"><label>Approved at</label><span><%= @memory.approved_at&.strftime('%Y-%m-%d %H:%M') || '—' %></span></div>
+      <% end %>
     <% else %>
       <div class="meta-item"><label>Path</label><span class="mono"><%= file_key %></span></div>
     <% end %>
@@ -32,6 +48,12 @@
 
 <div class="btn-bar">
   <% if is_db %>
+    <% unless @memory.approved? %>
+      <%= form_with url: approve_memory_path(@memory), method: :post, local: true, style: 'display:inline' do %>
+        <input type="text" name="approved_by" placeholder="Your name (required)" style="padding:7px 10px; border:1px solid #ccc; border-radius:4px; margin-right:6px;">
+        <button type="submit" class="btn btn-danger" data-confirm="Approve this memory? The AI will then be able to recall it.">Approve</button>
+      <% end %>
+    <% end %>
     <%= link_to 'Edit', edit_memory_path(@memory), class: 'btn' %>
     <%= link_to 'Versions', memory_versions_path(@memory), class: 'btn btn-secondary' %>
     <%= button_to 'Delete', memory_path(@memory), method: :delete, class: 'btn btn-danger', form: { style: 'display:inline' },data: { confirm: 'Delete this memory? Past versions remain in history.' } %>
@@ -49,6 +71,7 @@
         <div>
           <strong>v<%= v.id %></strong>
           <span class="ver-meta">— <%= v.created_at.strftime('%Y-%m-%d %H:%M') %> by <%= v.edited_by || 'unknown' %></span>
+          <% if v.status == 'approved' %><span class="badge status-approved">APPROVED</span><% end %>
           <% if v.change_note.present? %><div class="ver-meta"><%= v.change_note %></div><% end %>
         </div>
         <div>

data/app/views/rails_console_ai/skills/_form.html.erb

@@ -11,36 +11,14 @@
 <%= form_with model: @skill, url: form_url, method: form_method, local: true do |f| %>
   <div class="form-card">
     <div class="form-row">
-      <label>Name</label>
-      <%= f.text_field :name, value: @skill.name, required: true %>
-    </div>
-
-    <div class="form-row">
-      <label>Description</label>
-      <%= f.text_field :description, value: @skill.description, placeholder: 'One-line description of when to use this skill' %>
-    </div>
-
-    <div class="form-row">
-      <label>Body (markdown)</label>
-      <%= f.text_area :body, value: @skill.body, rows: 18 %>
-      <div class="hint">Include "## When to use", "## Recipe" (numbered steps with code blocks), "## Notes".</div>
-    </div>
-
-    <div class="form-row">
-      <label>Tags (comma-separated)</label>
-      <%= f.text_field :tags, value: Array(@skill.tags).join(', '), placeholder: 'booking-page, admin' %>
-    </div>
-
-    <div class="form-row">
-      <label>Bypass guards for methods (one per line)</label>
-      <%= f.text_area :bypass_guards_for_methods, value: Array(@skill.bypass_guards_for_methods).join("\n"), rows: 4 %>
+      <label>Markdown (frontmatter + body)</label>
+      <%= f.text_area :content, value: @skill.content, rows: 28, required: true, style: 'font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px;' %>
       <div class="hint">
-        Two forms accepted — anything else is ignored:
-        <ul style="margin:6px 0 0 18px; padding:0;">
-          <li><code>ClassName#method</code> — instance method, e.g. <code>BookingPage#save!</code></li>
-          <li><code>ClassName.method</code> — class (singleton) method, e.g. <code>User.create_admin!</code></li>
-        </ul>
-        Namespaced classes work: <code>Acme::Booking#destroy</code>. The <code>!</code> is part of the match, so <code>save</code> and <code>save!</code> are different specs. While the skill is active, calls to these methods skip the configured safety guards (DB writes, HTTP mutations, email, etc.) <strong>for that tool-call only</strong>.
+        YAML frontmatter between <code>---</code> lines, then the markdown body. Required frontmatter:
+        <code>name</code>, <code>description</code>. Optional: <code>tags</code>,
+        <code>bypass_guards_for_methods</code> (entries shaped like <code>ClassName#method</code> or
+        <code>ClassName.method</code> — while the skill is active, calls to these methods skip the
+        configured safety guards for that tool-call only).
       </div>
     </div>
 

data/app/views/rails_console_ai/skills/diff.html.erb

@@ -5,14 +5,7 @@
   Version #<%= @from.id %> (<%= @from.created_at.strftime('%Y-%m-%d %H:%M') %>) → <%= @to_label %>
 </p>
 
-<h3 style="margin:16px 0 6px;">Body</h3>
-<%= render_text_diff(@from.body, @to_body, left_label: "v##{@from.id}", right_label: @to_label) %>
-
-<h3 style="margin:24px 0 6px;">Tags</h3>
-<%= render_json_diff(Array(@from.tags), @to_tags, left_label: "v##{@from.id}", right_label: @to_label) %>
-
-<h3 style="margin:24px 0 6px;">Bypass guards</h3>
-<%= render_json_diff(Array(@from.bypass_guards_for_methods), @to_bypass, left_label: "v##{@from.id}", right_label: @to_label) %>
+<%= render_text_diff(@from.content, @to_content, left_label: "v##{@from.id}", right_label: @to_label) %>
 
 <div class="btn-bar" style="margin-top:24px;">
   <% if @to.nil? %>

data/app/views/rails_console_ai/skills/new.html.erb

@@ -1,23 +1,6 @@
 <%= link_to '← All skills', skills_path, class: 'back-link' %>
 <h2 style="margin-bottom:16px;">New skill</h2>
 
-<%= form_with url: import_skills_path, method: :post, local: true do %>
-  <div class="form-card" style="background:#f8f9fa;">
-    <div class="form-row" style="margin-bottom:8px;">
-      <label>Paste a .md file (optional)</label>
-      <textarea name="content" rows="14" placeholder="---&#10;name: My skill&#10;description: What it does&#10;tags: [admin]&#10;bypass_guards_for_methods: []&#10;---&#10;&#10;## When to use&#10;…&#10;&#10;## Recipe&#10;1. …"></textarea>
-      <div class="hint">
-        Paste the full contents of a Markdown file (YAML frontmatter between
-        <code>---</code> lines, then a markdown body) — same format as
-        <code>.rails_console_ai/skills/*.md</code>. The fields below will be
-        prefilled from the paste. You can review and tweak before clicking
-        <strong>Create skill</strong>.
-      </div>
-    </div>
-    <button type="submit" class="btn btn-secondary">Parse pasted content ↓</button>
-  </div>
-<% end %>
-
 <%= render 'form',
       form_url: skills_path,
       form_method: :post,

data/config/routes.rb

@@ -8,7 +8,6 @@ RailsConsoleAi::Engine.routes.draw do
     end
     collection do
       get :diff
-      post :import
     end
     resources :versions, only: [:index, :show], controller: 'skill_versions' do
       member do
@@ -18,9 +17,11 @@ RailsConsoleAi::Engine.routes.draw do
   end
 
   resources :memories do
+    member do
+      post :approve
+    end
     collection do
       get :diff
-      post :import
     end
     resources :versions, only: [:index, :show], controller: 'memory_versions' do
       member do
@@ -35,7 +36,6 @@ RailsConsoleAi::Engine.routes.draw do
     end
     collection do
       get :diff
-      post :import
     end
     resources :versions, only: [:index, :show], controller: 'agent_versions' do
       member do

data/lib/generators/rails_console_ai/templates/initializer.rb

@@ -5,11 +5,11 @@ RailsConsoleAi.configure do |config|
   # API key (or set ANTHROPIC_API_KEY / OPENAI_API_KEY env var)
   # config.api_key = 'sk-...'
 
-  # Model override (defaults: claude-opus-4-6 for Anthropic, gpt-5.3-codex for OpenAI)
-  # config.model = 'claude-opus-4-6'
+  # Model override (defaults: claude-sonnet-5 for Anthropic, gpt-5.3-codex for OpenAI)
+  # config.model = 'claude-opus-4-8'
 
-  # Max tokens for LLM response
-  config.max_tokens = 4096
+  # Max tokens for LLM response (default resolves per model family; 16000 for Claude models)
+  # config.max_tokens = 4096
 
   # Temperature (0.0 - 1.0)
   config.temperature = 0.2
@@ -35,7 +35,7 @@ RailsConsoleAi.configure do |config|
   # AWS Bedrock provider (uses AWS credential chain — no API key needed):
   # config.provider = :bedrock
   # config.bedrock_region = 'us-east-1'
-  # config.model = 'us.anthropic.claude-sonnet-4-6'
+  # config.model = 'us.anthropic.claude-sonnet-5'
 
   # Debug mode: prints full API requests/responses and tool calls to stderr
   # config.debug = true

data/lib/rails_console_ai/agent_loader.rb

@@ -159,16 +159,10 @@ module RailsConsoleAi
       key = agent_key(name)
       existing = load_agent_file(key)
 
-      frontmatter = {
-        'name' => name,
-        'description' => description
-      }
-      frontmatter['max_rounds'] = max_rounds if max_rounds
-      frontmatter['model'] = model if model
-      tool_list = Array(tools)
-      frontmatter['tools'] = tool_list unless tool_list.empty?
-
-      content = "---\n#{YAML.dump(frontmatter).sub("---\n", '').strip}\n---\n\n#{body}\n"
+      content = self.class.dump(
+        name: name, description: description, body: body,
+        max_rounds: max_rounds, model: model, tools: tools
+      )
       @storage.write(key, content)
 
       path = @storage.respond_to?(:root_path) ? File.join(@storage.root_path, key) : key
@@ -210,5 +204,19 @@ module RailsConsoleAi
     rescue Psych::SyntaxError
       nil
     end
+
+    # Inverse of parse: emit a canonical .md (frontmatter + body) string from
+    # structured attrs.
+    def self.dump(name:, description:, body:, max_rounds: nil, model: nil, tools: nil)
+      frontmatter = {
+        'name' => name,
+        'description' => description
+      }
+      frontmatter['max_rounds'] = max_rounds if max_rounds
+      frontmatter['model'] = model if model
+      tool_list = Array(tools)
+      frontmatter['tools'] = tool_list unless tool_list.empty?
+      "---\n#{YAML.dump(frontmatter).sub("---\n", '').strip}\n---\n\n#{body}\n"
+    end
   end
 end

data/lib/rails_console_ai/agent_runner.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'rails_console_ai/prefixed_io'
 require 'rails_console_ai/session_logger'
 require 'rails_console_ai/channel/api'
@@ -7,6 +8,8 @@ require 'rails_console_ai/providers/base'
 require 'rails_console_ai/executor'
 
 module RailsConsoleAi
+  class RunnerTimeoutError < StandardError; end
+
   # Long-running worker that polls the sessions table for queued agent_api
   # rows, claims them atomically, and runs each in its own Thread via
   # ConversationEngine#one_shot. Started by `rake rails_console_ai:agents`.
@@ -87,13 +90,20 @@ module RailsConsoleAi
 
     def spawn(session)
       tag = "[agent/#{session.id}] @#{session.user_name || '?'}"
-      puts "#{tag} << #{session.query.to_s.strip}"
+      opts = parse_options(session)
+      banner_extras = []
+      banner_extras << 'thinking' if opts['use_thinking_model']
+      if (cap = opts['max_wall_clock_seconds'])
+        banner_extras << "cap=#{cap}s"
+      end
+      banner = banner_extras.empty? ? '' : " (#{banner_extras.join(', ')})"
+      puts "#{tag}#{banner} << #{session.query.to_s.strip}"
 
       t = Thread.new do
         Thread.current.report_on_exception = false
         Thread.current[:log_prefix] = tag
         begin
-          run_one(session)
+          run_one(session, opts)
         ensure
           ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
         end
@@ -101,30 +111,82 @@ module RailsConsoleAi
       @mutex.synchronize { @threads[session.id] = t }
     end
 
-    def run_one(session)
+    def parse_options(session)
+      raw = session.respond_to?(:options) ? session.options : nil
+      return {} if raw.nil? || raw.to_s.empty?
+      return raw if raw.is_a?(Hash)
+      JSON.parse(raw)
+    rescue => e
+      warn "AgentRunner: failed to parse session.options (#{e.class}: #{e.message}); ignoring."
+      {}
+    end
+
+    def run_one(session, opts = nil)
+      opts ||= parse_options(session)
       started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       channel = Channel::Api.new(user_name: session.user_name)
       sandbox_binding = Object.new.instance_eval { binding }
       engine = ConversationEngine.new(binding_context: sandbox_binding, channel: channel)
+      engine.upgrade_to_thinking_model if opts['use_thinking_model']
 
-      exec_result = engine.one_shot(session.query, existing_session_id: session.id)
+      exec_result = run_with_deadline(opts['max_wall_clock_seconds']) do
+        engine.one_shot(session.query, existing_session_id: session.id)
+      end
       result_text = compose_result(channel.captured_output, exec_result)
 
+      if aborted?(session.id)
+        puts ">> aborted (result discarded)"
+        return
+      end
       SessionLogger.update(session.id, status: 'ready', result: result_text)
 
       elapsed = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - started) * 1000).round
       preview = result_text.to_s.strip.lines.first.to_s.strip
       preview = preview[0, 120] + '…' if preview.length > 120
       puts ">> ready (#{elapsed}ms) #{preview}"
+    rescue RunnerTimeoutError => e
+      warn ">> TIMEOUT #{e.message}"
+      SessionLogger.update(session.id, status: 'failed', error_message: e.message) unless aborted?(session.id)
     rescue => e
       warn ">> FAILED #{e.class}: #{e.message}"
       e.backtrace&.first(5)&.each { |line| warn "   #{line}" }
+      return if aborted?(session.id)
       SessionLogger.update(session.id,
         status: 'failed',
         error_message: "#{e.class}: #{e.message}\n#{Array(e.backtrace).first(10).join("\n")}"
       )
     end
 
+    # An abort (RailsConsoleAi.abort_agent) flips the row to 'aborted' while we
+    # run; in that case the run's outcome must not overwrite the abort.
+    def aborted?(session_id)
+      Session.where(id: session_id).pluck(:status).first == 'aborted'
+    end
+
+    # When cap is nil or non-positive, run inline. Otherwise spawn a nested
+    # worker thread, join with the deadline, and kill + raise on overshoot.
+    # Kept localized (vs Timeout.timeout) so a runaway provider call can't
+    # raise from inside our own bookkeeping code.
+    def run_with_deadline(cap)
+      return yield if cap.nil? || cap.to_f <= 0
+      result = nil
+      error = nil
+      worker = Thread.new do
+        Thread.current.report_on_exception = false
+        begin
+          result = yield
+        rescue => e
+          error = e
+        end
+      end
+      if worker.join(cap.to_f).nil?
+        worker.kill
+        raise RunnerTimeoutError, "exceeded max_wall_clock_seconds (#{cap}s)"
+      end
+      raise error if error
+      result
+    end
+
     # Build the `result` payload returned via get_agent_response. The
     # LLM's prose lands in the channel's captured_output; the value the
     # generated code returned lands in exec_result. Without including the

data/lib/rails_console_ai/channel/console.rb

@@ -368,7 +368,7 @@ module RailsConsoleAi
         config = RailsConsoleAi.configuration
         model = @engine.effective_model
         thinking = config.resolved_thinking_model
-        pricing = Configuration::PRICING[model]
+        pricing = Configuration.pricing_for(model)
 
         @real_stdout.puts "\e[36m  Model info:\e[0m"
         @real_stdout.puts "\e[2m    Provider:        #{config.provider}\e[0m"