kettle-family 1.3.13 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272212c97732ca16915b15849051f070a1886d2c45d4ea55d839185cc6db7e52
-  data.tar.gz: '08bb932c0d13e1567c1fd4ee3e5696d454f9f16a494a1c5c82864e3b580a831d'
+  metadata.gz: e9c9f3d7625a5dae78bd27ceda81c4237775381bf4f16fcc2bedb5b419637248
+  data.tar.gz: 73d2e5ffe67938d6aee937f8db6e8be9d253dd65dd964e34b4270929769e1b94
 SHA512:
-  metadata.gz: 5733eacb7b6c037f40657513242fc133908c00746ad99bf78bbf1c6df956c7ae5b976d5568ad37ac703b1f4aa76404885203c14122d8b584d51dbeae813edf23
-  data.tar.gz: 3e7c6aa05a68187fcbd443e4f758d88308d4b3aebc24e4f82d032fe301a5273d9ad2e5c4c13d72d24bc8c8730c187bff1c13fd0990a75e99548e3d77ed43b612
+  metadata.gz: 0c540e99bd58a29da64965936ded31a18b71558c5c1b0fdc6aa87198e8843373f2ecf0c14ce2b70c59cd4d03adb3a70fd6da52052054e61838412acb845f03f6
+  data.tar.gz: 2f9c08642978b28576845989cb362a9c9da1d6eed77f82c6aaf4be9a24bd916d4905be6c4079e529539a94af706caaa8ec6d4ada61d972affcfd446539720ec8

data/CHANGELOG.md

@@ -30,6 +30,32 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.15] - 2026-10-18
+
+- TAG: [v1.3.15][1.3.15t]
+- COVERAGE: 93.39% -- 7228/7740 lines in 44 files
+- BRANCH COVERAGE: 77.69% -- 2883/3711 branches in 44 files
+- 36.88% documented
+
+### Fixed
+
+- Convert registered worktree owner PIDs to integers before checking process liveness on Ruby 4.
+
+## [1.3.14] - 2026-10-17
+
+- TAG: [v1.3.14][1.3.14t]
+- COVERAGE: 93.36% -- 7226/7740 lines in 44 files
+- BRANCH COVERAGE: 77.69% -- 2883/3711 branches in 44 files
+- 36.88% documented
+
+### Added
+
+- [kc] mise-tasks-command: kettle-family mise-tasks command — ensures the destination root mise.toml includes the kettle-family managed TOML task file ([task_config].includes), creates the managed file from the shipped baseline, warns on task redefinitions (redefinition allowed, root wins), removes duplicates with opt-in --clean, and registers the managed file as template-managed (keep_destination) in the destination kettle-jem config via psych-merge; backed by Kettle::Family::MiseTasks, ast-crispr-toml, and psych-merge
+
+### Changed
+
+- Release progress pane renders member lines in execution order with wave-number labels (e.g. 2.kettle-jem), and all report summary lists (succeeded/skipped/failed/pending) are now alphabetical regardless of parallel completion order
+
 ## [1.3.13] - 2026-10-17
 
 - TAG: [v1.3.13][1.3.13t]
