samagotchi 0.35.0 → 0.37.0

data/lib/samagotchi/recap_setup.rb

@@ -3,6 +3,7 @@
 require_relative "config"
 require_relative "log"
 require_relative "idle_recap"
+require_relative "idle_target"
 require_relative "recap_store"
 
 module Samagotchi
@@ -41,60 +42,21 @@ module Samagotchi
       base_url = string_config(kwarg_config, :base_url) || registry_string("recap.base_url")
       host_ref = string_config(kwarg_config, :host_ref) || string_config(kwarg_config, :host) || registry_string("recap.host_ref")
       model = string_config(kwarg_config, :model) || registry_string("recap.model")
-      label = model
 
-      # The model as any model ref (ModelRef): its alias applied once, and
-      # its host (own or the alias's) picks the recap host when host_ref
-      # doesn't.
-      parsed = model && host_registry.model_ref(model)
-      target = nil
-      if base_url.nil? && host_ref.nil? && model.nil?
-        target = -> { session_target.call }
-      elsif base_url.nil? && host_ref.nil? && !parsed.host_name
-        # A model naming no host goes where a bare --model goes
-        # (HostRegistry#host_for_model: the default host unless another's
-        # list has it), resolved at each attempt.
-        target = lambda do
-          resolved = host_registry.resolve(model)
-          { base_url: resolved.openai_base_url, api_key_env: resolved.entry.api_key_env,
-            model: resolved.bare_model, label: label.to_s.strip }
-        end
-      else
-        host_ref ||= parsed.host_name if parsed && base_url.nil?
-        # If host_ref given, derive base_url (the host's OpenAI base) and its
-        # API key variable from the host_registry entry
-        api_key_env = nil
-        if host_ref && !host_ref.empty?
-          entry = host_registry.find_entry(host_ref)
-          if entry
-            base_url = entry.openai_base_url
-            api_key_env = entry.api_key_env
-            named = parsed&.host_conflict || parsed&.host_name
-            if named && named != entry.name
-              Log.warn(:recap, "model_host_mismatch",
-                       echo: "Warning: recap model '#{model}' names host '#{named}', not recap.host_ref '#{host_ref}'; recap disabled.",
-                       model: model, host_ref: host_ref)
-              return nil
-            end
-            model = parsed.id if parsed
-          else
-            Log.warn(:recap, "host_ref_unknown", echo: "Warning: recap host_ref '#{host_ref}' not found in hosts:; recap disabled.", host_ref: host_ref)
-            return nil
-          end
-        elsif parsed && !parsed.host_name
-          model = parsed.id
-        end
+      settings = { model: model, host_ref: host_ref, base_url: base_url, host_registry: host_registry }
+      target = if base_url.nil? && host_ref.nil? && model.nil?
+                 -> { session_target.call }
+               elsif !IdleTarget.host_named?(**settings)
+                 # A model naming no host goes where a bare --model goes
+                 # (HostRegistry#host_for_model: the default host unless
+                 # another's list has it), resolved at each attempt.
+                 -> { IdleTarget.resolve(**settings) }
+               else
+                 fixed = fixed_target(settings)
+                 return nil unless fixed
 
-        if base_url.to_s.strip.empty? || model.to_s.strip.empty?
-          Log.warn(:recap, "recap_unconfigured",
-                   echo: "Warning: SAMAGOTCHI session recap is enabled but base_url/model are missing; recap disabled. " \
-                         "Set recap: {host_ref:, model:} or SAMAGOTCHI_RECAP_BASE_URL and SAMAGOTCHI_RECAP_MODEL (or pass recap: {base_url:, model:}), " \
-                         "or leave them all out to recap with the session's own model.")
-          return nil
-        end
-        fixed = { base_url: base_url.to_s.strip, api_key_env: api_key_env, model: model.to_s.strip, label: label.to_s.strip }
-        target = -> { fixed }
-      end
+                 -> { fixed }
+               end
 
       IdleRecap.new(
         engine: engine,
@@ -107,6 +69,30 @@ module Samagotchi
       )
     end
 
