kettle-family 1.2.98 → 1.2.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a170049375aa0330277e878596e92a61b58655a29ca9aeba1e9ab0006fa46c04
-  data.tar.gz: 5bfcd0c99c774fad470b8510188e6eaad700c2ca3157f64eb1a9b52ac320d6c6
+  metadata.gz: 8b8d7a476e1af0096eca0bc0870cd9a8623b2ad2ccdcfa5080ec184b5b561096
+  data.tar.gz: df5707cdac3c7838df5cbbc83731ffb7741dfe818e440a83d917792a1f4290b3
 SHA512:
-  metadata.gz: c527202894d4bca3ada36684b9a7f3700052ebd53967ebb7ea7a65cc0db5cc20a5bf04eec6730f380a444fd69ed6828428fc29e16a1718371eab48eea0647601
-  data.tar.gz: b147945409bca869bf23ea6ab8773b7fc8fc6c7677ef877367d2970b3c73edb1efe628606c267de48f58af8cb4db761d527ce8df457b1fe6d4f729ae8c662229
+  metadata.gz: 1cc3290cedbd5e35c1c77f4810b6fba3e562297e66a8f1c0d5a0f575110c231771cb460ae67617d289dcf845cde1f0ef4ed09aa996ca5774631fbe1f0c8a4556
+  data.tar.gz: f6e8a65bfd5e7dd3c544a6b47443383a7a9d4cfc7597a52e509bbc9cf765cf1835624f8b4022db1b80b45b2cb0e40c3a5de77acb08f0cfd953c44913d6611454

data/CHANGELOG.md

@@ -30,6 +30,34 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.100] - 2026-09-09
+
+- TAG: [v1.2.100][1.2.100t]
+- COVERAGE: 93.51% -- 6283/6719 lines in 35 files
+- BRANCH COVERAGE: 78.15% -- 2553/3267 branches in 35 files
+- 32.84% documented
+
+### Fixed
+
+- Run each family member through its own mise runtime instead of inheriting the orchestrator runtime.
+
+- Refresh dependent release lockfiles after a runtime sibling publishes without waiting for later Gemfile-only tooling dependencies.
+
+- Preserve the Mise launcher path when running commands in member worktrees from a Bundler environment.
+
+## [1.2.99] - 2026-09-09
+
+- TAG: [v1.2.99][1.2.99t]
+- COVERAGE: 93.52% -- 6261/6695 lines in 35 files
+- BRANCH COVERAGE: 78.19% -- 2542/3251 branches in 35 files
+- 32.75% documented
+
+### Fixed
+
+- Keep resumed family releases on the prepared CI commit by skipping dependency-floor reconciliation and disabling sibling paths for child release validation.
+
+- Scope branch-stack release resumes to the prepared branch so later targets run their complete release lifecycle before CI monitoring.
+
 ## [1.2.98] - 2026-09-09
 
 - TAG: [v1.2.98][1.2.98t]
