actionagent 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2d4c834fd9d4b7990cd9deb27061d5b56e25e1379ae66c1b7251c0c890b645
-  data.tar.gz: 84903be1227333260c6b7b90079c4a67f1d5fc60c07bafc6b28651b81b8804cf
+  metadata.gz: f6e31cd17a84e6621881630137c3478268d2e31c8bba138516a397c23964c4f9
+  data.tar.gz: 28e83e7b84704c5ff9de2b475998273ac3dd328929515472f31e3743981927de
 SHA512:
-  metadata.gz: d11a547b4172f715efa0a16c3da0f548e06ff17ac2b7c7524b9a696d16a4f1248123ca9d2f859187862112b1b3fbfdafd73a556891eaf4bcd810492eb92be81f
-  data.tar.gz: bda14fd2e530157019b6b823581d08c42eb9896a4db726f1325b03b339e14f21b0e97cb003bc693e131440ed6a56d5ffca7f330ba147ddcf8d89a77994fedc85
+  metadata.gz: 3a9e49dce9507b1243dd494b842c967bb5cb04921a7825ae2e16e37ed3cf25e845ae5b86de26b50cacdb01e7120859624ea7667d05c0d04048489bc7af5b534e
+  data.tar.gz: bebd359520c4ea07d69288ef8381afd5e5f663ea6df3264e17db81c2bc1a6d78836be216a8677666ede6223a1069f39e3e8e3a709025adcf8c9817a2be9750c9

data/app/models/action_agent/telemetry_trace.rb

@@ -135,7 +135,7 @@ module ActionAgent
       # Add account if in multi-tenant mode
       attrs[:account] = account if ActionAgent.multi_tenant? && account
 
-      create!(attrs)
+      create!(attrs).tap { |record| AgentRegistrar.call(record) }
     end
 
     # Sums a span's token counts (used to decide which spans carry the

data/app/services/action_agent/agent_execution_service.rb

@@ -354,8 +354,14 @@ module ActionAgent
         define_singleton_method(:name) { klass_name }
 
         # Persist the conversation (agent_contexts / agent_messages /
-        # agent_generations) via solid_agent. contextable: false — the context
-        # is loaded explicitly in the action below.
+        # agent_generations) via solid_agent. Auto-context is switched off —
+        # the context is loaded explicitly in the action below.
+        #
+        # The keyword that switches it off was renamed (contextable: ->
+        # contextual:) between solid_agent 0.1 and 0.2, and the gemspec floor
+        # admits both, so it is resolved from the installed method rather than
+        # hard-coded: passing the wrong one is an ArgumentError that only
+        # surfaces when a run executes.
         #
         # The model classes are named explicitly because solid_agent infers
         # bare "AgentContext"/"AgentMessage"/"AgentGeneration" and resolves
@@ -363,10 +369,12 @@ module ActionAgent
         # inferred names only resolve in a host app that happens to have
         # top-level models of its own.
         include SolidAgent::HasContext
-        has_context contextable: false,
+        has_context(
+          ActionAgent.solid_agent_auto_context_keyword => false,
           class_name: "ActionAgent::AgentContext",
           message_class: "ActionAgent::AgentMessage",
           generation_class: "ActionAgent::AgentGeneration"
+        )
 
         if effective_provider == :mock
           # Test environment only (see #provider_available?).

data/app/services/action_agent/agent_toolbox.rb

@@ -399,7 +399,7 @@ module ActionAgent
         if defined?(SolidAgent::ToolCache)
           SolidAgent::ToolCache.fetch(tool: name.to_s, args: kwargs, ttl: CACHE_TTL, &block)
         else
-          key = "solid_agent:tool_cache:#{name}:#{Digest::SHA256.hexdigest(kwargs.sort.to_h.to_json)}"
+          key = fallback_cache_key(name, kwargs)
           cached = Rails.cache.read(key)
           return cached.merge(cached: true) unless cached.nil?
 
@@ -411,6 +411,29 @@ module ActionAgent
         end
       end
 
+      # Byte-for-byte the key SolidAgent::ToolCache would compute, so an app
+      # that upgrades solid_agent mid-TTL keeps reading what it already
+      # cached instead of silently starting over. Nested hashes and
+      # symbol/string keys have to normalize the same way, which a plain
+      # `kwargs.sort.to_h.to_json` does not do.
+      #
+      # test/integration/solid_agent/tool_cache_test.rb asserts the two
+      # schemes still agree.
+      def fallback_cache_key(name, kwargs)
+        "solid_agent:tool_cache:#{name}:#{Digest::SHA256.hexdigest(normalize_cache_args(kwargs).to_json)}"
+      end
+
+      def normalize_cache_args(args)
+        case args
+        when Hash
+          args.map { |key, value| [ key.to_s, normalize_cache_args(value) ] }.sort_by(&:first)
+        when Array
+          args.map { |value| normalize_cache_args(value) }
+        else
+          args
+        end
+      end
+
       # SSRF guard for fetch_url: reject hosts that resolve to loopback,
       # private, or link-local addresses.
       def public_host?(host)

data/lib/action_agent/engine.rb

@@ -13,6 +13,13 @@ module ActionAgent
 
     engine_name "action_agent"
 
+    # Basenames this engine spells differently from Zeitwerk's default
+    # camelization, consulted by the inflections initializer below. Empty
+    # today: every file here is named for the constant default camelization
+    # produces. An engine file that wants a genuine acronym in its constant
+    # adds its basename here rather than relying on the host to register one.
+    INFLECTION_OVERRIDES = {}.freeze
+
     config.action_agent = ActiveSupport::OrderedOptions.new
 
     # The dashboard's JS and CSS ship prebuilt in the gem. Adding the
