agent2agent 1.0.8 → 1.1.0

data/lib/a2a/sse/stream.rb

@@ -19,11 +19,11 @@ module A2A
     #
     # Usage:
     #
-    #   stream = A2A::SSE::Stream.new
+    #   stream = A2A::SSE::RestStream.new(task_id: "t1", context_id: "c1")
     #
     #   Async do
-    #     stream.event({ "task" => { ... } })
-    #     stream.event({ "statusUpdate" => { ... } })
+    #     stream.task(status: { state: "TASK_STATE_WORKING", timestamp: "..." })
+    #     stream.status_update(status: { state: "TASK_STATE_COMPLETED", timestamp: "..." })
     #     stream.finish
     #   end
     #
@@ -38,6 +38,14 @@ module A2A
         "connection"        => "keep-alive",
       }.freeze
 
+      attr_reader :task_id, :context_id
+
+      def initialize(task_id:, context_id:, **options)
+        @task_id    = task_id
+        @context_id = context_id
+        super(**options)
+      end
+
       # Emit an SSE event.
       #
       # @param data [Hash, String] the event payload (Hashes are JSON-encoded)
@@ -71,6 +79,45 @@ module A2A
       def self.headers
         SSE_HEADERS
       end
+
+      # --- Typed event emitters -------------------------------------------
+      #
+      # Dynamically generated from the StreamResponse schema.
+      # Each property in StreamResponse (task, message, statusUpdate,
+      # artifactUpdate) gets a snake_case method that:
+      #
+      #   1. Injects @task_id and @context_id (using the correct key name
+      #      for each type — Task uses `id`, others use `task_id`)
+      #   2. Builds the schema Definition from kwargs
+      #   3. Wraps it in the StreamResponse envelope
+      #   4. Calls #event to emit the SSE wire format
+      #
+      # This means you never pass task_id/context_id manually:
+      #
+      #   stream.task(status: { state: "TASK_STATE_WORKING" })
+      #   stream.artifact_update(artifact: { ... }, append: false, last_chunk: true)
+      #   stream.status_update(status: { state: "TASK_STATE_COMPLETED" })
+      #   stream.message(role: "ROLE_AGENT", parts: [{ text: "Hello" }])
+      #
+
+      stream_response = A2A::Schema["Stream Response"]
+
+      stream_response.property_refs.each do |camel_key, (_kind, title)|
+        target_props = A2A::Schema[title].schema_properties
+
+        # Task uses `id` for the task identifier; the other three use `taskId`
+        task_id_key = target_props.include?("id") ? :id : :task_id
+
+        # camelCase -> snake_case method name
+        method_name = camel_key
+          .gsub(/([A-Z])/) { "_#{$1.downcase}" }
+          .delete_prefix("_")
+
+        define_method(method_name) do |**kwargs|
+          merged = { task_id_key => @task_id, context_id: @context_id }.merge(kwargs)
+          event({ camel_key => A2A::Schema[title].new(merged).to_h })
+        end
+      end
     end
   end
 end
@@ -80,7 +127,7 @@ test do
 
   describe "A2A::SSE::Stream" do
     it "formats SSE events correctly" do
-      stream = A2A::SSE::Stream.new
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
 
       stream.event({ "task" => { "id" => "t1" } })
       stream.finish
@@ -95,7 +142,7 @@ test do
     end
 
     it "includes event type when provided" do
-      stream = A2A::SSE::Stream.new
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
 
       stream.event("hello", type: "ping")
       stream.finish
@@ -106,7 +153,7 @@ test do
     end
 
     it "includes event id when provided" do
-      stream = A2A::SSE::Stream.new
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
 
       stream.event("test", id: "42")
       stream.finish
@@ -116,7 +163,7 @@ test do
     end
 
     it "is a Protocol::HTTP::Body::Readable" do
-      stream = A2A::SSE::Stream.new
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
       stream.is_a?(Protocol::HTTP::Body::Readable).should == true
     end
 
@@ -125,5 +172,86 @@ test do
       headers["content-type"].should == "text/event-stream"
       headers["cache-control"].should.include("no-cache")
     end
