samagotchi 0.22.0 → 0.24.0

data/lib/samagotchi/memory_bundle/source.rb

@@ -28,7 +28,7 @@ module Samagotchi
         lower = path.downcase
         if lower.end_with?(".zip")
           normalize_zip(path)
-        elsif lower.end_with?(".tar.gz") || lower.end_with?(".tgz") || lower.end_with?(".tar")
+        elsif lower.end_with?(".tar.gz", ".tgz", ".tar")
           normalize_tar(path)
         else
           ext = File.extname(path).downcase
@@ -57,6 +57,7 @@ module Samagotchi
       def self.git_url?(str)
         s = str.to_s.strip
         return false if s.empty?
+
         s.match?(%r{\A(?:https?://|git@|ssh://|git://|file://).+})
       end
 
@@ -78,6 +79,7 @@ module Samagotchi
           args += [url, clone_dir]
           result = system(*args)
           raise UnknownSourceError, "git clone failed for #{git_url}" unless result && File.directory?(clone_dir)
+
           # Capture HEAD commit before stripping .git (audit trail)
           commit = nil
           begin
@@ -103,12 +105,11 @@ module Samagotchi
         end
       end
 
-      private
-
       def self.normalize_zip(zip_path)
         Dir.mktmpdir("samagotchi-zip-") do |extract_dir|
           result = system("unzip", "-o", zip_path, "-d", extract_dir)
           raise UnknownSourceError, "unzip failed for #{zip_path}" unless result
+
           clean_copy_of(extract_dir)
         end
       end
@@ -119,6 +120,7 @@ module Samagotchi
           cmd = is_gz ? ["tar", "-xzf"] : ["tar", "-xf"]
           result = system(*cmd, tar_path, "-C", extract_dir)
           raise UnknownSourceError, "tar extraction failed for #{tar_path}" unless result
+
           clean_copy_of(extract_dir)
         end
       end
@@ -150,6 +152,8 @@ module Samagotchi
         end
         [dst, true]
       end
+
+      private_class_method :normalize_zip, :normalize_tar, :clean_copy_of
     end
   end
 end

data/lib/samagotchi/memory_bundle/status.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "digest"
 require_relative "provenance"
 require_relative "manifest"
@@ -20,7 +21,7 @@ module Samagotchi
         return nil unless data
 
         raw_scope = scope_override || data[:scope]&.to_s
-        scope = (raw_scope.nil? || raw_scope.strip.empty?) ? "system" : raw_scope
+        scope = raw_scope.nil? || raw_scope.strip.empty? ? "system" : raw_scope
         target_dir = MemoryPaths.scope_dir(scope)
         files = data[:files] || {}
         details = {}
@@ -108,6 +109,7 @@ module Samagotchi
       def self.index_has_entry?(scope, file_key)
         path = IndexUpdater.index_path_for(scope)
         return false unless path && File.exist?(path)
+
         content = File.read(path)
         [file_key.delete_suffix(".md"), file_key].uniq.any? { |name| content.match?(IndexUpdater.managed_pattern(name)) }
       end

data/lib/samagotchi/memory_bundle/system_bundle.rb

@@ -110,12 +110,13 @@ module Samagotchi
 
       def skip?
         val = ENV[SKIP_ENV].to_s.strip.downcase
-        val == "1" || val == "true"
+        %w[1 true].include?(val)
       end
 
       # Unparseable versions fall back to the old "any difference upgrades" behaviour.
       def installed_newer?(installed, shipped)
-        installed, shipped = installed.to_s, shipped.to_s
+        installed = installed.to_s
+        shipped = shipped.to_s
         return false unless Gem::Version.correct?(installed) && Gem::Version.correct?(shipped)
 
         Gem::Version.new(installed) > Gem::Version.new(shipped)

data/lib/samagotchi/memory_bundle/trash.rb

@@ -44,7 +44,7 @@ module Samagotchi
       def self.empty!(bundles_dir: MemoryPaths.bundles_dir, older_than_days: nil, now: Time.now, dry_run: false)
         entries = self.entries(bundles_dir: bundles_dir, now: now)
         if older_than_days
-          cutoff = now - older_than_days.to_i * 86_400
+          cutoff = now - (older_than_days.to_i * 86_400)
           entries = entries.select { |e| e.time < cutoff }
         end
         return entries if dry_run
@@ -98,7 +98,7 @@ module Samagotchi
         File.directory?(path) && !File.symlink?(path)
       end
 
-      def self.entry_for(trash_dir, name, now)
+      def self.entry_for(trash_dir, name, _now)
         path = File.join(trash_dir, name)
         time = parse_timestamp(name) || File.mtime(path)
         files, bytes = count_files(path)
@@ -126,11 +126,14 @@ module Samagotchi
         bytes = 0
         Dir.glob(File.join(dir, "**", "*"), File::FNM_DOTMATCH).each do |f|
           next if File.directory?(f)
+
           files += 1
           bytes += File.size(f) rescue 0
         end
         [files, bytes]
       end
+
+      private_class_method :real_dir?, :entry_for, :parse_timestamp, :count_files
     end
   end
 end

data/lib/samagotchi/memory_bundle/uninstaller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "fileutils"
 require "digest"
 require_relative "../memory_paths"
@@ -38,7 +39,7 @@ module Samagotchi
         # Determine scope from flag or provenance
         cli_scope = @scope.to_s.strip.empty? ? nil : @scope
         raw = cli_scope || data[:scope]&.to_s
-        target_scope = (raw.nil? || raw.strip.empty?) ? "system" : raw
+        target_scope = raw.nil? || raw.strip.empty? ? "system" : raw
         target_dir = MemoryPaths.scope_dir(target_scope) or raise UninstallError, "invalid scope: #{target_scope}"
 
         files = data[:files] || {}
@@ -55,19 +56,20 @@ module Samagotchi
         end.reject { |_, others| others.empty? }
 
         blocked = []
-        files.each do |file_key, meta|
+        files.each do |file_key, _meta|
           file_key_str = file_key.to_s
           target_path = File.join(target_dir, file_key_str)
           base_path = provenance.base_path(file_key_str)
           next unless File.exist?(target_path)
           next if shared.key?(file_key_str)
+
           if !@force && File.exist?(base_path) && Merger.current_modified?(base_path, target_path)
             blocked << file_key_str
             @warnings << "Skipped #{file_key_str}: local edits detected (use --force to remove)"
           end
         end
 
-        raise UninstallError, "Uninstall blocked: #{blocked.join(', ')} has local edits (use --force)" if blocked.any?
+        raise UninstallError, "Uninstall blocked: #{blocked.join(", ")} has local edits (use --force)" if blocked.any?
 
         files.each do |file_key, _meta|
           file_key_str = file_key.to_s
@@ -108,10 +110,11 @@ module Samagotchi
             end
           end
           # Remove hooks dir if empty, else rm_rf will clean
-          FileUtils.rm_rf(hooks_dir) if Dir.exist?(hooks_dir)
+          FileUtils.rm_rf(hooks_dir)
         else
-          # Ensure stale hooks dir removed even if provenance has no hooks map but dir exists
-          FileUtils.rm_rf(provenance.hooks_dir) if Dir.exist?(provenance.hooks_dir)
+          # A stale hooks dir goes even when provenance has no hooks map
+          # (rm_rf ignores a missing dir).
+          FileUtils.rm_rf(provenance.hooks_dir)
         end
 
         plugin_path = provenance.plugin_path(data)

data/lib/samagotchi/memory_bundle.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "memory_bundle/manifest"
 require_relative "memory_bundle/source"
 require_relative "memory_bundle/provenance"

data/lib/samagotchi/model_overlay.rb

@@ -32,10 +32,7 @@ module Samagotchi
 
       key = model_name.to_s
         .downcase
-        .gsub(/[^a-z0-9]+/, "-")
-        .gsub(/-+/, "-")
-        .sub(/\A-/, "")
-        .sub(/-\z/, "")
+        .gsub(/[^a-z0-9]+/, "-").squeeze("-").delete_prefix("-").delete_suffix("-")
       key.empty? ? nil : key
     end
 
@@ -43,12 +40,13 @@ module Samagotchi
     # Respects MemoryBundle overrides (delegates to Tools::MemoryRead.memories_dir).
     def self.overlay_path_for(name, key, scope)
       return nil unless key && !key.to_s.strip.empty?
+
       File.join(Tools::MemoryRead.memories_dir(scope), "#{name}.#{key.to_s.strip}.md")
     end
 
     # Regex matching overlay file names: /<something>.<lowercase-dashed-key>.md\z
     # Useful for tooling, tests, and future index suppression.
-    OVERLAY_SUFFIX_PATTERN = /\.([a-z0-9\-]+)\.md\z/
+    OVERLAY_SUFFIX_PATTERN = /\.([a-z0-9-]+)\.md\z/
 
     # The base file name (`tips.md`) an overlay-looking name
     # (`tips.qwen3.md`) would belong to, or nil when it doesn't match the

data/lib/samagotchi/model_profile.rb

@@ -17,10 +17,13 @@ module Samagotchi
     MODEL_FROM_CLI_ENV = "SAMAGOTCHI_DEFAULT_MODEL_FROM_CLI"
     # No model anywhere (--model, default.model in config.yml, the env): a
     # first run before any config. An ArgumentError, as before.
-    MissingModel = Class.new(ArgumentError)
+    class MissingModel < ArgumentError
+    end
+
     # A host-qualified model whose host isn't configured (a MissingModel,
     # so every surface that reports a missing model reports it the same way).
-    UnknownHost = Class.new(MissingModel)
+    class UnknownHost < MissingModel
+    end
 
     # Gemma 4 thinks in a channel: `<|channel>thought` … `<channel|>`. The
     # one source for the parser, the stream splitter, the literal guard and
@@ -74,7 +77,7 @@ module Samagotchi
       new(
         name: "gemma4",
         turn_start: "<|turn>",
-        turn_end: "<end_of_turn>",
+        turn_end: "<turn|>",
         tool_call_open: "<|tool_call>",
         tool_call_close: "<tool_call|>",
         tool_response_open: "<|tool_response>",
@@ -88,7 +91,7 @@ module Samagotchi
         user_prefix: "",
         assistant_prefix: "",
         model_prefix: "",
-        stop_sequences: ["<end_of_turn>", "<|tool_response>"],
+        stop_sequences: ["<turn|>", "<|tool_response>"],
         tool_decl_format: :gemma4
       )
     end
@@ -165,14 +168,15 @@ module Samagotchi
       if !parsed.host_name && (disabled = disabled_host_prefix(ref, hosts, env))
         raise UnknownHost, "host '#{disabled}' is disabled (enabled: false in config.yml)"
       end
+
       warn_host_slash(ref, hosts) unless parsed.host_name
       host = Samagotchi::ConfigFile.unknown_host_prefix(ref, hosts: hosts)
       return model_name unless host
 
       names = hosts.keys.map { |k| k.to_s.downcase }.sort
       near = Samagotchi::Config.near_names(host, names).first(3)
-      hint = near.empty? ? "" : " (did you mean #{near.map { |n| "'#{n}'" }.join(' or ')}?)"
-      raise UnknownHost, "unknown host '#{host}' in model '#{ref}'#{hint}; the configured hosts are #{names.join(', ')}"
+      hint = near.empty? ? "" : " (did you mean #{near.map { |n| "'#{n}'" }.join(" or ")}?)"
+      raise UnknownHost, "unknown host '#{host}' in model '#{ref}'#{hint}; the configured hosts are #{names.join(", ")}"
     end
 
     # The prefix of "box:x" when box is a host config.yml has with
@@ -275,7 +279,7 @@ module Samagotchi
       FINGERPRINTS.each do |name, markers|
         return [name, markers.join(" + ")] if markers.all? { |marker| template.include?(marker) }
       end
-      return ["qwen36", "ChatML"] if template.include?("<|im_start|>")
+      return %w[qwen36 ChatML] if template.include?("<|im_start|>")
 
       nil
     end
@@ -341,7 +345,7 @@ module Samagotchi
 
     def self.configured(value, where)
       profile = named(value)
-      Log.warn(:config, "unknown_profile", echo: "Warning: unknown profile #{value.to_s.inspect} in #{where} (allowed: #{NAMES.join(', ')}) — ignored", profile: value.to_s, where: where) unless profile
+      Log.warn(:config, "unknown_profile", echo: "Warning: unknown profile #{value.to_s.inspect} in #{where} (allowed: #{NAMES.join(", ")}) — ignored", profile: value.to_s, where: where) unless profile
       profile
     end
     private_class_method :configured

data/lib/samagotchi/note_command.rb

@@ -92,6 +92,7 @@ module Samagotchi
     # passes down may never close: waiting on either would hang a script.
     def read_stdin
       return nil if @stdin.respond_to?(:tty?) && @stdin.tty?
+
       if @stdin.respond_to?(:stat)
         stat = @stdin.stat
         return nil unless stat.pipe? || stat.file?
@@ -135,7 +136,7 @@ module Samagotchi
       if owner
         @stdout.puts("#{short}  queued: its worker adds it within a few seconds")
       else
-        queued = SessionInbox.find_new_note_files(File.dirname(File.dirname(path))).size
+        queued = SessionInbox.find_new_note_files(File.dirname(path, 2)).size
         @stdout.puts("#{short}  waits for the session's next start (#{queued} #{queued == 1 ? "note" : "notes"} queued)")
       end
       true

data/lib/samagotchi/output_formatter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Samagotchi
   # OutputFormatter strips model wire-format tokens from raw engine output at
   # render time, so downstream renderers (web UI, terminal UI) never show the
@@ -23,7 +24,6 @@ module Samagotchi
     # wrapper forms; bare <name> content (no pipe) is deliberately preserved.
     CONTROL_NAMES = %w[
       turn
-      end_of_turn
       tool_call
       tool_response
       tool
@@ -40,31 +40,32 @@ module Samagotchi
     # <word> in the surrounding content is NOT stripped:
     #   <|name> / <name|> / <|name|>
     INDIVIDUAL_RE = Regexp.new(
-      '<\\|(?:' + CONTROL_NAMES.join('|') + ')\\|?>' \
-      '|<(?:' + CONTROL_NAMES.join('|') + ')\\|>'
+      '<\\|(?:' + CONTROL_NAMES.join("|") + ')\\|?>' \
+      "|<(?:" + CONTROL_NAMES.join("|") + ')\\|>'
     )
     INDIVIDUAL_RE.freeze
 
     # Angle-bracketed literal tokens stripped wholesale (including the thought
     # channel's trailing word). Applied before INDIVIDUAL_RE so multi-part tokens
     # are removed as a unit. Pipes are escaped; angle brackets are literal.
-    LITERALS_RE = /<\|"\|>|<end_of_turn>/.freeze
+    LITERALS_RE = /<\|"\|>/
 
     # Gemma 4's thought channel, as a whole block: `<|channel>thought` to its
     # `<channel|>` close, or to the end of the text when the close is missing
     # (ToolCallParser::Gemma strips the same pair). Removing only the marker
     # would leave the model's private reasoning in the answer; the channel is
     # the profile's thinking lane, not output.
-    GEMMA_THOUGHT_RE = /<\|\w*channel>thought.*?(?:<channel\|>|\z)/m.freeze
+    GEMMA_THOUGHT_RE = /<\|\w*channel>thought.*?(?:<channel\|>|\z)/m
 
     # Qwen prompt-literal placeholders, e.g. </think>.
-    PROMPT_LITERALS = /\[\[SAMAGOTCHI_LITERAL_[A-Z_]+\]\]/.freeze
+    PROMPT_LITERALS = /\[\[SAMAGOTCHI_LITERAL_[A-Z_]+\]\]/
 
     # Qwen3.6 thinking blocks: <think>...</think> (including empty)
-    QWEN_THINK_RE = /<think>.*?<\/think>/m.freeze
+    QWEN_THINK_RE = %r{<think>.*?</think>}m
     # Qwen tool_call XML blocks that survive when a tool call is rendered as text
     # e.g. <tool_call>\n<function=list_reminders>\n</function>\n</tool_call>
-    QWEN_TOOL_CALL_RE = /<tool_call>.*?<\/tool_call>/m.freeze
+    QWEN_TOOL_CALL_RE = %r{<tool_call>.*?</tool_call>}m
+
     module_function
 
     # Remove both control-token and prompt-literal token families from +text+.
@@ -79,7 +80,7 @@ module Samagotchi
         .gsub(/[ \t]+/, " ")
         .gsub(/ *\n */, "\n")
         .strip
-      cleaned.empty? ? '' : cleaned
+      cleaned.empty? ? "" : cleaned
     end
 
     # The same tokens as #strip, but the text keeps its layout (indentation,
@@ -91,15 +92,15 @@ module Samagotchi
 
     def remove_tokens(text)
       text.to_s
-          .gsub(QWEN_THINK_RE, '')
-          .gsub(GEMMA_THOUGHT_RE, '')
-          .gsub(QWEN_TOOL_CALL_RE, '')
-          .gsub(LITERALS_RE, '')
-          .gsub(INDIVIDUAL_RE, '')
-          .gsub(PROMPT_LITERALS, '')
+          .gsub(QWEN_THINK_RE, "")
+          .gsub(GEMMA_THOUGHT_RE, "")
+          .gsub(QWEN_TOOL_CALL_RE, "")
+          .gsub(LITERALS_RE, "")
+          .gsub(INDIVIDUAL_RE, "")
+          .gsub(PROMPT_LITERALS, "")
           # orphaned closing tags that may remain after block removal
-          .gsub(/<\/?think>/, '')
-          .gsub(/<\/?tool_call>/, '')
+          .gsub(%r{</?think>}, "")
+          .gsub(%r{</?tool_call>}, "")
     end
   end
 end

data/lib/samagotchi/owner_lock.rb

@@ -40,7 +40,8 @@ module Samagotchi
     # @return [OwnerLock, nil] nil when another owner holds it
     def self.acquire(session_dir, kind:, wait: DEFAULT_WAIT)
       FileUtils.mkdir_p(session_dir)
-      file = File.open(path(session_dir), File::RDWR | File::CREAT, 0o644)
+      # Held open on purpose: the flock lives as long as the OwnerLock (#release closes it).
+      file = File.open(path(session_dir), File::RDWR | File::CREAT, 0o644) # rubocop:disable Style/FileOpen
       deadline = monotonic_now + wait.to_f
       until file.flock(File::LOCK_EX | File::LOCK_NB)
         if monotonic_now >= deadline

data/lib/samagotchi/plugin/api.rb

@@ -51,6 +51,7 @@ module Samagotchi
       #   it runs as other commands do)
       def command(name, description, anytime: false, &block)
         raise ArgumentError, "command #{name.inspect} needs a block" unless block
+
         name = name.to_s
         raise ArgumentError, "command name #{name.inspect} must look like /name (a-z, 0-9, _ and -)" unless name.match?(COMMAND_NAME)
         if (taken = @registries.commands.entries.find { |entry| entry.name == name })
@@ -78,9 +79,9 @@ module Samagotchi
       # @param targets [#call, nil] args → what guardrail rules match: a Hash
       #   with paths: (absolute or relative to the cwd), command: (a shell
       #   command) and cwd:, each optional
-      def tool(name, description, params: {}, schema: nil, label: nil, preview: nil, targets: nil, &block)
+      def tool(name, description, params: {}, schema: nil, label: nil, preview: nil, targets: nil, &)
         spec = Api.tool_spec(name, description, params: params, schema: schema, label: label, preview: preview,
-                                                targets: targets, &block)
+                                                targets: targets, &)
         if (taken = @registries.tools[spec[:name]])
           raise ArgumentError, "tool #{spec[:name]} is already registered (#{taken.source})"
         end
@@ -124,9 +125,9 @@ module Samagotchi
         end
 
         # As Api#tool.
-        def tool(name, description, params: {}, schema: nil, label: nil, preview: nil, targets: nil, &block)
+        def tool(name, description, params: {}, schema: nil, label: nil, preview: nil, targets: nil, &)
           spec = Api.tool_spec(name, description, params: params, schema: schema, label: label, preview: preview,
-                                                  targets: targets, &block)
+                                                  targets: targets, &)
           raise ArgumentError, "tool #{spec[:name]} is registered twice" if @specs.any? { |s| s[:name] == spec[:name] }
 
           @specs << spec
@@ -159,6 +160,7 @@ module Samagotchi
       # @return [Service]
       def service(name, eager: false, &block)
         raise ArgumentError, "service #{name.inspect} needs a block" unless block
+
         name = "#{@bundle}:#{name}"
         raise ArgumentError, "service #{name} is registered twice" if @services.any? { |svc| svc.name == name }
         raise ArgumentError, "this chi has no services (plugins: false)" unless @registries.services
@@ -249,6 +251,7 @@ module Samagotchi
       # @return [Hash] {name:, schema:, label:, preview:, targets:, block:}
       def self.tool_spec(name, description, params: {}, schema: nil, label: nil, preview: nil, targets: nil, &block)
         raise ArgumentError, "tool #{name.inspect} needs a block" unless block
+
         name = name.to_s
         raise ArgumentError, "tool name #{name.inspect} must be a-z, 0-9 and _ (at most 48)" unless name.match?(TOOL_NAME)
         raise ArgumentError, "tool #{name}: preview must respond to #call" if preview && !preview.respond_to?(:call)
@@ -323,7 +326,7 @@ module Samagotchi
       # (a call built without one, in a spec say: the call without its
       # name), string keys, typed by +parameters+, frozen.
       def self.args_of(call, parameters = nil)
-        given = call[:args].is_a?(Hash) ? call[:args] : call.reject { |key, _| key == :name || key == :args }
+        given = call[:args].is_a?(Hash) ? call[:args] : call.reject { |key, _| %i[name args].include?(key) }
         Tools::Args.coerce(given, parameters).freeze
       end
 

data/lib/samagotchi/plugin/context.rb

@@ -107,9 +107,7 @@ module Samagotchi
       # $XDG_STATE_HOME/samagotchi/plugins/<bundle>/, created on first use.
       # @return [String]
       def data_dir
-        @data_dir ||= begin
-          File.join(Paths.state_dir(env: @env), "plugins", @bundle).tap { |dir| FileUtils.mkdir_p(dir) }
-        end
+        @data_dir ||= File.join(Paths.state_dir(env: @env), "plugins", @bundle).tap { |dir| FileUtils.mkdir_p(dir) }
       end
 
       # The conversation so far, a frozen copy, without the system prompt.

data/lib/samagotchi/plugin/loader.rb

@@ -73,7 +73,7 @@ module Samagotchi
         true
       rescue Exception => e # rubocop:disable Lint/RescueException -- a plugin's SyntaxError or exit must not stop chi
         api&.abort!
-        raise if e.is_a?(Interrupt)
+        raise if e.is_a?(SignalException) # Ctrl-C and kill signals are the user's
 
         failed(bundle_name, basename, "#{e.class}: #{e.message}", failures)
       end

data/lib/samagotchi/plugin/service.rb

@@ -62,7 +62,7 @@ module Samagotchi
       def running? = @state == :running
 
       # @return [Symbol] :idle, :running or :stopped
-      def state = @state
+      attr_reader :state
 
       # Run the stop callbacks (newest first) once; a raise is logged, the
       # rest still run. It never starts again after this.

data/lib/samagotchi/plugin/sessions.rb

@@ -38,6 +38,7 @@ module Samagotchi
       def fork(messages:, title: nil, prompt: nil)
         parent_id = @host.session_id.call or raise Error, "this session has no id yet"
         raise Error, "a scratch session starts no other sessions: they would outlive it" if @host.scratch&.call
+
         state_dir = self.state_dir
         prompt = prompt.to_s.strip.empty? ? nil : prompt.to_s
         check_children(parent_id, state_dir) if prompt

data/lib/samagotchi/plugin_tasks.rb

@@ -121,7 +121,7 @@ module Samagotchi
         sleep(INIT_WAIT_POLL)
       end
       Log.info(:plugins, "init_wait", ms: ((@clock.call - started) * 1000).round,
-                                      cancelled: controller&.cancelled? ? true : nil)
+                                      cancelled: controller&.cancelled? || nil)
       true
     end
 

data/lib/samagotchi/prompt.rb

@@ -3,6 +3,8 @@
 require_relative "model_profile"
 require_relative "prompt_literal_guard"
 require_relative "vision_context"
+require_relative "tool_response"
+require_relative "steer"
 
 module Samagotchi
   # Formats a message list into a prompt string ready for the /completion endpoint.
@@ -10,10 +12,13 @@ module Samagotchi
   # Supports multiple model profiles (Gemma 4, Qwen 3.6, etc.) with different
   # token formats, role prefixing strategies, and tool response handling.
   #
-  # Gemma 4:
-  #   - Turn markers: <|turn>ROLE\n...<end_of_turn>\n
-  #   - Tool response: standalone <|tool_response>...<tool_response|>
-  #   - Generation cue: <|turn>model\n
+  # Gemma 4 (as its chat template renders a conversation):
+  #   - Turn markers: <|turn>ROLE\n...<turn|>\n, the text trimmed
+  #   - Tool calls and their responses stay inside the model's turn:
+  #     ...<tool_call|><|tool_response>response:NAME{value:<|"|>...<|"|>}<tool_response|>
+  #     and the model goes on in the same turn
+  #   - Generation cue: <|turn>model\n, or nothing after a tool response
+  #   - An answer's thought is dropped once a later user turn starts
   #
   # Qwen 3.6:
   #   - Role framing: <|im_start|>ROLE\n...<|im_end|>
@@ -51,11 +56,9 @@ module Samagotchi
              else
                format_with_turn_markers(messages, profile, suffixes)
              end
-      [text + prefill.to_s, images]
+      [text + prefill_for(messages, profile, prefill), images]
     end
 
-    private
-
     def self.image_lines(items, profile, images)
       return "" if items.empty?
 
@@ -71,19 +74,70 @@ module Samagotchi
     end
 
     def self.format_with_turn_markers(messages, profile, suffixes)
-      # Gemma 4 style: <|turn>ROLE\n...<end_of_turn>\n
+      last_user = messages.rindex { |m| m[:role] == "user" } || -1
       parts = messages.each_with_index.map do |m, index|
         content = prompt_content_for(m, profile) + suffixes[index]
-        if m[:role] == "tool_response"
-          "#{profile.tool_response_open}\n#{content}#{profile.tool_response_close}\n"
+        previous = index.positive? ? messages[index - 1][:role] : nil
+        following = messages[index + 1]&.dig(:role)
+        case m[:role]
+        when "tool_response"
+          # Inside the model's turn; closed when another role follows.
+          tool_response_blocks(content, profile) +
+            (following && following != "tool_response" && following != "model" ? "#{profile.turn_end}\n" : "")
+        when "model"
+          content = strip_gemma_thought(content) if index < last_user && !content.include?(profile.tool_call_open)
+          opener = previous == "tool_response" ? "" : "#{profile.turn_start}model\n"
+          closer = following == "tool_response" ? "" : "#{profile.turn_end}\n"
+          "#{opener}#{content.strip}#{closer}"
         else
-          "#{profile.turn_start}#{m[:role]}\n#{content}#{profile.turn_end}\n"
+          "#{profile.turn_start}#{m[:role]}\n#{content.strip}#{profile.turn_end}\n"
         end
       end
-      parts << "#{profile.turn_start}model\n"
+      parts << "#{profile.turn_start}model\n" unless ends_in_tool_response?(messages)
       parts.join
     end
 
+    def self.ends_in_tool_response?(messages)
+      messages.last&.dig(:role) == "tool_response"
+    end
+
+    # The text after the generation cue: +prefill+, except where Gemma's
+    # turn goes on after a tool response (no cue, so nothing to fill).
+    # The prompt and the model message the kernel keeps both use it.
+    def self.prefill_for(messages, profile, prefill)
+      return "" if !profile.uses_role_prefixes? && ends_in_tool_response?(messages)
+
+      prefill.to_s
+    end
+
+    # A native tool_response entry (ToolResponse.joined: "[name]" outputs
+    # joined by its SEPARATOR) as Gemma's template writes the results: one
+    # response:NAME{value:<|"|>…<|"|>} block per call. A part that doesn't
+    # open with a "[name]" is the previous output's own text.
+    def self.tool_response_blocks(content, profile)
+      runs = content.split(ToolResponse::SEPARATOR).each_with_object([]) do |part, acc|
+        if (match = part.match(/\A\[([^\]\s]+)\](?:\n| |\z)/))
+          acc << [match[1], match.post_match]
+        elsif acc.empty?
+          acc << ["unknown", part]
+        else
+          acc.last[1] = "#{acc.last[1]}#{ToolResponse::SEPARATOR}#{part}"
+        end
+      end
+      runs = [["unknown", ""]] if runs.empty?
+      q = profile.string_delim
+      runs.map do |name, body|
+        "#{profile.tool_response_open}response:#{name}{value:#{q}#{body}#{q}}#{profile.tool_response_close}"
+      end.join
+    end
+
+    GEMMA_THOUGHT_BLOCK = /#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_OPEN.delete_suffix("thought"))}.*?#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_CLOSE)}/m
+    private_constant :GEMMA_THOUGHT_BLOCK
+
+    def self.strip_gemma_thought(content)
+      content.gsub(GEMMA_THOUGHT_BLOCK, "")
+    end
+
     def self.format_with_prefixes(messages, profile, suffixes)
       # Qwen 3.6 style: <|im_start|>ROLE\n...<|im_end|>
       parts = []
