kettle-jem 7.1.12 → 7.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e0de622cce8cbeac62c66ab84c8af4299d5f4a045269ac1a8d81f7adf22fb6
-  data.tar.gz: c10ba7dd6cc3735001d2bb4497ee74cdeeb51bf28deba4f8ed1b5fbb437bfd84
+  metadata.gz: a5727e30e966bc0b35df82298bf1ed8c7b9724641604e814d0ca3d655a3cd119
+  data.tar.gz: a1bfadf03c584d245ad03f06466cc133a228f473092865593fe02d7bff5f5d9b
 SHA512:
-  metadata.gz: 57beaa915a2392c3aa5b6223d39fb77deb3e01c2107e480f907c569b682973b9fe9fcceb86c6d118658487c26d139d6d8b44b87f264a74ee3ebdc5ab342246da
-  data.tar.gz: ab9ede849c6d36a1a860ab4a984a45d31869b973796993d6becec68847a818f2f71fd1173ccb22a30045a551ec0f947c37b32623cc97dd3aa2196f2addba2f39
+  metadata.gz: 1abd520d313d7888500f58aa5f6bbf494e56c3e7c10629ba4f5206927bb111ce0b03096b43651caef812006d01134f7e20c8ffe40bb97fc7da0064ee2c897e05
+  data.tar.gz: cdafb8779bc44d03077368e7db0554e0eb998d15d0960542cb77658c947abec959396f3a60ff16245bf2b6aeabb26b7fd448b1f53cf10616fa83afaddb87a03c

data/CHANGELOG.md

@@ -30,6 +30,36 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.13] - 2026-08-31
+
+- TAG: [v7.1.13][7.1.13t]
+- COVERAGE: 93.62% -- 11103/11860 lines in 16 files
+- BRANCH COVERAGE: 76.97% -- 4728/6143 branches in 16 files
+- 17.96% documented
+
+### Changed
+
+- [kc] kettle-jem/template: updated 796 project files:
+  - code and tests (40)
+  - configuration (24)
+  - dependencies (294)
+  - documentation (18)
+  - other (246)
+  - workflows (174)
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-family (>= 1.2.65 -> >= 1.2.74)
+
+### Fixed
+
+- Preserve existing lockfile platforms and add the local host platform during template lockfile normalization.
+
+- Preserve locked dependencies while adding the local host platform to template-normalized lockfiles.
+
+- Preserved configured per-engine CI commands across workflow template updates.
+
+- Invalidate workflow template checksums when a configured per-engine command changes.
+
 ## [7.1.12] - 2026-08-30
 
 - TAG: [v7.1.12][7.1.12t]
@@ -1716,7 +1746,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Released kettle-jem as part of the initial StructuredMerge Ruby 7.0.0 gem set.
 - Included packaged templates and parser-backed merge support for Ruby gem templating.
 
