textus 0.54.2 → 0.55.1

data/lib/textus/manifest/capabilities.rb

@@ -11,9 +11,9 @@ module Textus
       # declares a `kind: workspace` zone is therefore rejected at load (no
       # `keep`-holder); declare `roles:` to opt into a workspace lane (ADR 0033).
       DEFAULT_MAPPING = {
-        Textus::Role::HUMAN => %w[author propose].freeze,
-        Textus::Role::AGENT => %w[propose].freeze,
-        Textus::Role::AUTOMATION => %w[converge].freeze,
+        Textus::Value::Role::HUMAN => %w[author propose].freeze,
+        Textus::Value::Role::AGENT => %w[propose].freeze,
+        Textus::Value::Role::AUTOMATION => %w[converge].freeze,
       }.freeze
 
       # Returns { role_name => [verbs] }. When `roles:` is declared we use

data/lib/textus/manifest/entry/base.rb

@@ -75,7 +75,7 @@ module Textus
           # Read a named template from the store's templates/ directory.
           # Raises TemplateError when the file doesn't exist.
           def read_template(name)
-            path = File.join(container.root.to_s, "templates", name)
+            path = container.geometry.template_path(name)
             unless File.exist?(path)
               raise Textus::TemplateError.new(
                 "template '#{name}' not found",

data/lib/textus/manifest/entry/publish/subtree_mirror.rb

@@ -9,7 +9,7 @@ module Textus
         # shared shape — Tree always walks at `base` and honors `ignore` in the
         # prune (ADR 0047 D4, so a derived index in the mirrored dir survives).
         class SubtreeMirror
-          def initialize(entry, pctx, publisher: Textus::Ports::Publisher.new)
+          def initialize(entry, pctx, publisher: Textus::Port::Publisher.new)
             @entry     = entry
             @pctx      = pctx
             @publisher = publisher
@@ -52,7 +52,7 @@ module Textus
           # targets_under can't reach another leaf's sentinels.
           def prune(target_dir, written, honor_ignore)
             kept = written.map { |w| File.expand_path(w["target"]) }
-            store = Textus::Ports::SentinelStore.new
+            store = Textus::Port::SentinelStore.new
             store.targets_under(target_dir, @pctx.root).filter_map do |managed|
               abs = File.expand_path(managed)
               next nil if kept.include?(abs)

data/lib/textus/manifest/entry/publish/to_paths.rb

@@ -9,7 +9,7 @@ module Textus
         # ADR 0094: iterates publish_targets (to-targets), rendering through a
         # template when the target declares one, or copying verbatim otherwise.
         class ToPaths < Mode
-          def initialize(entry, publisher: Textus::Ports::Publisher.new)
+          def initialize(entry, publisher: Textus::Port::Publisher.new)
             super(entry)
             @publisher = publisher
           end

data/lib/textus/manifest/schema/semantics/cross_field.rb

@@ -0,0 +1,53 @@
+module Textus
+  class Manifest
+    module Schema
+      module Semantics
+        module CrossField
+          def check_cross_field!(raw)
+            check_owners!(raw["lanes"], raw["entries"])
+            check_lane_kind_consistency!(raw)
+          end
+
+          def check_owners!(lanes, entries)
+            Array(lanes).each_with_index { |z, i| check_owner!(z["owner"], "$.lanes[#{i}]") }
+            Array(entries).each_with_index { |e, i| check_owner!(e["owner"], "$.entries[#{i}]") }
+          end
+
+          def check_owner!(owner, path)
+            return if owner.nil?
+            return if valid_owner?(owner)
+
+            raise BadManifest.new(
+              "invalid owner '#{owner}' at '#{path}' " \
+              "(expected <archetype> or <archetype>:<subject>, archetype one of: #{Textus::Value::Role::NAMES.join(", ")})",
+            )
+          end
+
+          def valid_owner?(token)
+            return false unless token.is_a?(String) && !token.empty?
+
+            archetype, subject = token.split(":", 2)
+            return false unless Textus::Value::Role::NAMES.include?(archetype)
+            return true if subject.nil?
+
+            OWNER_SUBJECT_PATTERN.match?(subject)
+          end
+
+          def check_lane_kind_consistency!(raw)
+            held = Capabilities.resolve(raw["roles"]).values.flatten.uniq
+
+            Array(raw["lanes"]).each_with_index do |z, i|
+              verb = KIND_REQUIRES_VERB[z["kind"]]
+              next if verb.nil? || held.include?(verb)
+
+              raise BadManifest.new(
+                "lane '#{z["name"]}' (#{z["kind"]}) at '$.lanes[#{i}]' " \
+                "needs a role with capability '#{verb}'; none declared",
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textus/manifest/schema/semantics/invariants.rb

@@ -0,0 +1,125 @@
+module Textus
+  class Manifest
+    module Schema
+      module Semantics
+        module Invariants
+          def check_invariants!(raw)
+            check_roles!(raw["roles"])
+            check_lanes!(raw["lanes"])
+            check_entries!(raw["entries"])
+            check_rules!(raw["rules"])
+            check_single_queue!(raw)
+            check_single_machine!(raw)
+            walk(raw["audit"], AUDIT_KEYS, "$.audit") if raw["audit"].is_a?(Hash)
+          end
+
+          def check_roles!(roles)
+            return if roles.nil?
+
+            roles.each_with_index do |r, i|
+              path = "$.roles[#{i}]"
+              name = r["name"]
+              unless Textus::Value::Role::NAMES.include?(name)
+                raise BadManifest.new(
+                  "unknown role name '#{name}' at '#{path}' (allowed: #{Textus::Value::Role::NAMES.join(", ")})",
+                )
+              end
+              Array(r["can"]).each do |verb|
+                next if CAPABILITIES.include?(verb)
+
+                hint = %w[ingest fetch].include?(verb) ? " — the quarantine capability folded into 'converge' (ADR 0090)" : ""
+                raise BadManifest.new(
+                  "unknown capability '#{verb}' for role '#{name}' at '#{path}' " \
+                  "(known: #{CAPABILITIES.join(", ")})#{hint}",
+                )
+              end
+            end
+
+            author_holders = roles.count { |r| Array(r["can"]).include?("author") }
+            return if author_holders <= 1
+
+            raise BadManifest.new(
+              "manifest declares #{author_holders} roles with the author capability; at most one is allowed",
+            )
+          end
+
+          def check_lanes!(lanes)
+            Array(lanes).each_with_index do |z, i|
+              walk(z, LANE_KEYS, "$.lanes[#{i}]")
+              next unless %w[quarantine derived].include?(z["kind"])
+
+              raise BadManifest.new(
+                "lane kind '#{z["kind"]}' at '$.lanes[#{i}]' was folded into 'machine' (ADR 0091) — " \
+                "use `kind: machine`",
+              )
+            end
+          end
+
+          def check_entries!(entries)
+            Array(entries).each_with_index do |e, i|
+              path = "$.entries[#{i}]"
+              walk(e, ENTRY_KEYS, path)
+              check_publish_block!(e, path)
+              walk(e["source"], SOURCE_KEYS, "#{path}.source") if e.is_a?(Hash) && e["source"].is_a?(Hash)
+            end
+          end
+
+          def check_rules!(rules)
+            Array(rules).each_with_index do |r, i|
+              path = "$.rules[#{i}]"
+              walk(r, RULE_KEYS, path)
+              FIELD_REGISTRY.each_value do |meta|
+                next unless meta[:sub_keys]
+
+                value = r.is_a?(Hash) ? r[meta[:yaml_key]] : nil
+                walk(value, meta[:sub_keys], "#{path}.#{meta[:yaml_key]}") if value.is_a?(Hash)
+              end
+            end
+          end
+
+          def check_publish_block!(entry, path)
+            return unless entry.is_a?(Hash) && entry.key?("publish")
+
+            block = entry["publish"]
+            if block.is_a?(Hash)
+              raise BadManifest.new(
+                "publish: at '#{path}.publish' must be a list of targets (ADR 0094); the map form was retired.",
+              )
+            end
+            raise BadManifest.new("publish: must be a list of targets at '#{path}.publish'") unless block.is_a?(Array)
+
+            block.each_with_index do |t, i|
+              raise BadManifest.new("publish target ##{i} must be a mapping at '#{path}.publish'") unless t.is_a?(Hash)
+
+              walk(t, %w[to tree template inject_boot], "#{path}.publish[#{i}]")
+            end
+          end
+
+          def check_single_queue!(raw)
+            queues = Array(raw["lanes"]).select { |z| z["kind"] == "queue" }.map { |z| z["name"] }
+            return if queues.size <= 1
+
+            raise BadManifest.new("at most one lane may declare kind: queue (found: #{queues.join(", ")})")
+          end
+
+          def check_single_machine!(raw)
+            machines = Array(raw["lanes"]).select { |z| z["kind"] == "machine" }.map { |z| z["name"] }
+            return if machines.size <= 1
+
+            raise BadManifest.new("at most one lane may declare kind: machine (found: #{machines.join(", ")})")
+          end
+
+          def walk(hash, allowed, path)
+            return unless hash.is_a?(Hash)
+
+            hash.each_key do |k|
+              next if allowed.include?(k)
+
+              raise BadManifest.new("unknown key '#{k}' at '#{path}'")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textus/manifest/schema/semantics/migration.rb

@@ -0,0 +1,83 @@
+module Textus
+  class Manifest
+    module Schema
+      module Semantics
+        module Migration
+          def check_migration!(raw)
+            Array(raw["entries"]).each_with_index do |e, i|
+              path = "$.entries[#{i}]"
+              check_retired_publish_keys!(e, path)
+              check_retired_render_keys!(e, path)
+            end
+            check_rules_retired_keys!(raw["rules"])
+          end
+
+          def check_retired_publish_keys!(entry, path)
+            return unless entry.is_a?(Hash)
+
+            if entry.key?("publish_each")
+              raise BadManifest.new(
+                "publish_each was removed in 0.42.0 (ADR 0051) at '#{path}' — " \
+                "mirror the subtree with `publish: { tree: \"...\" }`.",
+              )
+            end
+            if entry.key?("publish_to")
+              raise BadManifest.new(
+                "publish_to was replaced by the publish: block in 0.43.0 (ADR 0052) at '#{path}' — " \
+                "use `publish: { to: [...] }`.",
+              )
+            end
+            if entry.key?("publish_tree")
+              raise BadManifest.new(
+                "publish_tree was replaced by the publish: block in 0.43.0 (ADR 0052) at '#{path}' — " \
+                "use `publish: { tree: \"...\" }`.",
+              )
+            end
+            return unless entry.key?("index_filename")
+
+            raise BadManifest.new(
+              "index_filename was removed in 0.43.0 (ADR 0053) at '#{path}'.",
+            )
+          end
+
+          def check_retired_render_keys!(entry, path)
+            return unless entry.is_a?(Hash)
+
+            if entry.key?("template")
+              raise BadManifest.new(
+                "entry-level `template:` was removed at '#{path}' (ADR 0094): rendering is a " \
+                "publish concern — `publish: [{ to:, template: }]`.",
+              )
+            end
+            if entry.key?("inject_boot")
+              raise BadManifest.new(
+                "entry-level `inject_boot:` was removed at '#{path}' (ADR 0094).",
+              )
+            end
+            return unless entry.key?("provenance")
+
+            raise BadManifest.new("entry-level `provenance:` was removed at '#{path}' (ADR 0094).")
+          end
+
+          def check_rules_retired_keys!(rules)
+            Array(rules).each_with_index do |r, i|
+              path = "$.rules[#{i}]"
+              { "lifecycle" => "age GC moved to `retention:` rule", "materialize" => "removed (ADR 0093)" }
+                .each do |old, hint|
+                  next unless r.is_a?(Hash) && r.key?(old)
+
+                  raise BadManifest.new("`#{old}:` was removed at '#{path}' (ADR 0093) — #{hint}.")
+                end
+              next unless r.is_a?(Hash) && r.key?("upkeep")
+
+              raise BadManifest.new(
+                "rule key `upkeep:` was removed (ADR 0093): move age-GC to `retention:` " \
+                "and production to the entry's `source:`",
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textus/manifest/schema/semantics.rb

@@ -1,230 +1,25 @@
 # frozen_string_literal: true
 
+require_relative "semantics/invariants"
+require_relative "semantics/migration"
+require_relative "semantics/cross_field"
+
 module Textus
   class Manifest
     module Schema
       # Cross-field rules and ADR migration hints. Called by Validator.validate!
       # AFTER the structural dry-schema Contract passes. Operates on the raw hash.
       module Semantics
+        extend Invariants
+        extend Migration
+        extend CrossField
+
         module_function
 
         def check!(raw)
-          check_roles!(raw["roles"])
-          check_lanes!(raw["lanes"])
-          check_entries!(raw["entries"])
-          check_owners!(raw["lanes"], raw["entries"])
-          check_rules!(raw["rules"])
-          check_single_queue!(raw)
-          check_single_machine!(raw)
-          check_lane_kind_consistency!(raw)
-          walk(raw["audit"], AUDIT_KEYS, "$.audit") if raw["audit"].is_a?(Hash)
-        end
-
-        def check_roles!(roles)
-          return if roles.nil?
-
-          roles.each_with_index do |r, i|
-            path = "$.roles[#{i}]"
-            name = r["name"]
-            unless Textus::Role::NAMES.include?(name)
-              raise BadManifest.new(
-                "unknown role name '#{name}' at '#{path}' (allowed: #{Textus::Role::NAMES.join(", ")})",
-              )
-            end
-            Array(r["can"]).each do |verb|
-              next if CAPABILITIES.include?(verb)
-
-              hint = %w[ingest fetch].include?(verb) ? " — the quarantine capability folded into 'converge' (ADR 0090)" : ""
-              raise BadManifest.new(
-                "unknown capability '#{verb}' for role '#{name}' at '#{path}' " \
-                "(known: #{CAPABILITIES.join(", ")})#{hint}",
-              )
-            end
-          end
-
-          author_holders = roles.count { |r| Array(r["can"]).include?("author") }
-          return if author_holders <= 1
-
-          raise BadManifest.new(
-            "manifest declares #{author_holders} roles with the author capability; at most one is allowed",
-          )
-        end
-
-        def check_lanes!(lanes)
-          Array(lanes).each_with_index do |z, i|
-            walk(z, LANE_KEYS, "$.lanes[#{i}]")
-            next unless %w[quarantine derived].include?(z["kind"])
-
-            raise BadManifest.new(
-              "lane kind '#{z["kind"]}' at '$.lanes[#{i}]' was folded into 'machine' (ADR 0091) — " \
-              "use `kind: machine`",
-            )
-          end
-        end
-
-        def check_entries!(entries)
-          Array(entries).each_with_index do |e, i|
-            path = "$.entries[#{i}]"
-            check_retired_publish_keys!(e, path)
-            check_retired_render_keys!(e, path)
-            walk(e, ENTRY_KEYS, path)
-            check_publish_block!(e, path)
-            walk(e["source"], SOURCE_KEYS, "#{path}.source") if e.is_a?(Hash) && e["source"].is_a?(Hash)
-          end
-        end
-
-        def check_retired_publish_keys!(entry, path)
-          return unless entry.is_a?(Hash)
-
-          if entry.key?("publish_each")
-            raise BadManifest.new(
-              "publish_each was removed in 0.42.0 (ADR 0051) at '#{path}' — " \
-              "mirror the subtree with `publish: { tree: \"...\" }`.",
-            )
-          end
-          if entry.key?("publish_to")
-            raise BadManifest.new(
-              "publish_to was replaced by the publish: block in 0.43.0 (ADR 0052) at '#{path}' — " \
-              "use `publish: { to: [...] }`.",
-            )
-          end
-          if entry.key?("publish_tree")
-            raise BadManifest.new(
-              "publish_tree was replaced by the publish: block in 0.43.0 (ADR 0052) at '#{path}' — " \
-              "use `publish: { tree: \"...\" }`.",
-            )
-          end
-          return unless entry.key?("index_filename")
-
-          raise BadManifest.new(
-            "index_filename was removed in 0.43.0 (ADR 0053) at '#{path}'.",
-          )
-        end
-
-        def check_retired_render_keys!(entry, path)
-          return unless entry.is_a?(Hash)
-
-          if entry.key?("template")
-            raise BadManifest.new(
-              "entry-level `template:` was removed at '#{path}' (ADR 0094): rendering is a " \
-              "publish concern — `publish: [{ to:, template: }]`.",
-            )
-          end
-          if entry.key?("inject_boot")
-            raise BadManifest.new(
-              "entry-level `inject_boot:` was removed at '#{path}' (ADR 0094).",
-            )
-          end
-          return unless entry.key?("provenance")
-
-          raise BadManifest.new("entry-level `provenance:` was removed at '#{path}' (ADR 0094).")
-        end
-
-        def check_publish_block!(entry, path)
-          return unless entry.is_a?(Hash) && entry.key?("publish")
-
-          block = entry["publish"]
-          if block.is_a?(Hash)
-            raise BadManifest.new(
-              "publish: at '#{path}.publish' must be a list of targets (ADR 0094); the map form was retired.",
-            )
-          end
-          raise BadManifest.new("publish: must be a list of targets at '#{path}.publish'") unless block.is_a?(Array)
-
-          block.each_with_index do |t, i|
-            raise BadManifest.new("publish target ##{i} must be a mapping at '#{path}.publish'") unless t.is_a?(Hash)
-
-            walk(t, %w[to tree template inject_boot], "#{path}.publish[#{i}]")
-          end
-        end
-
-        def check_owners!(lanes, entries)
-          Array(lanes).each_with_index { |z, i| check_owner!(z["owner"], "$.lanes[#{i}]") }
-          Array(entries).each_with_index { |e, i| check_owner!(e["owner"], "$.entries[#{i}]") }
-        end
-
-        def check_owner!(owner, path)
-          return if owner.nil?
-          return if valid_owner?(owner)
-
-          raise BadManifest.new(
-            "invalid owner '#{owner}' at '#{path}' " \
-            "(expected <archetype> or <archetype>:<subject>, archetype one of: #{Textus::Role::NAMES.join(", ")})",
-          )
-        end
-
-        def valid_owner?(token)
-          return false unless token.is_a?(String) && !token.empty?
-
-          archetype, subject = token.split(":", 2)
-          return false unless Textus::Role::NAMES.include?(archetype)
-          return true if subject.nil?
-
-          OWNER_SUBJECT_PATTERN.match?(subject)
-        end
-
-        def check_rules!(rules)
-          Array(rules).each_with_index do |r, i|
-            path = "$.rules[#{i}]"
-            # Check retired keys BEFORE the generic walk so specific hints fire first.
-            { "lifecycle" => "age GC moved to `retention:` rule", "materialize" => "removed (ADR 0093)" }
-              .each do |old, hint|
-                next unless r.is_a?(Hash) && r.key?(old)
-
-                raise BadManifest.new("`#{old}:` was removed at '#{path}' (ADR 0093) — #{hint}.")
-              end
-            if r.is_a?(Hash) && r.key?("upkeep")
-              raise BadManifest.new(
-                "rule key `upkeep:` was removed (ADR 0093): move age-GC to `retention:` " \
-                "and production to the entry's `source:`",
-              )
-            end
-            walk(r, RULE_KEYS, path)
-            FIELD_REGISTRY.each_value do |meta|
-              next unless meta[:sub_keys]
-
-              value = r.is_a?(Hash) ? r[meta[:yaml_key]] : nil
-              walk(value, meta[:sub_keys], "#{path}.#{meta[:yaml_key]}") if value.is_a?(Hash)
-            end
-          end
-        end
-
-        def check_single_queue!(raw)
-          queues = Array(raw["lanes"]).select { |z| z["kind"] == "queue" }.map { |z| z["name"] }
-          return if queues.size <= 1
-
-          raise BadManifest.new("at most one lane may declare kind: queue (found: #{queues.join(", ")})")
-        end
-
-        def check_single_machine!(raw)
-          machines = Array(raw["lanes"]).select { |z| z["kind"] == "machine" }.map { |z| z["name"] }
-          return if machines.size <= 1
-
-          raise BadManifest.new("at most one lane may declare kind: machine (found: #{machines.join(", ")})")
-        end
-
-        def check_lane_kind_consistency!(raw)
-          held = Capabilities.resolve(raw["roles"]).values.flatten.uniq
-
-          Array(raw["lanes"]).each_with_index do |z, i|
-            verb = KIND_REQUIRES_VERB[z["kind"]]
-            next if verb.nil? || held.include?(verb)
-
-            raise BadManifest.new(
-              "lane '#{z["name"]}' (#{z["kind"]}) at '$.lanes[#{i}]' " \
-              "needs a role with capability '#{verb}'; none declared",
-            )
-          end
-        end
-
-        def walk(hash, allowed, path)
-          return unless hash.is_a?(Hash)
-
-          hash.each_key do |k|
-            next if allowed.include?(k)
-
-            raise BadManifest.new("unknown key '#{k}' at '#{path}'")
-          end
+          check_migration!(raw)
+          check_invariants!(raw)
+          check_cross_field!(raw)
         end
       end
     end

data/lib/textus/meta.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "securerandom"
+
+module Textus
+  module Meta
+    NO_META_FORMATS = %w[text].freeze
+
+    FIELDS = {
+      "uid" => {
+        inject: lambda { |meta, content, existing_meta|
+          m = meta.is_a?(Hash) ? meta.dup : {}
+          existing = existing_meta.is_a?(Hash) ? existing_meta["uid"] : nil
+          m["uid"] = existing || Textus::Value::Uid.mint unless m["uid"].is_a?(String) && !m["uid"].empty?
+          [m, content]
+        },
+      },
+      "sources" => {
+        inject: lambda { |meta, content, existing_meta|
+          m = meta.is_a?(Hash) ? meta.dup : {}
+          existing = existing_meta.is_a?(Hash) ? existing_meta["sources"] : nil
+
+          if m.key?("sources")
+            raise Textus::BadContent.new(nil, "_meta.sources must be an array") unless m["sources"].is_a?(Array)
+
+            m["sources"] = m["sources"].map { |s| validate_source_shape!(s) }
+          elsif existing.is_a?(Array) && !existing.empty?
+            m["sources"] = existing
+          end
+
+          [m, content]
+        },
+      },
+    }.freeze
+
+    def self.inject_all(meta, content, existing_meta = {}, format: nil)
+      return [meta, content] if NO_META_FORMATS.include?(format)
+
+      FIELDS.each_value do |field|
+        meta, content = field[:inject].call(meta, content, existing_meta)
+      end
+
+      [meta, content]
+    end
+
+    def self.validate_source_shape!(src)
+      raise Textus::BadContent.new(nil, "each source must be a string") unless src.is_a?(String)
+
+      raise Textus::BadContent.new(nil, "each source must start with 'raw.', got #{src.inspect}") unless src.match?(/\Araw\./)
+
+      src
+    end
+  end
+end