+    # The recap's pinned host and model (IdleTarget.resolve), or nil after
+    # a warning when they can't be resolved (recap stays off).
+    # @return [IdleTarget, nil]
+    def self.fixed_target(settings)
+      IdleTarget.resolve(**settings)
+    rescue IdleTarget::Unresolved => e
+      case e.reason
+      when :host_ref_unknown
+        Log.warn(:recap, "host_ref_unknown", echo: "Warning: recap host_ref '#{e.host_ref}' not found in hosts:; recap disabled.",
+                                             host_ref: e.host_ref)
+      when :model_host_mismatch
+        Log.warn(:recap, "model_host_mismatch",
+                 echo: "Warning: recap model '#{e.model}' names host '#{e.named}', not recap.host_ref '#{e.host_ref}'; recap disabled.",
+                 model: e.model, host_ref: e.host_ref)
+      else
+        Log.warn(:recap, "recap_unconfigured",
+                 echo: "Warning: SAMAGOTCHI session recap is enabled but base_url/model are missing; recap disabled. " \
+                       "Set recap: {host_ref:, model:} or SAMAGOTCHI_RECAP_BASE_URL and SAMAGOTCHI_RECAP_MODEL (or pass recap: {base_url:, model:}), " \
+                       "or leave them all out to recap with the session's own model.")
+      end
+      nil
+    end
+    private_class_method :fixed_target
+
     # recap.sentences as [min, max]; an invalid value warns and falls back to
     # the default range (the recap stays on).
     def self.recap_sentences(value)

data/lib/samagotchi/send_command.rb

@@ -225,21 +225,6 @@ module Samagotchi
       "#{ContextQuote.block(context)}#{message}"
     end
 
-    # Only a pipe or a file is read. A terminal means nobody piped anything
-    # in, and a socket a launcher or an agent's shell passes down may never
-    # close: with -m, waiting on either would hang a script. (A pipe the
-    # caller never closes still hangs, as it would for cat.)
-    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?
-      end
-
-      @stdin.read
-    end
-
     # A worker session like the web start page's: saved as running with the
     # message before its worker spawns, so lists and the web show it at
     # once. The full id, so a script can pass it on. The model's host is
@@ -477,12 +462,5 @@ module Samagotchi
       else " with #{@images.size} images"
       end
     end
-
-    # The text as UTF-8 whatever the locale says: with no LANG/LC_* (an app
-    # started from Finder, launchd) stdin reads as US-ASCII and ARGV as
-    # binary. Invalid bytes become U+FFFD rather than an error.
-    def utf8(text)
-      text&.dup&.force_encoding(Encoding::UTF_8)&.scrub
-    end
   end
 end

data/lib/samagotchi/session_commands.rb

@@ -277,6 +277,7 @@ module Samagotchi
           ("git #{rule.git}" if rule.git),
           ("touches #{rule.touches}" if rule.touches),
           ("rm #{rule.rm}" if rule.rm),
+          ("memory #{rule.memory}" if rule.memory),
           ("models #{rule.models.join(",")}" if rule.models),
           ("modes #{rule.modes.join(",")}" if rule.modes),
           ("skip_read_only" if rule.skip_read_only)

data/lib/samagotchi/tool_activity.rb

