anima-core 1.4.0 → 1.5.1

data/app/models/snapshot.rb

@@ -18,8 +18,12 @@
 # @!attribute level
 #   @return [Integer] compression level (1 = from raw messages, 2 = from L1 snapshots)
 # @!attribute token_count
-#   @return [Integer] cached token count of the summary text
+#   @return [Integer] token count of the summary text. Seeded with a
+#     local estimate on create and later refined by {CountTokensJob}
+#     using the real Anthropic tokenizer.
 class Snapshot < ApplicationRecord
+  include TokenEstimation
+
   belongs_to :session
 
   # 32KB — generous upper bound (~8K tokens). The LLM tool description advises
@@ -30,12 +34,17 @@ class Snapshot < ApplicationRecord
   validates :from_message_id, presence: true
   validates :to_message_id, presence: true
   validates :level, presence: true, numericality: {greater_than: 0}
-  validates :token_count, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+  validates :token_count, numericality: {greater_than_or_equal_to: 0}
   validate :from_message_id_not_after_to_message_id
 
   scope :for_level, ->(level) { where(level: level) }
   scope :chronological, -> { order(:from_message_id) }
 
+  # @return [String] summary text used for token estimation and remote counting
+  def tokenization_text
+    text.to_s
+  end
+
   # L1 snapshots whose message range is NOT fully contained within any L2 snapshot.
   # Used to determine which L1 snapshots are still "live" in the viewport.
   scope :not_covered_by_l2, -> {
@@ -48,29 +57,10 @@ class Snapshot < ApplicationRecord
     )
   }
 
-  # Snapshots whose source messages have fully evicted from the sliding window.
-  # A snapshot is visible when its entire message range precedes the first
-  # message currently in the viewport.
-  #
-  # @param first_message_id [Integer] the first message ID in the sliding window
-  scope :source_messages_evicted, ->(first_message_id) {
-    where("to_message_id < ?", first_message_id)
-  }
-
-  # @return [Integer] token cost, using cached count or heuristic estimate
-  def token_cost
-    token_count.positive? ? token_count : estimate_tokens
-  end
-
   private
 
   def from_message_id_not_after_to_message_id
     return unless from_message_id && to_message_id
     errors.add(:from_message_id, "must be <= to_message_id") if from_message_id > to_message_id
   end
-
-  # @return [Integer] estimated token count (at least 1)
-  def estimate_tokens
-    [(text.bytesize / Message::BYTES_PER_TOKEN.to_f).ceil, 1].max
-  end
 end

data/bin/inspect-cassette

@@ -106,6 +106,8 @@ puts "          (#{omitted} non-LLM HTTP requests omitted)" if omitted > 0
 puts
 
 seen_messages = 0
+previous_first = nil
+
 llm_interactions.each_with_index do |interaction, round|
   request_body = JSON.parse(interaction["request"]["body"]["string"])
   messages = request_body["messages"] || []
@@ -114,17 +116,28 @@ llm_interactions.each_with_index do |interaction, round|
   status = interaction["response"]["status"]["code"]
   model = response_body["model"] || request_body["model"]
 
+  # Detect a new conversation: cassettes can interleave multiple phantom
+  # sessions (Mneme, Melete, Aoide's drain) that each keep their own
+  # independent message history. When a new round's first message differs
+  # from the prior round's, or the round has fewer messages than we've
+  # already shown, we've crossed into a new conversation — rewind the
+  # dedup counter so we render from the top again.
+  first = messages.first
+  if round > 0 && (previous_first != first || messages.size < seen_messages)
+    puts "─── new conversation ───"
+    puts
+    seen_messages = 0
+  end
+  previous_first = first
+
   puts "── Round #{round + 1} (#{status} #{model}) ──"
   puts
 
-  # Print only messages we haven't shown yet
-  new_messages = messages[seen_messages..]
-  new_messages.each do |msg|
+  messages[seen_messages..].to_a.each do |msg|
     puts format_message(msg)
     puts
   end
 
-  # Print the assistant response from this round
   if response_body["content"]
     assistant_msg = {"role" => "assistant", "content" => response_body["content"]}
     puts format_message(assistant_msg)

data/config/application.rb

@@ -8,6 +8,7 @@ require "active_record/railtie"
 require "active_job/railtie"
 require "action_cable/engine"
 require "rails/test_unit/railtie"
+require "aasm"
 require "draper"
 require "solid_cable"
 require "solid_queue"

data/config/initializers/event_subscribers.rb

@@ -3,17 +3,84 @@
 # Registers global EventBus subscribers at boot time.
 # Subscribers registered here receive all events regardless of which
 # process emitted them (brain server, background job, etc.).
