samagotchi 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94cd11abcfad07ad2843b4e0fc2eea368d77ab6080403d308db906270a1832c6
-  data.tar.gz: 21ac6e7093ee196d98e2ba50979cdbb28f1a3a10ab0e9cac9bad01c88a078daf
+  metadata.gz: 2992e0608fe9019274ad60016432c5d1a7cc6c3b6656b8f294adcfb30d93b843
+  data.tar.gz: 94ba5cde3571e628cf79183bd905a0b16a408ab136120cb66557bb5b09ab8c3c
 SHA512:
-  metadata.gz: fa39259864928d70d8cf830d0c7cc15c6865cea75d383484979897800a9f79d6f9fa4d79df3700285d9871e8d0cf5420e9af7c0143ab08e71182befa287b52af
-  data.tar.gz: 24f0fe6863767b628c1eec6957bf6cf33d8966b45f8b2cbdfd7ab268d6c323835dba8ff09fbdd9359775263693228a7a11f0d125cf0a38d7f044d6932ca7c4b9
+  metadata.gz: 0f8924a312d690bd366f793d0a13bd26f17ffd7db8dfe106b7edbab122348550cd221721225f1ee7db40b7a071dd1f162ad8d2bb6b637dec9f9607dcc09def86
+  data.tar.gz: 7e5fd2d1d211f9da17621ff2dce4d99c1aa76656c6a37a2308ed3de6e7a4bcf8e1edf506c4ef02473e7391505b1671a6db4da9102231aa20881ed289dd303dab

data/CHANGELOG.md

@@ -8,6 +8,25 @@ and commands may change between minor versions. How releases are made:
 
 ## [Unreleased]
 
+## [0.5.1] - 2026-09-30
+
+### Fixed
+
+- `chi desktop install` / `upgrade` builds the helper again on Macs whose
+  Command Line Tools lack SwiftUI's macro plugin ("plugin for module
+  'SwiftUIMacros' not found", since 0.5.0's image thumbnails).
+- After updating chi and restarting `chi web`, the browser loads the new page
+  code on the next reload instead of running the old one for up to an hour.
+- A plugin's warning card stays in sight when its step closes while the turn
+  goes on.
+- Sessions on OpenAI-compatible hosts no longer fail to send a request when a
+  message with an image also carries text with broken UTF-8 bytes.
+- `delegate` and `delegate_result` return as soon as a delegated session's
+  turn fails, instead of waiting out the 10-minute timeout when it failed
+  quickly.
+
+Update with `chi update`. No bundle versions changed.
+
 ## [0.5.0] - 2026-09-30
 
 ### Security
@@ -312,7 +331,8 @@ and long-lived sessions.
 - A macOS desktop helper (`chi desktop install`): a "Send to chi" Service and a
   hotkey panel that send selected text or the clipboard to your sessions.
 
