cadenya 0.26.0 → 0.28.0

data/lib/cadenya/models/rotate_challenge_token_response.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Cadenya
+  module Models
+    # @see Cadenya::Resources::Account#rotate_challenge_token
+    class RotateChallengeTokenResponse < Cadenya::Internal::Type::BaseModel
+      # @!attribute challenge_token
+      #
+      #   @return [String, nil]
+      optional :challenge_token, String, api_name: :challengeToken
+
+      # @!method initialize(challenge_token: nil)
+      #   Response containing the newly generated challenge token.
+      #
+      #   @param challenge_token [String]
+    end
+  end
+end

data/lib/cadenya/models/tool_set_adapter_mcp.rb

@@ -20,6 +20,12 @@ module Cadenya
       #   @return [Cadenya::Models::ToolFilter, nil]
       optional :include_tools, -> { Cadenya::ToolFilter }, api_name: :includeTools
 
+      # @!attribute just_in_time
+      #   Defines behavior for just-in-time capable tool set adapters (IE: MCP).
+      #
+      #   @return [Cadenya::Models::ToolSetAdapterMcp::JustInTime, nil]
+      optional :just_in_time, -> { Cadenya::ToolSetAdapterMcp::JustInTime }, api_name: :justInTime
+
       # @!attribute tool_approvals
       #   Approval filters that will automatically set the approval requirement on tools
       #   synced from an external source
@@ -32,7 +38,7 @@ module Cadenya
       #   @return [String, nil]
       optional :url, String
 
-      # @!method initialize(exclude_tools: nil, headers: nil, include_tools: nil, tool_approvals: nil, url: nil)
+      # @!method initialize(exclude_tools: nil, headers: nil, include_tools: nil, just_in_time: nil, tool_approvals: nil, url: nil)
       #   Some parameter documentations has been truncated, see
       #   {Cadenya::Models::ToolSetAdapterMcp} for more details.
       #
@@ -42,9 +48,40 @@ module Cadenya
       #
       #   @param include_tools [Cadenya::Models::ToolFilter] Top-level filter with simple boolean logic (no nesting)
       #
+      #   @param just_in_time [Cadenya::Models::ToolSetAdapterMcp::JustInTime] Defines behavior for just-in-time capable tool set adapters (IE: MCP).
+      #
       #   @param tool_approvals [Cadenya::Models::ApprovalRequirementFilter] Approval filters that will automatically set the approval requirement on tools s
       #
       #   @param url [String]
+
+      # @see Cadenya::Models::ToolSetAdapterMcp#just_in_time
+      class JustInTime < Cadenya::Internal::Type::BaseModel
+        # @!attribute enabled
+        #
+        #   @return [Boolean, nil]
+        optional :enabled, Cadenya::Internal::Type::Boolean
+
+        # @!attribute fail_objective_on_tool_list_error
+        #   If set, an objective will automatically be failed if tools cannot be loaded in
+        #   the initial stages of an objective being created. Tools are loaded
+        #   asynchronously, so this setting is useful for ensuring that an objective
+        #   continued any further if tools are not available.
+        #
+        #   @return [Boolean, nil]
+        optional :fail_objective_on_tool_list_error,
+                 Cadenya::Internal::Type::Boolean,
+                 api_name: :failObjectiveOnToolListError
+
+        # @!method initialize(enabled: nil, fail_objective_on_tool_list_error: nil)
+        #   Some parameter documentations has been truncated, see
+        #   {Cadenya::Models::ToolSetAdapterMcp::JustInTime} for more details.
+        #
+        #   Defines behavior for just-in-time capable tool set adapters (IE: MCP).
+        #
+        #   @param enabled [Boolean]
+        #
+        #   @param fail_objective_on_tool_list_error [Boolean] If set, an objective will automatically be failed if tools cannot be loaded
+      end
     end
   end
 end

data/lib/cadenya/models/tool_sets/tool_info.rb

@@ -18,12 +18,25 @@ module Cadenya
         #   @return [Cadenya::Models::ResourceMetadata, nil]
         optional :tool_set, -> { Cadenya::ResourceMetadata }, api_name: :toolSet
 