+#
+# Three event layers:
+# 1. Domain events (anima.agent_message, anima.system_message,
+#    anima.goal.created, anima.goal.updated, etc.) — raw intent
+# 2. Lifecycle events (anima.message.created) — emitted after persistence
+# 3. Drain pipeline events (anima.session.start_melete, start_mneme,
+#    start_processing, llm_responded, tool_executed) — the event-driven
+#    agent loop that promotes PendingMessages into the conversation,
+#    calls the LLM, and dispatches tool execution (epic #427). Pipeline
+#    order: Melete first; Mneme conditional on a goal change during the
+#    Melete run; Processing always closes the chain.
+#
+# Persister bridges layer 1 → 2 by creating Message records whose
+# after_create_commit emits MessageCreated events.
+MESSAGE_LIFECYCLE_FILTER = ->(event) { event[:name].start_with?("anima.message.") }
+MESSAGE_CREATED_FILTER = ->(event) { event[:name] == "anima.message.created" }
+EVICTION_FILTER = ->(event) { event[:name] == "anima.eviction.completed" }
+SUBAGENT_EVICTED_FILTER = ->(event) { event[:name] == "anima.subagent.evicted" }
+ACTIVE_STATE_TRIGGER_FILTER = ->(event) {
+  %w[anima.skill.activated anima.workflow.activated anima.eviction.completed].include?(event[:name])
+}
+SESSION_STATE_FILTER = ->(event) { event[:name] == "anima.session.state_changed" }
+AUTHENTICATION_REQUIRED_FILTER = ->(event) { event[:name] == "anima.authentication_required" }
+START_MNEME_FILTER = ->(event) { event[:name] == "anima.session.start_mneme" }
+START_MELETE_FILTER = ->(event) { event[:name] == "anima.session.start_melete" }
+START_PROCESSING_FILTER = ->(event) { event[:name] == "anima.session.start_processing" }
+LLM_RESPONDED_FILTER = ->(event) { event[:name] == "anima.session.llm_responded" }
+TOOL_EXECUTED_FILTER = ->(event) { event[:name] == "anima.session.tool_executed" }
+
 Rails.application.config.after_initialize do
+  # SessionStateBroadcaster also runs in tests — job/channel specs assert
+  # ActionCable broadcasts, which now flow through this subscriber.
+  Events::Bus.subscribe(Events::Subscribers::SessionStateBroadcaster.new, &SESSION_STATE_FILTER)
+
+  # AuthenticationBroadcaster turns provider auth failures into a
+  # conversation-visible system_message plus a client-side action frame.
+  Events::Bus.subscribe(Events::Subscribers::AuthenticationBroadcaster.new, &AUTHENTICATION_REQUIRED_FILTER)
+
+  # Drain pipeline — registered in all environments so job/channel specs
+  # can drive the full event-driven loop end-to-end.
+  Events::Bus.subscribe(Events::Subscribers::MnemeKickoff.new, &START_MNEME_FILTER)
+  Events::Bus.subscribe(Events::Subscribers::MeleteKickoff.new, &START_MELETE_FILTER)
+  Events::Bus.subscribe(Events::Subscribers::DrainKickoff.new, &START_PROCESSING_FILTER)
+  Events::Bus.subscribe(Events::Subscribers::LLMResponseHandler.new, &LLM_RESPONDED_FILTER)
+  Events::Bus.subscribe(Events::Subscribers::ToolResponseCreator.new, &TOOL_EXECUTED_FILTER)
+
   unless Rails.env.test?
+    # --- Domain event subscribers (layer 1) ---
+
     # Global persister handles events from all sessions (brain server, background jobs).
-    # Skips non-pending user messages — those are persisted by their callers
-    # (SessionChannel#speak for idle sessions, AgentLoop#process for direct usage).
+    # Skips user messages — those are promoted from PendingMessage by {DrainJob}.
     Events::Bus.subscribe(Events::Subscribers::Persister.new)
 
     # Bridges transient events (e.g. BounceBack) to ActionCable for client delivery.
     Events::Bus.subscribe(Events::Subscribers::TransientBroadcaster.new)
 