-[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.12...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.13...HEAD
+[7.1.13]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.12...v7.1.13
+[7.1.13t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.13
 [7.1.12]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.11...v7.1.12
 [7.1.12t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.12
 [7.1.11]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.10...v7.1.11

data/README.md

@@ -278,6 +278,21 @@ Neither `appraisal_matrix` nor `framework_matrix` implicitly changes the root
 local development bundle. Pair either policy with `test_bundle` when the
 default local test command needs a specific framework or harness.
 
+### Per-Engine Workflow Commands
+
+Generated workflows use `workflows.exec_cmd` by default. When a legacy engine
+needs a narrower test command but should still receive the normal generated
+workflow maintenance, configure `workflows.engine_exec_cmds` with the exact
+matrix `ruby` value. The override changes only that matrix entry's `exec_cmd`;
+setup, retry, cache, and pin behavior remains template-managed.
+
+```yaml
+workflows:
+  exec_cmd: kettle-test --example-status-log .rspec_status
+  engine_exec_cmds:
+    truffleruby-22.3: kettle-test --tag ~type:acceptance --example-status-log .rspec_status
+```
+
 ### Default Local Test Bundle
 
 The root `Gemfile` is the default bundle for local commands such as
@@ -864,7 +879,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-11.776-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-11.860-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/kettle/jem/tasks/install_task.rb

@@ -47,6 +47,7 @@ module Kettle
           install_steps.concat(run_bundle_setup_commands(project_root, env: setup_env, run_options: effective_run_options, command_runner: command_runner))
           install_steps << appraisal_generate_step(project_root, env: setup_env, run_options: effective_run_options)
           install_steps << rubocop_gradual_autocorrect_step(project_root, env: setup_env, run_options: effective_run_options)
+          install_steps << normalize_lockfile_platforms_step(project_root, env: setup_env, run_options: effective_run_options)
           install_steps << normalize_lockfile_step(project_root, env: setup_env, run_options: effective_run_options)
           install_steps << bundled_handoff_step(project_root: project_root, env: env, run_options: effective_run_options)
           install_steps = execute_orchestration_steps(install_steps, project_root: project_root, env: setup_env, run_options: effective_run_options, command_runner: command_runner)
@@ -738,15 +739,64 @@ module Kettle
 
           {
             name: "bundle_lock_normalization",
-            command: lockfile_normalization_command,
+            command: lockfile_normalization_command(project_root),
             status: "ready",
             env: normal_lockfile_env(project_root, env),
-            reason: "bundle_update_without_templating_overrides"
+            reason: "bundle_lock_update_preserving_platforms_without_templating_overrides"
           }
         end
 
-        def lockfile_normalization_command
-          %w[bundle update]
+        def normalize_lockfile_platforms_step(project_root, env:, run_options: {})
+          return skipped_lockfile_normalization_step("lockfile_platform_normalization", "skip_lock_normalization") if Kettle::Jem::DecisionPolicy.value_to_boolean((run_options || {})[:skip_lock_normalization])
+          return skipped_lockfile_normalization_step("lockfile_platform_normalization", "local_path_development_env") if local_path_development_env?(env)
+          return skipped_lockfile_normalization_step("lockfile_platform_normalization", "missing_Gemfile.lock") unless File.file?(File.join(project_root.to_s, "Gemfile.lock"))
+
+          {
+            name: "lockfile_platform_normalization",
+            status: "ready",
+            reason: "preserve_locked_dependencies_and_add_local_platform"
+          }
+        end
+
+        def normalize_lockfile_platforms(project_root)
+          lock_path = File.join(project_root.to_s, "Gemfile.lock")
+          contents = Bundler.read_file(lock_path)
+          platforms = (Bundler::LockfileParser.new(contents).platforms.map(&:to_s) + [Gem::Platform.local.to_s]).reject(&:empty?).uniq.sort
+          lines = contents.lines
+          platforms_index = lines.index { |line| line == "PLATFORMS\n" }
+          raise Bundler::LockfileError, "Gemfile.lock does not contain a PLATFORMS section" unless platforms_index
+
+          next_section_index = lines.each_index.find do |index|
+            index > platforms_index && !lines[index].start_with?("  ") && lines[index] != "\n"
+          end
+          raise Bundler::LockfileError, "Gemfile.lock PLATFORMS section has no following section" unless next_section_index
+
+          normalized_section = ["PLATFORMS\n", *platforms.map { |platform| "  #{platform}\n" }, "\n"]
+          return {changed: false, platforms: platforms} if lines[platforms_index...next_section_index] == normalized_section
+
+          # Bundler exposes a parser but no public platform-only writer. Keep the
+          # locked dependency graph byte-for-byte intact while rewriting this
+          # validated, line-oriented section.
+          lines[platforms_index...next_section_index] = normalized_section
+          File.write(lock_path, lines.join)
+          {changed: true, platforms: platforms}
+        end
+
+        def skipped_lockfile_normalization_step(name, reason)
+          {name: name, status: "skipped", reason: reason}
+        end
+
+        def lockfile_normalization_command(project_root)
+          platforms = lockfile_normalization_platforms(project_root)
+          ["bundle", "lock", *platforms.map { |platform| "--add-platform=#{platform}" }, "--update"]
+        end
+
+        def lockfile_normalization_platforms(project_root)
+          lock_path = File.join(project_root.to_s, "Gemfile.lock")
+          existing = Bundler::LockfileParser.new(Bundler.read_file(lock_path)).platforms.map(&:to_s)
+          (existing + [Gem::Platform.local.to_s]).reject(&:empty?).uniq.sort
+        rescue Bundler::LockfileError, Errno::ENOENT
+          [Gem::Platform.local.to_s]
         end
 
         def distinct_bundle_install_step(project_root, env:, setup_env:)
@@ -1152,6 +1202,8 @@ module Kettle
               execute_ready_command_step(step, project_root: project_root, env: env, quiet: quiet, command_runner: command_runner)
             when "bundle_lock_normalization"
               execute_ready_command_step(step, project_root: project_root, env: env, quiet: quiet, command_runner: command_runner)
+            when "lockfile_platform_normalization"
+              execute_lockfile_platform_normalization_step(step, project_root: project_root)
             when "rubocop_lts_local_branch"
               execute_ready_command_step(step, project_root: project_root, env: env, quiet: quiet, command_runner: command_runner)
             when "bundle_install_requested_env"
@@ -1174,6 +1226,19 @@ module Kettle
           end
         end
 
+        def execute_lockfile_platform_normalization_step(step, project_root:)
+          return step unless step.fetch(:status) == "ready"
+
+          result = normalize_lockfile_platforms(project_root)
+          step.merge(
+            status: "succeeded",
+            reason: result.fetch(:changed) ? "local_platform_added" : "local_platform_already_present",
+            platforms: result.fetch(:platforms)
+          )
+        rescue Bundler::LockfileError, Errno::ENOENT => error
+          step.merge(status: "failed", reason: "lockfile_platform_normalization_failed", stderr: error.message)
+        end
+
         def setup_command_env(project_root, env)
           command_env = (env || {}).to_h.dup
           templating_requested = command_env.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?

data/lib/kettle/jem/tasks/template_task.rb

@@ -23,9 +23,10 @@ module Kettle
           setup_env = Kettle::Jem::Tasks::InstallTask.setup_command_env(project_root, env)
           hook_step = Kettle::Jem::Tasks::InstallTask.hook_templates_step(project_root, effective_run_options)
           git_drivers_step = Kettle::Jem::Tasks::InstallTask.git_drivers_step(project_root, effective_run_options)
+          platform_step = Kettle::Jem::Tasks::InstallTask.normalize_lockfile_platforms_step(project_root, env: setup_env, run_options: effective_run_options)
           lock_step = Kettle::Jem::Tasks::InstallTask.normalize_lockfile_step(project_root, env: setup_env, run_options: effective_run_options)
           template_steps = Kettle::Jem::Tasks::InstallTask.execute_orchestration_steps(
-            [hook_step, git_drivers_step, lock_step],
+            [hook_step, git_drivers_step, platform_step, lock_step],
             project_root: project_root,
             env: setup_env,
             run_options: effective_run_options,

data/lib/kettle/jem/templates/gem.gemspec.example

@@ -118,7 +118,7 @@ Gem::Specification.new do |spec|
   #       and preferably a modular one (see gemfiles/modular/*.gemfile).
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.18")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.24")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Security
   spec.add_development_dependency("bundler-audit", "~> 0.9.3")                      # ruby >= 2.0.0

data/lib/kettle/jem/templates/shim/gem.gemspec.example

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "{KJ|SHIMMED_GEM_NAME}"
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.18")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.24")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Tasks
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/kettle/jem/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "7.1.12"
+      VERSION = "7.1.13"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/jem.rb

@@ -102,6 +102,24 @@ module Kettle
     ].freeze
     PACKAGED_TEMPLATE_ROOT = File.expand_path("jem/templates", __dir__)
     TRANSFER_CHANGELOG_TEMPLATE_PATH = "CHANGELOG.transfer.md"
+    TRANSFER_CHANGELOG_FILTER_FIELD_TYPES = {
+      "profile" => :enum,
+      "topology" => :enum,
+      "ruby.min" => :version,
+      "engine.jruby" => :boolean,
+      "engine.truffleruby" => :boolean,
+      "engine.alternates" => :boolean,
+      "feature.appraisals" => :boolean,
+      "feature.rubyforum" => :boolean,
+      "feature.rubyforum_project_tag" => :boolean,
+      "feature.corporate_sponsors" => :boolean,
+      "feature.organization_logo" => :boolean,
+      "feature.structuredmerge_driver" => :boolean,
+      "feature.dedicated_version_gem" => :boolean,
+      "workflow.dep_heads" => :boolean,
+      "workflow.jruby_94" => :boolean,
+      "version_gem.mode" => :enum
+    }.freeze
     COPY_ONLY_WHEN_MISSING_TEMPLATE_PATHS = %w[REEK bin/setup].freeze
     MONOREPO_ROOT_TEMPLATE_PROFILE = "monorepo-root"
     MONOREPO_SUBGEM_PACKAGE_TEMPLATE_PROFILE = "monorepo-subgem-package"
@@ -3525,6 +3543,7 @@ module Kettle
         provider: "github_actions",
         default_branch: "main",
         exec_cmd: github_actions_exec_cmd(kettle_config, env),
+        engine_exec_cmds: github_actions_engine_exec_cmds(kettle_config),
         recording: project_recording_enabled?(project_root, kettle_config),
         ruby_versions: github_actions_ruby_versions(project_runtime.fetch(:test_min_ruby)),
         test_min_ruby: project_runtime.fetch(:test_min_ruby).to_s,
@@ -4168,9 +4187,32 @@ module Kettle
       if report.fetch(:relative_path).to_s == "spec/spec_helper.rb"
         payload[:spec_helper_template_policy_fingerprint_version] = SPEC_HELPER_TEMPLATE_POLICY_FINGERPRINT_VERSION
       end
+      if report.fetch(:relative_path).to_s.start_with?(".github/workflows/")
+        engine_exec_cmds = github_workflow_engine_exec_cmds_for_template(
+          source_path,
+          report.dig(:request_envelope, :request, :runtime_context, :ci, :engine_exec_cmds) ||
+            report.dig(:request_envelope, :request, :runtime_context, "ci", "engine_exec_cmds") ||
+            {}
+        )
+        payload[:github_workflow_engine_exec_cmds] = engine_exec_cmds unless engine_exec_cmds.empty?
+      end
       payload
     end
 
+    def github_workflow_engine_exec_cmds_for_template(source_path, overrides)
+      return {} unless source_path && File.file?(source_path)
+
+      configured = stringify_keys_for_json(overrides)
+      return {} if configured.empty?
+
+      yaml_mapping_nodes(File.read(source_path)).each_with_object({}) do |mapping, matching|
+        engine = yaml_mapping_scalar_value(mapping, "ruby")
+        matching[engine] = configured[engine] if configured.key?(engine)
+      end
+    rescue Psych::Exception
+      {}
+    end
+
     def version_namespace_template_file?(relative_path)
       basename = File.basename(relative_path.to_s)
       basename == "version.rb" || basename == "version_gem.rb" || basename.end_with?(".gemspec")
@@ -4476,6 +4518,7 @@ module Kettle
         chunks.fetch(offset % chunks.length) << job
       end
       chunks.reject(&:empty?).flat_map do |chunk|
+        # rubocop:disable ThreadSafety/NewThread -- Bounded workers only read shared inputs and are joined below.
         Thread.new do
           thread_id = Thread.current.object_id
           chunk.map do |recipe, index|
@@ -4495,6 +4538,7 @@ module Kettle
             [index, report]
           end
         end
+        # rubocop:enable ThreadSafety/NewThread
       end.flat_map(&:value).to_h
     end
 
@@ -5398,10 +5442,10 @@ module Kettle
       [
         {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.3"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.18"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.24"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.65"\n)},
-        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.11"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.74"\n)},
+        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.12"\n)},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
@@ -6322,24 +6366,7 @@ module Kettle
     end
 
     def transfer_changelog_filter_field_types