@@ -115,7 +169,12 @@ module Samagotchi
       # peer session), and a turn note carries an error's text: escaped like
       # user content so it can't close its turn.
       role = ESCAPED_KINDS.include?(message[:kind].to_s) ? "user" : message[:role]
-      PromptLiteralGuard.escape(message[:content], profile: profile, role: role)
+      # A steer or merged input is led by a header naming its sender (added
+      # after the escape: the header has no literals to guard).
+      Steer.wire_text(message, PromptLiteralGuard.escape(message[:content], profile: profile, role: role))
     end
+
+    private_class_method :image_lines, :format_with_turn_markers, :ends_in_tool_response?, :tool_response_blocks,
+                         :strip_gemma_thought, :format_with_prefixes, :prompt_content_for
   end
 end

data/lib/samagotchi/prompt_literal_guard.rb

@@ -8,7 +8,7 @@ module Samagotchi
   module PromptLiteralGuard
     GEMMA_TOKEN_PAIRS = [
       ["[[SAMAGOTCHI_LITERAL_TURN_START]]", "<|turn>"],
-      ["[[SAMAGOTCHI_LITERAL_TURN_END]]", "<end_of_turn>"],
+      ["[[SAMAGOTCHI_LITERAL_TURN_END]]", "<turn|>"],
       ["[[SAMAGOTCHI_LITERAL_TOOL_CALL_OPEN]]", "<|tool_call>"],
       ["[[SAMAGOTCHI_LITERAL_TOOL_CALL_CLOSE]]", "<tool_call|>"],
       ["[[SAMAGOTCHI_LITERAL_TOOL_RESPONSE_OPEN]]", "<|tool_response>"],