@@ -3038,7 +3064,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.3.13...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.15...HEAD
+[1.3.15]: https://github.com/kettle-dev/kettle-family/compare/v1.3.14...v1.3.15
+[1.3.15t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.15
+[1.3.14]: https://github.com/kettle-dev/kettle-family/compare/v1.3.13...v1.3.14
+[1.3.14t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.14
 [1.3.13]: https://github.com/kettle-dev/kettle-family/compare/v1.3.12...v1.3.13
 [1.3.13t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.13
 [1.3.12]: https://github.com/kettle-dev/kettle-family/compare/v1.3.11...v1.3.12

data/README.md

@@ -1225,7 +1225,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-7.597-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-7.740-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/cli.rb

@@ -10,7 +10,7 @@ module Kettle
     class CLI < CommandKit::Command
       include CommandKit::Commands
 
-      COMMANDS = %w[version mise-trust discover plan report metadata check clean-blockers clean-installed clean-unreleased reconcile-releases reset test lint docs template gha-sha-pins bup bupb update-bundler bex install bump bump-version add-changelog release push pull sync up branch-lanes release-state state].freeze
+      COMMANDS = %w[version mise-trust mise-tasks discover plan report metadata check clean-blockers clean-installed clean-unreleased reconcile-releases reset test lint docs template gha-sha-pins bup bupb update-bundler bex install bump bump-version add-changelog release push pull sync up branch-lanes release-state state].freeze
       WORKFLOW_COMMANDS = %w[check reset test lint docs template gha-sha-pins bup bupb update-bundler bex release push pull sync up].freeze
 
       command_name "kettle-family"
@@ -264,6 +264,93 @@ module Kettle
         end
       end
 
+      class MiseTasks < BaseCommand
+        command_name "mise-tasks"
+        usage "[options]"
+        description "Ensure the root mise.toml includes the kettle-family managed task file; warn on redefinitions."
+
+        option :task_file, long: "--task-file", value: {type: String, usage: "PATH"},
+          desc: "Managed TOML task file name, relative to the root (default: mise-family.tasks.toml)"
+        option :clean, long: "--clean", desc: "Remove task definitions from the root mise.toml that duplicate the managed file (opt-in; default warns only)"
+
+        DEFAULT_TASK_FILE = "mise-family.tasks.toml"
+
+        def run(*args)
+          unexpected_arguments!(args)
+          require "fileutils"
+          root = File.expand_path(options[:root] || Dir.pwd)
+          task_file_name = options[:task_file] || DEFAULT_TASK_FILE
+          root_mise = File.join(root, "mise.toml")
+          task_file_path = File.join(root, task_file_name)
+
+          unless File.file?(root_mise)
+            stderr.puts("kettle-family: no mise.toml at #{root_mise}")
+            return 1
+          end
+
+          unless File.file?(task_file_path)
+            baseline = File.join(__dir__, "templates", "mise-family.tasks.toml")
+            FileUtils.cp(baseline, task_file_path)
+            stdout.puts("created #{task_file_name} from the kettle-family baseline")
+          end
+
+          root_content = File.read(root_mise)
+          task_file_content = File.file?(task_file_path) ? File.read(task_file_path) : nil
+
+          result = if options[:clean]
+            Kettle::Family::MiseTasks.clean_redefinitions(
+              root_content: root_content,
+              task_file_content: task_file_content,
+              task_file_name: task_file_name
+            )
+          else
+            Kettle::Family::MiseTasks.ensure_include(
+              root_content: root_content,
+              task_file_name: task_file_name,
+              task_file_content: task_file_content
+            )
+          end
+
+          if result.changed
+            File.write(root_mise, result.content)
+            stdout.puts("updated mise.toml")
+          else
+            stdout.puts("mise.toml already up to date")
+          end
+
+          if result.redefinitions.empty?
+            stdout.puts("no task redefinitions")
+          else
+            result.redefinitions.each do |name|
+              winner = options[:clean] ? "managed task file" : "root mise.toml (redefinition allowed; use --clean to restore the managed definition)"
+              stderr.puts("kettle-family: task #{name.inspect} is defined in both mise.toml and #{task_file_name}; #{winner} wins")
+            end
+            return 1 if options[:clean] && !result.redefinitions.empty?
+          end
+
+          # Register the managed file in the destination's kettle-jem config
+          # when the project is kettle-jem-templated.
+          %w[.structuredmerge/kettle-jem.yml .kettle-jem.yml].each do |config_relative|
+            config_path = File.join(root, config_relative)
+            next unless File.file?(config_path)
+
+            registration = Kettle::Family::MiseTasks.register_in_jem_config(
+              config_content: File.read(config_path),
+              task_file_name: task_file_name
+            )
+            if registration.changed
+              File.write(config_path, registration.content)
+              stdout.puts("registered #{task_file_name} in #{config_relative}")
+            else
+              stdout.puts("#{task_file_name} already registered in #{config_relative}")
+            end
+            break
+          end
+
+          0
+        end
+      end
+
       class Plan < Discover
         command_name "plan"
         description "Alias for discover while execution workflows are built."
@@ -659,6 +746,7 @@ module Kettle
       command Discover
       command Version
       command MiseTrust
+      command MiseTasks
       command Plan
       command "report", ReportCommand
       command Metadata

data/lib/kettle/family/mise_tasks.rb

@@ -0,0 +1,259 @@
+# frozen_string_literal: true
+
+require "ast/crispr"
+require "ast/crispr/toml"
+require "psych/merge"
+
+module Kettle
+  module Family
+    # Slice-1044 family mise tasks primitive: ensure a destination root
+    # `mise.toml` references the kettle-family-managed TOML task file via
+    # `[task_config] includes`, and report (optionally clean) task
+    # redefinitions between the root file and the managed file.
+    #
+    # Precedence contract (mise): a task defined in the root `mise.toml` wins
+    # over the same name from a task file. Redefinition is therefore allowed
+    # and only reported; `clean` is always opt-in.
+    #
+    # All edits go through ast-crispr Actors with the ast-crispr-toml adapter.
+    module MiseTasks
+      TomlSelectors = Ast::Crispr::Toml::Selectors
+
+      # changed:         the root content was modified
+      # include_present: the include reference is (now) present and correct
+      # content:         the resulting root mise.toml content
+      # redefinitions:   task names defined in BOTH the root and the managed file
+      Result = Struct.new(:changed, :include_present, :content, :redefinitions)
+
+      # Task names declared in a mise.toml / TOML task file.
+      #
+      # The two shapes differ:
+      # - a root `mise.toml` (`managed: false`, default) namespaces tasks
+      #   under `[tasks]` / `[tasks.<name>]`;
+      # - a TOML task file loaded through `[task_config].includes`
+      #   (`managed: true`) uses the mise-task schema: each top-level table
+      #   IS a task (bare name), e.g. `[family-canary]`.
+      #
+      # @param content [String] TOML source
+      # @param managed [Boolean] parse as a managed TOML task file
+      # @return [Array<String>]
+      def self.task_names(content, managed: false)
+        context = Ast::Crispr::Toml.document_context(content: content, source_label: "mise.toml")
+        if managed
+          tables = context.structural_owners(owner_scope: :tables)
+          names = tables.reject { |table| table.name == "task_config" }.map(&:name)
+          context.structural_owners(owner_scope: :root_pairs).each do |pair|
+            names << pair.name.to_s unless pair.full_path == "includes" || pair.full_path.include?(".")
+          end
+          return names.compact.reject(&:empty?).uniq
+        end
+
+        names = []
+        context.structural_owners(owner_scope: :tables).each do |table|
+          next unless table.name == "tasks" || table.name.start_with?("tasks.")
+
+          # `[tasks.<name>]` sub-tables ARE task definitions; their inner
+          # pairs are task configuration, not task names. Only the bare
+          # `[tasks]` table carries trivial task entries as pairs.
+          if table.name == "tasks"
+            table.wrapper.pairs.each { |pair| names << pair.key_name.to_s }
+          else
+            names << table.name.sub(/\Atasks\./, "")
+          end
+        end
+        context.structural_owners(owner_scope: :root_pairs).each do |pair|
+          names << pair.name.to_s if pair.full_path == "tasks"
+        end
+        names.compact.reject(&:empty?).uniq
+      end
+
+      # Register the managed task file as kettle-jem template-managed in the
+      # destination's kettle-jem config. The registration is a template-side
+      # fragment merged into the destination YAML with psych-merge:
+      # destination entries always win, so an existing strategy choice is
+      # never overridden — only a missing registration is added.
+      #
+      # Skips silently (changed: false) when the destination has no
+      # kettle-jem config: a project that is not kettle-jem-templated has
+      # nothing to register.
+      #
+      # @param config_content [String] destination kettle-jem config YAML
+      # @param task_file_name [String] managed task file name
+      # @return [Result]-shaped Struct (changed, include_present, content, redefinitions: [])
+      def self.register_in_jem_config(config_content:, task_file_name:)
+        fragment = <<~YAML
+          files:
+            #{task_file_name}:
+              strategy: keep_destination
+        YAML
+
+        merge_result = Psych::Merge.merge_yaml(
+          fragment,
+          config_content,
+          "yaml",
+          add_template_only_nodes: true,
+          preference: :destination
+        )
+        raise Error, Array(merge_result[:diagnostics]).map { |d| d[:message] || d["message"] }.join("; ") unless merge_result[:ok]
+
+        updated = merge_result[:output]
+        Result.new(changed: updated != config_content, include_present: true, content: updated, redefinitions: [])
+      end
+
+      # Task names defined in BOTH the root mise.toml and the managed task file.
+      #
+      # @param root_content [String] destination mise.toml content
+      # @param task_file_content [String, nil] managed task file content
+      # @return [Array<String>] sorted redefined task names (empty when task_file_content is nil)
+      def self.redefinitions(root_content:, task_file_content:)
+        return [] if task_file_content.nil?
+
+        (task_names(root_content) & task_names(task_file_content, managed: true)).sort
+      end
+
+      # Ensure the root mise.toml contains `[task_config] includes = ["<task_file_name>"]`.
+      #
+      # @param root_content [String] the destination's mise.toml content
+      # @param task_file_name [String] managed task file name, relative to the config root
+      # @param task_file_content [String, nil] managed task file content, for redefinition detection
+      # @return [Result]
+      def self.ensure_include(root_content:, task_file_name:, task_file_content: nil)
+        redefs = redefinitions(root_content: root_content, task_file_content: task_file_content)
+        context = Ast::Crispr::Toml.document_context(content: root_content, source_label: "mise.toml")
+
+        if include_present?(context, task_file_name)
+          return Result.new(changed: false, include_present: true, content: root_content, redefinitions: redefs)
+        end
+
+        updated = add_include(context, task_file_name)
+        Result.new(
+          changed: updated != root_content,
+          include_present: true,
+          content: updated,
+          redefinitions: redefinitions(root_content: updated, task_file_content: task_file_content)
+        )
+      end
+
+      # Remove duplicate task definitions from the root mise.toml.
+      # Opt-in (`--clean`); never runs implicitly.
+      #
+      # @param root_content [String] the destination's mise.toml content
+      # @param task_file_content [String] managed task file content
+      # @param task_file_name [String] managed task file name
+      # @return [Result]
+      def self.clean_redefinitions(root_content:, task_file_content:, task_file_name:)
+        redefs = redefinitions(root_content: root_content, task_file_content: task_file_content)
+        content = root_content
+        redefs.each do |name|
+          # A task can be defined as a `[tasks.<name>]` table block or as a
+          # trivial `name = "…"` pair inside `[tasks]`; try both owners.
+          [
+            TomlSelectors.table(path: "tasks.#{name}"),
+            TomlSelectors.pair(path: "tasks.#{name}")
+          ].each do |target|
+            result = Ast::Crispr::Delete.result(
+              content: content,
+              target: target,
+              source_label: "mise.toml"
+            )
+            content = result.updated_content if result.success? && result.changed
+          end
+        end
+
+        context = Ast::Crispr::Toml.document_context(content: content, source_label: "mise.toml")
+        Result.new(
+          changed: content != root_content,
+          include_present: include_present?(context, task_file_name),
+          content: content,
+          redefinitions: redefinitions(root_content: content, task_file_content: task_file_content)
+        )
+      end
+
+      # Kinds to try when deleting a task definition: a `[tasks.<name>]`
+      # table block or a `name = "…"` pair inside `[tasks]`.
+      TASK_OWNER_KINDS = %i[table pair].freeze
+
+      class << self
+        # Build a successful Result. `include_present` is always true on an
+        # ensure_include outcome: a no-op means the reference was already correct.
+        def ok_result(content, redefs, changed: false)
+          Result.new(changed: changed, include_present: true, content: content, redefinitions: redefs)
+        end
+
+        private
+
+        def document_context(content)
+          Ast::Crispr::Toml.document_context(content: content, source_label: "mise.toml")
+        end
+
+        def include_present?(context, task_file_name)
+          includes_entries(context).any? { |entry| entry == task_file_name.to_s }
+        end
+
+        # String entries of `task_config.includes`; empty when the table or
+        # the pair does not exist.
+        def includes_entries(context)
+          table = context.structural_owners(owner_scope: :tables).find { |owner| owner.name == "task_config" }
+          return [] unless table
+
+          pair = table.wrapper.pairs.find { |candidate| candidate.key_name.to_s.strip == "includes" }
+          return [] unless pair
+
+          value = pair.value_node
+          if value&.array?
+            value.elements.map { |element| unquote(element.text) }
+          else
+            [unquote(value&.text)]
+          end.compact
+        end
+
+        def unquote(text)
+          text.to_s.strip.gsub(/\A["']|["']\z/, "")
+        end
+
+        def add_include(context, task_file_name)
+          content = context.content
+          block = "[task_config]\nincludes = [\"#{task_file_name}\"]\n"
+
+          table = context.structural_owners(owner_scope: :tables).find { |owner| owner.name == "task_config" }
+          if table.nil?
+            result = Ast::Crispr::Insert.result(
+              content: content,
+              text: block,
+              destination: nil,
+              if_missing: :append,
+              source_label: "mise.toml"
+            )
+            return fail_or(result)
+          end
+
+          pairs = table.wrapper.pairs
+          result =
+            if pairs.empty?
+              Ast::Crispr::Replace.result(
+                content: content,
+                target: TomlSelectors.table(path: "task_config"),
+                replacement: block.rstrip + "\n",
+                source_label: "mise.toml"
+              )
+            else
+              last = pairs.last
+              Ast::Crispr::Replace.result(
+                content: content,
+                target: TomlSelectors.pair(path: "task_config.#{last.key_name}"),
+                replacement: "#{last.text}\nincludes = [\"#{task_file_name}\"]\n",
+                source_label: "mise.toml"
+              )
+            end
+          fail_or(result)
+        end
+
+        def fail_or(result)
+          raise Error, result.error.to_s unless result.success?
+
+          result.updated_content
+        end
+      end
+    end
+  end
+end

data/lib/kettle/family/release_state_check.rb

@@ -922,7 +922,7 @@ module Kettle
       end
 
       def process_alive?(pid)
-        Process.kill(0, pid)
+        Process.kill(0, Integer(pid, 10))
         true
       rescue Errno::ESRCH
         false

data/lib/kettle/family/report.rb

@@ -442,11 +442,12 @@ module Kettle
       def selected_member_results
         return {} unless member_result_command?
 
-        visible_results.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |result, memo|
+        built = visible_results.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |result, memo|
           next unless selected_names.include?(result.member_name)
 
           memo[result.member_name] << result
         end
+        built.sort.to_h
       end
 
       def summary_succeeded
@@ -475,7 +476,8 @@ module Kettle
       end
 
       def summary_failed
-        visible_results.reject(&:ok?).map do |result|
+        # Alphabetical summary lists, regardless of parallel completion order.
+        visible_results.reject(&:ok?).sort_by.with_index { |result, index| [result.member_name, index] }.map do |result|
           {
             "member" => result.member_name,
             "phase" => result.phase,
@@ -490,7 +492,7 @@ module Kettle
 
         ran = summary_ran_member_names
         reason = pending_reason
-        (selected_names - ran).map do |member_name|
+        (selected_names - ran).sort.map do |member_name|
           {
             "member" => member_name,
             "phase" => command,
@@ -518,11 +520,11 @@ module Kettle
 
         return selected_member_results.keys unless command == "release"
 
-        failed = visible_results.reject(&:ok?).map(&:member_name)
+        failed = visible_results.reject(&:ok?).map(&:member_name).uniq.sort
         terminal = selected_member_results.filter_map do |member_name, member_results|
           member_name if member_results.any? { |result| release_terminal_result?(result) }
         end
-        (failed + terminal).uniq
+        (failed + terminal.sort).uniq
       end
 
       def summary_terminal_member_results(member_results)

data/lib/kettle/family/templates/mise-family.tasks.toml

@@ -0,0 +1,11 @@
+# kettle-family managed family mise tasks (slice-1044 baseline)
+#
+# This file is owned by kettle-family and is overwritten on template updates.
+# It uses the mise-task schema: each top-level table is a task, addressable
+# from the destination root mise.toml via [task_config] includes.
+#
+# Define family tasks below. Example:
+#
+# [family-lint]
+# description = "Run the family lint gate"
+# run = "mise run lint"

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -4705,12 +4705,16 @@ module Kettle
       end
 
       def start_release_progress(release_members)
+        wave_numbers = release_waves(release_members).each_with_index.flat_map do |wave, index|
+          wave.map { |member| [member.name, index + 1] }
+        end.to_h
         progress = WorkflowProgress.new(
           io: progress_io,
           label: release_progress_label,
           total: release_members.length,
           jobs: release_jobs(release_members),
-          members: release_members
+          members: release_members,
+          waves: wave_numbers
         )
         progress.start
         progress

data/lib/kettle/family/workflow_progress.rb

@@ -15,7 +15,7 @@ module Kettle
       DEFAULT_TERMINAL_WIDTH = 80
       ELLIPSIS = "..."
 
-      def initialize(io:, label:, total:, jobs:, members: [], enabled: true, clock: nil, heading: nil)
+      def initialize(io:, label:, total:, jobs:, members: [], enabled: true, clock: nil, heading: nil, waves: {})
         @io = io
         @label = label
         @total = total.to_i
@@ -23,11 +23,19 @@ module Kettle
         @heading = heading
         @clock = clock || lambda { Process.clock_gettime(Process::CLOCK_MONOTONIC) }
         @enabled = enabled && !!io
+        # Lines render in the order the caller passes: the task's actual
+        # execution order (wave plan for release, dependency order elsewhere).
+        # The pane is a schedule view, so it reflects reality, unlike the
+        # alphabetical summary lists in the report.
         @line_order = members.map(&:name)
+        # When the task runs in waves, prefix each member with its wave number
+        # ("2.kettle-jem") so the wave structure is visible instead of the
+        # ordering looking arbitrary.
+        @waves = waves.to_h.transform_values { |wave| wave.to_i }
         @started = false
         @stopped = false
         @member_totals = {}
-        @member_labels = @line_order.to_h { |member_name| [member_name, member_name] }
+        @member_labels = @line_order.to_h { |member_name| [member_name, wave_label(member_name)] }
         @member_counts = Hash.new(0)
         @member_started_at = {}
         @member_finished_elapsed = {}
@@ -60,7 +68,7 @@ module Kettle
         return unless @enabled
 
         synchronize do
-          @member_labels[key] = label
+          store_label(key, label)
           @member_totals[key] = total.to_i
           @member_counts[key] = 0
           @member_started_at[key] ||= monotonic_now
@@ -77,7 +85,7 @@ module Kettle
         return unless @enabled
 
         synchronize do
-          @member_labels[key] = label
+          store_label(key, label)
           event_mark = mark || (success ? "." : "F")
           increment_member_count(key)
           if @tty
@@ -94,7 +102,7 @@ module Kettle
         return if status.to_s.empty?
 
         synchronize do
-          @member_labels[key] = label
+          store_label(key, label)
           if @tty
             append_event(key, mark) if mark
             render(key, status: status)
@@ -108,7 +116,7 @@ module Kettle
         return unless @enabled
 
         synchronize do
-          @member_labels[key] = label
+          store_label(key, label)
           total = @member_totals[key].to_i
           @member_counts[key] = total if total.positive?
           @member_finished_elapsed[key] = elapsed_seconds_by_name(key)
@@ -173,6 +181,20 @@ module Kettle
 
       private
 
+      # "2.kettle-jem" when the member belongs to wave 2, otherwise the bare
+      # name. Wave numbers come from the caller's `waves:` mapping.
+      def wave_label(member_name)
+        wave = @waves[member_name]
+        wave ? "#{wave}.#{member_name}" : member_name
+      end
+
+      # Store a display label, re-applying the wave prefix when the caller
+      # passes the bare member name, so updates never strip "2." from
+      # "2.kettle-jem". Explicit custom labels are stored verbatim.
+      def store_label(key, label)
+        @member_labels[key] = (@waves[key] && label == key) ? wave_label(key) : label
+      end
+
       def render(member_key, status:)
         render_name(member_key, status: status)
         render_tty_block if @tty

data/lib/kettle/family.rb

@@ -30,6 +30,7 @@ require_relative "family/appraisal_bootstrap"
 require_relative "family/release_waves"
 require_relative "family/release_graph"
 require_relative "family/execution_profile"
+require_relative "family/mise_tasks"
 require_relative "family/workflow"
 require_relative "family/discovery"
 require_relative "family/orderer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.15
 platform: ruby
 authors:
 - Peter H. Boling
@@ -37,6 +37,46 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ast-crispr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
+- !ruby/object:Gem::Dependency
+  name: ast-crispr-toml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
 - !ruby/object:Gem::Dependency
   name: command_kit
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +205,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.27
+- !ruby/object:Gem::Dependency
+  name: psych-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: toml-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.11
 - !ruby/object:Gem::Dependency
   name: tsort
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +537,7 @@ files:
 - lib/kettle/family/local_install.rb
 - lib/kettle/family/member.rb
 - lib/kettle/family/member_loader.rb
+- lib/kettle/family/mise_tasks.rb
 - lib/kettle/family/nomono_bootstrap.rb
 - lib/kettle/family/orderer.rb
 - lib/kettle/family/paths.rb
@@ -473,6 +554,7 @@ files:
 - lib/kettle/family/secrets.rb
 - lib/kettle/family/secrets_broker.rb
 - lib/kettle/family/selection.rb
+- lib/kettle/family/templates/mise-family.tasks.toml
 - lib/kettle/family/unreleased_gem_cleanup.rb
 - lib/kettle/family/version.rb
 - lib/kettle/family/version_bump.rb
@@ -485,10 +567,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.3.13
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.13/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.15
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.15/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.13
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.15
   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