samagotchi 0.22.0 → 0.23.0

data/lib/samagotchi/llm/openai_chat.rb

@@ -53,13 +53,28 @@ module Samagotchi
       # How much of a 200's non-stream body is read as a possible JSON error.
       PLAIN_ERROR_LIMIT = 64 * 1024
       DEFAULT_MODELS_TTL = 60
+      # OpenRouter holds a paid request's estimated cost against the balance
+      # while it runs: the input plus the output max_tokens allows (a fixed
+      # per-request cap when it is unset), and refuses a request with a 402
+      # once the running ones fill the budget. A request that names a sane
+      # limit holds less. 32k leaves room for any one step's answer.
+      OPENROUTER_MAX_TOKENS = 32_768
 
-      attr_reader :base_url, :host_name, :api_key_env, :models_ttl, :first_token_timeout
+      attr_reader :base_url, :host_name, :api_key_env, :models_ttl, :first_token_timeout, :default_max_tokens
 
       # @param entry [HostRegistry::HostEntry]
-      def self.for(entry, **options)
+      def self.for(entry, **)
         new(base_url: entry.openai_base_url, host_name: entry.name, api_key_env: entry.api_key_env,
-            remote: entry.remote?, **options)
+            remote: entry.remote?, default_max_tokens: (OPENROUTER_MAX_TOKENS if openrouter?(entry.openai_base_url)),
+            **)
+      end
+
+      # true when +url+ is OpenRouter's API (openrouter.ai or a subdomain).
+      def self.openrouter?(url)
+        host = URI(url.to_s).host.to_s.downcase
+        host == "openrouter.ai" || host.end_with?(".openrouter.ai")
+      rescue URI::Error
+        false
       end
 
       # Tool arguments as a Hash; "" is {}, invalid JSON stays a String.
@@ -87,10 +102,13 @@ module Samagotchi
       # @param remote [Boolean] a provider on the network, not a local server
       # @param first_token_timeout [Numeric, nil] seconds a streamed answer
       #   may take to show something (LLM::HTTP); nil: no limit
+      # @param default_max_tokens [Integer, nil] max_tokens for a request
+      #   whose options name none (OPENROUTER_MAX_TOKENS); nil sends none
       def initialize(base_url:, host_name:, api_key_env: nil, stream: true, retries: true, timeout: nil,
                      env: ENV, sleeper: nil, retry_policy: nil, models_ttl: DEFAULT_MODELS_TTL, remote: false,
-                     first_token_timeout: nil, purpose: "chat")
+                     first_token_timeout: nil, purpose: "chat", default_max_tokens: nil)
         @remote = remote
+        @default_max_tokens = default_max_tokens
         # What its requests are for, in the log (LLM::HTTP::LOGGED_PURPOSES).
         @purpose = purpose
         @first_token_timeout = first_token_timeout
@@ -163,7 +181,7 @@ module Samagotchi
         models = []
         after = nil
         MAX_MODEL_PAGES.times do