-      @transfer_changelog_filter_field_types ||= {
-        "profile" => :enum,
-        "topology" => :enum,
-        "ruby.min" => :version,
-        "engine.jruby" => :boolean,
-        "engine.truffleruby" => :boolean,
-        "engine.alternates" => :boolean,
-        "feature.appraisals" => :boolean,
-        "feature.rubyforum" => :boolean,
-        "feature.rubyforum_project_tag" => :boolean,
-        "feature.corporate_sponsors" => :boolean,
-        "feature.organization_logo" => :boolean,
-        "feature.structuredmerge_driver" => :boolean,
-        "feature.dedicated_version_gem" => :boolean,
-        "workflow.dep_heads" => :boolean,
-        "workflow.jruby_94" => :boolean,
-        "version_gem.mode" => :enum
-      }.freeze
+      TRANSFER_CHANGELOG_FILTER_FIELD_TYPES
     end
 
     def transfer_changelog_filter_predicate_applies?(type, actual, operator, expected)
@@ -6425,11 +6452,13 @@ module Kettle
     end
 
     def changelog_transfer_line_parser
-      @changelog_transfer_line_parser ||= TransferChangelogLineParser.new
+      Thread.current.thread_variable_get(:kettle_jem_transfer_changelog_line_parser) ||
+        Thread.current.thread_variable_set(:kettle_jem_transfer_changelog_line_parser, TransferChangelogLineParser.new)
     end
 
     def changelog_transfer_filter_parser
