kettle-family 1.2.94 → 1.2.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60682b3f2d2f1017624cc67b428ff954b71f03eca4fdb6034cbe229183cba970
-  data.tar.gz: ea873857902fa44d2b2051e6449f21d84515139f005e1a9c148dfedf5062ce2f
+  metadata.gz: 9b482c620e7f5e341caead6b52476cc8dc26e56c5d0ecde281ca27f7aaacc3e3
+  data.tar.gz: 78c5c14ec0d5a90a34341650d010216e241fb4927983dff9507b66d9e9ccaf6d
 SHA512:
-  metadata.gz: a14c847688ce762dbf03be0229b1c5ac0da23d3892e2e803467b8dc6efe73df4ede2b43d64a6ffedbccaf38f11da162bfad6bbf574a44b29739dafe8b8d70cba
-  data.tar.gz: 8ad7d29e783dace84ef807339b81907fe9e6e7c7f35ee60c4ac95b412a0972983c6eb7d9e8dad708801b270eda6ee0bb87d8759a22e3d4e29d6f254d4bfa6ff3
+  metadata.gz: 61ab40f1165dc584b786cf9e5f72005390aa786bcc2f6d0b1f4e9c172d566d8efd310625bac5a218312b221e5f8577071d699dc0eadaa6b1260cdb7ac4444736
+  data.tar.gz: f4097829a8ca4127f0a2a6dc4f53ea84886d14e68c9df2ec82db9319904482ba9d6f2339d087596b048419d7c63707462f5c38e45e8bf475149e295fc4479868

checksums.yaml.gz.sig

