ace-herdr 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3b1b413921a28b8ebd2437c424f885d11ec65bcf886fdb173101b8ce5ca8de
-  data.tar.gz: a4ebad7d9470e1f7f1e74e6b7a66d3ced20605f13bb323c67f5abc51993978ee
+  metadata.gz: cff3b8e4bd486d4b0e4e9a914fbdfe7010ffd1bc2a2be82babd93acf273e875d
+  data.tar.gz: 1b2e18f9c0faef285ff1e4003ff65b49565227a95ce4d80321cf43108486ff8c
 SHA512:
-  metadata.gz: b53397db1e608164a19390d073ae7420b602ec1a8152b975f11d6dd3443dda4da4ff5208644aecf7f2bb7bfc269034c6813eac283683eed4ea916b1b01c52795
-  data.tar.gz: e716fc0fe8329fffda5b2c18c81395432b3257b4fee3118207f21e016f69185454f4ea2661fda6f8ba3aa42eebaf0aaca773fed7e20d7899ff08e6c139f2cb18
+  metadata.gz: ccc1d8b7fc65614ff262c9a84cf431e0a964057426a49e3cd981a38909c85f22752d31bb3b0924f26ccee69eb74487fa41a46a4fef8ab50fcd607cda64f921bd
+  data.tar.gz: 0c0f22e240507331336df50b2ebc8966a4b390ae6728b6ccb86b1628eba228d6a82ffa81db19439d2974d124a015bf06a02770558dec1911b40b22a51d2131e6

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.1] - 2026-10-16
+
+### Fixed
+
+- Share native immutable session normalization between Inbox and process admission so real Pi path selectors bind their session UUID without weakening ancestry, foreground owner or live-session checks.
+
+### Changed
+
+- Follow the ace-hitl-contract 0.3 request-envelope line (dependency floor).
+
 ## [0.6.0] - 2026-10-16
 
 ### Added

data/lib/ace/herdr/atoms/native_agent_session.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Ace
+  module Herdr
+    module Atoms
+      # Herdr reports Pi sessions as paths and Codex sessions as IDs. Both
+      # consumers bind the same immutable UUID; names never identify a session.
+      module NativeAgentSession
+        UUID = /\A[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}\z/
+        PI_PATH = /_([0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12})\.jsonl\z/
+
+        def self.normalize(session, agent:)
+          return nil unless %w[codex pi].include?(agent) && session.is_a?(Hash) && session["agent"] == agent
+
+          value = session["value"]
+          return nil unless value.is_a?(String) && value.valid_encoding? && !value.include?("\0")
+
+          kind = session["kind"]
+          if agent == "pi" && kind == "path"
+            return nil unless value.start_with?("/") && value.bytesize <= 4096
+
+            value = PI_PATH.match(value)&.captures&.first
+            kind = "id"
+          end
+          return nil unless kind == "id" && value.is_a?(String) && UUID.match?(value)
+
+          {"agent" => agent, "kind" => "id", "value" => value}
+        end
+      end
+    end
+  end
+end

data/lib/ace/herdr/organisms/inbox.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../errors"
+require_relative "../atoms/native_agent_session"
 require "digest"
 require "json"
 require "time"
@@ -22,8 +23,6 @@ module Ace
 
         EVENT = /\A[A-Za-z0-9][A-Za-z0-9._-]{0,127}\z/
         TARGET_IDENTITY = %w[session pane terminal_id agent thread thread_kind].freeze
-        THREAD_ID = /\A[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}\z/
-        PI_PATH = /_([0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12})\.jsonl\z/
         # Single validator for Pi queue event ids, shared by enqueue and
         # delivery observation so the two sites can never disagree again.
         PI_EVENT_ID = /\A(?:inb|wnk)-[a-z0-9-]{8,64}\z/
@@ -577,7 +576,7 @@ module Ace
         def validate_expected_target!(target)
           unless target.is_a?(Hash) && TARGET_IDENTITY.all? { |key| target[key].is_a?(String) && !target[key].empty? } &&
               %w[codex pi].include?(target["agent"]) && target["thread_kind"] == "id" &&
-              THREAD_ID.match?(target["thread"]) && target["terminal_id"].bytesize <= 64
+              Atoms::NativeAgentSession::UUID.match?(target["thread"]) && target["terminal_id"].bytesize <= 64
             raise ValidationError, "accepted original native target is incomplete or invalid"
           end
         end
@@ -627,21 +626,12 @@ module Ace
           raise ValidationError, "unsupported native agent" unless %w[codex pi].include?(agent)
           session = pane["agent_session"]
           raise IdentityDriftError, "native session identity is unavailable" unless session.is_a?(Hash) && session["agent"] == agent
-          thread = session["value"].to_s
-          kind = session["kind"]
-          if agent == "pi" && kind == "path"
-            thread = PI_PATH.match(thread)&.captures&.first.to_s
-            kind = "id"
-          end
-          # Only an immutable session UUID may carry a binding: a name
-          # survives an agent restart in the same pane/terminal, so a reused
-          # session could inherit an old event.
-          unless kind == "id" && THREAD_ID.match?(thread)
+          normalized = Atoms::NativeAgentSession.normalize(session, agent: agent)
+          unless normalized
             raise ValidationError,
-              "native queue binding requires an immutable session id " \
-              "(got #{kind.inspect})"
+              "native queue binding requires an immutable session id (got #{session['kind'].inspect})"
           end
-          raise ValidationError, "Pi queue requires a session ID" if agent == "pi" && kind != "id"
+          thread, kind = normalized.values_at("value", "kind")
           raw_terminal = pane["terminal_id"]
           terminal = raw_terminal.to_s.strip if raw_terminal.is_a?(String) || raw_terminal.is_a?(Integer)
           if terminal.nil? || terminal.empty? || terminal.bytesize > 64

data/lib/ace/herdr/organisms/runtime_adapter.rb

@@ -4,6 +4,7 @@ require "ace/runtime"
 require "digest"
 require "fileutils"
 require "json"
+require_relative "../atoms/native_agent_session"
 
 module Ace
   module Herdr
@@ -124,12 +125,10 @@ module Ace
               process.is_a?(Hash) && process["pid"] == owner.dig("process_identity", "pid")
             end
 
-            session = native["agent_session"]
+            session = Atoms::NativeAgentSession.normalize(native["agent_session"], agent: native["agent"])
             workspace = native["workspace_id"] || native["session_id"]
             terminal = native["terminal_id"]
-            next nil unless session.is_a?(Hash) && session["kind"] == "id" &&
-              session["value"].is_a?(String) && session["value"].match?(Inbox::THREAD_ID) &&
-              session["agent"] == native["agent"] && native["agent"].is_a?(String) &&
+            next nil unless session &&
               workspace.is_a?(String) && !workspace.empty? &&
               (terminal.is_a?(String) || terminal.is_a?(Integer)) && !terminal.to_s.empty?
 

data/lib/ace/herdr/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module Herdr
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-herdr
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michal Czyz
@@ -49,14 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ace-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - lib/ace/herdr.rb
 - lib/ace/herdr/atoms/answer_digest.rb
 - lib/ace/herdr/atoms/json_find.rb
+- lib/ace/herdr/atoms/native_agent_session.rb
 - lib/ace/herdr/cli.rb
 - lib/ace/herdr/cli/commands/capture.rb
 - lib/ace/herdr/cli/commands/close.rb