-    # Routes text messages between parent and sub-agent sessions via @mentions.
-    Events::Bus.subscribe(Events::Subscribers::SubagentMessageRouter.new)
+    # --- Lifecycle event subscribers (layer 2) ---
+
+    # Broadcasts message creates and updates to connected WebSocket clients.
+    Events::Bus.subscribe(Events::Subscribers::MessageBroadcaster.new, &MESSAGE_LIFECYCLE_FILTER)
+
+    # Routes agent_message Messages between parent and sub-agent sessions
+    # via @mentions. Hangs off the Message persistence lifecycle, so every
+    # persisted agent_message is a routing opportunity.
+    Events::Bus.subscribe(Events::Subscribers::SubagentMessageRouter.new, &MESSAGE_CREATED_FILTER)
+
+    # Checks whether Mneme should run after each persisted message.
+    Events::Bus.subscribe(Events::Subscribers::MnemeScheduler.new, &MESSAGE_CREATED_FILTER)
+
+    # Broadcasts eviction cutoff to clients after Mneme advances the boundary.
+    Events::Bus.subscribe(Events::Subscribers::EvictionBroadcaster.new, &EVICTION_FILTER)
+
+    # Broadcasts sub-agent HUD removal when eviction takes the last trace
+    # of a sub-agent past the Mneme boundary.
+    Events::Bus.subscribe(Events::Subscribers::SubagentVisibilityBroadcaster.new, &SUBAGENT_EVICTED_FILTER)
+
+    # Rebroadcasts active skills/workflow on every event that can change
+    # the set: skill activation, workflow activation, or eviction.
+    Events::Bus.subscribe(Events::Subscribers::ActiveStateBroadcaster.new, &ACTIVE_STATE_TRIGGER_FILTER)
   end
 end

data/config/initializers/inflections.rb

@@ -4,6 +4,8 @@
 Rails.autoloaders.each do |autoloader|
   autoloader.inflector.inflect(
     "llm" => "LLM",
-    "tui" => "TUI"
+    "tui" => "TUI",
+    "llm_response_handler" => "LLMResponseHandler",
+    "llm_responded" => "LLMResponded"
   )
 end

data/db/cable_structure.sql

@@ -1,9 +1,9 @@
-CREATE TABLE IF NOT EXISTS "solid_cable_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "channel" blob(1024) NOT NULL, "channel_hash" integer(8) NOT NULL, "created_at" datetime(6) NOT NULL, "payload" blob(536870912) NOT NULL);
+CREATE TABLE "solid_cable_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "channel" blob(1024) NOT NULL, "channel_hash" integer(8) NOT NULL, "created_at" datetime(6) NOT NULL, "payload" blob(536870912) NOT NULL);
 CREATE INDEX "index_solid_cable_messages_on_channel" ON "solid_cable_messages" ("channel");
 CREATE INDEX "index_solid_cable_messages_on_channel_hash" ON "solid_cable_messages" ("channel_hash");
 CREATE INDEX "index_solid_cable_messages_on_created_at" ON "solid_cable_messages" ("created_at");
-CREATE TABLE IF NOT EXISTS "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
-CREATE TABLE IF NOT EXISTS "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
+CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
+CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
 INSERT INTO "schema_migrations" (version) VALUES
 ('1');
 

data/db/migrate/20260407170803_remove_viewport_message_ids_from_sessions.rb

@@ -0,0 +1,5 @@
+class RemoveViewportMessageIdsFromSessions < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :sessions, :viewport_message_ids, :json, default: "[]", null: false
+  end
+end

data/db/migrate/20260407180400_remove_mneme_snapshot_pointer_columns_from_sessions.rb

@@ -0,0 +1,6 @@
+class RemoveMnemeSnapshotPointerColumnsFromSessions < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :sessions, :mneme_snapshot_first_message_id, :integer
+    remove_column :sessions, :mneme_snapshot_last_message_id, :integer
+  end
+end

data/db/migrate/20260411120553_add_token_count_to_pinned_messages.rb

@@ -0,0 +1,5 @@
+class AddTokenCountToPinnedMessages < ActiveRecord::Migration[8.1]
+  def change
+    add_column :pinned_messages, :token_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20260411172926_remove_active_skills_and_workflow_from_sessions.rb

@@ -0,0 +1,6 @@
+class RemoveActiveSkillsAndWorkflowFromSessions < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :sessions, :active_skills, :json
+    remove_column :sessions, :active_workflow, :string
+  end
+end

data/db/migrate/20260412110625_replace_processing_with_aasm_state.rb

@@ -0,0 +1,6 @@
+class ReplaceProcessingWithAasmState < ActiveRecord::Migration[8.1]
+  def change
+    add_column :sessions, :aasm_state, :string, default: "idle", null: false
+    remove_column :sessions, :processing, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20260418150323_add_kind_and_message_type_to_pending_messages.rb

@@ -0,0 +1,6 @@
+class AddKindAndMessageTypeToPendingMessages < ActiveRecord::Migration[8.1]
+  def change
+    add_column :pending_messages, :kind, :string, default: "active", null: false
+    add_column :pending_messages, :message_type, :string
+  end
+end

data/db/migrate/20260419120000_add_drain_fields_to_pending_messages.rb

@@ -0,0 +1,7 @@
+class AddDrainFieldsToPendingMessages < ActiveRecord::Migration[8.1]
+  def change
+    add_column :pending_messages, :tool_use_id, :string
+    add_column :pending_messages, :success, :boolean
+    add_column :pending_messages, :bounce_back, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20260419130000_drop_pending_messages_kind_default.rb