-        # @!method initialize(created_by: nil, tool_set: nil)
+        response_only do
+          # @!attribute signature
+          #   Content signature identifying the tool within its tool set: a hash of the
+          #   sanitized llm_tool_name, description, and canonical parameters. Two tools with
+          #   the same llm_tool_name but different parameters or description (as MCP servers
+          #   may return per user) have distinct signatures.
+          #
+          #   @return [String, nil]
+          optional :signature, String
+        end
+
+        # @!method initialize(created_by: nil, signature: nil, tool_set: nil)
         #   Some parameter documentations has been truncated, see
         #   {Cadenya::Models::ToolSets::ToolInfo} for more details.
         #
         #   @param created_by [Cadenya::Models::Profile] A profile identifies a user or non-human principal (such as an API key)
         #
+        #   @param signature [String] Content signature identifying the tool within its tool set: a hash of the
+        #
         #   @param tool_set [Cadenya::Models::ResourceMetadata] Standard metadata for persistent, named resources (e.g., agents, tools, prompts)
       end
     end

data/lib/cadenya/models.rb

@@ -47,6 +47,8 @@ module Cadenya
 
   AccountRetrieveParams = Cadenya::Models::AccountRetrieveParams
 
+  AccountRotateChallengeTokenParams = Cadenya::Models::AccountRotateChallengeTokenParams
+
   AccountRotateWebhookSigningKeyParams = Cadenya::Models::AccountRotateWebhookSigningKeyParams
 
   AccountSpec = Cadenya::Models::AccountSpec
@@ -219,6 +221,8 @@ module Cadenya
 
   ResourceMetadata = Cadenya::Models::ResourceMetadata
 
+  RotateChallengeTokenResponse = Cadenya::Models::RotateChallengeTokenResponse
+
   RotateWebhookSigningKeyResponse = Cadenya::Models::RotateWebhookSigningKeyResponse
 
   SearchSearchToolsOrToolSetsParams = Cadenya::Models::SearchSearchToolsOrToolSetsParams

data/lib/cadenya/resources/account.rb

@@ -24,6 +24,25 @@ module Cadenya
         )
       end
 
+      # Rotates the challenge token sent in the X-Cadenya-Challenge-Token header on MCP
+      # tools/list requests. Returns only the new token.
+      #
+      # @overload rotate_challenge_token(request_options: {})
+      #
+      # @param request_options [Cadenya::RequestOptions, Hash{Symbol=>Object}, nil]
+      #
+      # @return [Cadenya::Models::RotateChallengeTokenResponse]
+      #
+      # @see Cadenya::Models::AccountRotateChallengeTokenParams
+      def rotate_challenge_token(params = {})
+        @client.request(
+          method: :post,
+          path: "v1/account:rotateChallengeToken",
+          model: Cadenya::RotateChallengeTokenResponse,
+          options: params[:request_options]
+        )
+      end
+
       # Rotates the webhook signing key for the account. Returns only the new key.
       #
       # @overload rotate_webhook_signing_key(request_options: {})

data/lib/cadenya/resources/objectives.rb

@@ -20,17 +20,19 @@ module Cadenya
       #
       # Creates a new objective in the workspace
       #
-      # @overload create(workspace_id, agent_id:, data:, episodic_memory: nil, initial_message: nil, memory_cascade: nil, metadata: nil, secrets: nil, user_data: nil, variation_id: nil, request_options: {})
+      # @overload create(workspace_id, agent_id:, system_prompt_data:, episodic_memory: nil, first_user_message: nil, first_user_message_data: nil, memory_cascade: nil, metadata: nil, secrets: nil, variation_id: nil, request_options: {})
       #
       # @param workspace_id [String]
       #
       # @param agent_id [String]
       #
-      # @param data [Hash{Symbol=>Object}] Arbitrary data for the objective. May be used in liquid templates for prompts co
+      # @param system_prompt_data [Hash{Symbol=>Object}] Arbitrary data rendered into the selected variation's system_prompt_template
       #
       # @param episodic_memory [Cadenya::Models::ObjectiveCreateParams::EpisodicMemory] Episodic is used to configure the episodic memory for the objective
       #
-      # @param initial_message [String] Optional override for the initial message sent to the agent. This becomes the fi
+      # @param first_user_message [String] Optional explicit first user message for the LLM chat history. When not set,
+      #
+      # @param first_user_message_data [Hash{Symbol=>Object}] Arbitrary data rendered into the selected variation's first_user_message_templat
       #
       # @param memory_cascade [Array<Cadenya::Models::MemoryReference>] Memory layers/entries layered over the baseline cascade inherited
       #