+
+    it "stores task_id and context_id" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+      stream.task_id.should == "t1"
+      stream.context_id.should == "c1"
+    end
+
+    # --- Typed emit methods ---
+
+    it "#task emits a task event with injected id and context_id" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+
+      stream.task(status: { state: "TASK_STATE_WORKING", timestamp: "2025-01-01T00:00:00Z" })
+      stream.finish
+
+      chunk = stream.read
+      parsed = JSON.parse(chunk.sub(/\Adata: /, "").strip)
+      parsed["task"]["id"].should == "t1"
+      parsed["task"]["contextId"].should == "c1"
+      parsed["task"]["status"]["state"].should == "TASK_STATE_WORKING"
+    end
+
+    it "#status_update emits with injected task_id and context_id" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+
+      stream.status_update(status: { state: "TASK_STATE_COMPLETED", timestamp: "2025-01-01T00:00:00Z" })
+      stream.finish
+
+      chunk = stream.read
+      parsed = JSON.parse(chunk.sub(/\Adata: /, "").strip)
+      parsed["statusUpdate"]["taskId"].should == "t1"
+      parsed["statusUpdate"]["contextId"].should == "c1"
+      parsed["statusUpdate"]["status"]["state"].should == "TASK_STATE_COMPLETED"
+    end
+
+    it "#artifact_update emits with injected task_id and context_id" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+
+      stream.artifact_update(
+        artifact: { artifact_id: "a1", parts: [{ text: "hello" }] },
+        append: false,
+        last_chunk: true
+      )
+      stream.finish
+
+      chunk = stream.read
+      parsed = JSON.parse(chunk.sub(/\Adata: /, "").strip)
+      parsed["artifactUpdate"]["taskId"].should == "t1"
+      parsed["artifactUpdate"]["contextId"].should == "c1"
+      parsed["artifactUpdate"]["artifact"]["artifactId"].should == "a1"
+      parsed["artifactUpdate"]["append"].should == false
+      parsed["artifactUpdate"]["lastChunk"].should == true
+    end
+
+    it "#message emits with injected task_id and context_id" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+
+      stream.message(
+        message_id: "m1",
+        role: "ROLE_AGENT",
+        parts: [{ text: "Hello" }]
+      )
+      stream.finish
+
+      chunk = stream.read
+      parsed = JSON.parse(chunk.sub(/\Adata: /, "").strip)
+      parsed["message"]["taskId"].should == "t1"
+      parsed["message"]["contextId"].should == "c1"
+      parsed["message"]["role"].should == "ROLE_AGENT"
+    end
+
+    it "typed methods allow overriding injected values" do
+      stream = A2A::SSE::Stream.new(task_id: "t1", context_id: "c1")
+
+      stream.task(id: "override", status: { state: "TASK_STATE_WORKING" })
+      stream.finish
+
+      chunk = stream.read
+      parsed = JSON.parse(chunk.sub(/\Adata: /, "").strip)
+      parsed["task"]["id"].should == "override"
+    end
   end
 end

data/lib/a2a/sse.rb

@@ -3,3 +3,4 @@
 require_relative "sse/stream"
 require_relative "sse/json_rpc_stream"
 require_relative "sse/rest_stream"
+require_relative "sse/event_parser"

data/lib/a2a/test_helpers.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "a2a"
+require "a2a/agent"
+require "a2a/proto"
+require "a2a/schema"
+
+module A2A
+  module TestHelpers
+    # Returns a stub agent that handles all A2A operations with
+    # minimal valid responses. Useful for integration tests that
+    # need a working server without real business logic.
+    def self.stub_agent
+      Agent.new do
+        on "SendMessage" do
+          respond_with -> (env) {
+            A2A::Schema["Send Message Response"].new({})
+          }
+        end
+
+        on "SendStreamingMessage" do
+          respond_with -> (env) {
+            A2A::Schema["Stream Response"].new({})
+          }
+        end
+
+        on "GetTask" do
+          respond_with -> (env) {
+            A2A::Schema["Task"].new(
+              "id"        => "test-id",
+              "contextId" => "ctx-1",
+              "status"    => { "state" => "TASK_STATE_COMPLETED", "timestamp" => "2025-01-01T00:00:00Z" }
+            )
+          }
+        end
+
+        on "ListTasks" do
+          respond_with -> (env) {
+            A2A::Schema["List Tasks Response"].new({})
+          }
+        end
+
+        on "CancelTask" do
+          respond_with -> (env) {
+            A2A::Schema["Task"].new(
+              "id"        => "test-id",
+              "contextId" => "ctx-1",
+              "status"    => { "state" => "TASK_STATE_CANCELED", "timestamp" => "2025-01-01T00:00:00Z" }
+            )
+          }
+        end
+
+        on "SubscribeToTask" do
+          respond_with -> (env) {
+            A2A::Schema["Stream Response"].new({})
+          }
+        end
+
+        on "CreateTaskPushNotificationConfig" do
+          respond_with -> (env) {
+            A2A::Schema["Task Push Notification Config"].new("url" => "http://example.com")
+          }
+        end
+
+        on "GetTaskPushNotificationConfig" do
+          respond_with -> (env) {
+            A2A::Schema["Task Push Notification Config"].new("url" => "http://example.com")
+          }
+        end
+
+        on "ListTaskPushNotificationConfigs" do
+          respond_with -> (env) {
+            A2A::Schema["List Task Push Notification Configs Response"].new({})
+          }
+        end
+
+        on "GetExtendedAgentCard" do
+          respond_with -> (env) {
+            A2A::Schema["Agent Card"].new("name" => "Test", "version" => "1.0")
+          }
+        end
+
+        on "DeleteTaskPushNotificationConfig" do
+          respond_with -> (env) { nil }
+        end
+      end
+    end
+  end
+end

