samagotchi 0.22.0 → 0.24.0

data/lib/samagotchi/log_subscriber.rb

@@ -46,7 +46,8 @@ module Samagotchi
       type = event[:type]&.to_sym
       return unless type
 
-      if respond_to?(handler = :"on_#{type}", true)
+      handler = :"on_#{type}"
+      if respond_to?(handler, true)
         send(handler, event)
       elsif ANNOUNCED.key?(type)
         log(:info, type, **event.slice(*ANNOUNCED[type]), **origin(event), **items(event))
@@ -108,8 +109,9 @@ module Samagotchi
                                         stopped_by: event[:stopped_by])
       return unless event[:stopped_by]
 
-      # A plugin cut this generation (stop_generation); the turn goes on.
-      log(:info, :generation_stopped, iteration: event[:iteration], bundle: event[:stopped_by],
+      # A plugin (stop_generation) or a steer (Engine#cut_for_steer, by
+      # "steer") cut this generation; the turn goes on.
+      log(:info, :generation_stopped, iteration: event[:iteration], by: event[:stopped_by],
                                       reason: event[:stop_reason].to_s[0, 200], thinking_chars: event[:thinking_chars], ms: ms)
     end
 

data/lib/samagotchi/memory_bundle/builder.rb

@@ -65,8 +65,9 @@ module Samagotchi
           candidates_by_basename = candidates.map { |p| [File.basename(p), p] }.to_h
           missing = allow.reject { |k| candidates_by_basename.key?(k) }
           unless missing.empty?
-            raise BuildError, "Requested file(s) not found in #{@scope} scope: #{missing.join(', ')}"
+            raise BuildError, "Requested file(s) not found in #{@scope} scope: #{missing.join(", ")}"
           end
+
           candidates = with_overlays(allow, candidates_by_basename).map { |k| candidates_by_basename[k] }
         else
           candidates = leave_out_owned(candidates, resolved_name)
@@ -107,6 +108,7 @@ module Samagotchi
             src = File.join(prov.hooks_dir, basename)
             # Skip if hook file missing on disk
             next unless File.exist?(src)
+
             # meta may be symbol-keyed
             m = meta.is_a?(Hash) ? meta.transform_keys(&:to_s) : {}
             sha = (m["sha256"] || m["checksum"] || "").to_s
@@ -245,7 +247,7 @@ module Samagotchi
       def summary
         lines = []
         lines << "Built #{@built_files.size} file(s) to #{@out_path}"
-        lines << "Files: #{@built_files.join(', ')}" unless @built_files.empty?
+        lines << "Files: #{@built_files.join(", ")}" unless @built_files.empty?
         lines.concat(@placeholder_warnings.map { |w| "Placeholder: #{w}" }) unless @placeholder_warnings.empty?
         lines.concat(@warnings) unless @warnings.empty?
         lines.join("\n")
@@ -275,6 +277,7 @@ module Samagotchi
 
       def normalize_scope(val)
         return nil if val.nil? || val.to_s.strip.empty?
+
         v = val.to_s.strip.downcase
         %w[project system].include?(v) ? v : nil
       end
@@ -295,7 +298,7 @@ module Samagotchi
       def default_name(scope)
         if scope == "project"
           base = File.basename(MemoryPaths.project_root).gsub(/[^A-Za-z0-9_-]/, "-").downcase
-          base = base.gsub(/-+/, "-").gsub(/\A-+|-+\z/, "")
+          base = base.squeeze("-").gsub(/\A-+|-+\z/, "")
           base = "project" if base.empty?
           "chi_#{base}_memories"
         else
@@ -356,6 +359,7 @@ module Samagotchi
           if File.exist?(expanded) && !File.directory?(expanded)
             raise BuildError, "Output path exists and is not a directory: #{expanded}"
           end
+
           [expanded, :dir]
         end
       end
@@ -365,6 +369,7 @@ module Samagotchi
         if File.exist?(out_path)
           raise BuildError, "Output file already exists: #{out_path} — remove it or choose different --out"
         end
+
         # Use zip CLI like source.rb does with unzip
         Dir.chdir(staging) do
           result = system("zip", "-r", out_path, ".")
@@ -377,6 +382,7 @@ module Samagotchi
         if File.exist?(out_path)
           raise BuildError, "Output file already exists: #{out_path} — remove it or choose different --out"
         end
+
         # Use tar CLI
         Dir.chdir(staging) do
           cmd = case format

data/lib/samagotchi/memory_bundle/index_updater.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "fileutils"
 require "digest"
 require_relative "../atomic_file"
@@ -16,6 +17,7 @@ module Samagotchi
       def self.update_index(scope, entry_name, byte_count, description = nil, source: nil)
         index_path = index_path_for(scope)
         return true unless index_path
+
         locked_write(File.dirname(index_path)) do |content|
           new_line = managed_line(entry_name, scope, byte_count, description, source || nil)
           next auto_index_header + "\n\n" + new_line + "\n" if content.nil? || content.strip.empty?
@@ -32,20 +34,25 @@ module Samagotchi
         end
         true
       end
+
       def self.managed_pattern(name)
         /^- \*\*#{Regexp.escape(name)}\*\*[ \t]*(?:[·•].*|:.*)?(\r?\n|\z)/
       end
+
       def self.remove_index(scope, entry_name)
         index_path = index_path_for(scope)
         return true unless index_path && File.exist?(index_path)
+
         locked_write(File.dirname(index_path)) do |content|
           pattern = managed_pattern(entry_name)
           next nil unless content&.match?(pattern)
+
           # Clean up extra blank lines: collapse 3+ newlines to 2
           content.gsub(pattern, "").gsub(/\n{3,}/, "\n\n")
         end
         true
       end
+
       # Read-modify-write of <dir>/index.md under an exclusive flock on a sidecar
       # <dir>/.index.lock, so sessions in several worktrees of one repository
       # (one shared project folder) don't drop each other's lines. Yields the
@@ -61,6 +68,7 @@ module Samagotchi
           Samagotchi::AtomicFile.write(index_path, updated) unless updated.nil?
         end
       end
+
       def self.managed_line(name, scope, byte_count, description, source = nil)
         line = "- **#{name}** · #{scope} · #{date_str} · #{byte_count}"
         line += " · from #{source}" unless source.to_s.strip.empty?
@@ -68,6 +76,7 @@ module Samagotchi
         line += " — #{desc}" unless desc.to_s.empty?
         line
       end
+
       def self.extract_description(line)
         if line =~ /\s—\s(.*)\s*\z/
           $1
@@ -75,6 +84,7 @@ module Samagotchi
           $1
         end
       end
+
       # The bundle a managed line names ("· from <bundle>", before any
       # " — description"), or nil.
       def self.extract_source(line)
@@ -86,14 +96,16 @@ module Samagotchi
           "Managed entries below are auto-maintained by memory_write " \
           "(name, scope, last-written date, size). Free-form sections are preserved."
       end
+
       def self.date_str
         require "date"
         Date.today.iso8601
       end
+
       def self.index_path_for(scope)
         base_dir = MemoryPaths.scope_dir(scope.to_s.strip)
         base_dir && File.join(base_dir, "#{MEMORY_INDEX}.md")
       end
     end
   end
-end
+end

data/lib/samagotchi/memory_bundle/installer.rb

@@ -80,11 +80,9 @@ module Samagotchi
         rescue SourceNormalizer::UnknownSourceError => e
           raise InstallError, "Source normalization failed: #{e.message}"
         rescue Manifest::ValidationError => e
-          if @strict
-            raise InstallError, e.message
-          else
-            @warnings << "No manifest found — proceeding without strict manifest validation"
-          end
+          raise InstallError, e.message if @strict
+
+          @warnings << "No manifest found — proceeding without strict manifest validation"
         end
 
         # Determine target scope (CLI wins over manifest).
@@ -185,8 +183,9 @@ module Samagotchi
             end
           end
 
-          hook_entries.each do |basename, meta|
+          hook_entries.each do |basename, _meta|
             next unless basename.is_a?(String) && !basename.empty?
+
             all_hooks_in_bundle << basename
             src = File.join(normalized_dir, "hooks", basename)
             next unless File.exist?(src)
@@ -194,11 +193,11 @@ module Samagotchi
             dest = File.join(hooks_target, basename)
 
             if @dry_run
-              if File.exist?(dest) && !@force
-                @results[basename] = { status: "would_skip" }
-              else
-                @results[basename] = { status: "would_install" }
-              end
+              @results[basename] = if File.exist?(dest) && !@force
+                                     { status: "would_skip" }
+                                   else
+                                     { status: "would_install" }
+                                   end
               next
             end
 
@@ -207,10 +206,8 @@ module Samagotchi
               prev_meta = existing_provenance[:hooks] ? (existing_provenance[:hooks][basename.to_sym] || existing_provenance[:hooks][basename]) : nil
               if prev_meta
                 prev_sha = prev_meta[:sha256] || prev_meta["sha256"]
-                if File.exist?(dest)
-                  if !Provenance.recorded_sha(prev_sha).empty? && !Provenance.sha_matches?(dest, prev_sha)
-                    @warnings << "Hook #{basename} was locally modified; overwriting"
-                  end
+                if File.exist?(dest) && !Provenance.recorded_sha(prev_sha).empty? && !Provenance.sha_matches?(dest, prev_sha)
+                  @warnings << "Hook #{basename} was locally modified; overwriting"
                 end
               end
             end
@@ -249,11 +246,12 @@ module Samagotchi
           existing_provenance[:hooks].keys.each do |old_key|
             old_key_str = old_key.to_s
             next if all_hooks_in_bundle.include?(old_key_str)
+
             old_dest = File.join(hooks_target, old_key_str)
             if File.exist?(old_dest) && !@force
               @warnings << "Bundle no longer includes hook #{old_key_str} but local file exists — removing"
             end
-            FileUtils.rm_f(old_dest) if File.exist?(old_dest)
+            FileUtils.rm_f(old_dest)
           end
         end
 
@@ -261,14 +259,16 @@ module Samagotchi
         if manifest && @strict
           all_hooks_in_bundle.each do |basename|
             next if @conflicts.key?(basename)
+
             expected = manifest.checksum_for_hook(basename)
-            if expected
-              dest = File.join(hooks_target, basename)
-              next unless File.exist?(dest)
-              actual = Digest::SHA256.hexdigest(File.read(dest))
-              if actual != expected
-                @warnings << "Checksum mismatch for hook #{basename}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-              end
+            next unless expected
+
+            dest = File.join(hooks_target, basename)
+            next unless File.exist?(dest)
+
+            actual = Digest::SHA256.hexdigest(File.read(dest))
+            if actual != expected
+              @warnings << "Checksum mismatch for hook #{basename}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
             end
           end
         end
@@ -313,18 +313,21 @@ module Samagotchi
         if manifest && @strict
           all_files_in_bundle.each do |file_key|
             next if @conflicts.key?(file_key)
+
             status = @results[file_key] ? @results[file_key][:status].to_s : nil
             # skipped: not copied, so a local edit isn't a bad download.
             next if %w[kept kept_pruned fast_forward updated skipped].include?(status)
+
             # For dry-run, fast_forward would appear as "fast_forward", updated not yet
             target_path = File.join(target_dir, file_key)
             next unless File.exist?(target_path)
+
             expected = manifest.checksum_for(file_key)
-            if expected
-              actual = Digest::SHA256.hexdigest(File.read(target_path))
-              if actual != expected
-                @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-              end
+            next unless expected
+
+            actual = Digest::SHA256.hexdigest(File.read(target_path))
+            if actual != expected
+              @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
             end
           end
         end
@@ -342,18 +345,19 @@ module Samagotchi
             owned.each do |file_key|
               target_path = File.join(target_dir, file_key)
               next unless File.exist?(target_path)
+
               status = @results[file_key] ? @results[file_key][:status].to_s : nil
               if %w[kept noop conflict kept_pruned].include?(status)
                 # Keep old base snapshot — do not overwrite with edited current
                 # Use base snapshot as source if it exists to preserve old checksum
                 base_path = provenance.base_path(file_key)
-                if File.exist?(base_path)
-                  # Keep existing provenance entry by re-using base content
-                  # We still need to include it to prevent pruning, but with base content
-                  provenance_files[file_key] = base_path
-                else
-                  provenance_files[file_key] = target_path
-                end
+                provenance_files[file_key] = if File.exist?(base_path)
+                                               # Keep existing provenance entry by re-using base content
+                                               # We still need to include it to prevent pruning, but with base content
+                                               base_path
+                                             else
+                                               target_path
+                                             end
               else
                 # installed, updated, skipped — use current target (which is incoming for updated)
                 provenance_files[file_key] = target_path
@@ -364,14 +368,15 @@ module Samagotchi
               existing_provenance[:files].keys.each do |old_key|
                 old_key_str = old_key.to_s
                 next if all_files_in_bundle.include?(old_key_str)
+
                 # If it was kept_pruned, include it with base content to prevent pruning
-                if @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
-                  base_path = provenance.base_path(old_key_str)
-                  target_path = File.join(target_dir, old_key_str)
-                  # Use base if exists to keep old checksum, else target
-                  src = File.exist?(base_path) ? base_path : target_path
-                  provenance_files[old_key_str] = src if File.exist?(src)
-                end
+                next unless @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
+
+                base_path = provenance.base_path(old_key_str)
+                target_path = File.join(target_dir, old_key_str)
+                # Use base if exists to keep old checksum, else target
+                src = File.exist?(base_path) ? base_path : target_path
+                provenance_files[old_key_str] = src if File.exist?(src)
               end
             end
           else
@@ -393,6 +398,7 @@ module Samagotchi
           elsif hooks_files_for_provenance.any?
             hooks_files_for_provenance.each do |basename, path|
               next unless File.exist?(path)
+
               sha = Digest::SHA256.hexdigest(File.read(path))
               hooks_for_provenance[basename] = { "sha256" => "sha256:#{sha}", "event" => "", "on_error" => "skip", "priority" => 100 }
             end
@@ -418,6 +424,7 @@ module Samagotchi
         all_files_in_bundle.each do |file_key|
           file_path = File.join(target_dir, file_key)
           next unless File.exist?(file_path)
+
           names = Placeholder.detect_in_file(file_path)
           if names.any?
             @placeholder_warnings << "#{file_key}: {{#{names.join("}}, {{")}}}"
@@ -451,15 +458,15 @@ module Samagotchi
         removed = @results.select { |_, r| r[:status].to_s == "removed" }.keys
         would_remove = @results.select { |_, r| r[:status].to_s == "would_remove" }.keys
 
-        lines << "Installed: #{installed.join(', ')}" unless installed.empty?
-        lines << "Updated: #{updated.join(', ')}" unless updated.empty?
-        lines << "Would install: #{would_install.join(', ')}" unless would_install.empty?
-        lines << "Fast-forward: #{fast_forward.join(', ')}" unless fast_forward.empty?
-        lines << "Removed (no longer in the bundle): #{removed.join(', ')}#{trash_dir ? " (moved to #{trash_dir})" : ""}" unless removed.empty?
-        lines << "Would remove (no longer in the bundle): #{would_remove.join(', ')}" unless would_remove.empty?
-        lines << "Kept (local edits preserved): #{kept.join(', ')}" unless kept.empty?
-        lines << "Skipped: #{skipped.join(', ')}" unless skipped.empty?
-        lines << "Conflicts: #{conflicts.join(', ')}" unless conflicts.empty?
+        lines << "Installed: #{installed.join(", ")}" unless installed.empty?
+        lines << "Updated: #{updated.join(", ")}" unless updated.empty?
+        lines << "Would install: #{would_install.join(", ")}" unless would_install.empty?
+        lines << "Fast-forward: #{fast_forward.join(", ")}" unless fast_forward.empty?
+        lines << "Removed (no longer in the bundle): #{removed.join(", ")}#{" (moved to #{trash_dir})" if trash_dir}" unless removed.empty?
+        lines << "Would remove (no longer in the bundle): #{would_remove.join(", ")}" unless would_remove.empty?
+        lines << "Kept (local edits preserved): #{kept.join(", ")}" unless kept.empty?
+        lines << "Skipped: #{skipped.join(", ")}" unless skipped.empty?
+        lines << "Conflicts: #{conflicts.join(", ")}" unless conflicts.empty?
         lines.concat(@warnings) unless @warnings.empty?
         lines.concat(@placeholder_warnings) unless @placeholder_warnings.empty?
         lines << "#{@name} is already installed; `chi bundle upgrade #{@name}` updates it and keeps local edits" if @reinstall
@@ -494,6 +501,7 @@ module Samagotchi
         previous_files.each do |old_key, meta|
           key = old_key.to_s
           next if bundle_files.include?(key)
+
           target = File.join(target_dir, key)
           next unless File.exist?(target)
 
@@ -504,6 +512,7 @@ module Samagotchi
           elsif @force || installed_unchanged?(target, meta, provenance.base_path(key))
             @results[key] = { status: @dry_run ? "would_remove" : "removed", reason: "no longer in the bundle" }
             next if @dry_run
+
             @trash.move(target)
             remove_target_index(scope, key)
           else
@@ -518,6 +527,7 @@ module Samagotchi
       def installed_unchanged?(target, meta, base_path)
         recorded = meta.is_a?(Hash) ? meta[:checksum] || meta["checksum"] : nil
         return Provenance.sha_matches?(target, recorded) unless Provenance.recorded_sha(recorded).empty?
+
         File.exist?(base_path) && Provenance.file_sha(target) == Provenance.file_sha(base_path)
       end
 
@@ -577,12 +587,12 @@ module Samagotchi
         FileUtils.mkdir_p(provenance.plugin_dir)
         FileUtils.cp(src, dest)
         @results[plugin[:file]] = if unchanged
-                                   { status: "skipped", reason: "already up to date" }
-                                 elsif @upgrade && provenance.read
-                                   { status: "updated" }
-                                 else
-                                   { status: "installed" }
-                                 end
+                                    { status: "skipped", reason: "already up to date" }
+                                  elsif @upgrade && provenance.read
+                                    { status: "updated" }
+                                  else
+                                    { status: "installed" }
+                                  end
         expected = manifest.checksum_for_plugin
         actual = Digest::SHA256.hexdigest(File.binread(dest))
         if @strict && expected && actual != expected

data/lib/samagotchi/memory_bundle/listing.rb

@@ -30,8 +30,10 @@ module Samagotchi
 
         Dir.children(dir).sort.filter_map do |source|
           next unless File.file?(File.join(dir, source, "manifest.yml"))
+
           m = Manifest.read(dir: File.join(dir, source))
           next if m.name == SystemBundle::BUNDLE_NAME
+
           Shipped.new(name: m.name, source: source, version: m.version, description: m.description, includes: m.includes)
         rescue Manifest::ValidationError, Psych::Exception
           nil
@@ -70,8 +72,10 @@ module Samagotchi
       end
 
       def newer?(candidate, current)
-        candidate, current = candidate.to_s, current.to_s
+        candidate = candidate.to_s
+        current = current.to_s
         return false unless Gem::Version.correct?(candidate) && Gem::Version.correct?(current)
+
         Gem::Version.new(candidate) > Gem::Version.new(current)
       end
     end

data/lib/samagotchi/memory_bundle/manifest.rb

@@ -64,6 +64,7 @@ module Samagotchi
       def self.read(dir:)
         manifest_path = File.join(dir, "manifest.yml")
         raise ValidationError, "manifest.yml not found in #{dir}" unless File.exist?(manifest_path)
+
         new(path: manifest_path)
       end
 
@@ -72,6 +73,7 @@ module Samagotchi
       def checksum_for(file_key)
         raw = @files[file_key]
         return nil unless raw
+
         raw.start_with?("sha256:") ? raw[7..] : raw
       end
 
@@ -79,8 +81,10 @@ module Samagotchi
       def checksum_for_hook(basename)
         raw = @hooks[basename]
         return nil unless raw
+
         sha = raw[:sha256] || raw["sha256"]
         return nil unless sha
+
         sha.to_s.start_with?("sha256:") ? sha.to_s[7..] : sha.to_s
       end
 
@@ -99,18 +103,18 @@ module Samagotchi
         return nil if Gem::Requirement.new(*requirement.to_s.split(",").map(&:strip)).satisfied_by?(Gem::Version.new(version.to_s))
 
         "it requires chi #{requirement} (this is chi #{version})"
-      rescue ArgumentError, Gem::Requirement::BadRequirementError => e
+      rescue ArgumentError => e # Gem::Requirement::BadRequirementError is one
         "its requires_chi #{requirement.inspect} is not a version requirement (#{e.message})"
       end
 
       # Writes a fresh manifest.yml from computed checksums at `dir`.
-      def self.write(dir:, name:, version:, scope: nil, description: "", files:, hooks: nil, trust_level: nil,
+      def self.write(dir:, name:, version:, files:, scope: nil, description: "", hooks: nil, trust_level: nil,
                      plugin: nil, requires_chi: nil, needs: nil)
         FileUtils.mkdir_p(dir)
         manifest = {
           "name" => name,
           "version" => version,
-          "description" => description,
+          "description" => description
         }
         manifest["scope"] = scope if scope
         manifest["files"] = files # { "file.md" => "sha256:abc..." }
@@ -167,19 +171,23 @@ module Samagotchi
       def require_str(hash, key)
         val = hash[key]
         return val if val.is_a?(String) && !val.empty?
+
         raise ValidationError, "manifest missing required field: #{key}"
       end
 
       def normalize_scope(val)
         return nil if val.nil?
+
         v = val.to_s.strip.downcase
         %w[project system].include?(v) ? v : nil
       end
 
       def parse_files(raw)
         return {} unless raw.is_a?(Hash)
+
         raw.each_with_object({}) do |(k, v), acc|
           next unless k.is_a?(String) && !k.empty?
+
           str = v.to_s
           acc[k] = if str.start_with?("sha256:")
                      str
@@ -234,11 +242,13 @@ module Samagotchi
 
       def parse_hooks(raw)
         return {} unless raw.is_a?(Hash)
+
         raw.each_with_object({}) do |(k, v), acc|
           next unless k.is_a?(String) && !k.empty?
           next unless v.is_a?(Hash)
+
           sha = (v["sha256"] || v[:sha256] || "").to_s
-          sha = sha.start_with?("sha256:") ? sha : "sha256:#{sha}" unless sha.empty?
+          sha = "sha256:#{sha}" unless sha.empty? || sha.start_with?("sha256:")
           event = (v["event"] || v[:event] || "").to_s.strip
           on_error = (v["on_error"] || v[:on_error] || "skip").to_s.strip
           on_error = "skip" if on_error.empty?

data/lib/samagotchi/memory_bundle/merger.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "digest"
 
 module Samagotchi
@@ -33,18 +34,19 @@ module Samagotchi
         incoming_digest = Digest::SHA256.hexdigest(File.read(incoming_path))
 
         if current_digest == incoming_digest
-          return :noop
+          :noop
         elsif current_digest == base_digest
-          return :fast_forward
+          :fast_forward
         elsif incoming_digest == base_digest
-          return :keep
+          :keep
         else
-          return :conflict
+          :conflict
         end
       end
 
       def self.current_modified?(base_path, current_path)
         return true unless base_path && File.exist?(base_path) && File.exist?(current_path)
+
         Digest::SHA256.hexdigest(File.read(base_path)) != Digest::SHA256.hexdigest(File.read(current_path))
       end
     end

data/lib/samagotchi/memory_bundle/provenance.rb

@@ -154,11 +154,11 @@ module Samagotchi
         if existing && existing[:files]
           existing[:files].keys.each do |old_key|
             old_key_str = old_key.to_s
-            unless files.key?(old_key_str) || files.key?(old_key)
-              old_base = File.join(bases_dir, old_key_str)
-              FileUtils.rm_f(old_base) if File.exist?(old_base)
-              merged_entries.delete(old_key_str)
-            end
+            next if files.key?(old_key_str) || files.key?(old_key)
+
+            old_base = File.join(bases_dir, old_key_str)
+            FileUtils.rm_f(old_base)
+            merged_entries.delete(old_key_str)
           end
         end
 
@@ -172,9 +172,10 @@ module Samagotchi
           hooks.each do |k, v|
             next unless k.is_a?(String) && !k.empty?
             next unless v.is_a?(Hash)
+
             hv = v.transform_keys(&:to_sym)
             sha = (hv[:sha256] || "").to_s
-            sha = sha.start_with?("sha256:") ? sha : "sha256:#{sha}" unless sha.empty?
+            sha = "sha256:#{sha}" unless sha.empty? || sha.start_with?("sha256:")
             normalized_hooks[k] = {
               sha256: sha,
               event: (hv[:event] || "").to_s,
@@ -189,7 +190,7 @@ module Samagotchi
             old_key_str = old_key.to_s
             unless normalized_hooks.key?(old_key_str) || normalized_hooks.key?(old_key_str.to_sym)
               old_base = File.join(bases_dir, old_key_str)
-              FileUtils.rm_f(old_base) if File.exist?(old_base)
+              FileUtils.rm_f(old_base)
             end
           end
         end
@@ -204,12 +205,12 @@ module Samagotchi
             meta = meta.merge(sha256: "sha256:#{Digest::SHA256.hexdigest(File.read(src.to_s))}")
           end
           hooks_map[k] = meta.transform_keys(&:to_s)
-          if src && File.exist?(src.to_s)
-            begin
-              File.write(File.join(bases_dir, k), File.read(src.to_s))
-            rescue StandardError
-              nil
-            end
+          next unless src && File.exist?(src.to_s)
+
+          begin
+            File.write(File.join(bases_dir, k), File.read(src.to_s))
+          rescue StandardError
+            nil
           end
         end
 
@@ -256,6 +257,7 @@ module Samagotchi
         conflicts.each do |file_key, info|
           key = file_key.to_s
           next unless raw["files"].key?(key)
+
           src = [info[:incoming], info[:current]].find { |p| p && File.exist?(p) }
           next unless src
 
@@ -270,6 +272,7 @@ module Samagotchi
       def read
         manifest_path = File.join(@bundle_dir, "manifest.json")
         return nil unless File.exist?(manifest_path)
+
         JSON.parse(File.read(manifest_path), symbolize_names: true)
       end