@@ -38,8 +40,6 @@ module Cadenya
       #
       # @param secrets [Array<Cadenya::Models::ObjectiveCreateParams::Secret>] Secrets that can be used in the headers for tool calls using the secret interpol
       #
-      # @param user_data [Hash{Symbol=>Object}] Arbitrary data rendered into the selected variation's user_message_template
-      #
       # @param variation_id [String] Optional explicit variation selection. Overrides the agent's variation_selection
       #
       # @param request_options [Cadenya::RequestOptions, Hash{Symbol=>Object}, nil]
@@ -208,7 +208,7 @@ module Cadenya
       #
       # Continues an objective that has completed
       #
-      # @overload continue(objective_id, workspace_id:, enqueue: nil, message: nil, secrets: nil, request_options: {})
+      # @overload continue(objective_id, workspace_id:, enqueue: nil, message: nil, request_options: {})
       #
       # @param objective_id [String] Path param: The ID of the objective. If you have assigned an external ID to the
       #
@@ -218,8 +218,6 @@ module Cadenya
       #
       # @param message [String] Body param: The message to continue an objective that has completed (or you are
       #
-      # @param secrets [Array<Cadenya::Models::ObjectiveContinueParams::Secret>] Body param: Secrets that should be included with the message. Helpful for when y
-      #
       # @param request_options [Cadenya::RequestOptions, Hash{Symbol=>Object}, nil]
       #
       # @return [Cadenya::Models::ObjectiveEvent]

data/lib/cadenya/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cadenya
-  VERSION = "0.26.0"
+  VERSION = "0.28.0"
 end

data/lib/cadenya.rb

@@ -60,6 +60,7 @@ require_relative "cadenya/models/account"
 require_relative "cadenya/models/account_info"
 require_relative "cadenya/models/account_resource_metadata"
 require_relative "cadenya/models/account_retrieve_params"
+require_relative "cadenya/models/account_rotate_challenge_token_params"
 require_relative "cadenya/models/account_rotate_webhook_signing_key_params"
 require_relative "cadenya/models/account_spec"
 require_relative "cadenya/models/agent"
@@ -223,6 +224,7 @@ require_relative "cadenya/models/profile"
 require_relative "cadenya/models/profile_spec"
 require_relative "cadenya/models/profile_whoami_params"
 require_relative "cadenya/models/resource_metadata"
+require_relative "cadenya/models/rotate_challenge_token_response"
 require_relative "cadenya/models/rotate_webhook_signing_key_response"
 require_relative "cadenya/models/search_search_tools_or_tool_sets_params"
 require_relative "cadenya/models/search_search_tools_or_tool_sets_response"

data/rbi/cadenya/models/account_info.rbi

@@ -6,6 +6,17 @@ module Cadenya
       OrHash =
         T.type_alias { T.any(Cadenya::AccountInfo, Cadenya::Internal::AnyHash) }
 
+      # The challenge token Cadenya sends in the X-Cadenya-Challenge-Token header on
+      # every MCP tools/list request. Server implementations can accept a valid
+      # challenge token in place of per-user auth when listing tools, while still
+      # requiring real auth on tools/call. Rotate with RotateChallengeToken; update any
+      # servers validating the token before rotating.
+      sig { returns(T.nilable(String)) }
+      attr_reader :challenge_token
+
+      sig { params(challenge_token: String).void }
+      attr_writer :challenge_token
+
       # An API key for the account. Use workspace-association RPCs to grant the key
       # access to specific workspaces; a key with zero workspaces is valid but cannot
       # access workspace-scoped resources.
