kettle-family 1.2.97 → 1.2.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85cd07ac87342ba42bcea97136be59eb3cdde7737f33e81f8b1f554d9ed5f875
-  data.tar.gz: fe3d86e41548b66fde62baf1b81dda2636befa505c1db6c0c2e82fe4a6b35b2e
+  metadata.gz: e3fff3ab628dc6f5338ddf0a820485b986ce5f40aec27a905f1ee15e18450ab9
+  data.tar.gz: fa34533d50ee506f05e2f1cd9f865c011d12e91996b1c38cbabfe76eb0f9c676
 SHA512:
-  metadata.gz: 772815e8948f2760a938e55ccff3a2848073a3605b02c3581995e01e40e1a80037356c033abea71b13c01bc06efb2ea3a93a09401266e712f51ddf1bf42290af
-  data.tar.gz: 0a6886e0040e1389b95b876d6ca90dba2dc3e633024a2b7132db3a50671d9126e9f86e7492f1c14ad723af914fce3d4c78be1fabd1cc76a71aaa50aaaec3580f
+  metadata.gz: 81f62b1263cd2afbe483f7af09d0a4c1b3e4efac0328938592c84e381d5d731188031e1e9dad97ce343573b025a50d9de62424ce92d12be7245beced5de9996d
+  data.tar.gz: 95713fbc85dd8e285b7b94364bfe799735df2d2b9f19b1205d2ad0819d793f66c94e39aa3b3816826b2987dacabc14519e24f01a0447f29af1edb55567d49f95

data/CHANGELOG.md

@@ -30,6 +30,32 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 93.50% -- 6245/6679 lines in 35 files
+- BRANCH COVERAGE: 78.08% -- 2529/3239 branches in 35 files
+- 32.75% documented
+
+### Fixed
+
+- Commit the final normalized Gemfile.lock after sibling and branch-worktree template runs.
+
+- Bootstrap member releases from the family tool bundle before registry lockfile normalization.
+
 ## [1.2.97] - 2026-09-08
 
 - TAG: [v1.2.97][1.2.97t]