@@ -1,6 +1,3 @@
-y;�"Ĕs$�5�U[G*W8M�}q?�x���eI��ݞaWf��<.�ePF��`���9@�
-A��~ON��3��1��ݎ��[�#
z
-�Ѫ�
N�#F�a΃��[�D�Ͽ���ҷHj��鼊c�/���{��������ʇ��p��
-�{���>pp�L۹F|�^ҡ8��QS"����ch�m<�=Pn�P�qK
-I�j��97���H	��f�V*�<�zۗ��H�>���f�.���rFi�c�e��6�	����MM�?�s��c������|���l}�����"���q1K�����j/Cx�8<0F�3$��6��"ā���{�md�Kǩ֫�¡!�8lr;
-��ƿ�H4cXKXF5�[;@�v@Oz�
+A(�#�-]Zf��(��ȯ�7ֺJ2Qf
+�Mx'{UM:�F�롄�>�����q�!b�w��2ɤ8#+e*d>#�`NǚB��z��6�8|r�^@����߰���7���G������?�5*݆��.�s9� �y���D��eJ^�N�h����!O]k2ǯ8�/y	T5�}Ϥ�'x�hHg�0�wHE$�~���h�Ť��a���I��W9u�.^J3���%-�YJ�ӓ�����>0����K36���4p
+����U�1?ɔo(S�FC�

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.95] - 2026-09-07
+
+- TAG: [v1.2.95][1.2.95t]
+- COVERAGE: 93.49% -- 6199/6631 lines in 35 files
+- BRANCH COVERAGE: 78.03% -- 2515/3223 branches in 35 files
+- 32.58% documented
+
+### Fixed
+
+- Run release-target branch worktrees through the full template bootstrap workflow before member preparation.
+
 ## [1.2.94] - 2026-09-07
 
 - TAG: [v1.2.94][1.2.94t]
@@ -2640,7 +2651,9 @@ 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.94...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.95...HEAD
+[1.2.95]: https://github.com/kettle-dev/kettle-family/compare/v1.2.94...v1.2.95
+[1.2.95t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.95
 [1.2.94]: https://github.com/kettle-dev/kettle-family/compare/v1.2.93...v1.2.94
 [1.2.94t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.94
 [1.2.93]: https://github.com/kettle-dev/kettle-family/compare/v1.2.92...v1.2.93

data/README.md

@@ -902,6 +902,23 @@ the template dependency graph. It must not invoke release-lockfile reset logic:
 release normalization intentionally disables local paths, while template
 recovery needs configured sibling paths to resolve unreleased family versions.
 
+### Branch Worktree Equivalence
+
+A release-target branch worktree is a separate checkout of the same template
+member, not a reduced template workflow. Before its member template body runs,
+it executes the same debugger, Appraisal, and Nomono bootstrap boundary as an
+ordinary member. It then executes the same lockfile preparation, dependency
+preparation and recovery, `kettle-jem` invocation, lockfile normalization, and
+template commit path with the same `template_local` environment.
+
+Only checkout mechanics differ: Family creates and trusts the linked worktree,
+rebases that target branch on its own upstream when one exists, attaches the
+branch name to the results, and removes the worktree after completion. These
+steps are necessary because each target has a distinct Git ref and an absolute
+`mise` configuration path. They do not change the dependency graph or omit a
+template phase. Regression specs assert that branch worktrees call the shared
+bootstrap boundary and cannot start a member template body when it fails.
+
 ## 🔐 Security
 
 See [SECURITY.md][🔐security].
@@ -1154,7 +1171,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.613-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.631-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/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -932,14 +932,8 @@ module Kettle
       end
 
       def template_member_workflow_results(workflow_members)
-        debugger_results = template_debugger_bootstrap_results(workflow_members)
-        return debugger_results unless debugger_results.all?(&:ok?)
-
-        appraisal_results = template_appraisal_bootstrap_results(workflow_members)
-        return debugger_results + appraisal_results unless appraisal_results.all?(&:ok?)
-
-        bootstrap_results = template_bootstrap_dependency_results(workflow_members)
-        return debugger_results + appraisal_results + bootstrap_results unless bootstrap_results.all?(&:ok?)
+        bootstrap_results = template_member_bootstrap_results(workflow_members)
+        return bootstrap_results unless bootstrap_results.all?(&:ok?)
 
         template_progress = start_template_progress(workflow_members)
         results = template_dependency_waves(workflow_members).each_with_object([]) do |wave, memo|
@@ -948,7 +942,22 @@ module Kettle
           break memo unless wave_results.all?(&:ok?)
         end
         emit_template_progress_summary(results, progress: template_progress)
-        debugger_results + appraisal_results + bootstrap_results + results
+        bootstrap_results + results
+      end
+
+      # This is the common preparation boundary for every template member,
+      # regardless of whether it runs in its primary checkout, a monorepo
+      # worktree, or a release-target branch worktree. Keep branch mechanics
+      # outside this method so they cannot silently omit a bootstrap phase.
+      def template_member_bootstrap_results(workflow_members)
+        debugger_results = template_debugger_bootstrap_results(workflow_members)
+        return debugger_results unless debugger_results.all?(&:ok?)
+
+        appraisal_results = template_appraisal_bootstrap_results(workflow_members)
+        return debugger_results + appraisal_results unless appraisal_results.all?(&:ok?)
+
+        bootstrap_results = template_bootstrap_dependency_results(workflow_members)
+        debugger_results + appraisal_results + bootstrap_results
       end
 
       def template_debugger_bootstrap_results(workflow_members)
@@ -1650,6 +1659,17 @@ module Kettle
       end
 
       def template_branch_worktree_entries_results(entries)
+        results = template_branch_worktree_sync_results(entries)
+        return results unless results.all?(&:ok?)
+
+        # A branch worktree is a different checkout, not a different template
+        # profile. Run the exact same member bootstrap boundary used by normal
+        # members before any branch begins its member template body.
+        bootstrap_results = template_member_bootstrap_results(entries.map { |entry| entry.fetch(:member) })
+        tag_template_worktree_results(bootstrap_results, entries)
+        results.concat(bootstrap_results)
+        return results unless bootstrap_results.all?(&:ok?)
+
         wave_jobs = template_jobs(entries)
         queue = Queue.new
         entries.each_with_index { |entry, index| queue << [index, entry] }
@@ -1671,23 +1691,41 @@ module Kettle
             end
           end
         end.each(&:join)
-        ordered_results.compact.flatten
+        results + ordered_results.compact.flatten
       end
 
       def template_branch_worktree_entry_results(entry, wave_jobs: 1)
         member = entry.fetch(:member)
         branch = entry.fetch(:branch)
-        runner = command_runner
-        results = []
-        if git_upstream_for(member)
-          results << runner.call(member: member, phase: "template_branch_sync", command: ["git", "rebase", "@{upstream}"])
-        end
-        results.concat(template_results_for_member(member, wave_jobs: wave_jobs)) if results.all?(&:ok?)
+        # Bootstrap and upstream synchronization are deliberately performed
+        # for the complete branch set before workers start. The member body is
+        # the same method normal template waves invoke.
+        results = template_results_for_member(member, wave_jobs: wave_jobs)
         tag_branch_results(results, branch)
         emit_template_event_line(member, results.all?(&:ok?) ? "." : "F", "branch #{branch}")
         results
       end
 
+      def template_branch_worktree_sync_results(entries)
+        runner = command_runner
+        entries.filter_map do |entry|
+          member = entry.fetch(:member)
+          upstream = git_upstream_for(member)
+          next unless upstream
+
+          result = runner.call(member: member, phase: "template_branch_sync", command: ["git", "rebase", "@{upstream}"])
+          result.branch = entry.fetch(:branch)
+          result
+        end
+      end
+
+      def tag_template_worktree_results(results, entries)
+        branches_by_root = entries.to_h { |entry| [File.expand_path(entry.fetch(:member).root), entry.fetch(:branch)] }
+        results.each do |result|
+          result.branch = branches_by_root[File.expand_path(result.workdir)] if result.workdir
+        end
+      end
+
       def template_branch_worktree_cleanup_results(entries, runner:, control_member:)
         entries.filter_map do |entry|
           worktree_root = entry[:worktree_root]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.94
+  version: 1.2.95
 platform: ruby
 authors:
 - Peter H. Boling
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.31
+        version: 3.0.32
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.31
+        version: 3.0.32
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -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.94
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.94/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.95
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.95/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.94
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.95
   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