samagotchi 0.22.0 → 0.23.0

data/lib/samagotchi/turn_flow.rb

@@ -27,10 +27,10 @@ module Samagotchi
       return [:resume, nil] if normalized.empty?
 
       lowered = normalized.downcase
-      return [:resume, nil] if lowered == CONTINUE_COMMAND || lowered == "yes" || lowered == "y"
-      return [:abort, nil] if lowered == "no" || lowered == "n"
+      return [:resume, nil] if [CONTINUE_COMMAND, "yes", "y"].include?(lowered)
+      return [:abort, nil] if %w[no n].include?(lowered)
 
-      reason_match = normalized.match(/\A(?:no|n)\s*[,:\-]\s*(.+)\z/i)
+      reason_match = normalized.match(/\A(?:no|n)\s*[,:-]\s*(.+)\z/i)
       if reason_match
         reason = reason_match[1].to_s.strip
         return [:abort, nil] if reason.empty?
@@ -220,11 +220,11 @@ module Samagotchi
       lines << "- original_prompt: #{original_prompt.to_s.empty? ? "(unavailable)" : original_prompt}"
 
       tool_trace = context ? Array(context[:tool_trace]) : []
-      if tool_trace.empty?
-        lines << "- interrupted_tools: (none)"
-      else
-        lines << "- interrupted_tools: #{tool_trace.join("; ")}"
-      end
+      lines << if tool_trace.empty?
+                 "- interrupted_tools: (none)"
+               else
+                 "- interrupted_tools: #{tool_trace.join("; ")}"
+               end
 
       model_intent = context && context[:last_model_intent]
       lines << "- last_model_intent: #{model_intent.to_s.empty? ? "(unavailable)" : model_intent}"

data/lib/samagotchi/turn_note.rb

@@ -98,7 +98,11 @@ module Samagotchi
     # emptyAnswerLine words it the same).
     def empty_answer_line(retries)
       count = retries.to_i
-      after = count.positive? ? " (after #{count} #{count == 1 ? "retry" : "retries"})" : ""
+      after = if count.positive?
+                " (after #{count} #{count == 1 ? "retry" : "retries"})"
+              else
+                ""
+              end
       "no answer: the model returned nothing#{after}"
     end
 

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/vision_support.rb

@@ -45,7 +45,7 @@ module Samagotchi
       marker.is_a?(String) && !marker.empty? ? marker : nil
     end
 
-    def self.configured(target, entry, models, names)
+    def self.configured(_target, entry, models, names)
       models ||= begin
         ConfigFile.model_settings
       rescue StandardError
@@ -58,7 +58,7 @@ module Samagotchi
       Answer.new(value: entry.vision, reason: entry.vision ? nil : "hosts.#{entry.name} sets vision: false")
     end
 
-    def self.native(target, entry, profile, trust_config:)
+    def self.native(target, _entry, profile, trust_config:)
       client = target.client
       transport = client.transport.name
       return no("#{transport} hosts take no images (only llama.cpp does)") unless transport == :llama_cpp

data/lib/samagotchi/web/app.rb

@@ -157,6 +157,7 @@ module Samagotchi
         req = Rack::Request.new(env)
         return forbidden unless local_host_header?(env)
         return cross_origin if cross_site?(env)
+
         if @lan && !LOOPBACK_PEERS.include?(env["REMOTE_ADDR"].to_s)
           denied = token_gate(req)
           return denied if denied
@@ -506,13 +507,16 @@ module Samagotchi
 
       def sanitize_limit(val)
         return nil if val.nil? || val.to_s.strip.empty?
+
         n = val.to_i
         return nil if n <= 0
+
         [n, 1000].min
       end
 
       def sanitize_offset(val)
         return 0 if val.nil? || val.to_s.strip.empty?
+
         n = val.to_i
         n.positive? ? n : 0
       end
@@ -522,6 +526,7 @@ module Samagotchi
         unless body.is_a?(Hash)
           return error_response(400, "invalid_json", "invalid JSON body")
         end
+
         prompt = body["prompt"] || body[:prompt]
         # idle: a session with no first turn, for a first message with
         # images (the page uploads them into it, then sends the turn).
@@ -529,6 +534,7 @@ module Samagotchi
         if prompt.to_s.strip.empty? && !idle
           return error_response(400, "missing_fields", "prompt is required")
         end
+
         # dir: the folder the chat starts in (the page's scope); without it,
         # the server's own cwd.
         dir, error = scope_dir(body["dir"])
@@ -891,11 +897,13 @@ module Samagotchi
         unless body.is_a?(Hash)
           return error_response(400, "invalid_json", "invalid JSON body")
         end
+
         prompt = body["prompt"] || body[:prompt]
         client_id = body["client_id"] || body[:client_id]
         if prompt.to_s.strip.empty?
           return error_response(400, "missing_fields", "prompt is required")
         end
+
         images = turn_images(id, body["images"])
         return error_response(400, "bad_images", images) if images.is_a?(String)
 
@@ -1173,7 +1181,7 @@ module Samagotchi
         lambda do |io|
           query = req.query_string.to_s.empty? ? "" : "?#{req.query_string}"
           body = ProxyStreamBody.new(host: DEFAULT_HOST, port: port, session_id: id, query: query, headers: req.env,
-                                    server_running: @server_running)
+                                     server_running: @server_running)
           body.each { |chunk| io.write(chunk) }
         rescue Errno::EPIPE, Errno::ECONNRESET, IOError
           nil # client went away — end the stream quietly