@@ -0,0 +1,5 @@
+class DropPendingMessagesKindDefault < ActiveRecord::Migration[8.1]
+  def change
+    change_column_default :pending_messages, :kind, from: "active", to: nil
+  end
+end

data/db/migrate/20260419140000_add_drain_indexes_to_pending_messages.rb

@@ -0,0 +1,8 @@
+class AddDrainIndexesToPendingMessages < ActiveRecord::Migration[8.1]
+  def change
+    add_index :pending_messages, [:session_id, :message_type, :created_at],
+      name: "index_pending_messages_on_drain_ordering"
+    add_index :pending_messages, [:session_id, :tool_use_id],
+      name: "index_pending_messages_on_session_and_tool_use"
+  end
+end

data/db/migrate/20260420100000_add_hud_visibility_to_sessions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Sub-agent sessions track presence in the parent's HUD panel through the
+# +hud_visible+ boolean. Mneme flips it to +false+ when viewport eviction
+# removes every trace of the sub-agent (spawn pair + response pairs). The
+# +spawn_tool_use_id+ column lets the trace query find the spawn pair
+# directly instead of string-matching the +spawn_subagent+ tool_input.
+class AddHudVisibilityToSessions < ActiveRecord::Migration[8.1]
+  def change
+    add_column :sessions, :hud_visible, :boolean, default: true, null: false
+    add_column :sessions, :spawn_tool_use_id, :string
+
+    add_index :sessions, [:parent_session_id, :hud_visible]
+  end
+end

data/db/queue_structure.sql

@@ -1,61 +1,61 @@
-CREATE TABLE IF NOT EXISTS "solid_queue_jobs" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "active_job_id" varchar, "arguments" text, "class_name" varchar NOT NULL, "concurrency_key" varchar, "created_at" datetime(6) NOT NULL, "finished_at" datetime(6), "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, "scheduled_at" datetime(6), "updated_at" datetime(6) NOT NULL);
+CREATE TABLE "solid_queue_jobs" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "active_job_id" varchar, "arguments" text, "class_name" varchar NOT NULL, "concurrency_key" varchar, "created_at" datetime(6) NOT NULL, "finished_at" datetime(6), "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, "scheduled_at" datetime(6), "updated_at" datetime(6) NOT NULL);
 CREATE INDEX "index_solid_queue_jobs_on_active_job_id" ON "solid_queue_jobs" ("active_job_id");
 CREATE INDEX "index_solid_queue_jobs_on_class_name" ON "solid_queue_jobs" ("class_name");
 CREATE INDEX "index_solid_queue_jobs_on_finished_at" ON "solid_queue_jobs" ("finished_at");
 CREATE INDEX "index_solid_queue_jobs_for_filtering" ON "solid_queue_jobs" ("queue_name", "finished_at");
 CREATE INDEX "index_solid_queue_jobs_for_alerting" ON "solid_queue_jobs" ("scheduled_at", "finished_at");
-CREATE TABLE IF NOT EXISTS "solid_queue_pauses" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "queue_name" varchar NOT NULL);
+CREATE TABLE "solid_queue_pauses" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "queue_name" varchar NOT NULL);
 CREATE UNIQUE INDEX "index_solid_queue_pauses_on_queue_name" ON "solid_queue_pauses" ("queue_name");
-CREATE TABLE IF NOT EXISTS "solid_queue_processes" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "hostname" varchar, "kind" varchar NOT NULL, "last_heartbeat_at" datetime(6) NOT NULL, "metadata" text, "name" varchar NOT NULL, "pid" integer NOT NULL, "supervisor_id" bigint);
+CREATE TABLE "solid_queue_processes" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "hostname" varchar, "kind" varchar NOT NULL, "last_heartbeat_at" datetime(6) NOT NULL, "metadata" text, "name" varchar NOT NULL, "pid" integer NOT NULL, "supervisor_id" bigint);
 CREATE INDEX "index_solid_queue_processes_on_last_heartbeat_at" ON "solid_queue_processes" ("last_heartbeat_at");
 CREATE UNIQUE INDEX "index_solid_queue_processes_on_name_and_supervisor_id" ON "solid_queue_processes" ("name", "supervisor_id");
 CREATE INDEX "index_solid_queue_processes_on_supervisor_id" ON "solid_queue_processes" ("supervisor_id");