-[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.5.1...HEAD
+[0.5.1]: https://github.com/dm1try/samagotchi/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/dm1try/samagotchi/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/dm1try/samagotchi/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/dm1try/samagotchi/compare/v0.2.0...v0.3.0

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

@@ -1,6 +1,6 @@
 ---
 name: samagotchi-system
-version: 0.5.0
+version: 0.5.1
 scope: system
 description: Default system memories — identity, self map, config modification protocol, memory guide and the delegated-session rules
 files:

data/lib/samagotchi/desktop/macos/Panel.swift

@@ -18,6 +18,10 @@ final class PanelModel: ObservableObject {
   @Published var source = ""
   /// Sent as `--image` with a message; notes are text only.
   @Published var images: [PanelImage] = []
+  /// The thumbnail under the pointer (shows its ✕). Kept here, not in a
+  /// @State: some Command Line Tools SDKs want the SwiftUIMacros plugin for
+  /// @State and don't ship it ("plugin for module 'SwiftUIMacros' not found").
+  @Published var hoveredImage: UUID?
   @Published var sessions: [LiveSession] = []
   @Published var selected: Set<String> = []
   /// The "New session" row; never together with sessions (`--new` takes no ids).
@@ -48,8 +52,13 @@ final class PanelModel: ObservableObject {
 
   func remove(_ image: PanelImage) {
     images.removeAll { $0 == image }
+    if hoveredImage == image.id { hoveredImage = nil }
     ImageIntake.delete([image])
   }
+  /// Leaving one thumbnail may come after entering the next.
+  func hover(_ image: PanelImage, _ inside: Bool) {
+    if inside { hoveredImage = image.id } else if hoveredImage == image.id { hoveredImage = nil }
+  }
   var recent: [LiveSession] { sessions.filter(\.recent) }
 
   /// The last choice, where still live; else the only live session; else,
@@ -145,7 +154,10 @@ struct PanelView: View {
       ScrollView(.horizontal, showsIndicators: false) {
         HStack(spacing: 8) {
           ForEach(model.images) { image in
-            Thumbnail(image: image, removable: model.phase != .sending) { model.remove(image) }
+            Thumbnail(image: image, removable: model.phase != .sending, hover: model.hoveredImage == image.id,
+                      onHover: { model.hover(image, $0) }) {
+              model.remove(image)
+            }
           }
         }
         .padding(.horizontal, 19).padding(.vertical, 2)
@@ -280,8 +292,9 @@ struct PanelView: View {
 struct Thumbnail: View {
   let image: PanelImage
   let removable: Bool
+  let hover: Bool
+  let onHover: (Bool) -> Void
   let remove: () -> Void
-  @State private var hover = false
 
   var body: some View {
     Group {
@@ -308,7 +321,7 @@ struct Thumbnail: View {
         .help("remove")
       }
     }
-    .onHover { hover = $0 }
+    .onHover(perform: onHover)
     .help(image.name)
   }
 }

data/lib/samagotchi/llm/openai_chat.rb

@@ -218,7 +218,8 @@ module Samagotchi
         SamplingSettings.log_text(body.except(:model, :messages, :stream, :stream_options, :tools, :tool_choice))
       end
 
-      # A String stays a String; an Array of parts passes as given.
+      # A String stays a String; an Array of parts passes as given, its text
+      # parts scrubbed like a String.
       def wire_message(message)
         wire = message.to_h.transform_keys(&:to_sym)
         wire[:content] = format_content(wire[:content]) if wire.key?(:content)
@@ -226,11 +227,20 @@ module Samagotchi
       end
 
       def format_content(content)
-        return content if content.is_a?(Array) || content.nil?
+        return content if content.nil?
+        return content.map { |part| scrub_part(part) } if content.is_a?(Array)
 
         scrub(content.to_s)
       end
 
+      def scrub_part(part)
+        return part unless part.is_a?(Hash)
+
+        part.to_h do |key, value|
+          [key, key.to_s == "text" && value.is_a?(String) ? scrub(value) : value]
+        end
+      end
+
       # Invalid UTF-8 (a tool's garbled output) would make to_json raise.
       def scrub(text)
         text.encoding == Encoding::UTF_8 && !text.valid_encoding? ? text.scrub("?") : text

data/lib/samagotchi/reply_wait.rb

@@ -103,6 +103,15 @@ module Samagotchi
       end
     end
 
+    # The session as it was before a message went in (call's baseline:):
+    # its messages, the question pending then, and when its last turn
+    # ended, so a turn that ends before the first look still ends the wait.
+    # @return [Hash]
+    def baseline_of(session, question_id: session.pending_question&.dig(:id))
+      last = session.last_turn.is_a?(Hash) ? session.last_turn["ended_at"] : nil
+      { messages: session.messages.size, question_id: question_id, last_turn: last }
+    end
+
     # An idle session whose turn ended after the baseline was taken: its
     # last_turn moved on, or its messages grew (a turn's note).
     def turn_ended_since?(session, baseline)

data/lib/samagotchi/send_command.rb

@@ -307,12 +307,9 @@ module Samagotchi
     end
 
     # The session as it was before the message went in (ReplyWait's
-    # baseline): its messages, the question pending then, and when its last
-    # turn ended, so a turn that ends before the first look still ends the
-    # wait.
-    def baseline_of(session, question_id: session.pending_question&.dig(:id))
-      last = session.last_turn.is_a?(Hash) ? session.last_turn["ended_at"] : nil
-      { messages: session.messages.size, question_id: question_id, last_turn: last }
+    # baseline).
+    def baseline_of(session, **options)
+      ReplyWait.baseline_of(session, **options)
     end
 
     # @return [Integer] the exit status

data/lib/samagotchi/tools/delegate.rb

@@ -83,6 +83,7 @@ module Samagotchi
         child = SessionManager.spawn_session(prompt: task, working_directory: parent.working_directory,
                                              model_name: child_model(model, parent), memories: CHILD_MEMORIES,
                                              parent_id: parent.id, state_dir: state_dir)
+        DelegateWait.mark_started(parent.id, child)
         child.id
       end
       private_class_method :start_child
@@ -100,7 +101,7 @@ module Samagotchi
         end
 
         # Only a reply after this delivery counts as the follow-up's.
-        DelegateWait.mark_seen(parent.id, id, state_dir: state_dir)
+        DelegateWait.mark_seen(parent.id, child, state_dir: state_dir)
         delivered = SessionManager.deliver_turn(id, prompt: task, client_id: "#{CLIENT_PREFIX}:#{parent.id[0, 8]}",
                                                     state_dir: state_dir)
         case delivered[:status]

data/lib/samagotchi/tools/delegate_wait.rb

@@ -9,10 +9,12 @@ module Samagotchi
   module Tools
     # Waiting for a delegated session's next reply, shared by delegate and
     # delegate_result: ReplyWait in the tools' words, with a cursor per
-    # child (the newest reply this parent was already given). The cursors
-    # live in this process (a worker runs one session), keyed by parent and
-    # child; a worker respawn loses them, which only repeats the newest reply
-    # once.
+    # child (the newest reply this parent was already given) and the child
+    # as it was before the message went in (ReplyWait's baseline), so a turn
+    # that ends before the wait's first look (a fast failure) still ends it.
+    # Both live in this process (a worker runs one session), keyed by parent
+    # and child; a worker respawn loses them, which only repeats the newest
+    # reply once or waits for a later turn.
     module DelegateWait
       TIMEOUT_DEFAULT = 600
       POLL_INTERVAL = 0.5
@@ -28,6 +30,11 @@ module Samagotchi
         @seen ||= {}
       end
 
+      # @return [Hash{Array(String, String) => Hash}] [parent id, child id] → ReplyWait baseline taken before sending
+      def baselines
+        @baselines ||= {}
+      end
+
       # @param child_id [String] the child's full id
       # @param peers [Peers] the parent (session_id, state_dir, cancelled?)
       # @param timeout [Integer] seconds
@@ -38,7 +45,9 @@ module Samagotchi
         key = [peers.session_id, child_id]
         cancelled = -> { peers.respond_to?(:cancelled?) && peers.cancelled? }
         wait = ReplyWait.call(child_id, state_dir: sd, cursor: seen[key], timeout: timeout.to_i,
-                                        poll_interval: poll_interval, cancelled: cancelled)
+                                        poll_interval: poll_interval, cancelled: cancelled, baseline: baselines[key])
+        # The turn sent to is handed over: a later wait looks for a later one.
+        baselines.delete(key) if %i[done no_reply].include?(wait.status)
         case wait.status
         when :done
           seen[key] = wait.file
@@ -61,9 +70,18 @@ module Samagotchi
       end
 
       # Point the cursor at the newest reply now, so only a later one counts
-      # (a follow-up sent to a child that already answered).
-      def mark_seen(parent_id, child_id, state_dir:)
-        seen[[parent_id, child_id]] = ReplyWait.newest_reply(child_id, state_dir: state_dir)
+      # (a follow-up sent to a child that already answered), and take the
+      # child's baseline before the follow-up goes in.
+      # @param child [Session] the child as loaded before sending
+      def mark_seen(parent_id, child, state_dir:)
+        seen[[parent_id, child.id]] = ReplyWait.newest_reply(child.id, state_dir: state_dir)
+        baselines[[parent_id, child.id]] = ReplyWait.baseline_of(child)
+      end
+
+      # A new child's baseline: as spawned, before its first turn ran.
+      # @param child [Session] the session spawn_session returned
+      def mark_started(parent_id, child)
+        baselines[[parent_id, child.id]] = ReplyWait.baseline_of(child, question_id: nil)
       end
 
       def reply_result(child_id, text)

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "cgi/escape" # CGI.escapeHTML; Ruby 4.0 ships only cgi/escape
+require "digest"
 require "fileutils"
 require "json"
 require "time"
@@ -1161,13 +1162,26 @@ module Samagotchi
         full = File.join(@public_dir, rel)
         if File.file?(full) && full.start_with?(@public_dir)
           body = File.binread(full)
-          ctype = mime_type(full)
-          [200, { "Content-Type" => ctype, "Content-Length" => body.bytesize.to_s, "Cache-Control" => "public, max-age=3600" }, [body]]
+          # no-cache + a content ETag: the browser revalidates every asset
+          # (the ES-module imports too) and gets a cheap 304 while it is
+          # unchanged, so a gem upgrade + chi web restart takes effect on the
+          # next load instead of after max-age runs out.
+          etag = %("#{Digest::SHA256.hexdigest(body)[0, 32]}")
+          headers = { "Cache-Control" => "no-cache", "ETag" => etag }
+          return [304, headers, []] if etag_match?(req.get_header("HTTP_IF_NONE_MATCH"), etag)
+
+          [200, headers.merge("Content-Type" => mime_type(full), "Content-Length" => body.bytesize.to_s), [body]]
         else
           not_found(path: req.path_info)
         end
       end
 
+      def etag_match?(if_none_match, etag)
+        return false if if_none_match.nil?
+
+        if_none_match.split(",").map { |t| t.strip.delete_prefix("W/") }.any? { |t| t == "*" || t == etag }
+      end
+
       def mime_type(path)
         case File.extname(path).downcase
         when ".html" then "text/html; charset=utf-8"

data/lib/samagotchi/web/public/turn_view.js

@@ -313,8 +313,20 @@ export function createTurnView({
     if (k) sawText(k);
   }
 
+  // A step that closes mid-turn (the next one starts) collapses: a warn card
+  // in it would go out of sight until the turn ends. It moves out of the
+  // step, right after it in the block (open while the turn runs), where
+  // turnEnded still finds it and takes it out of the block (leavesBlock).
+  function liftWarnCards(gen) {
+    const entry = genEls.get(gen);
+    if (!entry) return;
+    const cards = [...entry.el.querySelectorAll(".plugin-card.warn")];
+    if (cards.length) entry.el.after(...cards);
+  }
+
   function apply(r) {
     if (!r) return;
+    if (r.closed && r.opened) liftWarnCards(r.closed);
     if (r.closed) closeGenEl(r.closed);
     if (r.opened) createGenEl(r.gen);
     if (r.closed || r.opened) updateBlockSummary();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dmitry Dedov