-      @changelog_transfer_filter_parser ||= TransferChangelogFilterParser.new
+      Thread.current.thread_variable_get(:kettle_jem_transfer_changelog_filter_parser) ||
+        Thread.current.thread_variable_set(:kettle_jem_transfer_changelog_filter_parser, TransferChangelogFilterParser.new)
     end
 
     def changelog_transfer_list_item_payload(source)
@@ -9056,7 +9085,30 @@ module Kettle
     end
 
     def finalize_github_workflow_template(content, facts = nil)
-      inject_framework_matrix_workflow_env(update_github_actions_pins(content), facts)
+      output = apply_github_actions_engine_exec_cmd_overrides(content, facts)
+      inject_framework_matrix_workflow_env(update_github_actions_pins(output), facts)
+    end
+
+    def apply_github_actions_engine_exec_cmd_overrides(content, facts)
+      overrides = facts.to_h.dig(:ci, :engine_exec_cmds).to_h
+      return content if overrides.empty?
+
+      lines = content.to_s.lines
+      yaml_mapping_nodes(content).sort_by { |mapping| -mapping.start_line }.each do |mapping|
+        engine = yaml_mapping_scalar_value(mapping, "ruby")
+        command = overrides[engine]
+        next if command.to_s.empty?
+
+        exec_cmd_node = yaml_mapping_scalar_node(mapping, "exec_cmd")
+        next unless exec_cmd_node
+
+        line_index = exec_cmd_node.start_line
+        indent = lines.fetch(line_index).to_s.match(/\A(\s*)/)[1]
+        lines[line_index] = "#{indent}exec_cmd: #{yaml_double_quoted_scalar(command)}\n"
+      end
+      lines.join
+    rescue Psych::Exception
+      content
     end
 
     def inject_framework_matrix_workflow_env(content, facts)