-CREATE TABLE IF NOT EXISTS "solid_queue_recurring_tasks" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "arguments" text, "class_name" varchar, "command" varchar(2048), "created_at" datetime(6) NOT NULL, "description" text, "key" varchar NOT NULL, "priority" integer DEFAULT 0, "queue_name" varchar, "schedule" varchar NOT NULL, "static" boolean DEFAULT TRUE NOT NULL, "updated_at" datetime(6) NOT NULL);
+CREATE TABLE "solid_queue_recurring_tasks" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "arguments" text, "class_name" varchar, "command" varchar(2048), "created_at" datetime(6) NOT NULL, "description" text, "key" varchar NOT NULL, "priority" integer DEFAULT 0, "queue_name" varchar, "schedule" varchar NOT NULL, "static" boolean DEFAULT TRUE NOT NULL, "updated_at" datetime(6) NOT NULL);
 CREATE UNIQUE INDEX "index_solid_queue_recurring_tasks_on_key" ON "solid_queue_recurring_tasks" ("key");
 CREATE INDEX "index_solid_queue_recurring_tasks_on_static" ON "solid_queue_recurring_tasks" ("static");
-CREATE TABLE IF NOT EXISTS "solid_queue_semaphores" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "expires_at" datetime(6) NOT NULL, "key" varchar NOT NULL, "updated_at" datetime(6) NOT NULL, "value" integer DEFAULT 1 NOT NULL);
+CREATE TABLE "solid_queue_semaphores" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "expires_at" datetime(6) NOT NULL, "key" varchar NOT NULL, "updated_at" datetime(6) NOT NULL, "value" integer DEFAULT 1 NOT NULL);
 CREATE INDEX "index_solid_queue_semaphores_on_expires_at" ON "solid_queue_semaphores" ("expires_at");
 CREATE INDEX "index_solid_queue_semaphores_on_key_and_value" ON "solid_queue_semaphores" ("key", "value");
 CREATE UNIQUE INDEX "index_solid_queue_semaphores_on_key" ON "solid_queue_semaphores" ("key");
-CREATE TABLE IF NOT EXISTS "solid_queue_blocked_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "concurrency_key" varchar NOT NULL, "created_at" datetime(6) NOT NULL, "expires_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, CONSTRAINT "fk_rails_4cd34e2228"
+CREATE TABLE "solid_queue_blocked_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "concurrency_key" varchar NOT NULL, "created_at" datetime(6) NOT NULL, "expires_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, CONSTRAINT "fk_rails_4cd34e2228"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE INDEX "index_solid_queue_blocked_executions_for_release" ON "solid_queue_blocked_executions" ("concurrency_key", "priority", "job_id");
 CREATE INDEX "index_solid_queue_blocked_executions_for_maintenance" ON "solid_queue_blocked_executions" ("expires_at", "concurrency_key");
 CREATE UNIQUE INDEX "index_solid_queue_blocked_executions_on_job_id" ON "solid_queue_blocked_executions" ("job_id");
-CREATE TABLE IF NOT EXISTS "solid_queue_claimed_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "process_id" bigint, CONSTRAINT "fk_rails_9cfe4d4944"
+CREATE TABLE "solid_queue_claimed_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "process_id" bigint, CONSTRAINT "fk_rails_9cfe4d4944"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE UNIQUE INDEX "index_solid_queue_claimed_executions_on_job_id" ON "solid_queue_claimed_executions" ("job_id");
 CREATE INDEX "index_solid_queue_claimed_executions_on_process_id_and_job_id" ON "solid_queue_claimed_executions" ("process_id", "job_id");
-CREATE TABLE IF NOT EXISTS "solid_queue_failed_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "error" text, "job_id" bigint NOT NULL, CONSTRAINT "fk_rails_39bbc7a631"
+CREATE TABLE "solid_queue_failed_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "error" text, "job_id" bigint NOT NULL, CONSTRAINT "fk_rails_39bbc7a631"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE UNIQUE INDEX "index_solid_queue_failed_executions_on_job_id" ON "solid_queue_failed_executions" ("job_id");
-CREATE TABLE IF NOT EXISTS "solid_queue_ready_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, CONSTRAINT "fk_rails_81fcbd66af"
+CREATE TABLE "solid_queue_ready_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, CONSTRAINT "fk_rails_81fcbd66af"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE UNIQUE INDEX "index_solid_queue_ready_executions_on_job_id" ON "solid_queue_ready_executions" ("job_id");
 CREATE INDEX "index_solid_queue_poll_all" ON "solid_queue_ready_executions" ("priority", "job_id");
 CREATE INDEX "index_solid_queue_poll_by_queue" ON "solid_queue_ready_executions" ("queue_name", "priority", "job_id");