@@ -1249,7 +1257,7 @@ module Samagotchi
       def serve_static(req)
         # Serve files under public_dir for /assets/* and bare paths
         rel = req.path_info.sub(%r{\A/(assets|public)/}, "")
-        rel = req.path_info.sub(%r{\A/}, "") if rel == req.path_info
+        rel = req.path_info.delete_prefix("/") if rel == req.path_info
         # Prevent directory traversal
         rel = rel.split("/").reject { |p| p == ".." || p.empty? }.join("/")
         full = File.join(@public_dir, rel)
@@ -1483,7 +1491,7 @@ module Samagotchi
 
           norm_role = role == "model" ? "assistant" : role
           # normalize assistant vs model, keep user as is
-          norm_role = "assistant" if norm_role == "assistant" || norm_role == "model"
+          norm_role = "assistant" if %w[assistant model].include?(norm_role)
           norm_role = "user" if norm_role == "user"
           next unless %w[user assistant].include?(norm_role)
 
@@ -1644,7 +1652,6 @@ module Samagotchi
         json_response(status, { error: code, detail: detail })
       end
 
-
       def not_found(path:)
         error_response(404, "not_found", "not found: #{path}")
       end
@@ -1740,12 +1747,12 @@ module Samagotchi
           @server_running = server_running
         end
 
-        def each(&block)
+        def each(&)
           # Forward the browser's auto-reconnect cursor: the bridge prefers the
           # Last-Event-ID header over ?from_seq, and the reconnect URL carries a
           # stale initial cursor — without this the bridge would replay content
           # already delivered (duplicate bubbles).
-          @client.stream(query: @query, last_event_id: @headers["HTTP_LAST_EVENT_ID"], running: @server_running, &block)
+          @client.stream(query: @query, last_event_id: @headers["HTTP_LAST_EVENT_ID"], running: @server_running, &)
         end
       end
     end

data/lib/samagotchi/web/markdown_renderer.rb

@@ -34,7 +34,7 @@ module Samagotchi
 
         html = Commonmarker.to_html(markdown.to_s, options: {
           render: { escape: true }, # escape raw HTML from source; highlighter output is still emitted
-          extension: { header_ids: nil },
+          extension: { header_ids: nil }
         })
         return nil unless html
 
@@ -71,6 +71,7 @@ module Samagotchi
       def sanitize_attributes(node)
         node.attribute_nodes.each do |attribute|
           next if allowed_attribute?(node, attribute.name)
+
           node.remove_attribute(attribute.name)
         end
         return unless node.name == "a"

data/lib/samagotchi/web/qr.rb

@@ -21,7 +21,13 @@ module Samagotchi
         rows = matrix(text, quiet: quiet)
         rows << Array.new(rows.first.size, false) if rows.size.odd?
         rows.each_slice(2).map do |top, bottom|
-          line = top.zip(bottom).map { |t, b| t ? (b ? "█" : "▀") : (b ? "▄" : " ") }.join
+          line = top.zip(bottom).map do |t, b|
+            if t
+              b ? "█" : "▀"
+            else
+              (b ? "▄" : " ")
+            end
+          end.join
           color ? "#{COLORS}#{line}#{RESET}" : line
         end
       end

data/lib/samagotchi/web/server.rb

@@ -94,8 +94,12 @@ module Samagotchi
             puts lan_off_line(setting)
             return 0
           end
-          start(port: port, host: host, url: url, open_browser: open_browser, markdown: markdown, view: view,
-                annotate_presets: annotate_presets, lan: lan) ? 0 : 1
+          if start(port: port, host: host, url: url, open_browser: open_browser, markdown: markdown, view: view,
+                   annotate_presets: annotate_presets, lan: lan)
+            0
+          else
+            1
+          end
         end
       rescue Lan::Error => e
         warn "Error: #{e.message}"

data/lib/samagotchi/worker.rb

@@ -166,6 +166,7 @@ module Samagotchi
         # A session stopped before this worker took the lock (e.g. a stop
         # right after create) must not run its initial prompt.
         return :stopped if stopped_on_disk?
+
         # Plugins' slow setup (chi.init: an MCP server's first start), in
         # the background, shown by the UIs; a turn waits only for the ones
         # that bring tools.
@@ -483,15 +484,22 @@ module Samagotchi
     # queued while it ran are refused, then the caller's block takes the
     # result (or the error the Engine announced as :turn_failed), the
     # answer goes to the output file and the session is saved.
+    # A failure before the Engine's turn began (this save, say) goes to the
+    # block too, with no :turn_failed: it is logged, the session idle again.
     # @yieldparam result [Object, nil] Engine#run_turn's, nil on a failure
     # @yieldparam error [StandardError, nil]
     def run_engine_turn(prompt, **turn_args)
-      @session.status = Session::STATUS_RUNNING
-      @session.save(state_dir: @state_dir)
       begin
+        @session.status = Session::STATUS_RUNNING
+        @session.save(state_dir: @state_dir)
         result = @engine.run_turn(@session, prompt, pending_input: pending_input_drain, **turn_args)
       rescue StandardError => e
         error = e
+        # Still running: no turn of the Engine's ended (it never began).
+        if @session.status == Session::STATUS_RUNNING
+          @session.status = Session::STATUS_IDLE
+          Log.warn(:worker, "turn_not_begun", error: e.class.name, msg: e.message)
+        end
       ensure
         refuse_queued_commands
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -9,20 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: reline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: reline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rqrcode_core
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: chi is an agent harness for local and OpenAI-compatible models (llama.cpp,
   mlx, oMLX, hosted APIs). It runs sessions in a terminal REPL or in background workers
   you can attach to from the terminal and a web UI, keeps memories in plain files