@@ -26,26 +33,34 @@ module ActionAgent
       app.config.filter_parameters += [ :credential, :api_key, :access_token ]
     end
 
-    # The controllers under app/controllers/action_agent/api are ActionAgent::Api,
-    # but an engine's files are autoloaded by the host's `rails.main` loader,
-    # under the host's inflections. A host that declares `inflect.acronym "API"`
-    # — common enough that Rails documents it — makes Zeitwerk expect
-    # ActionAgent::API::TracesController in a file that defines
-    # ActionAgent::Api::TracesController, and every request to the mount raises
-    # Zeitwerk::NameError.
+    # This engine's constants are spelled the way Zeitwerk's own inflector
+    # spells them — Api, McpCatalog, ApiKey — but an engine's files are
+    # autoloaded by the host's `rails.main` loader, under the *host's*
+    # inflections. A host that declares `inflect.acronym "API"` or "MCP" (both
+    # common, and documented by Rails) makes Zeitwerk expect
+    # ActionAgent::API::TracesController or ActionAgent::MCPCatalog from files
+    # that define ActionAgent::Api::TracesController and
+    # ActionAgent::McpCatalog. The constant never resolves and the request
+    # raises Zeitwerk::NameError.
+    #
+    # Every path under this engine therefore camelizes with Zeitwerk's default
+    # rules, ignoring whatever acronyms the host has registered. Applied by
+    # path rather than through `inflect`: the loader is shared with the host,
+    # so a blanket rule would re-spell the host's own constants. `camelize`
+    # receives the absolute path, which is the only hook that can tell this
+    # engine's files from the host's.
     #
-    # Scoped to this engine's own path rather than set through `inflect`: the
-    # loader is shared, so a blanket rule would re-spell the host's own API
-    # constants. `camelize` receives the absolute path, which is the only hook
-    # that can tell this engine's api/ from the host's.
+    # Basenames whose spelling this engine cannot express through default
+    # camelization (a genuine acronym it wants uppercased) go in OVERRIDES.
     initializer "action_agent.inflections", before: :set_autoload_paths do
-      engine_root = root.to_s
+      engine_root = File.join(root.to_s, "")
+      default = Zeitwerk::Inflector.new
 
       Rails.autoloaders.main.inflector.singleton_class.prepend(Module.new do
         define_method(:camelize) do |basename, abspath|
-          next "Api" if basename == "api" && abspath.to_s.start_with?(engine_root)
+          next super(basename, abspath) unless abspath.to_s.start_with?(engine_root)
 
-          super(basename, abspath)
+          ActionAgent::Engine::INFLECTION_OVERRIDES.fetch(basename) { default.camelize(basename, abspath) }
         end
       end)
     end
@@ -59,13 +74,33 @@ module ActionAgent
     # So the namespace answers to both. `const_missing` rather than an eager
     # alias because the controllers are autoloaded on demand, and naming them at
     # boot would load the whole dashboard.
-    ActionAgent.singleton_class.prepend(Module.new do
+    # The router does not consult the autoloader's inflector, so an acronym
+    # host asks for ActionAgent::API::MCPServersController while the constants
+    # are Api::McpServersController. Rather than enumerate the pairs, an
+    # all-caps run in a missing constant is retried in the spelling default
+    # camelization produces: API -> Api, MCPServersController -> McpServers-
+    # Controller. Only the engine's own namespaces are touched, and only for a
+    # constant that is already missing.
+    inflection_shim = Module.new do
       def const_missing(name)
-        return const_get(:Api) if name == :API
+        relaxed = name.to_s.gsub(/([A-Z])([A-Z]+)(?=[A-Z][a-z]|\d|\z)/) { "#{$1}#{$2.downcase}" }
+
+        return super if relaxed == name.to_s || !const_defined?(relaxed, false)
+
+        const_get(relaxed, false)
+      end
+    end
 
-        super
+    ActionAgent.singleton_class.prepend(inflection_shim)
+
+    # ActionAgent::Api is autoloaded, so it cannot be reopened at this point.
+    # Zeitwerk hands it over as soon as it is defined, which is before the
+    # router can ask it for a controller.
+    initializer "action_agent.api_inflection_shim" do
+      Rails.autoloaders.main.on_load("ActionAgent::Api") do |mod, _abspath|
+        mod.singleton_class.prepend(inflection_shim)
       end
-    end)
+    end
 
     initializer "action_agent.assets", before: :append_assets_path do |app|
       builds = root.join("app", "assets", "builds").to_s

data/lib/action_agent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionAgent
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/action_agent.rb

@@ -20,6 +20,25 @@ module ActionAgent
       global = defined?(::ActiveRecord::Base) ? ::ActiveRecord::Base.table_name_prefix : ""
       "#{global}#{@table_name_prefix ||= "active_agent_"}"
     end
+
+    # Which keyword the installed solid_agent uses to switch has_context's
+    # auto-context off: `contextable:` up to 0.1, `contextual:` from 0.2. The
+    # gemspec floor admits both, and passing the wrong one raises an
+    # ArgumentError deep inside a run rather than at boot — so
+    # AgentExecutionService asks rather than assumes.
+    #
+    # Covered by test/integration/solid_agent, which runs this engine against
+    # solid_agent's main branch as well as the released gem.
+    def solid_agent_auto_context_keyword
+      @solid_agent_auto_context_keyword ||= begin
+        keywords = ::SolidAgent::HasContext::ClassMethods
+          .instance_method(:has_context).parameters
+          .select { |type, _| [ :key, :keyreq ].include?(type) }
+          .map(&:last)
+
+        keywords.include?(:contextual) ? :contextual : :contextable
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionagent
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Justin Bowen