@@ -39,7 +39,7 @@ module Samagotchi
     #   worker runs in its session's working directory)
     def tool_activity_event(tool_name, call, result, registry: nil, cwd: Dir.pwd)
       event = {
-        action: tool_activity_action(tool_name, registry: registry),
+        action: tool_activity_action(tool_name, registry: registry, call: call),
         tool: tool_name,
         params: tool_activity_params(tool_name, call, registry: registry),
         status: tool_activity_status(result, tool_name)
@@ -151,14 +151,15 @@ module Samagotchi
       parts.drop(base.length).join("/")
     end
 
-    def tool_activity_action(tool_name, registry: nil)
+    # @param call [Hash, nil] the call, for a label that depends on its form
+    def tool_activity_action(tool_name, registry: nil, call: nil)
       case tool_name
       when Tools::Execute::NAME then "running command"
       when Tools::Read::NAME then "reading file"
       when Tools::Write::NAME then "writing file"
       when Tools::Edit::NAME then "editing file"
       when Tools::MemoryRead::NAME then "reading memory"
-      when Tools::MemoryWrite::NAME then "saving memory"
+      when Tools::MemoryWrite::NAME then memory_write_action(call)
       when Tools::TaskCreate::NAME then "starting background task"
       when Tools::TaskGet::NAME then "checking task"
       when Tools::TaskList::NAME then "listing tasks"
@@ -182,6 +183,15 @@ module Samagotchi
     # whose task was stopped (the stop-task button, or the model's task_stop),
     # and for a command the user's Stop killed or kept from starting: a
     # cancel, not a failure (its text still starts "Error:" for the model).
+    # memory_write's label: a call with only a description changes the index line.
+    def memory_write_action(call)
+      return "saving memory" unless call.is_a?(Hash)
+      return "removing memory" if call[:remove].to_s.strip.downcase == "true"
+      return "updating memory description" if call[:content].to_s.empty? && !call[:description].to_s.strip.empty?
+
+      "saving memory"
+    end
+
     def tool_activity_status(result, tool_name = nil)
       text = result.to_s
       return "stopped" if text == Tools::Execute::NOT_RUN_ON_STOP
@@ -232,6 +242,7 @@ module Samagotchi
         parts << "scope=#{preview_tool_param(scope)}" unless scope.empty?
         desc = call[:description].to_s.strip
         parts << "description=#{preview_tool_param(desc)}" unless desc.empty?
+        parts << "remove=true" if call[:remove].to_s.strip.downcase == "true"
         parts.join(" ")
       when Tools::TaskCreate::NAME
         parts = ["command=#{preview_tool_param(call[:content])}"]

data/lib/samagotchi/tool_declarations.rb

@@ -127,7 +127,7 @@ module Samagotchi
       },
       {
         name: "memory_write",
-        description: "Write or update a memory entry in scoped memories. Scope is required: project or system. Use the `name` parameter for the entry name (use `name`, NOT `path` — the file tools use `path`); each scope's index.md is auto-maintained (one managed line per entry); use name \"index\" to write the index file verbatim. For a small change to an existing memory (a step, a line), `edit` its file (<scope dir>/<name>.md) instead of rewriting it all; its index line is refreshed either way. If the user asks to save guidance for the current model only, pass current_model_only: true to save a model-specific overlay.",
+        description: "Write or update a memory entry in scoped memories. Scope is required: project or system. Use the `name` parameter for the entry name (use `name`, NOT `path` — the file tools use `path`); each scope's index.md is auto-maintained (one managed line per entry); use name \"index\" to write the index file verbatim. For a small change to an existing memory (a step, a line), `edit` its file (<scope dir>/<name>.md) instead of rewriting it all; its index line is refreshed either way. To change only an entry's index line, pass name, scope and description without content; to remove an entry, name, scope and remove: true. If the user asks to save guidance for the current model only, pass current_model_only: true to save a model-specific overlay.",
         parameters: {
           type: "object",
           properties: {
@@ -137,7 +137,7 @@ module Samagotchi
             },
             content: {
               type: "string",
-              description: "Markdown content to write"
+              description: "Markdown content to write; leave it out to change only the description"
             },
             scope: {
               type: "string",
@@ -145,14 +145,18 @@ module Samagotchi
             },
             description: {
               type: "string",
-              description: "Optional short description appended to the managed index line"
+              description: "Optional one-line description (at most 200 characters) appended to the managed index line; without content, it changes only that line"
             },
             current_model_only: {
               type: "boolean",
               description: "Set true to save this entry as a model-specific overlay for the current model only (<name>.<model>.md); it is auto-appended when the entry is read under that model and never listed in the index."
+            },
+            remove: {
+              type: "boolean",
+              description: "Set true, with only name and scope, to remove the entry: its file (and model overlays) move to the bundle trash and its index line is dropped. Only when the user asked or a skill's steps say so."
             }
           },
-          required: %w[name content scope]
+          required: %w[name scope]
         }
       },
       {

data/lib/samagotchi/tools/builtins.rb

@@ -63,7 +63,7 @@ module Samagotchi
         MemoryWrite::NAME => lambda do |call, kctx|
           MemoryWrite.call(call[:content], path: call[:path], scope: call[:scope], description: call[:description],
                                            current_model_only: truthy?(call[:current_model_only]),
-                                           model_key: kctx.model_key)
+                                           model_key: kctx.model_key, remove: truthy?(call[:remove]))
         end,
         Write::NAME => ->(call, _kctx) { Write.call(call[:content], path: call[:path]) },
         Read::NAME => lambda do |call, _kctx|

data/lib/samagotchi/tools/memory.rb

