samagotchi 0.21.0 → 0.23.0

data/lib/samagotchi/bundle_command.rb

@@ -121,7 +121,7 @@ module Samagotchi
       when "trash" then trash(@argv[1..])
       else
         @stderr.puts "Unknown bundle subcommand: #{sub}. Use: install, upgrade, uninstall, status, diff, list, build, trash"
-        return CLI::Exit::USAGE
+        CLI::Exit::USAGE
       end
     end
 
@@ -131,7 +131,8 @@ module Samagotchi
       parsed = parse_flags(INSTALL_FLAGS, rest, "install", help: INSTALL_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, source = parsed.options, parsed.args.last
+      opts = parsed.options
+      source = parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       if source.nil? || source.empty?
@@ -142,6 +143,7 @@ module Samagotchi
       if Samagotchi::MemoryBundle::Profile.shipped_meta?(expanded_source)
         return install_profile(expanded_source, scope: scope, force: force, dry_run: false, word: "Install")
       end
+
       bundle_name = bundle_name_or_fail(expanded_source, "Install") or return 1
       run_installer(installer_for(expanded_source, bundle_name, scope: scope, force: force), failed: "Install") do |manifest|
         print_hooks_and_plugin(manifest)
@@ -153,7 +155,8 @@ module Samagotchi
       parsed = parse_flags(UPGRADE_FLAGS, rest, "upgrade", help: UPGRADE_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, source = parsed.options, parsed.args.last
+      opts = parsed.options
+      source = parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       dry_run = opts.fetch(:dry_run, false)
@@ -166,6 +169,7 @@ module Samagotchi
       if Samagotchi::MemoryBundle::Profile.shipped_meta?(expanded_source)
         return install_profile(expanded_source, scope: scope, force: force, dry_run: dry_run, word: "Upgrade")
       end
+
       bundle_name = bundle_name_or_fail(expanded_source, "Upgrade") or return 1
       unless Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).installed?
         @stderr.puts "Bundle '#{bundle_name}' not installed — falling back to install"
@@ -195,8 +199,8 @@ module Samagotchi
       nil
     end
 
-    def installer_for(source, name, scope:, force:, **options)
-      Samagotchi::MemoryBundle::Installer.new(source: source, name: name, scope: scope, force: force, strict: true, **options)
+    def installer_for(source, name, scope:, force:, **)
+      Samagotchi::MemoryBundle::Installer.new(source: source, name: name, scope: scope, force: force, strict: true, **)
     end
 
     # Runs +installer+, prints its summary, then yields the manifest.
@@ -217,7 +221,7 @@ module Samagotchi
     end
 
     def print_hooks_and_plugin(manifest, plugin: true)
-      @stdout.puts "Hooks: #{manifest.hooks.size} hook(s) (#{manifest.hooks.keys.join(', ')})" if manifest&.hooks&.any?
+      @stdout.puts "Hooks: #{manifest.hooks.size} hook(s) (#{manifest.hooks.keys.join(", ")})" if manifest&.hooks&.any?
       @stdout.puts "Plugin: #{manifest.plugin[:file]} (loads at the next chi start)" if plugin && manifest&.plugin
     end
 
@@ -245,7 +249,7 @@ module Samagotchi
       installer.conflicts.each { |k, _| @stdout.puts "  conflict: #{k}" }
       launch = if agent.nil? && @stdin.tty?
                  @stdout.print "Conflicts detected — launch interactive agent to resolve? [y/N] "
-                 ans = begin; @stdin.gets; rescue => _e; nil; end
+                 ans = begin; @stdin.gets; rescue StandardError => _e; nil; end
                  ans && ans.strip.downcase.start_with?("y")
                elsif agent.nil?
                  @stdout.puts "Non-interactive terminal: kept your edits in the file(s) above; the rest is upgraded. Re-run with --force to take the bundle's version, or --agent in a TTY to merge."
@@ -279,7 +283,8 @@ module Samagotchi
       parsed = parse_flags(UNINSTALL_FLAGS, rest, "uninstall", help: UNINSTALL_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, bundle_name = parsed.options, parsed.args.last
+      opts = parsed.options
+      bundle_name = parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       if bundle_name.nil? || bundle_name.empty?
@@ -294,13 +299,13 @@ module Samagotchi
         uninstaller.run
         @stdout.puts "Uninstalled bundle '#{bundle_name}'"
         puts_trashed(uninstaller.trashed_files, uninstaller.trash_dir)
-        @stdout.puts "Removed: #{uninstaller.removed_files.join(', ')}" unless uninstaller.removed_files.empty?
+        @stdout.puts "Removed: #{uninstaller.removed_files.join(", ")}" unless uninstaller.removed_files.empty?
         hook_removed = uninstaller.removed_files.count { |f| f.start_with?("hooks/") }
         @stdout.puts "Hooks removed: #{hook_removed}" if hook_removed > 0
         uninstaller.warnings.each { |w| @stdout.puts w }
-        return 0
+        0
       rescue Samagotchi::MemoryBundle::Uninstaller::UninstallError => e
-        @stderr.puts "Uninstall failed: #{e.message}"; return 1
+        @stderr.puts "Uninstall failed: #{e.message}"; 1
       end
     end
 
@@ -432,7 +437,7 @@ module Samagotchi
           @stdout.puts "  #{bname} v#{st[:provenance][:version]} scope=#{status_scope(st)} files=#{st[:files].size}#{hook_info}#{plugin_info}#{includes_info} issues=#{mods}"
         end
       end
-      return 0
+      0
     end
 
     # "team (unknown)" for a scope this chi can't resolve (Status#bundle_status).
@@ -467,7 +472,7 @@ module Samagotchi
         @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
         @stdout.puts "--- current (on-disk) ---"
         @stdout.puts File.exist?(plugin_path) ? File.read(plugin_path) : "(missing)"
-        @stdout.puts "--- metadata: sha256=#{data[:plugin][:sha256]}#{data[:requires_chi] ? " requires_chi=#{data[:requires_chi]}" : ""}"
+        @stdout.puts "--- metadata: sha256=#{data[:plugin][:sha256]}#{" requires_chi=#{data[:requires_chi]}" if data[:requires_chi]}"
       end
       if file_arg
         # Try file first, then hook
@@ -491,7 +496,7 @@ module Samagotchi
           meta = hooks[file_arg.to_sym] || hooks[file_arg]
           if meta
             m = meta.transform_keys(&:to_s)
-            @stdout.puts "--- metadata: event=#{m['event']} on_error=#{m['on_error']} priority=#{m['priority']} sha256=#{m['sha256']}"
+            @stdout.puts "--- metadata: event=#{m["event"]} on_error=#{m["on_error"]} priority=#{m["priority"]} sha256=#{m["sha256"]}"
           end
         elsif plugin_file && [plugin_file, "plugin/#{plugin_file}"].include?(file_arg)
           show_plugin.call
@@ -524,7 +529,7 @@ module Samagotchi
           meta = hooks[k.to_sym] || hooks[k]
           if meta
             m = meta.transform_keys(&:to_s)
-            @stdout.puts "--- metadata: event=#{m['event']} on_error=#{m['on_error']} priority=#{m['priority']} sha256=#{m['sha256']}"
+            @stdout.puts "--- metadata: event=#{m["event"]} on_error=#{m["on_error"]} priority=#{m["priority"]} sha256=#{m["sha256"]}"
           end
           @stdout.puts ""
         end
@@ -533,7 +538,7 @@ module Samagotchi
           @stdout.puts ""
         end
       end
-      return 0
+      0
     end
 
     def list
@@ -552,6 +557,7 @@ module Samagotchi
         @stdout.puts "Installed:"
         installed.each do |b|
           next @stdout.puts("  #{b.name.ljust(name_w)}  (#{b.error})") if b.error
+
           line = "  #{b.name.ljust(name_w)}  #{"v#{b.version || "?"}".ljust(ver_w)}  scope=#{b.scope || "?"}  " \
                  "#{b.includes ? profile_members(b.includes, installed) : "files=#{b.files}"}  installed=#{b.installed_at || "?"}"
           line += "  (shipped v#{b.upgrade.version}: chi bundle upgrade #{b.upgrade.source})" if b.upgrade
@@ -567,7 +573,7 @@ module Samagotchi
           @stdout.puts "  #{s.source.ljust(name_w)}  #{"v#{s.version}".ljust(ver_w)}  #{s.description}#{members}".rstrip
         end
       end
-      return 0
+      0
     end
 
     # An installed profile's list cell: its recorded members still
@@ -575,7 +581,7 @@ module Samagotchi
     def profile_members(members, installed)
       names = installed.map(&:name)
       here, gone = members.partition { |m| names.include?(m) }
-      "includes=#{here.join(",")}#{gone.empty? ? "" : "  left out=#{gone.join(",")}"}"
+      "includes=#{here.join(",")}#{"  left out=#{gone.join(",")}" unless gone.empty?}"
     end
 
     def build(rest)
@@ -602,16 +608,16 @@ module Samagotchi
         result = builder.run
         @stdout.puts "Built #{result[:files].size} file(s) to #{result[:out_path]}"
         @stdout.puts "Bundle: #{result[:name]} v#{result[:version]} scope=#{result[:scope]}"
-        @stdout.puts "Files: #{result[:files].join(', ')}" unless result[:files].empty?
+        @stdout.puts "Files: #{result[:files].join(", ")}" unless result[:files].empty?
         builder.warnings.each { |w| @stdout.puts w }
         unless result[:placeholder_warnings].empty?
           @stdout.puts "Placeholders:"
           result[:placeholder_warnings].each { |w| @stdout.puts "  #{w}" }
         end
-        return 0
+        0
       rescue Samagotchi::MemoryBundle::Builder::BuildError => e
         @stderr.puts "Build failed: #{e.message}"
-        return 1
+        1
       end
     end
 
@@ -655,7 +661,7 @@ module Samagotchi
       end
 
       entries.each do |e|
-        @stdout.puts "  #{e.name}  #{e.files} file#{'s' unless e.files == 1}  #{format_bytes(e.bytes)}  #{format_age(e.time)}"
+        @stdout.puts "  #{e.name}  #{e.files} file#{"s" unless e.files == 1}  #{format_bytes(e.bytes)}  #{format_age(e.time)}"
       end
       @stdout.puts "\nEmpty it with: chi bundle trash --empty [--older-than DAYS]"
       0
@@ -664,7 +670,7 @@ module Samagotchi
     def do_empty(older_than_days:, dry_run:)
       entries = Samagotchi::MemoryBundle::Trash.empty!(
         older_than_days: older_than_days,
-        dry_run: dry_run,
+        dry_run: dry_run
       )
       if entries.empty?
         @stdout.puts "The bundle trash is empty."
@@ -674,11 +680,11 @@ module Samagotchi
       total_files = entries.sum(&:files)
       if dry_run
         entries.each do |e|
-          @stdout.puts "Would delete: #{e.name} (#{e.files} file#{'s' unless e.files == 1}, #{format_bytes(e.bytes)})"
+          @stdout.puts "Would delete: #{e.name} (#{e.files} file#{"s" unless e.files == 1}, #{format_bytes(e.bytes)})"
         end
-        @stdout.puts "\n(dry-run: #{entries.size} folder#{'s' unless entries.size == 1}, #{total_files} file#{'s' unless total_files == 1})"
+        @stdout.puts "\n(dry-run: #{entries.size} folder#{"s" unless entries.size == 1}, #{total_files} file#{"s" unless total_files == 1})"
       else
-        @stdout.puts "Deleted #{entries.size} folder#{'s' unless entries.size == 1} (#{total_files} file#{'s' unless total_files == 1}) from the trash."
+        @stdout.puts "Deleted #{entries.size} folder#{"s" unless entries.size == 1} (#{total_files} file#{"s" unless total_files == 1}) from the trash."
       end
       0
     end
@@ -686,6 +692,7 @@ module Samagotchi
     # Format bytes as human-readable (B, KB, MB with one decimal)
     def format_bytes(bytes)
       return "0 B" if bytes == 0
+
       if bytes < 1024
         "#{bytes} B"
       elsif bytes < 1_048_576
@@ -731,6 +738,7 @@ module Samagotchi
     # helpers for bundle_name derivation
     def expand_source(src)
       return src if Samagotchi::MemoryBundle::SourceNormalizer.git_url?(src)
+
       Samagotchi::MemoryBundle::SourceNormalizer.shipped_bundle_dir(src) || File.expand_path(src)
     end
 
@@ -749,13 +757,13 @@ module Samagotchi
       begin
         nd, owned = Samagotchi::MemoryBundle::SourceNormalizer.normalize(expanded_src)
         m = Samagotchi::MemoryBundle::Manifest.read(dir: nd)
-        return m.name
+        m.name
       rescue Samagotchi::MemoryBundle::Manifest::ValidationError
         # Fallback to source basename without archive extensions
         src = expanded_src
         name = File.basename(src)
         name = name.sub(/\.tar\.gz\z/i, "").sub(/\.tgz\z/i, "").sub(/\.zip\z/i, "").sub(/\.tar\z/i, "")
-        return name.empty? ? File.basename(nd || src) : name
+        name.empty? ? File.basename(nd || src) : name
       ensure
         Samagotchi::MemoryBundle::SourceNormalizer.cleanup(nd) if owned
       end
@@ -785,6 +793,7 @@ module Samagotchi
             preview = []
             max.times do |i|
               break if preview.size >= 30
+
               c = cur_lines[i]
               n = inc_lines[i]
               if c != n
@@ -795,7 +804,8 @@ module Samagotchi
             lines.concat(preview)
             lines << "    --- end preview ---"
           end
-        rescue => _e
+        rescue StandardError
+          # No preview for a file that can't be read: the diff lines stand alone.
         end
       end
       lines << ""

data/lib/samagotchi/bundles/btw/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: btw
-version: 0.1.1
+version: 0.1.2
 scope: system
 description: "/btw <question>: a side answer about the conversation, as a card in every UI, even mid-turn; Keep as session forks it into a child session"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:d12a970e7e5ada617fc7d55ee1de80b576835092d268af620f3f7241188e3297
+  sha256: sha256:226a251865695a86cdb05d6b6318fc062e0ab54518bb25733699db964cbed80b
 requires_chi: ">= 0.1.30"

data/lib/samagotchi/bundles/btw/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The btw bundle (docs/plugins.md, The btw bundle): /btw <question> asks the
 # session's model a side question about the conversation. The answer shows
 # as a card in every UI and goes nowhere else: the conversation, the saved

data/lib/samagotchi/bundles/check-in/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: check-in
-version: 0.2.1
+version: 0.2.2
 scope: system
 description: "Checks on a long turn: after N tool calls with no answer, a card asks the user (Nudge / Keep going / Stop), or the model is nudged to say what it has found"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:afbd0ecf5a41eefe79786e089aa918728ebb0fed0e3b75f84d754a47ec6ade18
+  sha256: sha256:52fcb0a3beccfee1e70e7d73162eace603da11bee43e535b1bc17d55eae98334
 requires_chi: ">= 0.3.0"

data/lib/samagotchi/bundles/check-in/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The check-in bundle (docs/plugins.md, The check-in bundle): a turn that
 # has made many tool calls without answering gets checked on. After `after`
 # tool calls (then every `every` more) it asks the user with a card (Nudge /

data/lib/samagotchi/bundles/known-names/hooks/known_names.rb

@@ -24,11 +24,11 @@ class KnownNames
   # Splits a command or path into tokens; each token's [-_.] parts are
   # candidates too. "~" splits: in "~name" (that user's home) the name
   # after it is what is checked.
-  TOKEN_SPLIT = %r{[/\s"'=:,;|&()<>@~]+}.freeze
-  PART_SPLIT = /[-_.]+/.freeze
+  TOKEN_SPLIT = %r{[/\s"'=:,;|&()<>@~]+}
+  PART_SPLIT = /[-_.]+/
   # A candidate with a shell glob character is not checked: `workato*`
   # is a pattern over the name, not a misspelling of it.
-  GLOB = /[*?\[\]{}]/.freeze
+  GLOB = /[*?\[\]{}]/
   ASK_OPTIONS = ["Correct it and run", "Run as is", "Deny"].freeze
 
   def initialize(settings = {})
@@ -134,6 +134,7 @@ class KnownNames
     names = @names + derived_names(event)
     names.each_with_object({}) do |name, acc|
       next if name.length < @min_length
+
       down = name.downcase
       next if @ignore.include?(down) || acc.key?(down)
 
@@ -149,7 +150,7 @@ class KnownNames
     root = context[:repo_root].to_s
     names << File.basename(root) if @derive.include?("repo") && !root.empty?
     names.concat(git_names(root)) if @derive.include?("git") && !root.empty?
-    names.map(&:to_s).map(&:strip).reject(&:empty?)
+    names.map { |name| name.to_s.strip }.reject(&:empty?)
   rescue StandardError
     names
   end
@@ -216,6 +217,6 @@ class KnownNames
   end
 
   def list(value)
-    Array(value).map(&:to_s).map(&:strip).reject(&:empty?)
+    Array(value).map { |name| name.to_s.strip }.reject(&:empty?)
   end
 end

data/lib/samagotchi/bundles/known-names/manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: known-names
-version: 0.1.4
+version: 0.1.5
 scope: system
 description: Catches a near-miss of a protected name (home folder, login, git name, repo name, names from config) in a tool call and rejects it with the right spelling; mode ask / correct optional
 trust_level: reviewed
@@ -8,7 +8,7 @@ files:
   known_names.md: sha256:d5348b95b6c655017b541910b36e384220da280818160201f6ec9a50e1e4287c
 hooks:
   known_names.rb:
-    sha256: sha256:c0845c9b6d04ec884c4641441d8a0ba3482283f4ee3e00c8b3bf99efb0c635b1
+    sha256: sha256:acff04fbe284b44644ca7140d574c1c0ebd2d999ede1243cd3fe0f432bfbb6d2
     event: before_tool_call
     on_error: log
     priority: 50

data/lib/samagotchi/bundles/loop-guard/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: loop-guard
-version: 0.3.1
+version: 0.3.2
 scope: system
 description: "Breaks loops: the same tool call with the same result again and again in one turn is denied with advice (after a few denies the turn stops with a card), and thinking that repeats itself while it streams is cut and the model asked again"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:32d04fa3f4b3394e80160dd780615a4a1ddeb3be0f2e327a6497c7766dbd9f11
+  sha256: sha256:27b135c462d8462313edaa1faa90f3104a1bff3c421d6965e9e71955f347d55b
 requires_chi: ">= 0.6.0"

data/lib/samagotchi/bundles/loop-guard/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The loop-guard bundle (docs/plugins.md, The loop-guard bundle): a model
 # that runs the same tool call again and again in one turn, getting the
 # same result each time, is told to stop (a guardrail deny with advice),

data/lib/samagotchi/bundles/mcp/manifest.yml

@@ -1,11 +1,11 @@
 ---
 name: mcp
-version: 0.4.1
+version: 0.4.2
 scope: system
 description: "Tools from MCP servers (stdio): each server in config.yml bundles: mcp: servers: runs for the session, its tools are mcp_<server>_<tool>; /mcp lists them"
 trust_level: reviewed
 files: {}
 plugin:
   file: plugin.rb
-  sha256: sha256:7c87e14dbdb20d32c37ef2a83f8d56448807ad26564a4034db4f6afbcf8a0323
+  sha256: sha256:d0491b038e7f111f9f8c629729a2b0525d573fd0b17d48ea8ec59c4a2b8b821b
 requires_chi: ">= 0.8.0"

data/lib/samagotchi/bundles/mcp/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The mcp bundle (docs/plugins.md, The mcp bundle): tools from MCP servers.
 # Each server in config.yml runs as a child process (stdio only in v1) for
 # the session's life; its tools are the model's as mcp_<server>_<tool>.

data/lib/samagotchi/bundles/skills/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: skills
-version: 0.1.5
+version: 0.1.6
 scope: system
 description: "Skills (skill_<name> memories, the steps of a task done together): /skill save, list, show and diff; older versions kept with a short diff line on every update; a nudge when a followed skill's step fails"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:9bd637f8fa933b03434e4ccdcbf2547aa011993b8044f2739ee7d50f995d2882
+  sha256: sha256:16aefdff7d7702a5feb9b2bafb9d975ceaa47f2864ad40f6df3624f4ba714136
 requires_chi: ">= 0.11.0"

data/lib/samagotchi/bundles/skills/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The skills bundle (docs/plugins.md, The skills bundle): a skill is a memory
 # named skill_<name> that holds the steps of a task done with the user
 # (docs/memory.md, Skills). The system bundle's identity already tells the
@@ -128,7 +130,7 @@ class Plugin
     removed = ops.count { |op, _| op == :del }
     first = ops.find { |op, _| op == :add } || ops.find { |op, _| op == :del }
     line = first ? cut(first.last.strip) : ""
-    "skill #{name} updated (+#{added} −#{removed})#{line.empty? ? "" : ": #{line}"} · /skill diff #{name}"
+    "skill #{name} updated (+#{added} −#{removed})#{": #{line}" unless line.empty?} · /skill diff #{name}"
   end
 
   # --- the nudge ------------------------------------------------------------
@@ -289,7 +291,7 @@ class Plugin
         next unless skill_name(name) == name
 
         date, description = index.fetch("skill_#{name}", [nil, nil])
-        line = +"#{name} · #{scope}"
+        line = "#{name} · #{scope}"
         line << " · #{date}" if date
         line << " — #{description}" if description
         line
@@ -338,7 +340,7 @@ class Plugin
     return "" if changed.empty?
 
     # Group changes whose context would touch into one hunk.
-    groups = changed.slice_when { |x, y| y - x > 2 * CONTEXT + 1 }.to_a
+    groups = changed.slice_when { |x, y| y - x > (2 * CONTEXT) + 1 }.to_a
     old_at = new_at = 0
     positions = ops.map do |op, _|
       at = [old_at, new_at]

data/lib/samagotchi/bundles/source-links/hooks/source_links.rb

@@ -60,7 +60,7 @@ class SourceLinks
   REGEX_TIMEOUT = 0.5
   # A bare URL (scheme-anchored, so it can't start inside a markdown label),
   # and a markdown link (label in group 1, target in group 2).
-  URL_SPAN = %r{[a-z][a-z0-9+.\-]*://\S+}i
+  URL_SPAN = %r{[a-z][a-z0-9+.-]*://\S+}i
   MARKDOWN_LINK = /\[([^\]]*)\]\(([^)]*)\)/
   # A fenced code block's opening line (up to 3 spaces, then ``` or ~~~).
   FENCE_OPEN = /\A {0,3}(`{3,}|~{3,})/
@@ -84,7 +84,7 @@ class SourceLinks
     return nil unless match
 
     host = match[1]
-    repo = match[2].to_s.sub(%r{\A/+}, "").sub(%r{/+\z}, "").sub(/\.git\z/, "").sub(%r{/+\z}, "")
+    repo = match[2].to_s.sub(%r{\A/+}, "").sub(%r{/+\z}, "").delete_suffix(".git").sub(%r{/+\z}, "")
     segments = repo.split("/", -1)
     return nil if host.empty? || segments.empty? || segments.any? { |segment| ["", ".", ".."].include?(segment) }
 
@@ -322,7 +322,7 @@ class SourceLinks
       in_target = start >= link[:target][0] && finish <= link[:target][1]
       in_label = start >= link[:label][0] && finish <= link[:label][1]
       in_target || (in_label && target_names_ref?(link[:target_text], text[start...finish],
-                                                   case_insensitive: match.regexp.casefold?))
+                                                  case_insensitive: match.regexp.casefold?))
     end
   end
 
@@ -354,7 +354,7 @@ class SourceLinks
 
   def line(found)
     shown = found.first(@max)
-    text = "sources: #{shown.map { |name, ref, url| "#{name} #{ref} → #{url}" }.join(', ')}"
+    text = "sources: #{shown.map { |name, ref, url| "#{name} #{ref} → #{url}" }.join(", ")}"
     extra = found.size - shown.size
     text += ", … +#{extra} more" if extra.positive?
     text
@@ -411,7 +411,7 @@ class SourceLinks
     groups = group_count(regex)
     known, unknown = used.partition do |word|
       if word.match?(/\A\d+\z/)
-        groups.nil? || (word.to_i.between?(1, groups))
+        groups.nil? || word.to_i.between?(1, groups)
       else
         BUILTIN_PLACEHOLDERS.include?(word) || regex.names.include?(word)
       end
@@ -430,7 +430,7 @@ class SourceLinks
   def group_count(regex)
     probe = Regexp.new("(?:#{regex.source}\n)|", regex.options, timeout: REGEX_TIMEOUT)
     probe.match("").size - 1
-  rescue RegexpError, Regexp::TimeoutError
+  rescue RegexpError # Regexp::TimeoutError is one
     nil
   end
 
@@ -528,6 +528,6 @@ class SourceLinks
 
   # A capture group is free-form, so escape what goes into the URL path.
   def escape_url(value)
-    value.to_s.gsub(%r{[^A-Za-z0-9\-._~]}) { |c| c.bytes.map { |b| format("%%%02X", b) }.join }
+    value.to_s.gsub(/[^A-Za-z0-9\-._~]/) { |c| c.bytes.map { |b| format("%%%02X", b) }.join }
   end
 end

data/lib/samagotchi/bundles/source-links/manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: source-links
-version: 0.3.2
+version: 0.3.3
 scope: system
 description: Links source refs (JIRA tickets, GitHub issues, …) in the model's answer — inline links in the web, and a one-line note after the turn (note false turns it off); sources are configured patterns
 trust_level: reviewed
@@ -8,7 +8,7 @@ files:
   source_links.md: sha256:aebd37f1e25491780994ecc4afc20ed6e8db32b724dc038302bb050177efada8
 hooks:
   source_links.rb:
-    sha256: sha256:5a996b718b1db729305b893ed583b9e600e813570861d47e0b65a24fec36a35d
+    sha256: sha256:454d3512a4aa078b288ff6d0ed25867222a56ead1a57ef1eaa14918e631fec23
     event: after_turn
     on_error: log
     priority: 90

data/lib/samagotchi/bundles/system/config_modification_protocol.md

@@ -18,7 +18,7 @@ Single registry `Samagotchi::Config` (`Config::ENTRIES` in `lib/samagotchi/confi
 
 Sections forbid `_`/`-` (`SECTION_RE` `/\A[a-z0-9]+\z/`); leaves keep `snake_case` in YAML (`base_url`) and become kebab in CLI (`base-url`) via registry derivation — no generic string split, registry lookup avoids flat vs nested collision.
 
-**Universal entries** (`expose: [:env,:config,:cli]`): `default.model`, `server.host/port/transport/open_timeout/read_timeout`, `server.first_token_timeout` (env and config only), `recap.model/base_url/host_ref/inactivity/timeout/min_user_turns/sentences`, `session.retention_days/max_count/keep_status/sweep_interval_hours/idle_exit_minutes`, `session.shared/keep_empty/max_children` (env and config only), `log.file/disable`, `status.line`, `context.status/window_tokens/chars_per_token/status_thresholds/status_cadence`, `thinking.turn_preamble`, `default.n_predict`, `max_tool_output_chars`, `retry.max/base_delay/max_delay`, `read.*`, `execute.*`, `web.port/host`, `no_interrupt`, `no_default_input` etc. (`Config::ENTRIES`; `expose` says which of env/config/cli each takes). Precedence is `CLI > ENV > file > default`.
+**Universal entries** (`expose: [:env,:config,:cli]`): `default.model`, `server.host/port/transport/open_timeout/read_timeout`, `server.first_token_timeout` (env and config only), `recap.model/base_url/host_ref/inactivity/timeout/min_user_turns/sentences`, `session.retention_days/max_count/keep_status/sweep_interval_hours/idle_exit_minutes`, `session.shared/keep_empty/max_children` (env and config only), `log.file/disable`, `status.line`, `context.status/window_tokens/chars_per_token/status_thresholds/status_cadence`, `thinking.turn_preamble`, `default.max_tokens`, `max_tool_output_chars`, `retry.max/base_delay/max_delay`, `read.*`, `execute.*`, `web.port/host`, `no_interrupt`, `no_default_input` etc. (`Config::ENTRIES`; `expose` says which of env/config/cli each takes). Precedence is `CLI > ENV > file > default`.
 
 Example `config.yml` (new nested form, preferred):
 

data/lib/samagotchi/bundles/system/manifest.yml

@@ -1,11 +1,11 @@
 ---
 name: samagotchi-system
-version: 0.21.0
+version: 0.23.0
 scope: system
 description: Default system memories — identity, self map, config modification protocol, memory guide and the delegated-session rules
 files:
   identity.md: sha256:29c2f7df9f6c5acbc5ec17000a4490741e55e426af15ca0d81c8706edd9bd027
   self_map.md: sha256:69bc0ec091fdaeedf6e3aa7365275461fe3eba32b2dedc9cf45044176c356af5
-  config_modification_protocol.md: sha256:8d8921854e616d840b393cdda6fd911b7d5e8172501bb8293c01f734121ccc21
+  config_modification_protocol.md: sha256:ec0b0c7023dbf03b93879e51cd5cdc38b22d43a2e5984ee11e8542ace077c3be
   memory_guide.md: sha256:17126f5adb9ef7b33c40e920ef339388c8c8c045b38a7de825b08760604db4e4
   delegated.md: sha256:0a71d5dfa7127df2d51cb5f0e7214240ed88777e36559430a8724c796d7ae561

data/lib/samagotchi/cancellation_controller.rb

@@ -97,7 +97,7 @@ module Samagotchi
       end
 
       if immediate_reason
-        block.call(immediate_reason)
+        yield(immediate_reason)
         nil
       else
         listener_id

data/lib/samagotchi/cli/command.rb

@@ -29,7 +29,7 @@ module Samagotchi
       # @return [Integer] the usage exit status
       def usage_error(message)
         usage = usage_on_error
-        error_line("#{command_name}: #{message}#{usage ? "" : " (see #{command_name} --help)"}")
+        error_line("#{command_name}: #{message}#{" (see #{command_name} --help)" unless usage}")
         @stderr.puts(usage) if usage
         Exit::USAGE
       end

data/lib/samagotchi/cli/parent_wait.rb

@@ -64,10 +64,11 @@ module Samagotchi
         result.text = result.text&.dup&.force_encoding(Encoding::UTF_8)&.scrub
         @reported = true
         ParentReport.report(result, session_id: id, stdout: @stdout, stderr: @stderr, command: command_name,
-                                    json: @json, timeout: timeout)
+                                    json: @json, timeout: timeout, extra: report_extra)
       rescue Interrupt
         if @json
-          @stdout.puts(ParentReport.json_line(ReplyWait::Result.new(status: :canceled), session_id: id))
+          @stdout.puts(ParentReport.json_line(ReplyWait::Result.new(status: :canceled), session_id: id,
+                                                                                        extra: report_extra))
           @stdout.flush
           @reported = true
         end
@@ -77,6 +78,12 @@ module Samagotchi
         error_line("#{command_name}: the session is gone (deleted while waiting)")
         Exit::FAILED
       end
+
+      # More keys for the JSON object: answered_here: false when chi
+      # answer's answer didn't go in (the question was no longer open).
+      def report_extra
+        @answered_here == false ? { answered_here: false } : {}
+      end
     end
   end
 end

data/lib/samagotchi/client.rb

@@ -224,9 +224,7 @@ module Samagotchi
     attr_reader :host_name
 
     # The wire-format strategy for this client's transport.
-    def transport
-      @transport
-    end
+    attr_reader :transport
 
     # Send a raw prompt and return the model's completion text.
     #
@@ -246,7 +244,7 @@ module Samagotchi
     # @param sampling    [Hash]          request fields to add (SamplingSettings):
     #   temperature, penalties, …; they can't replace the fields above
     # @return [String] the generated text
-    def complete(prompt, stop: ["<end_of_turn>", "<|tool_response>"], n_predict: nil, model: nil, on_chunk: nil, cancel_controller: nil, on_retry: nil,
+    def complete(prompt, stop: [], n_predict: nil, model: nil, on_chunk: nil, cancel_controller: nil, on_retry: nil,
                  images: [], sampling: {})
       images = Array(images)
       request = { stop: stop, n_predict: n_predict, model: model, sampling: sampling }
@@ -449,7 +447,7 @@ module Samagotchi
                  when :omlx
                    ->(model) { resolve_omlx_model(model) }
                  when :mlx
-                   ->(_model) { nil }
+                   ->(_model) {}
                  end
       Transport.new(name, model_resolver: resolver)
     end