@@ -2692,7 +2720,11 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.98...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.100...HEAD
+[1.2.100]: https://github.com/kettle-dev/kettle-family/compare/v1.2.99...v1.2.100
+[1.2.100t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.100
+[1.2.99]: https://github.com/kettle-dev/kettle-family/compare/v1.2.98...v1.2.99
+[1.2.99t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.99
 [1.2.98]: https://github.com/kettle-dev/kettle-family/compare/v1.2.97...v1.2.98
 [1.2.98t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.98
 [1.2.97]: https://github.com/kettle-dev/kettle-family/compare/v1.2.96...v1.2.97

data/README.md

@@ -435,6 +435,12 @@ metadata fix requires a new full release run from step 0:
 kettle-family release --publish --start-step 10 --local-ci
 ```
 
+For `release.target_branches`, a resume position applies only to the first
+selected branch, which is the one whose already-pushed release commit is being
+resumed. Each later branch starts from step 0 so it creates, commits, and pushes
+its own release candidate before `kettle-release` begins remote CI monitoring.
+Use `--start-at member@branch` when the resumed branch is not the first target.
+
 `--skip-changelog` skips only `kettle-changelog`; `--skip-appraisals` skips
 only the Appraisal generation portion of release step 5 and still runs
 `bin/rake yard`; and `--skip-ci` skips only remote CI monitoring. The generic
@@ -1180,7 +1186,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-6.679-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.719-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/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/family/command_runner.rb

@@ -10,6 +10,7 @@ module Kettle
       SENSITIVE_ENV_KEYS = [
         "KETTLE_RELEASE_GEM_SIGNING_PASSPHRASE"
       ].freeze
+      MISE_SESSION_ENV_PREFIX = "__MISE_"
 
       class OtpCoordinator
         def initialize(input: $stdin, output: $stdout, queue_total: nil, secrets_provider: nil, event_handler: nil)
@@ -616,11 +617,14 @@ module Kettle
 
       def process_env(member:, env:)
         base_env = unbundled_process_env
+        clear_outer_mise_session!(base_env) if mise_configured?(member)
         # Bundler's unbundled environment intentionally omits activation
         # variables, but it may also omit PATH. When `unsetenv_others` is used
         # for mise-managed members, dropping PATH makes nested commands such
         # as `bundle` unresolvable inside kettle-jem.
-        base_env["PATH"] = if base_env.key?("PATH")
+        base_env["PATH"] = if mise_configured?(member)
+          mise_member_path(base_env["PATH"], ENV["PATH"])
+        elsif base_env.key?("PATH")
           executable_path(base_env["PATH"])
         else
           ENV["PATH"]
@@ -647,6 +651,33 @@ module Kettle
         paths.compact.map(&:to_s).flat_map { |value| value.split(File::PATH_SEPARATOR) }.reject(&:empty?).uniq.join(File::PATH_SEPARATOR)
       end
 
+      # `mise exec` selects a member's declared runtime. Do not let the
+      # orchestrator's Ruby or gem bin directory precede it on PATH: Bundler
+      # otherwise executes the outer runtime after `mise` has entered the
+      # member directory, and can rewrite that member's lockfile with the
+      # wrong Bundler version.
+      def mise_member_path(*paths)
+        outer_runtime_paths = [Gem.bindir, File.dirname(RbConfig.ruby)].filter_map do |entry|
+          canonical_path(entry) unless entry.to_s.empty?
+        end
+        paths.flat_map { |path| path.to_s.split(File::PATH_SEPARATOR) }.reject(&:empty?).reject do |entry|
+          outer_runtime_paths.include?(canonical_path(entry))
+        end.uniq.join(File::PATH_SEPARATOR)
+      end
+
+      # Mise records its active configuration in private `__MISE_*` variables.
+      # Retaining them across a nested `mise exec -C member` makes Mise reuse
+      # the orchestrator's tool set instead of loading the member's mise.toml.
+      def clear_outer_mise_session!(env)
+        env.delete_if { |key, _value| key.start_with?(MISE_SESSION_ENV_PREFIX) }
+      end
+
+      def canonical_path(path)
+        File.realpath(path)
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        File.expand_path(path)
+      end
+
       def unbundled_process_env
         return Bundler.unbundled_env if defined?(Bundler) && Bundler.respond_to?(:unbundled_env)
         return Bundler.original_env if defined?(Bundler) && Bundler.respond_to?(:original_env)

data/lib/kettle/family/dependency_floor.rb

@@ -7,6 +7,24 @@ module Kettle
     class DependencyFloor
       DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency add_development_dependency].freeze
 
+      # Return only dependencies declared by the gemspec itself. Release
+      # ordering also observes Gemfile-only tooling dependencies, but those
+      # cannot have their published floor rewritten by this class.
+      def self.gemspec_dependency_names(member)
+        return [] unless member.gemspec_path && File.file?(member.gemspec_path)
+
+        source = File.read(member.gemspec_path)
+        parse_result = Kettle::Dev::VersionBump.parse_source(source, member.gemspec_path)
+        Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
+          next unless node.is_a?(Prism::CallNode) && DEPENDENCY_METHODS.include?(node.name)
+
+          name_node = node.arguments&.arguments&.first
+          name_node.unescaped if name_node.is_a?(Prism::StringNode)
+        end.uniq
+      rescue Kettle::Dev::Error => error
+        raise Error, error.message
+      end
+
       def initialize(released_members:, dependent_members:, mode: :dry_run)
         @released_members = released_members
         @dependent_members = dependent_members

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -1492,7 +1492,7 @@ module Kettle
             memo.concat(template_branch_sync_results(branch_members, runner: runner))
             break memo unless memo.last&.ok?
           end
-          branch_results = current_branch_results(branch_members)
+          branch_results = with_release_branch_resume_scope { current_branch_results(branch_members) }
           tag_branch_results(branch_results, branch)
           memo.concat(branch_results)
 
@@ -2604,6 +2604,10 @@ module Kettle
       end
 
       def release_dependency_floor_reconciliation_results(release_members)
+        # A step resume must continue the already-prepared release commit.
+        # Reconciliation can rewrite lockfiles and create a new commit, which
+        # invalidates the CI SHA selected by the caller's --start-step.
+        return [] if release_step_resume?
         return [] unless execute && auto_dependency_floors
         # Monorepo members intentionally keep their family dependencies as
         # paths in the canonical development lockfile. Registry reconciliation
@@ -2671,6 +2675,7 @@ module Kettle
       end
 
       def append_dependency_floor_results(released_members:, dependent_members:, runner:, memo:)
+        return if release_step_resume?
         return unless auto_dependency_floors
         return if dependent_members.empty?
 
@@ -2718,13 +2723,16 @@ module Kettle
         end
       end
 
-      # A release-valid lockfile must resolve every selected sibling dependency
-      # from the registry. Defer refreshes for dependents that still require a
-      # selected sibling from a later release wave; their gemspec floors can be
-      # updated now, but Bundler cannot resolve the future sibling remotely yet.
+      # A release-valid lockfile must resolve every selected sibling whose
+      # gemspec floor can be rewritten by DependencyFloor. Release ordering
+      # deliberately also includes Gemfile-only tooling dependencies, but
+      # those do not have a floor to reconcile and must not delay a runtime
+      # dependency's lockfile refresh until a later wave.
       def dependency_floor_refresh_ready?(member, released_members:)
         selected_names = members.map(&:name)
-        selected_dependencies = release_dependency_names(member).select { |dependency| selected_names.include?(dependency) }
+        selected_dependencies = DependencyFloor.gemspec_dependency_names(member).select do |dependency|
+          selected_names.include?(dependency)
+        end
         completed_names = Array(@release_completed_member_names) + released_members.map(&:name)
         selected_dependencies.all? { |dependency| completed_names.include?(dependency) }
       end
@@ -3486,11 +3494,33 @@ module Kettle
       end
 
       def release_start_step_for(member)
+        return nil if release_branch_resume_scoped? && !@release_branch_resume_active
         return start_step unless fast_recovery_for?(member)
 
         (fast_recovery == "retry-ci") ? 10 : 11
       end
 
+      # A release resume identifies one already-prepared branch commit. Later
+      # branches in the same stack still need their complete lifecycle: build,
+      # commit, push, and only then CI monitoring. Do not carry start_step (or
+      # named CI recovery) beyond that first branch.
+      def with_release_branch_resume_scope
+        return yield unless release_branch_resume_scoped?
+
+        previous = @release_branch_resume_active
+        @release_branch_resume_active = !@release_branch_resume_consumed
+        yield
+      ensure
+        @release_branch_resume_consumed = true if @release_branch_resume_active
+        @release_branch_resume_active = previous
+      end
+
+      def release_branch_resume_scoped?
+        command == "release" &&
+          !config.release_target_branches.empty? &&
+          (!start_step.nil? || !fast_recovery.nil?)
+      end
+
       def release_skip_steps_for(member)
         steps = Array(skip_steps).flat_map { |entry| entry.to_s.split(",") }.map(&:strip).reject(&:empty?)
         steps << "10" if skip_ci
@@ -3641,6 +3671,13 @@ module Kettle
         env = execution_profile(release_bootstrap_execution_profile, release_env)
         env.merge!(release_wave_local_path_env_for(member, family_root: family_root))
         env.merge!(release_local_path_policy_env(family_root: family_root))
+        # A resumed child kettle-release starts in the member's mise
+        # environment after the release candidate was already prepared.
+        # Disable sibling paths so mise cannot reactivate them before the
+        # resumed release validates that immutable lockfile. A new release
+        # retains the staged local-graph policy until kettle-release reaches
+        # its own release-lockfile boundary.
+        env.merge!(release_lockfile_local_path_env_overrides(member)) if release_step_resume?
         # Family release performs one live pin review before member releases.
         # Child kettle-release must consume that reviewed cache instead of
         # repeating the GitHub API lookup for every member.
@@ -5390,6 +5427,10 @@ module Kettle
         !start_step.nil? || !skip_steps.to_s.empty? || fast_recovery || skip_ci
       end
 
+      def release_step_resume?
+        !start_step.nil? || !skip_steps.to_s.empty?
+      end
+
       def execution_profile(profile, env)
         profile = ExecutionProfile.fetch(profile) unless profile.is_a?(ExecutionProfile::Definition)
         env = env.dup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.98
+  version: 1.2.100
 platform: ruby
 authors:
 - Peter H. Boling
@@ -94,7 +94,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.33
+        version: 3.0.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.33
+        version: 3.0.34
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -443,10 +443,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.98
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.98/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.100
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.100/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.98
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.100
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family