@@ -150,13 +150,37 @@ module Samagotchi
         /^- \*\*#{Regexp.escape(name)}\*\*[ \t]*(?:[·•].*|:.*)?(\r?\n|\z)/
       end
 
-      def self.call(content, path:, scope:, description: nil, current_model_only: false, model_key: nil)
+      # The longest description an index line takes: the line lands in
+      # every session's prompt for the repo.
+      DESCRIPTION_LIMIT = 200
+
+      # @param remove [Boolean] move the entry (and its model overlays) into
+      #   the bundle trash and drop its index line (#remove)
+      def self.call(content, path:, scope:, description: nil, current_model_only: false, model_key: nil, remove: false)
         entry_name = path.to_s.strip
         body = content.to_s
         return "Error: entry name is required" if entry_name.empty?
         return MemoryRead.invalid_name_error(entry_name) if MemoryRead.invalid_name?(entry_name)
         return "Error: scope is required" if scope.to_s.strip.empty?
-        return "Error: content is required" if body.empty?
+
+        if remove
+          if !body.empty? || !description.to_s.strip.empty? || current_model_only
+            return "Error: remove: true takes only name and scope (no content, description or current_model_only)"
+          end
+
+          return remove(entry_name, scope)
+        end
+
+        description = normalize_description(description)
+        if description && description.length > DESCRIPTION_LIMIT
+          return "Error: description is #{description.length} characters; the limit is #{DESCRIPTION_LIMIT} " \
+                 "(one line: what the memory is for)"
+        end
+        if body.empty?
+          return "Error: content is required (or pass only description to change the index line)" unless description
+
+          return update_description(entry_name, scope, description, current_model_only)
+        end
 
         resolved_scope = MemoryRead.normalize_scope(scope)
 
@@ -205,6 +229,83 @@ module Samagotchi
         "Error: #{e.message}"
       end
 
+      # A description as the index line takes it: whitespace (newlines too)
+      # collapsed to single spaces; nil when blank, which keeps the stored one.
+      def self.normalize_description(description)
+        text = description.to_s.gsub(/\s+/, " ").strip
+        text.empty? ? nil : text
+      end
+
+      # The description-only form: name, scope and description, no content.
+      # Rewrites that entry's index line (size and date too) and leaves its
+      # file alone, so a status kept in the description costs no rewrite of
+      # the body.
+      def self.update_description(entry_name, scope, description, current_model_only)
+        return "Error: the index has no index line of its own; pass content to write it" if entry_name == MEMORY_INDEX
+        if current_model_only
+          return "Error: a model overlay has no index line; pass content to write the overlay, or drop " \
+                 "current_model_only to change the base entry's description"
+        end
+
+        resolved_scope = MemoryRead.normalize_scope(scope)
+        file_path = File.join(MemoryRead.memories_dir(resolved_scope), "#{entry_name}.md")
+        return "Error: no memory '#{entry_name}' in #{resolved_scope} scope; pass content to create it" unless File.file?(file_path)
+
+        manage_index(resolved_scope, entry_name, File.size(file_path), description)
+        "Memory '#{entry_name}' description updated in #{resolved_scope} scope (file unchanged)."
+      end
+
+      # remove: true. Moves <name>.md and its model overlays into one
+      # MemoryBundle::Trash dir (memory-<name>-<time>, which `chi bundle
+      # trash` lists and empties) and drops the index line; a line whose
+      # file is already gone is dropped alone. A memory a bundle owns (an
+      # installed bundle's record lists it, or its line says "· from
+      # <bundle>") is the uninstaller's, and the index isn't a memory.
+      def self.remove(entry_name, scope)
+        return "Error: the index can't be removed; it is kept up to date for you" if entry_name == MEMORY_INDEX
+
+        require_relative "../memory_bundle/index_updater"
+        require_relative "../memory_bundle/provenance"
+        require_relative "../memory_bundle/trash"
+        resolved_scope = MemoryRead.normalize_scope(scope)
+        dir = MemoryRead.memories_dir(resolved_scope)
+        index = File.join(dir, "#{MEMORY_INDEX}.md")
+        index_text = File.file?(index) ? File.read(index, encoding: "UTF-8") : ""
+        line = index_text[managed_pattern(entry_name)]
+        file = File.join(dir, "#{entry_name}.md")
+
+        owner = Samagotchi::MemoryBundle::Provenance.claimants("#{entry_name}.md", scope: resolved_scope).first ||
+                (line && Samagotchi::MemoryBundle::IndexUpdater.extract_source(line))
+        return "Error: memory '#{entry_name}' came from bundle #{owner}; `chi bundle uninstall #{owner}` removes it" if owner
+
+        unless File.file?(file)
+          return "Error: no memory '#{entry_name}' in #{resolved_scope} scope" unless line
+
+          Samagotchi::MemoryBundle::IndexUpdater.remove_index(resolved_scope, entry_name)
+          return "Memory '#{entry_name}' had no file in #{resolved_scope} scope; its dangling index line was dropped."
+        end
+
+        trash = Samagotchi::MemoryBundle::Trash.new("memory-#{entry_name}")
+        ([file] + overlay_files(dir, entry_name, index_text)).each { |path| trash.move(path) }
+        Samagotchi::MemoryBundle::IndexUpdater.remove_index(resolved_scope, entry_name)
+        "Memory '#{entry_name}' removed from #{resolved_scope} scope: moved to #{trash.dir} " \
+          "(`chi bundle trash` lists and empties it); index line dropped."
+      end
+
+      # The entry's model overlays: <name>.<key>.md with a key ModelOverlay
+      # makes, unless that stem is a memory of its own (names may have dots:
+      # handoff_x.v2 has an index line).
+      def self.overlay_files(dir, entry_name, index_text)
+        pattern = /\A#{Regexp.escape(entry_name)}\.([a-z0-9-]+)\.md\z/
+        Dir.children(dir).sort.filter_map do |child|
+          key = child[pattern, 1] or next
+          next if index_text.match?(managed_pattern("#{entry_name}.#{key}"))
+
+          path = File.join(dir, child)
+          path if File.file?(path)
+        end
+      end
+
       # Adds or refreshes a single managed line for `entry_name` in the given
       # scope's index.md, preserving every other byte byte-for-byte.
       # Delegates to IndexUpdater to maintain a single source of truth.