-CREATE TABLE IF NOT EXISTS "solid_queue_recurring_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "run_at" datetime(6) NOT NULL, "task_key" varchar NOT NULL, CONSTRAINT "fk_rails_318a5533ed"
+CREATE TABLE "solid_queue_recurring_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "run_at" datetime(6) NOT NULL, "task_key" varchar NOT NULL, CONSTRAINT "fk_rails_318a5533ed"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE UNIQUE INDEX "index_solid_queue_recurring_executions_on_job_id" ON "solid_queue_recurring_executions" ("job_id");
 CREATE UNIQUE INDEX "index_solid_queue_recurring_executions_on_task_key_and_run_at" ON "solid_queue_recurring_executions" ("task_key", "run_at");
-CREATE TABLE IF NOT EXISTS "solid_queue_scheduled_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, "scheduled_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_c4316f352d"
+CREATE TABLE "solid_queue_scheduled_executions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "job_id" bigint NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "queue_name" varchar NOT NULL, "scheduled_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_c4316f352d"
 FOREIGN KEY ("job_id")
   REFERENCES "solid_queue_jobs" ("id")
  ON DELETE CASCADE);
 CREATE UNIQUE INDEX "index_solid_queue_scheduled_executions_on_job_id" ON "solid_queue_scheduled_executions" ("job_id");
 CREATE INDEX "index_solid_queue_dispatch_all" ON "solid_queue_scheduled_executions" ("scheduled_at", "priority", "job_id");
-CREATE TABLE IF NOT EXISTS "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
-CREATE TABLE IF NOT EXISTS "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
+CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
+CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
 INSERT INTO "schema_migrations" (version) VALUES
 ('1');
 

data/db/structure.sql

@@ -1,46 +1,48 @@
-CREATE TABLE IF NOT EXISTS "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
-CREATE TABLE IF NOT EXISTS "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
-CREATE TABLE IF NOT EXISTS "goals" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "session_id" integer NOT NULL, "parent_goal_id" integer, "description" text NOT NULL, "status" varchar DEFAULT 'active' NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "completed_at" datetime(6), "evicted_at" datetime(6), CONSTRAINT "fk_rails_874b7534ae"
-FOREIGN KEY ("session_id")
-  REFERENCES "sessions" ("id")
-, CONSTRAINT "fk_rails_feeb9df31e"
+CREATE TABLE "secrets" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "key" varchar NOT NULL, "namespace" varchar NOT NULL, "updated_at" datetime(6) NOT NULL, "value" text NOT NULL);
+CREATE UNIQUE INDEX "index_secrets_on_namespace_and_key" ON "secrets" ("namespace", "key");
+CREATE TABLE "goals" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "completed_at" datetime(6), "created_at" datetime(6) NOT NULL, "description" text NOT NULL, "evicted_at" datetime(6), "parent_goal_id" integer, "session_id" integer NOT NULL, "status" varchar DEFAULT 'active' NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_feeb9df31e"
 FOREIGN KEY ("parent_goal_id")
   REFERENCES "goals" ("id")
+, CONSTRAINT "fk_rails_874b7534ae"
+FOREIGN KEY ("session_id")
+  REFERENCES "sessions" ("id")
 );
-CREATE INDEX "index_goals_on_session_id" ON "goals" ("session_id");
 CREATE INDEX "index_goals_on_parent_goal_id" ON "goals" ("parent_goal_id");
 CREATE INDEX "index_goals_on_session_id_and_status" ON "goals" ("session_id", "status");
-CREATE TABLE IF NOT EXISTS "messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "session_id" integer NOT NULL, "message_type" varchar NOT NULL, "payload" json DEFAULT '{}' NOT NULL, "timestamp" integer(8) NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "token_count" integer DEFAULT 0 NOT NULL, "tool_use_id" varchar, "status" varchar, "api_metrics" json, CONSTRAINT "fk_rails_1ee2a92df0"
+CREATE INDEX "index_goals_on_session_id" ON "goals" ("session_id");
+CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
+CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
+CREATE TABLE "messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "api_metrics" json, "created_at" datetime(6) NOT NULL, "message_type" varchar NOT NULL, "payload" json DEFAULT '{}' NOT NULL, "session_id" integer NOT NULL, "status" varchar, "timestamp" integer(8) NOT NULL, "token_count" integer DEFAULT 0 NOT NULL, "tool_use_id" varchar, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_1ee2a92df0"
 FOREIGN KEY ("session_id")
   REFERENCES "sessions" ("id")
 );
 CREATE INDEX "index_messages_on_session_id_and_status" ON "messages" ("session_id", "status");
-CREATE INDEX "index_messages_on_tool_use_id" ON "messages" ("tool_use_id");
 CREATE INDEX "index_messages_on_session_id" ON "messages" ("session_id");
+CREATE INDEX "index_messages_on_tool_use_id" ON "messages" ("tool_use_id");
 CREATE INDEX "index_messages_on_message_type" ON "messages" ("message_type");
 CREATE INDEX "index_messages_on_session_id_and_message_type" ON "messages" ("session_id", "message_type");