@@ -27,11 +38,18 @@ module Cadenya
       # Server-populated information about the account.
       sig do
         params(
+          challenge_token: String,
           global_api_key: Cadenya::APIKey::OrHash,
           webhook_events_hmac_secret: String
         ).returns(T.attached_class)
       end
       def self.new(
+        # The challenge token Cadenya sends in the X-Cadenya-Challenge-Token header on
+        # every MCP tools/list request. Server implementations can accept a valid
+        # challenge token in place of per-user auth when listing tools, while still
+        # requiring real auth on tools/call. Rotate with RotateChallengeToken; update any
+        # servers validating the token before rotating.
+        challenge_token: nil,
         # An API key for the account. Use workspace-association RPCs to grant the key
         # access to specific workspaces; a key with zero workspaces is valid but cannot
         # access workspace-scoped resources.
@@ -46,6 +64,7 @@ module Cadenya
       sig do
         override.returns(
           {
+            challenge_token: String,
             global_api_key: Cadenya::APIKey,
             webhook_events_hmac_secret: String
           }

data/rbi/cadenya/models/account_rotate_challenge_token_params.rbi

@@ -0,0 +1,30 @@
+# typed: strong
+
+module Cadenya
+  module Models
+    class AccountRotateChallengeTokenParams < Cadenya::Internal::Type::BaseModel
+      extend Cadenya::Internal::Type::RequestParameters::Converter
+      include Cadenya::Internal::Type::RequestParameters
+
+      OrHash =
+        T.type_alias do
+          T.any(
+            Cadenya::AccountRotateChallengeTokenParams,
+            Cadenya::Internal::AnyHash
+          )
+        end
+
+      sig do
+        params(request_options: Cadenya::RequestOptions::OrHash).returns(
+          T.attached_class
+        )
+      end
+      def self.new(request_options: {})
+      end
+
+      sig { override.returns({ request_options: Cadenya::RequestOptions }) }
+      def to_hash
+      end
+    end
+  end
+end

data/rbi/cadenya/models/agent_spec.rbi

@@ -38,17 +38,6 @@ module Cadenya
       sig { params(episodic_memory_ttl: Integer).void }
       attr_writer :episodic_memory_ttl
 
-      # InputDataSchema is used for enforcing a data input when objectives are created.
-      # This is valuable when using liquid formatting in agent variation prompts. Input
-      # data schema is also valuable when using an agent as a sub-agent, as the schema
-      # is used as the tool's input parameter schema. If omitted, the sub-agent schema
-      # will be loaded with a simple "prompt" free text string as its schema.
-      sig { returns(T.nilable(T::Hash[Symbol, T.anything])) }
-      attr_reader :input_data_schema
-
-      sig { params(input_data_schema: T::Hash[Symbol, T.anything]).void }
-      attr_writer :input_data_schema
-
       # Optional output definition for objectives created for this agent. When provided,
       # Cadenya will append a tool to that will be called by the LLM in use by the
       # variant to extract information in the format provided here. Use this option when
@@ -59,6 +48,20 @@ module Cadenya
       sig { params(output_definition: T::Hash[Symbol, T.anything]).void }
       attr_writer :output_definition
 
+      # SystemPromptDataSchema enforces the shape of system_prompt_data when objectives
+      # are created. This is valuable when using liquid formatting in agent variation
+      # system prompt templates. The schema is also used when the agent is attached as a
+      # sub-agent, as it becomes the tool's input parameter schema. If omitted, the
+      # sub-agent schema will be loaded with a simple "prompt" free text string as its
+      # schema.
+      sig { returns(T.nilable(T::Hash[Symbol, T.anything])) }
+      attr_reader :system_prompt_data_schema
+
+      sig do
+        params(system_prompt_data_schema: T::Hash[Symbol, T.anything]).void
+      end
+      attr_writer :system_prompt_data_schema
+
       # The URL that Cadenya will send events for any objective assigned to the agent.
       sig { returns(T.nilable(String)) }
       attr_reader :webhook_events_url
@@ -74,8 +77,8 @@ module Cadenya
           description: String,
           enable_episodic_memory: T::Boolean,
           episodic_memory_ttl: Integer,
-          input_data_schema: T::Hash[Symbol, T.anything],
           output_definition: T::Hash[Symbol, T.anything],
+          system_prompt_data_schema: T::Hash[Symbol, T.anything],
           webhook_events_url: String
         ).returns(T.attached_class)
       end
@@ -95,17 +98,18 @@ module Cadenya
         # layer's expiry forward by this duration, and stored entries expire this long
         # after they are written. If not set, episodic memories are retained indefinitely.
         episodic_memory_ttl: nil,
-        # InputDataSchema is used for enforcing a data input when objectives are created.
-        # This is valuable when using liquid formatting in agent variation prompts. Input
-        # data schema is also valuable when using an agent as a sub-agent, as the schema
-        # is used as the tool's input parameter schema. If omitted, the sub-agent schema
-        # will be loaded with a simple "prompt" free text string as its schema.
-        input_data_schema: nil,
         # Optional output definition for objectives created for this agent. When provided,
         # Cadenya will append a tool to that will be called by the LLM in use by the
         # variant to extract information in the format provided here. Use this option when
         # you want structured data to be created by your objectives.
         output_definition: nil,
+        # SystemPromptDataSchema enforces the shape of system_prompt_data when objectives
+        # are created. This is valuable when using liquid formatting in agent variation
+        # system prompt templates. The schema is also used when the agent is attached as a
+        # sub-agent, as it becomes the tool's input parameter schema. If omitted, the
+        # sub-agent schema will be loaded with a simple "prompt" free text string as its
+        # schema.
+        system_prompt_data_schema: nil,
         # The URL that Cadenya will send events for any objective assigned to the agent.
         webhook_events_url: nil
       )