data/lib/a2a/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module A2A
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

data/lib/a2a.rb

@@ -12,15 +12,19 @@ require "rack"
 module A2A
 end
 
+require "a2a/errors"
 require "a2a/proto"
 require "a2a/schema"
 require "a2a/schema/definition"
 require "a2a/schema/validation_error"
-require "a2a/task_store"
-require "a2a/store"
 require "a2a/sse"
 require "a2a/agent"
 
 require "a2a/server"
 
+require "a2a/faraday/middleware/schema_request"
+require "a2a/faraday/middleware/json_rpc/request"
+require "a2a/faraday/middleware/json_rpc/response"
+require "a2a/faraday/middleware/rest/request"
+require "a2a/faraday/middleware/rest/response"
 require "a2a/client"

data/lib/traces/provider/a2a/{bindings → server/bindings}/json_rpc.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "../../../../a2a/bindings/json_rpc"
+require_relative "../../../../../a2a/server/bindings/json_rpc"
 require "traces/provider"
 
-Traces::Provider(A2A::Bindings::JsonRpc) do
+Traces::Provider(A2A::Server::Bindings::JsonRpc) do
   def call(env)
     Traces.trace("a2a.bindings.json_rpc.call") do |span|
       super.tap do |status, headers, body|

data/lib/traces/provider/a2a/{bindings → server/bindings}/rest.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "../../../../a2a/bindings/rest"
+require_relative "../../../../../a2a/server/bindings/rest"
 require "traces/provider"
 
-Traces::Provider(A2A::Bindings::Rest) do
+Traces::Provider(A2A::Server::Bindings::Rest) do
   def call(env)
     Traces.trace("a2a.bindings.rest.call") do |span|
       super.tap do |status, headers, body|

data/lib/traces/provider/a2a.rb

@@ -3,5 +3,5 @@
 require_relative "a2a/server"
 require_relative "a2a/server/dispatcher"
 require_relative "a2a/server/triage"
-require_relative "a2a/bindings/json_rpc"
-require_relative "a2a/bindings/rest"
+require_relative "a2a/server/bindings/json_rpc"
+require_relative "a2a/server/bindings/rest"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agent2agent
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - A2A Contributors
@@ -135,6 +135,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: async-http-faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,43 +203,42 @@ files:
 - data/spec.txt
 - lib/a2a.rb
 - lib/a2a/agent.rb
-- lib/a2a/bindings/json_rpc.rb
-- lib/a2a/bindings/rest.rb
 - lib/a2a/client.rb
+- lib/a2a/errors.rb
+- lib/a2a/errors/json_rpc_error.rb
+- lib/a2a/errors/rest_error.rb
+- lib/a2a/faraday/middleware/json_rpc/request.rb
+- lib/a2a/faraday/middleware/json_rpc/response.rb
+- lib/a2a/faraday/middleware/rest/request.rb
+- lib/a2a/faraday/middleware/rest/response.rb
+- lib/a2a/faraday/middleware/schema_request.rb
+- lib/a2a/middleware.rb
+- lib/a2a/middleware/extract_message.rb
+- lib/a2a/middleware/fetch_task.rb
+- lib/a2a/middleware/limit_history_length.rb
+- lib/a2a/middleware/limit_pagination_size.rb
+- lib/a2a/middleware/sse_stream.rb
 - lib/a2a/proto.rb
 - lib/a2a/schema.rb
 - lib/a2a/schema/definition.rb
 - lib/a2a/schema/validation_error.rb
 - lib/a2a/server.rb