-          uri = URI("#{@base_url}/models#{after ? "?after=#{URI.encode_www_form_component(after)}" : ""}")
+          uri = URI("#{@base_url}/models#{"?after=#{URI.encode_www_form_component(after)}" if after}")
           body = parse_json(@http.fetch(uri, get_request(uri), log_fields: { purpose: "models" }).body, "model list")
           models.concat(model_entries(body).map { |raw| model_info(raw) })
           break unless body.is_a?(Hash) && body["has_more"] && body["last_id"]
@@ -193,6 +211,18 @@ module Samagotchi
         nil
       end
 
+      def self.served_model(payload)
+        model = payload.is_a?(Hash) ? payload["model"] : nil
+        model.is_a?(String) && !model.strip.empty? ? model : nil
+      end
+
+      # OpenRouter names the provider that served a request (Baseten,
+      # Fireworks, …) in the body's `provider`; other servers send none.
+      def self.served_provider(payload)
+        provider = payload.is_a?(Hash) ? payload["provider"] : nil
+        provider.is_a?(String) && !provider.strip.empty? ? provider : nil
+      end
+
       private
 
       def timeouts(timeout)
@@ -211,11 +241,12 @@ module Samagotchi
           stream: @stream
         }
         body[:stream_options] = { include_usage: true } if @stream
+        body[:max_tokens] = @default_max_tokens if @default_max_tokens
         unless Array(tools).empty?
           body[:tools] = tools
           body[:tool_choice] = "auto"
         end
-        # A configured value replaces chi's own (temperature); nil drops it.
+        # A configured value replaces chi's own (temperature, max_tokens); nil drops it.
         body.merge(options || {}).compact
       end
 
@@ -259,34 +290,15 @@ module Samagotchi
           function = call["function"] || {}
           ToolCall.new(id: call["id"], name: function["name"].to_s, arguments: self.class.parse_arguments(function["arguments"]))
         end
-        ChatResponse.new(text: OpenAIChat.drop_leading_newlines(message["content"].to_s),
+        ChatResponse.new(text: message["content"].to_s,
                          reasoning: (message["reasoning_content"] || message["reasoning"]).to_s,
                          tool_calls: calls, usage: Usage.from_payload(body) || Usage.none,
                          finish_reason: body.dig("choices", 0, "finish_reason"), model: served_model(body),
                          provider: self.class.served_provider(body))
       end
 
-      # Workaround for Splash 1.0.2/1.1.0, which keeps the "\n\n" the model
-      # writes after </think> at the start of the answer
-      # (https://github.com/incoai/splash/issues/254). Remove once Splash
-      # strips it; llama.cpp already does. Streamed, it applies to the chunks
-      # until the first text.
-      def self.drop_leading_newlines(text) = text.sub(/\A[\r\n]+/, "")
-
-      def self.served_model(payload)
-        model = payload.is_a?(Hash) ? payload["model"] : nil
-        model.is_a?(String) && !model.strip.empty? ? model : nil
-      end
-
       def served_model(payload) = self.class.served_model(payload)
 
-      # OpenRouter names the provider that served a request (Baseten,
-      # Fireworks, …) in the body's `provider`; other servers send none.
-      def self.served_provider(payload)
-        provider = payload.is_a?(Hash) ? payload["provider"] : nil
-        provider.is_a?(String) && !provider.strip.empty? ? provider : nil
-      end
-
       def served_provider(payload) = self.class.served_provider(payload)
 
       # The parsed payload of a `data:` line; nil for blank lines, comments
@@ -357,7 +369,7 @@ module Samagotchi
         listed = raw["supported_parameters"] || raw["capabilities"]
         return nil unless listed.is_a?(Array)
 
-        listed.include?("tools") ? true : nil
+        listed.include?("tools") || nil
       end
 
       def cached_models
@@ -405,7 +417,6 @@ module Samagotchi
           @finish_reason = choice["finish_reason"] if choice["finish_reason"]
           delta = choice["delta"].is_a?(Hash) ? choice["delta"] : {}
           content = delta["content"].to_s
-          content = OpenAIChat.drop_leading_newlines(content) if @text.empty?
           reasoning = (delta["reasoning_content"] || delta["reasoning"]).to_s
           @text << content
           @reasoning << reasoning

data/lib/samagotchi/llm/prompt_cache.rb

@@ -55,7 +55,7 @@ module Samagotchi
       def content?(content)
         case content
         when String then !content.empty?
-        when Array then content.any? { |part| part.is_a?(Hash) }
+        when Array then content.any?(Hash)
         else false
         end
       end

data/lib/samagotchi/log.rb

@@ -143,7 +143,7 @@ module Samagotchi
       def safe_value(key, value)
         return "[redacted]" if key.match?(SECRET_KEY)
 
-        value = value.is_a?(Float) ? value.round(3) : value
+        value = value.round(3) if value.is_a?(Float)
         value.is_a?(String) && value.match?(URL) ? safe_url(value) : value
       end
 
@@ -185,7 +185,7 @@ module Samagotchi
       def build_state
         options = @options
         path = options.fetch(:path, :auto)
-        path = (LogPath.resolve rescue nil) if path == :auto
+        path = LogPath.resolve rescue nil if path == :auto
         level = options[:level] || (Config.get("log.level") rescue nil)
         level = LEVELS.key?(level.to_s.downcase.to_sym) ? level.to_s.downcase.to_sym : DEFAULT_LEVEL
         { writer: DebugLog.new(path: path), level: LEVELS.fetch(level), mirror: options[:mirror] ? true : false }

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))

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