@@ -119,8 +123,8 @@ module Cadenya
             description: String,
             enable_episodic_memory: T::Boolean,
             episodic_memory_ttl: Integer,
-            input_data_schema: T::Hash[Symbol, T.anything],
             output_definition: T::Hash[Symbol, T.anything],
+            system_prompt_data_schema: T::Hash[Symbol, T.anything],
             webhook_events_url: String
           }
         )

data/rbi/cadenya/models/agents/agent_schedule_spec.rbi

@@ -27,22 +27,23 @@ module Cadenya
         end
         attr_writer :schedule
 
-        # Optional input data passed to the objective. If the agent has an
-        # input_data_schema, this must satisfy it.
-        sig { returns(T.nilable(T.anything)) }
-        attr_reader :data
+        # Optional explicit first user message passed to CreateObjective on each fire.
+        # Becomes the first user message in the objective's chat history. When unset, the
+        # fired objective defers to the selected variation's first_user_message_template.
+        sig { returns(T.nilable(String)) }
+        attr_reader :first_user_message
 
-        sig { params(data: T.anything).void }
-        attr_writer :data
+        sig { params(first_user_message: String).void }
+        attr_writer :first_user_message
 
-        # Optional initial message passed to CreateObjective on each fire. Becomes the
-        # first user message in the objective's chat history. When unset, the fired
-        # objective defers to the selected variation's user_message_template.
-        sig { returns(T.nilable(String)) }
-        attr_reader :initial_message
+        # Optional data rendered into the variation's first_user_message_template when
+        # each fired objective is created. Separate from `system_prompt_data`, which
+        # renders the system prompt template.
+        sig { returns(T.nilable(T.anything)) }
+        attr_reader :first_user_message_data
 
-        sig { params(initial_message: String).void }
-        attr_writer :initial_message
+        sig { params(first_user_message_data: T.anything).void }
+        attr_writer :first_user_message_data
 
         # What to do when the previous run is still in flight. Defaults to SKIP.
         sig do
@@ -62,14 +63,14 @@ module Cadenya
         end
         attr_writer :overlap_policy
 
-        # Optional data rendered into the variation's user_message_template when each
-        # fired objective is created. Separate from `data`, which renders the system
-        # prompt template.
+        # Optional data rendered into the variation's system_prompt_template when each
+        # fired objective is created. If the agent has a system_prompt_data_schema, this
+        # must satisfy it.
         sig { returns(T.nilable(T.anything)) }
-        attr_reader :user_data
+        attr_reader :system_prompt_data
 
-        sig { params(user_data: T.anything).void }
-        attr_writer :user_data
+        sig { params(system_prompt_data: T.anything).void }
+        attr_writer :system_prompt_data
 
         # Optional explicit variation. When unset, the agent's variation_selection_mode
         # chooses per fire.
@@ -83,11 +84,11 @@ module Cadenya
         sig do
           params(
             schedule: Cadenya::Agents::AgentScheduleSpecSchedule::OrHash,
-            data: T.anything,
-            initial_message: String,
+            first_user_message: String,
+            first_user_message_data: T.anything,
             overlap_policy:
               Cadenya::Agents::AgentScheduleSpec::OverlapPolicy::OrSymbol,
-            user_data: T.anything,
+            system_prompt_data: T.anything,
             variation_id: String
           ).returns(T.attached_class)
         end