@@ -2679,7 +2705,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.97...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.99...HEAD
+[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
 [1.2.97t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.97
 [1.2.96]: https://github.com/kettle-dev/kettle-family/compare/v1.2.95...v1.2.96

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
@@ -662,6 +668,15 @@ and leaves RubyGems MFA prompts interactive by default:
 kettle-family release --publish --execute
 ```
 
+Release uses two explicitly separate execution contexts. `release_bootstrap`
+starts `kettle-release` from the family-root tool bundle, so a family can retain
+its configured local sibling graph while it prepares a release wave. It never
+uses a member's development Gemfile to boot the release tool. `release_registry`
+then resets each tracked release lockfile against registry dependencies and is
+also used by every project release child command. Local sibling paths therefore
+remain available only before that transition; they cannot enter the canonical
+lockfile, the release-preparation commit, or CI-facing project commands.
+
 Use named recovery modes when a publish wave has already prepared a member:
 
 ```console
@@ -1171,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.670-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.695-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/execution_profile.rb

@@ -40,6 +40,18 @@ module Kettle
           host_platform_policy: :active_platform_must_resolve,
           allowed_mutations: %i[template development_lockfiles generated]
         ),
+        # This profile only starts the release implementation from the family
+        # tool bundle. It is intentionally distinct from release_registry:
+        # canonical lockfile reset and all project release children use that
+        # registry-only profile after the tool has booted.
+        release_bootstrap: Definition.new(
+          name: :release_bootstrap,
+          path_gem_policy: :configured_siblings,
+          lockfile_role: :tool,
+          install_location: :family,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[release_tool_bootstrap]
+        ),
         release_registry: Definition.new(
           name: :release_registry,
           path_gem_policy: :registry_only,

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.97"
+      VERSION = "1.2.99"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -1451,6 +1451,7 @@ module Kettle
           normalize_lockfiles(member: member, runner: runner, memo: memo, phase: "normalize_lockfiles", commit_changes: commit_changes)
           emit_member_result_progress(member, memo.last, progress: progress, progress_key: progress_key, progress_label: progress_label)
           commit_template_changes(member: member, runner: runner, memo: memo) if commit_changes
+          commit_template_normalized_gemfile_lock(member: member, runner: runner, memo: memo, commit_changes: commit_changes)
           emit_member_result_progress(member, memo.last, progress: progress, progress_key: progress_key, progress_label: progress_label) if memo.last&.phase == "commit_template"
         ensure
           template_result = memo.find { |result| result.phase == "template" } || memo.last
@@ -1491,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)
 
@@ -2603,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
@@ -2670,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?
 
@@ -3485,11 +3491,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
@@ -3637,9 +3665,16 @@ module Kettle
       # changelog may live at the family root. Pass the shared paths to the
       # member release phase as well as to the separate family phase.
       def release_env_for_member(member, family_root: config.root, wave_jobs: 1)
-        env = release_env
+        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.
@@ -3703,15 +3738,15 @@ module Kettle
         candidates.find { |path| File.file?(path) }
       end
 
-      # A member's development lockfile can pin an older kettle-dev than the
-      # family runner. That older release tool may not understand the current
-      # family policy, notably configured monorepo PATH dependencies. Launch
-      # kettle-release from the family bundle instead; the release tool still
-      # runs member project commands from the member checkout.
+      # A member's development Gemfile can contain a deliberately local family
+      # graph that is not independently bootable after an earlier release wave
+      # changes a sibling's dependency floor. Launch kettle-release from the
+      # family tool bundle instead. The release tool still runs project commands
+      # from the member checkout, where it first normalizes canonical lockfiles
+      # with local paths disabled.
       def release_tool_gemfile_path(local_kettle_dev)
         local_kettle_dev_gemfile = local_kettle_dev_gemfile_path(local_kettle_dev)
         return local_kettle_dev_gemfile if local_kettle_dev_gemfile
-        return unless config.configured_monorepo_release?
 
         family_gemfile = File.join(config.root, "Gemfile")
         family_gemfile if File.file?(family_gemfile)
@@ -5319,6 +5354,23 @@ module Kettle
         end
       end
 
+      # Kettle Jem commits its own changes for sibling repositories. The final
+      # lockfile normalization therefore happens after that commit and needs a
+      # separate, deliberately narrow cleanup commit. Monorepos defer the
+      # template commit, which already includes the normalized lockfile.
+      def commit_template_normalized_gemfile_lock(member:, runner:, memo:, commit_changes:)
+        return unless execute && commit_changes && memo.all?
+        return if deferred_monorepo_template_commit?(member)
+
+        commit_normalized_lockfiles(
+          branch_members: [member],
+          runner: runner,
+          memo: memo,
+          reason: "template",
+          paths: ["Gemfile.lock"]
+        )
+      end
+
       def template_commit_message(member)
         "🎨 Template #{member.name} by kettle-family"
       end
@@ -5357,6 +5409,10 @@ module Kettle
         ExecutionProfile.fetch(:template_local)
       end
 
+      def release_bootstrap_execution_profile
+        ExecutionProfile.fetch(:release_bootstrap)
+      end
+
       def release_lockfile_execution_profile
         return ExecutionProfile.fetch(:release_recovery) if release_recovery?
         return ExecutionProfile.fetch(:release_monorepo) if preserve_monorepo_template_context?
@@ -5368,6 +5424,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
@@ -5375,7 +5435,7 @@ module Kettle
         when :template_local
           env["K_JEM_TEMPLATING"] = "true"
           env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
-        when :release_registry, :release_monorepo, :release_recovery
+        when :release_bootstrap, :release_registry, :release_monorepo, :release_recovery
           # Release profiles deliberately leave Bundler mutation decisions to
           # kettle-dev. The profile selection controls which local-path
           # overrides this workflow contributes below.
@@ -5588,10 +5648,14 @@ module Kettle
         text.include?(File::SEPARATOR)
       end
 
-      def commit_normalized_lockfiles(branch_members:, runner:, memo:, reason: command, force: false)
+      def commit_normalized_lockfiles(branch_members:, runner:, memo:, reason: command, force: false, paths: nil)
         return unless commit
         return unless force || commit_normalized_lockfiles?(reason)
 
+        pathspecs = Array(paths).map { |path| Shellwords.escape(path) }
+        pathspecs = ["Gemfile.lock", "'*.lock'", "'**/*.lock'"] if pathspecs.empty?
+        pathspec = pathspecs.join(" ")
+
         branch_members.each do |member|
           result = runner.call(
             member: member,
@@ -5599,7 +5663,7 @@ module Kettle
             command: [
               "sh",
               "-lc",
-              "files=$(git ls-files --modified --others --exclude-standard -- Gemfile.lock '*.lock' '**/*.lock'); " \
+              "files=$(git ls-files --modified --others --exclude-standard -- #{pathspec}); " \
                 "if [ -n \"$files\" ]; then printf '%s\\n' \"$files\" | xargs git add -- && git commit -m " \
                 "#{Shellwords.escape(normalized_lockfiles_commit_message(reason))}; fi"
             ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.97
+  version: 1.2.99
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.97
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.97/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.99
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.99/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.97
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.99
   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