data/lib/samagotchi/version.rb

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

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

@@ -61,8 +61,9 @@ export function approvalView(pq) {
   const who = a.rule ? [`rule ${a.rule}`, a.source].filter(Boolean).join(", ") : (a.source || "hook");
   const reason = a.reason ? String(a.reason) : "(no reason given)";
   return {
-    // A plugin tool's label ("chrome: screenshot"), as its row shows it.
-    tool: a.label || a.tool || "",
+    // A plugin tool's label ("chrome: screenshot"), as its row shows it;
+    // else the tool the call acts as (an MCP tool behind mcp_call).
+    tool: a.label || a.acts_as || a.tool || "",
     // A tool without a command or path (an MCP tool): its compact args.
     what: command || paths.join("\n") || a.args || "",
     isCommand: !!command,
@@ -142,7 +143,7 @@ export function summaryText(pq, { answer = null, cancelled = false, reason = ""
     const text = asked ? `${truncate(asked, 60)} → ${result}` : result;
     return truncate(relay ? `${relay.who}: ${text}` : text, 120);
   }
-  const label = isApproval(pq) ? `Approve ${pq.approval?.label || pq.approval?.tool || "call"}?`
+  const label = isApproval(pq) ? `Approve ${pq.approval?.label || pq.approval?.acts_as || pq.approval?.tool || "call"}?`
     : isContinue(pq) ? "Step limit" : "Question";
   return truncate(pq.header || label);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -167,6 +167,9 @@ files:
 - lib/samagotchi/broadcast/recipients.rb
 - lib/samagotchi/broadcast/scope_card.rb
 - lib/samagotchi/broadcast/tags.rb
+- lib/samagotchi/broadcast/triage.rb
+- lib/samagotchi/broadcast/triage_log.rb
+- lib/samagotchi/broadcast/triage_model.rb
 - lib/samagotchi/broadcast_command.rb
 - lib/samagotchi/bundle_command.rb
 - lib/samagotchi/bundle_needs.rb
@@ -284,6 +287,7 @@ files:
 - lib/samagotchi/idle_recap.rb
 - lib/samagotchi/idle_reminders.rb
 - lib/samagotchi/idle_scheduler.rb
+- lib/samagotchi/idle_target.rb
 - lib/samagotchi/image_store.rb
 - lib/samagotchi/installed_gem.rb
 - lib/samagotchi/installed_versions.rb