samagotchi 0.37.0 → 0.38.0

data/lib/samagotchi/tool_response.rb

@@ -4,9 +4,9 @@ module Samagotchi
   # A tool batch and the conversation entries its results become, for both
   # loops. The calls run through ToolRunner between the dispatch events;
   # what the model gets back is per format: the native loop answers a batch
-  # with ONE tool_response (#joined: the full outputs), the chat loop each
-  # call with its own, paired by tool_call_id (#single: the capped output,
-  # D-P2-6).
+  # with ONE tool_response (#joined), the chat loop each call with its own,
+  # paired by tool_call_id (#single). Both feed the capped outputs
+  # (max_tool_output_chars).
   module ToolResponse
     SEPARATOR = "\n\n---\n\n"
     # Saved with a result for the web's reload (a plugin tool's params line
@@ -37,12 +37,12 @@ module Samagotchi
       runs.filter_map { |run| run[:activity] }
     end
 
-    # The native loop's entry for a batch: the outputs joined, every image
+    # The native loop's entry for a batch: the capped outputs joined, every image
     # in call order with how many each call returned (the web's reload puts
     # each on its own tool row), and the saved-only fields one per call.
     def joined(runs)
       images = runs.flat_map { |run| Array(run[:images]) }
-      entry = { role: "tool_response", content: runs.map { |run| run[:output] }.join(SEPARATOR) }
+      entry = { role: "tool_response", content: runs.map { |run| run[:capped_output] }.join(SEPARATOR) }
       unless images.empty?
         entry[:images] = images
         entry[:image_counts] = runs.map { |run| Array(run[:images]).size }

data/lib/samagotchi/tool_runner.rb

@@ -13,9 +13,9 @@ module Samagotchi
   # The single per-call path both loops use: the tool_call_started and
   # tool_call_completed events, the guardrail gate (before_tool_call hooks
   # and their veto), dispatch through KernelLoop, the after_tool_call hook
-  # and the output cap. Each loop picks what the model gets back: native
-  # feeds the full `output:`, the chat loop feeds `capped_output:` (the cap
-  # on the event applies to both).
+  # and the output cap. Both loops feed the model `capped_output:` (cut to
+  # the cap with a "[cut: N of M chars …]" line), the text the event and
+  # the hook get too.
   class ToolRunner
     # More images in one result are left out, each with a line (a tool
     # that returns many screenshots can't flood the context).
@@ -83,12 +83,8 @@ module Samagotchi
       if (changed = changed_call_line(original, call))
         output = "#{changed}\n#{output}"
       end
-      capped = output
-      truncated = false
-      if max_tool_output_chars && output.length > max_tool_output_chars
-        truncated = true
-        capped = output[0, max_tool_output_chars]
-      end
+      truncated = !max_tool_output_chars.nil? && output.length > max_tool_output_chars
+      capped = truncated ? cut(output, max_tool_output_chars) : output
 
       # The call's outcome as its activity line has it (worked out from the
       # full output: ok, error, blocked, stopped); a dispatcher that raised
@@ -118,6 +114,19 @@ module Samagotchi
 
     private
 
+    # +output+ cut to +cap+ chars, the cut line included: the model knows
+    # what it didn't get. A cap smaller than the line keeps +cap+ chars and
+    # the line goes past it.
+    def cut(output, cap)
+      keep = cap - cut_line(cap, output.length).length
+      keep = cap unless keep.positive?
+      "#{output[0, keep]}#{cut_line(keep, output.length)}"
+    end
+
+    def cut_line(kept, total)
+      "\n[cut: #{kept} of #{total} chars; read it in parts]"
+    end
+
     # edit/write only: the file just before the call runs. The row diffs it
     # with the file after, whatever the result says, so an edit that fails
     # after writing still shows its change and one that wrote nothing shows

data/lib/samagotchi/update_command.rb

@@ -80,7 +80,7 @@ module Samagotchi
       @stderr = stderr
       @gem_spec = gem_spec
       @shipped_dir = shipped_dir
-      @platform = platform || ->(register:) { Desktop::MacOS.new(register: register, kitty: Desktop::MacOS.kitty_settings) }
+      @platform = platform || Desktop::MacOS.method(:from_config)
       @supported = supported
       @state_dir = state_dir
       @web = web || [Web::Lan.local_host(Config.get("web.host")), Config.get("web.port").to_i]

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.37.0"
+  VERSION = "0.38.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -237,6 +237,7 @@ files:
 - lib/samagotchi/desktop.rb
 - lib/samagotchi/desktop/macos.rb
 - lib/samagotchi/desktop/macos/App.swift
+- lib/samagotchi/desktop/macos/Broadcast.swift
 - lib/samagotchi/desktop/macos/ChiRunner.swift
 - lib/samagotchi/desktop/macos/Hotkey.swift
 - lib/samagotchi/desktop/macos/Images.swift