-CREATE TABLE IF NOT EXISTS "pinned_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "message_id" integer NOT NULL, "display_text" text NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_4a5f237c43"
+CREATE TABLE "pinned_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "display_text" text NOT NULL, "message_id" integer NOT NULL, "updated_at" datetime(6) NOT NULL, "token_count" integer DEFAULT 0 NOT NULL, CONSTRAINT "fk_rails_4a5f237c43"
 FOREIGN KEY ("message_id")
   REFERENCES "messages" ("id")
 );
 CREATE UNIQUE INDEX "index_pinned_messages_on_message_id" ON "pinned_messages" ("message_id");
-CREATE TABLE IF NOT EXISTS "goal_pinned_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "goal_id" integer NOT NULL, "pinned_message_id" integer NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_fb51bfeebe"
-FOREIGN KEY ("pinned_message_id")
-  REFERENCES "pinned_messages" ("id")
-, CONSTRAINT "fk_rails_689fd4bf8a"
+CREATE TABLE "goal_pinned_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "goal_id" integer NOT NULL, "pinned_message_id" integer NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_689fd4bf8a"
 FOREIGN KEY ("goal_id")
   REFERENCES "goals" ("id")
+, CONSTRAINT "fk_rails_fb51bfeebe"
+FOREIGN KEY ("pinned_message_id")
+  REFERENCES "pinned_messages" ("id")
 );
 CREATE INDEX "index_goal_pinned_messages_on_goal_id" ON "goal_pinned_messages" ("goal_id");
-CREATE INDEX "index_goal_pinned_messages_on_pinned_message_id" ON "goal_pinned_messages" ("pinned_message_id");
 CREATE UNIQUE INDEX "index_goal_pinned_messages_on_goal_id_and_pinned_message_id" ON "goal_pinned_messages" ("goal_id", "pinned_message_id");
-CREATE TABLE IF NOT EXISTS "snapshots" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "session_id" integer NOT NULL, "text" text NOT NULL, "from_message_id" integer NOT NULL, "to_message_id" integer NOT NULL, "level" integer DEFAULT 1 NOT NULL, "token_count" integer DEFAULT 0 NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_eb2ad51db9"
+CREATE INDEX "index_goal_pinned_messages_on_pinned_message_id" ON "goal_pinned_messages" ("pinned_message_id");
+CREATE TABLE "snapshots" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "from_message_id" integer NOT NULL, "level" integer DEFAULT 1 NOT NULL, "session_id" integer NOT NULL, "text" text NOT NULL, "to_message_id" integer NOT NULL, "token_count" integer DEFAULT 0 NOT NULL, "updated_at" datetime(6) NOT NULL, CONSTRAINT "fk_rails_eb2ad51db9"
 FOREIGN KEY ("session_id")
   REFERENCES "sessions" ("id")
 );
-CREATE INDEX "index_snapshots_on_session_id" ON "snapshots" ("session_id");
-CREATE INDEX "index_snapshots_on_session_id_and_level" ON "snapshots" ("session_id", "level");
 CREATE INDEX "index_snapshots_on_session_and_event_range" ON "snapshots" ("session_id", "from_message_id", "to_message_id");