@@ -9075,7 +9127,7 @@ module Kettle
         next unless insert_index
 
         indent = workflow_matrix_env_indent(lines, mapping)
-        additions = matrix_env.reject { |key, _value| yaml_mapping_scalar_value(mapping, key) }
+        additions = matrix_env.reject { |key, _value| yaml_mapping_scalar_node(mapping, key) }
         additions.reject! { |key, _value| inserted_locations.include?([insert_index, key.to_s]) }
         next if additions.empty?
 
@@ -9164,21 +9216,25 @@ module Kettle
     end
 
     def prune_workflow_matrix_item?(mapping, minimum)
-      ruby = yaml_mapping_scalar_value(mapping, "ruby")
-      return true if ruby && Gem::Version.new(ruby) < minimum
+      ruby = yaml_mapping_scalar_value(mapping, "ruby").to_s.strip
+      return true if !ruby.empty? && Gem::Version.new(ruby) < minimum
 
-      appraisal_ruby_version = appraisal_ruby_version(yaml_mapping_scalar_value(mapping, "appraisal"))
-      appraisal_ruby_version && Gem::Version.new(appraisal_ruby_version) < minimum
+      appraisal_ruby = appraisal_ruby_version(yaml_mapping_scalar_value(mapping, "appraisal")).to_s.strip
+      !appraisal_ruby.empty? && Gem::Version.new(appraisal_ruby) < minimum
     rescue ArgumentError
       false
     end
 
     def yaml_mapping_scalar_value(mapping, key)
+      yaml_mapping_scalar_node(mapping, key)&.value.to_s
+    end
+
+    def yaml_mapping_scalar_node(mapping, key)
       mapping.children.each_slice(2) do |key_node, value_node|
         next unless key_node.is_a?(Psych::Nodes::Scalar) && key_node.value.to_s == key.to_s
         next unless value_node.is_a?(Psych::Nodes::Scalar)
 
-        return value_node.value.to_s
+        return value_node
       end
       nil
     end
@@ -13796,7 +13852,9 @@ module Kettle
 
     def commit_file_work_units_thread(file_work_units, workers:)
       distribute_file_work_units(file_work_units, workers).map do |chunk|
+        # rubocop:disable ThreadSafety/NewThread -- Independent file units are joined before this method returns.
         Thread.new { chunk.each { |file_work_unit| commit_file_work_unit(file_work_unit) } }
+        # rubocop:enable ThreadSafety/NewThread
       end.each(&:join)
     end
 
@@ -14239,7 +14297,7 @@ module Kettle
               root: ["src", "my", "kettle-dev"]
             )
           elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("4.0.0")
-            gem "kettle-changelog", "~> 1.0", ">= 1.0.6"
+            gem "kettle-changelog", "~> 1.0", ">= 1.0.7"
           end
         end
       RUBY