@@ -96,19 +97,20 @@ module Cadenya
           # of calendar rules (wall-clock) and/or interval rules (duration), OR'd together.
           # At least one rule is required.
           schedule:,
-          # Optional input data passed to the objective. If the agent has an
-          # input_data_schema, this must satisfy it.
-          data: nil,
-          # Optional initial message passed to CreateObjective on each fire. Becomes the
-          # first user message in the objective's chat history. When unset, the fired
-          # objective defers to the selected variation's user_message_template.
-          initial_message: nil,
+          # Optional explicit first user message passed to CreateObjective on each fire.
+          # Becomes the first user message in the objective's chat history. When unset, the
+          # fired objective defers to the selected variation's first_user_message_template.
+          first_user_message: nil,
+          # Optional data rendered into the variation's first_user_message_template when
+          # each fired objective is created. Separate from `system_prompt_data`, which
+          # renders the system prompt template.
+          first_user_message_data: nil,
           # What to do when the previous run is still in flight. Defaults to SKIP.
           overlap_policy: nil,
-          # Optional data rendered into the variation's user_message_template when each
-          # fired objective is created. Separate from `data`, which renders the system
-          # prompt template.
-          user_data: nil,
+          # Optional data rendered into the variation's system_prompt_template when each
+          # fired objective is created. If the agent has a system_prompt_data_schema, this
+          # must satisfy it.
+          system_prompt_data: nil,
           # Optional explicit variation. When unset, the agent's variation_selection_mode
           # chooses per fire.
           variation_id: nil
@@ -119,11 +121,11 @@ module Cadenya
           override.returns(
             {
               schedule: Cadenya::Agents::AgentScheduleSpecSchedule,
-              data: T.anything,
-              initial_message: String,
+              first_user_message: String,
+              first_user_message_data: T.anything,
               overlap_policy:
                 Cadenya::Agents::AgentScheduleSpec::OverlapPolicy::OrSymbol,
-              user_data: T.anything,
+              system_prompt_data: T.anything,
               variation_id: String
             }
           )

data/rbi/cadenya/models/agents/agent_variation_spec.rbi

@@ -51,6 +51,18 @@ module Cadenya
         sig { params(description: String).void }
         attr_writer :description
 
+        # Liquid template for the first user message of objectives using this variation.
+        # Rendered with CreateObjectiveRequest.first_user_message_data into
+        # Objective.first_user_message, the first user message in the LLM chat history.
+        # CreateObjectiveRequest.first_user_message, when set, overrides the rendered
+        # result. If neither this template nor first_user_message is present, objective
+        # creation is rejected with InvalidArgument.
+        sig { returns(T.nilable(String)) }
+        attr_reader :first_user_message_template
+
+        sig { params(first_user_message_template: String).void }
+        attr_writer :first_user_message_template
+
         # ModelConfig defines the model configuration for a variation
         sig do
           returns(T.nilable(Cadenya::Agents::AgentVariationSpecModelConfig))
@@ -85,24 +97,14 @@ module Cadenya
         attr_writer :progressive_discovery
 
         # Liquid template for the system prompt of objectives using this variation.
-        # Rendered with CreateObjectiveRequest.data into Objective.system_prompt.
+        # Rendered with CreateObjectiveRequest.system_prompt_data into
+        # Objective.system_prompt.
         sig { returns(T.nilable(String)) }
         attr_reader :system_prompt_template
 
         sig { params(system_prompt_template: String).void }
         attr_writer :system_prompt_template
 
-        # Liquid template for the initial user message of objectives using this variation.
-        # Rendered with CreateObjectiveRequest.user_data and becomes the first user
-        # message in the LLM chat history. CreateObjectiveRequest.initial_message, when
-        # set, overrides the rendered result. If neither this template nor initial_message
-        # is present, objective creation is rejected with InvalidArgument.
-        sig { returns(T.nilable(String)) }
-        attr_reader :user_message_template
-
-        sig { params(user_message_template: String).void }
-        attr_writer :user_message_template
-
         # Weight for weighted random selection (>= 0). P(v) = v.weight / sum(all_weights).
         # Only used when the agent's variation_selection_mode is WEIGHTED. A weight of 0
         # means never auto-selected, but can still be chosen explicitly via variation_id