+CREATE INDEX "index_snapshots_on_session_id_and_level" ON "snapshots" ("session_id", "level");
+CREATE INDEX "index_snapshots_on_session_id" ON "snapshots" ("session_id");
 CREATE VIRTUAL TABLE messages_fts USING fts5(
   searchable_text,
   content='',
@@ -48,10 +50,10 @@ CREATE VIRTUAL TABLE messages_fts USING fts5(
   tokenize='porter unicode61'
 )
 /* messages_fts(searchable_text) */;
-CREATE TABLE IF NOT EXISTS 'messages_fts_data'(id INTEGER PRIMARY KEY, block BLOB);
-CREATE TABLE IF NOT EXISTS 'messages_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID;
-CREATE TABLE IF NOT EXISTS 'messages_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB, origin INTEGER);
-CREATE TABLE IF NOT EXISTS 'messages_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID;
+CREATE TABLE 'messages_fts_data'(id INTEGER PRIMARY KEY, block BLOB);
+CREATE TABLE 'messages_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID;
+CREATE TABLE 'messages_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB, origin INTEGER);
+CREATE TABLE 'messages_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID;
 CREATE TRIGGER messages_fts_insert AFTER INSERT ON messages
 WHEN NEW.message_type IN ('user_message', 'agent_message', 'system_message')
   OR (NEW.message_type = 'tool_call' AND json_extract(NEW.payload, '$.tool_name') = 'think')
@@ -73,20 +75,31 @@ WHEN OLD.message_type IN ('user_message', 'agent_message', 'system_message')
 BEGIN
   DELETE FROM messages_fts WHERE rowid = OLD.id;
 END;
-CREATE TABLE IF NOT EXISTS "secrets" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "namespace" varchar NOT NULL, "key" varchar NOT NULL, "value" text NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);
-CREATE UNIQUE INDEX "index_secrets_on_namespace_and_key" ON "secrets" ("namespace", "key");
-CREATE INDEX "index_goals_on_evicted_at" ON "goals" ("evicted_at");
-CREATE TABLE IF NOT EXISTS "pending_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "session_id" integer NOT NULL, "content" text NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "source_type" varchar DEFAULT 'user' NOT NULL, "source_name" varchar, CONSTRAINT "fk_rails_007242365b"
-FOREIGN KEY ("session_id")
-  REFERENCES "sessions" ("id")
-);
-CREATE INDEX "index_pending_messages_on_session_id" ON "pending_messages" ("session_id");
-CREATE TABLE IF NOT EXISTS "sessions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "view_mode" varchar DEFAULT 'basic' NOT NULL, "processing" boolean DEFAULT FALSE NOT NULL, "parent_session_id" integer, "prompt" text, "granted_tools" text, "name" varchar, "viewport_message_ids" json DEFAULT '[]' NOT NULL, "active_skills" json DEFAULT '[]' NOT NULL, "active_workflow" varchar, "interrupt_requested" boolean DEFAULT FALSE NOT NULL, "mneme_boundary_message_id" integer, "mneme_snapshot_first_message_id" integer, "mneme_snapshot_last_message_id" integer, "initial_cwd" varchar, CONSTRAINT "fk_rails_045409ac27"
+CREATE TABLE "sessions" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime(6) NOT NULL, "granted_tools" text, "interrupt_requested" boolean DEFAULT FALSE NOT NULL, "mneme_boundary_message_id" integer, "name" varchar, "parent_session_id" integer, "prompt" text, "recalled_message_ids" json DEFAULT '[]' NOT NULL, "updated_at" datetime(6) NOT NULL, "view_mode" varchar DEFAULT 'basic' NOT NULL, "initial_cwd" varchar, "aasm_state" varchar DEFAULT 'idle' NOT NULL, "hud_visible" boolean DEFAULT TRUE NOT NULL, "spawn_tool_use_id" varchar, CONSTRAINT "fk_rails_045409ac27"
 FOREIGN KEY ("parent_session_id")
   REFERENCES "sessions" ("id")
 );
+CREATE UNIQUE INDEX "index_sessions_on_parent_and_name_unique" ON "sessions" ("parent_session_id", "name") WHERE name IS NOT NULL;
 CREATE INDEX "index_sessions_on_parent_session_id" ON "sessions" ("parent_session_id");
+CREATE TABLE "pending_messages" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "content" text NOT NULL, "created_at" datetime(6) NOT NULL, "session_id" integer NOT NULL, "source_name" varchar, "source_type" varchar DEFAULT 'user' NOT NULL, "updated_at" datetime(6) NOT NULL, "kind" varchar NOT NULL, "message_type" varchar, "tool_use_id" varchar, "success" boolean, "bounce_back" boolean DEFAULT FALSE NOT NULL, CONSTRAINT "fk_rails_007242365b"
+FOREIGN KEY ("session_id")
+  REFERENCES "sessions" ("id")
+);
+CREATE INDEX "index_pending_messages_on_session_id" ON "pending_messages" ("session_id");
+CREATE INDEX "index_pending_messages_on_drain_ordering" ON "pending_messages" ("session_id", "message_type", "created_at");
+CREATE INDEX "index_pending_messages_on_session_and_tool_use" ON "pending_messages" ("session_id", "tool_use_id");
+CREATE INDEX "index_sessions_on_parent_session_id_and_hud_visible" ON "sessions" ("parent_session_id", "hud_visible");
 INSERT INTO "schema_migrations" (version) VALUES
+('20260420100000'),
+('20260419140000'),
+('20260419130000'),
+('20260419120000'),
+('20260418150323'),
+('20260412110625'),
+('20260411172926'),
+('20260411120553'),
+('20260407180400'),
+('20260407170803'),
 ('20260403080031'),
 ('20260401210935'),
 ('20260401180000'),

data/lib/agents/registry.rb

@@ -97,7 +97,7 @@ module Agents
     def validate_tools!(agent_name, tools)
       return if tools.empty?
 
-      unknown = tools - AgentLoop::STANDARD_TOOLS_BY_NAME.keys
+      unknown = tools - Tools::Registry::STANDARD_TOOLS_BY_NAME.keys
       return if unknown.empty?
 
       raise InvalidDefinitionError, "Unknown tools in '#{agent_name}': #{unknown.join(", ")}"