@@ -14951,18 +15009,30 @@ module Kettle
       return [] unless project_root && gemspec_metadata.is_a?(Hash)
 
       sibling_root = File.expand_path("..", project_root.to_s)
-      dependencies = Array(
-        gemspec_metadata[:runtime_dependencies] || gemspec_metadata["runtime_dependencies"]
-      )
-      dependencies.each_with_object([]) do |dependency, names|
-        name = dependency.respond_to?(:name) ? dependency.name.to_s : dependency.to_s
-        next if name.empty? || name == package_name.to_s
-        next unless direct_sibling_directory_defines_gem?(File.join(sibling_root, name), name)
-        next if Array(local_modular_eval_paths[name]).any?
-        next if names.include?(name)
+      excluded = [package_name.to_s, *local_modular_eval_paths.keys.map(&:to_s)]
+      pending = gemspec_runtime_dependency_names(gemspec_metadata)
+      discovered = []
 
-        names << name
+      until pending.empty?
+        name = pending.shift.to_s
+        next if name.empty? || discovered.include?(name)
+
+        sibling_path = File.join(sibling_root, name)
+        next unless direct_sibling_directory_defines_gem?(sibling_path, name)
+
+        discovered << name
+        sibling_metadata = sibling_gemspec_metadata(sibling_path, name)
+        pending.concat(gemspec_runtime_dependency_names(sibling_metadata))
+      end
+
+      discovered.reject { |name| excluded.include?(name) }
+    end
+
+    def sibling_gemspec_metadata(sibling_path, gem_name)
+      gemspec_path = Dir.glob(File.join(sibling_path, "*.gemspec")).find do |path|
+        metadata_value(static_project_gemspec_metadata(path), :gem_name).to_s == gem_name.to_s
       end
+      gemspec_path ? static_project_gemspec_metadata(gemspec_path) : {}
     end
 
     def local_modular_runtime_eval_paths(project_root, gemspec_metadata, package_name:)
@@ -15263,7 +15333,7 @@ module Kettle
     def main_gemfile_kettle_family_gem(package_name)
       return "" if package_name.to_s == "kettle-family"
 
-      %(gem "kettle-family", "~> 1.2", ">= 1.2.65"\n)
+      %(gem "kettle-family", "~> 1.2", ">= 1.2.74"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -18987,6 +19057,23 @@ module Kettle
       )
     end
 
+    # A generated workflow normally uses one command for every matrix entry.
+    # Legacy engines occasionally need a narrower command while retaining the
+    # rest of the generated workflow (setup, retries, cache keys, and pins).
+    def github_actions_engine_exec_cmds(config)
+      workflows = config["workflows"]
+      return {} unless workflows.is_a?(Hash)
+
+      raw = workflows["engine_exec_cmds"]
+      return {} unless raw.is_a?(Hash)
+
+      raw.each_with_object({}) do |(engine, command), overrides|
+        engine_name = engine.to_s.strip
+        command_text = command.to_s.strip
+        overrides[engine_name] = command_text unless engine_name.empty? || command_text.empty?
+      end
+    end
+
     def normalize_github_actions_exec_cmd(command)
       normalized = command.to_s.strip
       return "kettle-test" if OBSOLETE_APPRAISAL_SPEC_EXEC_CMDS.include?(normalized)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.12
+  version: 7.1.13
 platform: ruby
 authors:
 - Peter H. Boling
@@ -66,7 +66,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: ast-crispr-ruby-prism
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: ast-merge
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: bash-merge
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: citrus-toml-merge
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: commonmarker-merge
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: dotenv-merge
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: json-merge
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: kettle-changelog
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -336,7 +336,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: markdown-merge
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +346,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -356,7 +356,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: markly-merge
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +366,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -376,7 +376,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -400,7 +400,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: psych-merge
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +420,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -430,7 +430,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -454,7 +454,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -464,7 +464,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: ruby-merge
   requirement: !ruby/object:Gem::Requirement
@@ -474,7 +474,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -484,7 +484,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: token-resolver
   requirement: !ruby/object:Gem::Requirement
@@ -514,7 +514,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -524,7 +524,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
@@ -548,7 +548,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -558,7 +558,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: yaml-merge
   requirement: !ruby/object:Gem::Requirement
@@ -568,7 +568,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -578,7 +578,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -976,10 +976,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.12
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.12/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.13
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.13/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.12
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.13
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/kettle-jem