-- lib/a2a/server/cancel_task.rb
-- lib/a2a/server/create_task_push_notification_config.rb
-- lib/a2a/server/delete_task_push_notification_config.rb
+- lib/a2a/server/bindings/json_rpc.rb
+- lib/a2a/server/bindings/rest.rb
 - lib/a2a/server/dispatcher.rb
 - lib/a2a/server/env.rb
-- lib/a2a/server/get_extended_agent_card.rb
-- lib/a2a/server/get_task.rb
-- lib/a2a/server/get_task_push_notification_config.rb
-- lib/a2a/server/list_task_push_notification_configs.rb
-- lib/a2a/server/list_tasks.rb
-- lib/a2a/server/send_message.rb
-- lib/a2a/server/send_streaming_message.rb
-- lib/a2a/server/subscribe_to_task.rb
 - lib/a2a/server/triage.rb
 - lib/a2a/sse.rb
+- lib/a2a/sse/event_parser.rb
 - lib/a2a/sse/json_rpc_stream.rb
 - lib/a2a/sse/rest_stream.rb
 - lib/a2a/sse/stream.rb
-- lib/a2a/store.rb
-- lib/a2a/store/processor.rb
-- lib/a2a/store/pub_sub.rb
-- lib/a2a/store/sqlite.rb
-- lib/a2a/store/webhooks.rb
-- lib/a2a/task_store.rb
+- lib/a2a/test_helpers.rb
 - lib/a2a/version.rb
 - lib/traces/provider/a2a.rb
-- lib/traces/provider/a2a/bindings/json_rpc.rb
-- lib/traces/provider/a2a/bindings/rest.rb
 - lib/traces/provider/a2a/server.rb
+- lib/traces/provider/a2a/server/bindings/json_rpc.rb
+- lib/traces/provider/a2a/server/bindings/rest.rb
 - lib/traces/provider/a2a/server/dispatcher.rb
 - lib/traces/provider/a2a/server/triage.rb
 licenses:

data/lib/a2a/server/cancel_task.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class CancelTask
-      def call(env)
-        env["a2a.result"] = Schema["Task"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/create_task_push_notification_config.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class CreateTaskPushNotificationConfig
-      def call(env)
-        env["a2a.result"] = Schema["Task Push Notification Config"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/delete_task_push_notification_config.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class DeleteTaskPushNotificationConfig
-      def call(env)
-        env["a2a.result"] = nil # google.protobuf.Empty
-      end
-    end
-  end
-end

data/lib/a2a/server/get_extended_agent_card.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class GetExtendedAgentCard
-      def call(env)
-        card = env["a2a.agent_card"] || {}
-        env["a2a.result"] = Schema["Agent Card"].new(card)
-      end
-    end
-  end
-end

data/lib/a2a/server/get_task.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class GetTask
-      def call(env)
-        env["a2a.result"] = Schema["Task"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/get_task_push_notification_config.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class GetTaskPushNotificationConfig
-      def call(env)
-        env["a2a.result"] = Schema["Task Push Notification Config"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/list_task_push_notification_configs.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class ListTaskPushNotificationConfigs
-      def call(env)
-        env["a2a.result"] = Schema["List Task Push Notification Configs Response"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/list_tasks.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class ListTasks
-      def call(env)
-        env["a2a.result"] = Schema["List Tasks Response"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/send_message.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class SendMessage
-      def call(env)
-        env["a2a.result"] = Schema["Send Message Response"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/send_streaming_message.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class SendStreamingMessage
-      def call(env)
-        env["a2a.result"] = Schema["Stream Response"].new({})
-      end
-    end
-  end
-end

data/lib/a2a/server/subscribe_to_task.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "a2a"
-
-module A2A
-  module Server
-    class SubscribeToTask
-      def call(env)
-        env["a2a.result"] = Schema["Stream Response"].new({})
-      end
-    end
-  end
-end