@@ -120,12 +122,12 @@ module Cadenya
               Cadenya::Agents::AgentVariationSpecCompactionConfig::OrHash,
             constraints: Cadenya::Agents::AgentVariationSpecConstraints::OrHash,
             description: String,
+            first_user_message_template: String,
             model_config:
               Cadenya::Agents::AgentVariationSpecModelConfig::OrHash,
             progressive_discovery:
               Cadenya::Agents::AgentVariationSpecProgressiveDiscovery::OrHash,
             system_prompt_template: String,
-            user_message_template: String,
             weight: Integer
           ).returns(T.attached_class)
         end
@@ -137,6 +139,13 @@ module Cadenya
           constraints: nil,
           # Human-readable description of what this variation does or when it should be used
           description: nil,
+          # Liquid template for the first user message of objectives using this variation.
+          # Rendered with CreateObjectiveRequest.first_user_message_data into
+          # Objective.first_user_message, the first user message in the LLM chat history.
+          # CreateObjectiveRequest.first_user_message, when set, overrides the rendered
+          # result. If neither this template nor first_user_message is present, objective
+          # creation is rejected with InvalidArgument.
+          first_user_message_template: nil,
           # ModelConfig defines the model configuration for a variation
           model_config: nil,
           # ProgressiveDiscovery is used to indicate that the agent should automatically
@@ -146,14 +155,9 @@ module Cadenya
           # and can help select the best tools for the task.
           progressive_discovery: nil,
           # Liquid template for the system prompt of objectives using this variation.
-          # Rendered with CreateObjectiveRequest.data into Objective.system_prompt.
+          # Rendered with CreateObjectiveRequest.system_prompt_data into
+          # Objective.system_prompt.
           system_prompt_template: nil,
-          # Liquid template for the initial user message of objectives using this variation.
-          # Rendered with CreateObjectiveRequest.user_data and becomes the first user
-          # message in the LLM chat history. CreateObjectiveRequest.initial_message, when
-          # set, overrides the rendered result. If neither this template nor initial_message
-          # is present, objective creation is rejected with InvalidArgument.
-          user_message_template: nil,
           # Weight for weighted random selection (>= 0). P(v) = v.weight / sum(all_weights).
           # Only used when the agent's variation_selection_mode is WEIGHTED. A weight of 0
           # means never auto-selected, but can still be chosen explicitly via variation_id
@@ -169,11 +173,11 @@ module Cadenya
                 Cadenya::Agents::AgentVariationSpecCompactionConfig,
               constraints: Cadenya::Agents::AgentVariationSpecConstraints,
               description: String,
+              first_user_message_template: String,
               model_config: Cadenya::Agents::AgentVariationSpecModelConfig,
               progressive_discovery:
                 Cadenya::Agents::AgentVariationSpecProgressiveDiscovery,
               system_prompt_template: String,
-              user_message_template: String,
               weight: Integer
             }
           )

data/rbi/cadenya/models/agents/webhook_delivery_data.rbi

@@ -228,6 +228,11 @@ module Cadenya
               :OBJECTIVE_EVENT_TYPE_FINALIZED,
               Cadenya::Agents::WebhookDeliveryData::EventType::TaggedSymbol
             )
+          OBJECTIVE_EVENT_TYPE_NOTICE =
+            T.let(
+              :OBJECTIVE_EVENT_TYPE_NOTICE,
+              Cadenya::Agents::WebhookDeliveryData::EventType::TaggedSymbol
+            )
 
           sig do
             override.returns(

data/rbi/cadenya/models/agents/webhook_delivery_list_params.rbi

@@ -197,6 +197,11 @@ module Cadenya
               :OBJECTIVE_EVENT_TYPE_FINALIZED,
               Cadenya::Agents::WebhookDeliveryListParams::EventType::TaggedSymbol
             )
+          OBJECTIVE_EVENT_TYPE_NOTICE =
+            T.let(
+              :OBJECTIVE_EVENT_TYPE_NOTICE,
+              Cadenya::Agents::WebhookDeliveryListParams::EventType::TaggedSymbol
+            )
 
           sig do
             override.returns(