samagotchi 0.88.0 → 0.90.0

data/lib/samagotchi/hooks/bundle_loader.rb

@@ -126,6 +126,8 @@ module Samagotchi
         # Why the file doesn't match the sha256 recorded at install, or nil.
         # With none recorded, only a required hook counts as a mismatch.
         def sha_mismatch(file, recorded, required:)
+          return nil if MemoryBundle::Provenance.unchecked?(recorded)
+
           expected = MemoryBundle::Provenance.recorded_sha(recorded)
           return (required ? "no sha256 recorded for it (reinstall the bundle)" : nil) if expected.empty?
 

data/lib/samagotchi/installed_gem.rb

@@ -29,6 +29,17 @@ module Samagotchi
       File.file?(path) ? path : nil
     end
 
+    # What Bundler changed in ENV, mapped back to the values from before it
+    # (nil: unset); {} outside Bundler. Child chi commands use this in gem
+    # mode so they load the same installed gem without inheriting this app's
+    # bundle.
+    def unbundled_env_changes(env = ENV.to_h)
+      return {} unless defined?(::Bundler) && ::Bundler.respond_to?(:unbundled_env)
+
+      clean = ::Bundler.unbundled_env
+      (env.keys | clean.keys).each_with_object({}) { |key, changes| changes[key] = clean[key] unless clean[key] == env[key] }
+    end
+
     def real_path(path)
       File.realpath(path)
     rescue SystemCallError

data/lib/samagotchi/llm/model_result.rb

@@ -4,8 +4,8 @@ module Samagotchi
   module LLM
     # Normalized result returned by every ModelBackend downstream of the agentic
     # loop (the loop lives inside the backend). What Engine#run_turn and the
-    # renderers (TerminalUI / Bridge) read: .output (= .text, and .to_s, which
-    # is how the :turn_completed `result:` reaches JSON), .conversation,
+    # renderers (TerminalUI / Bridge) read: .output (= .text, and .to_s: the
+    # Engine's :turn_completed `result:`; clients get turn_summary.output), .conversation,
     # .canceled?, .cancellation_reason, .exhausted?, .resumable?,
     # .empty_answer?, plus the native loop's .tool_activity, .context_status
     # and .pending_tool_calls, which the interactive renderer needs.

data/lib/samagotchi/memory_bundle/asset_installer.rb

@@ -17,6 +17,8 @@ module Samagotchi
     # scripts/*. Each replaces what an earlier version installed. Installer
     # runs it after the memories; it adds to the installer's results and
     # warnings, and #run returns what the record (Provenance#write) keeps.
+    # A dev install (+dev+, `chi bundle install --dev`) links each file to
+    # the source instead of copying it, and warns of no checksum mismatch.
     class AssetInstaller
       # What was installed: the paths Provenance#write records (each
       # empty / nil on a dry run).
@@ -32,7 +34,7 @@ module Samagotchi
       # @param results, warnings, conflicts the Installer's (results and
       #   warnings are added to)
       def initialize(name:, source_dir:, manifest:, provenance:, existing:, results:, warnings:, conflicts:,
-                     force: false, strict: true, upgrade: false, dry_run: false)
+                     force: false, strict: true, upgrade: false, dry_run: false, dev: false)
         @name = name
         @bundle_dir = source_dir
         @manifest = manifest
@@ -45,6 +47,7 @@ module Samagotchi
         @strict = strict
         @upgrade = upgrade
         @dry_run = dry_run
+        @dev = dev
       end
 
       # @return [Installed]
@@ -52,8 +55,8 @@ module Samagotchi
       #   script the bundle doesn't have
       def run
         install_hooks
-        prune_dropped_hooks if @upgrade && @existing && !@dry_run
-        verify_hook_checksums if @manifest && @strict
+        prune_dropped_hooks if (@upgrade || (@dev && @existing&.dev)) && @existing && !@dry_run
+        verify_hook_checksums if @manifest && @strict && !@dev
         incoming_rules = Dir.glob(File.join(@bundle_dir, "guardrails", "*.yml")).sort
                             .reject { |src| linked_out?(src, "guardrails/#{File.basename(src)}") }
         guardrail_files = install_guardrails(incoming_rules)
@@ -109,7 +112,7 @@ module Samagotchi
 
         FileUtils.mkdir_p(@provenance.hooks_dir)
         unchanged = File.exist?(dest) && FileUtils.identical?(src, dest)
-        FileUtils.cp(src, dest)
+        place(src, dest)
         @results[basename] = if unchanged
                                { status: "skipped", reason: "already up to date" }
                              elsif @upgrade && @existing
@@ -132,7 +135,7 @@ module Samagotchi
           else
             FileUtils.mkdir_p(@provenance.hooks_dir)
             dest = File.join(@provenance.hooks_dir, basename)
-            FileUtils.cp(src, dest)
+            place(src, dest)
             @results[basename] = { status: "installed" }
             @hook_files[basename] = dest
           end
@@ -140,13 +143,13 @@ module Samagotchi
       end
 
       # An upgrade removes the hooks the previous version shipped and this
-      # one doesn't (a local file too, with a warning).
+      # one doesn't (a local file too, with a warning; a dev link silently).
       def prune_dropped_hooks
         @existing.hooks.each_key do |old_key_str|
           next if @bundle_hooks.include?(old_key_str)
 
           old_dest = File.join(@provenance.hooks_dir, old_key_str)
-          if File.exist?(old_dest) && !@force
+          if File.exist?(old_dest) && !@force && !File.symlink?(old_dest)
             @warnings << "Bundle no longer includes hook #{old_key_str} but local file exists — removing"
           end
           FileUtils.rm_f(old_dest)
@@ -193,7 +196,7 @@ module Samagotchi
         FileUtils.mkdir_p(target)
         incoming_rules.to_h do |src|
           dest = File.join(target, File.basename(src))
-          FileUtils.cp(src, dest)
+          place(src, dest)
           @results["guardrails/#{File.basename(src)}"] =
             unchanged.include?(src) ? { status: "skipped", reason: "already up to date" } : { status: "installed" }
           [File.basename(src), dest]
@@ -227,7 +230,7 @@ module Samagotchi
         unchanged = File.file?(dest) && FileUtils.identical?(src, dest)
         FileUtils.rm_rf(@provenance.plugin_dir)
         FileUtils.mkdir_p(@provenance.plugin_dir)
-        FileUtils.cp(src, dest)
+        place(src, dest)
         @results[plugin[:file]] = if unchanged
                                     { status: "skipped", reason: "already up to date" }
                                   elsif @upgrade && @provenance.installed?
@@ -237,7 +240,7 @@ module Samagotchi
                                   end
         expected = @manifest.checksum_for_plugin
         actual = Digest::SHA256.hexdigest(File.binread(dest))
-        if @strict && expected && actual != expected
+        if @strict && !@dev && expected && actual != expected
           @warnings << "Checksum mismatch for plugin #{plugin[:file]}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
         end
         dest
@@ -253,6 +256,8 @@ module Samagotchi
           src = File.join(@bundle_dir, "scripts", file)
           raise Installer::InstallError, "the manifest names scripts/#{file}, which the bundle doesn't have" unless File.file?(src)
           raise Installer::InstallError, "scripts/#{file} is a symlink (not installed)" if linked?(src)
+
+          @warnings << "scripts/#{file} is not executable; chmod +x #{src}" if @dev && !File.executable?(src)
         end
         return {} if @dry_run
 
@@ -266,21 +271,28 @@ module Samagotchi
         FileUtils.mkdir_p(@provenance.scripts_dir)
         scripts.to_h do |file, declared|
           dest = File.join(@provenance.scripts_dir, file)
-          FileUtils.cp(File.join(@bundle_dir, "scripts", file), dest)
+          place(File.join(@bundle_dir, "scripts", file), dest)
           @results["scripts/#{file}"] = if unchanged.include?(file) then { status: "skipped", reason: "already up to date" }
                                         elsif @upgrade && @provenance.installed? then { status: "updated" }
                                         else { status: "installed" }
                                         end
-          FileUtils.chmod(0o755, dest)
+          FileUtils.chmod(0o755, dest) unless @dev
           actual = Digest::SHA256.hexdigest(File.binread(dest))
           expected = declared.to_s.delete_prefix("sha256:")
-          if @strict && !expected.empty? && actual != expected
+          if @strict && !@dev && !expected.empty? && actual != expected
             @warnings << "Checksum mismatch for script #{file}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
           end
           [file, dest]
         end
       end
 
+      # Copies +src+ to +dest+, or (a dev install) links +dest+ to it. An
+      # existing link goes first: a copy over it would write into the source.
+      def place(src, dest)
+        FileUtils.rm_f(dest) if File.symlink?(dest)
+        @dev ? File.symlink(File.realpath(src), dest) : FileUtils.cp(src, dest)
+      end
+
       # Whether the bundle file +src+ reads through a symlink: it is one, or
       # it (or its dir, hooks/ say) resolves outside the bundle dir. A tar,
       # zip or git repo keeps links; copying through one would install any

data/lib/samagotchi/memory_bundle/installed_bundle.rb

@@ -22,13 +22,15 @@ module Samagotchi
     #   includes    a profile's recorded members, nil for a plain bundle
     #   session_settings
     #               the keys a session may set (chi --set), [] when none
+    #   dev         a dev install (`chi bundle install --dev`): its source is
+    #               the folder it links to and its files carry Provenance::DEV_SHA
     #   error       why manifest.json couldn't be read (the rest empty), else nil
     class InstalledBundle < Data.define(:name, :version, :scope, :source, :installed_at, :trust_level, :source_commit,
                                         :requires_chi, :files, :hooks, :guardrails, :scripts, :plugin, :needs,
-                                        :includes, :context_providers, :session_settings, :error)
+                                        :includes, :context_providers, :session_settings, :dev, :error)
       OPTIONAL = { version: nil, scope: nil, source: nil, installed_at: nil, trust_level: nil, source_commit: nil,
                    requires_chi: nil, files: {}, hooks: {}, guardrails: {}, scripts: {}, plugin: nil, needs: nil,
-                   includes: nil, context_providers: nil, session_settings: [], error: nil }.freeze
+                   includes: nil, context_providers: nil, session_settings: [], dev: false, error: nil }.freeze
 
       def initialize(name:, **fields)
         super(name: name, **OPTIONAL, **fields)
@@ -60,7 +62,8 @@ module Samagotchi
             scripts: mapping(h["scripts"]) { |meta| sha(meta) },
             plugin: PluginRef.parse(h["plugin"]), needs: h["needs"], context_providers: h["context_providers"],
             includes: h["includes"].is_a?(Array) ? h["includes"].map(&:to_s) : nil,
-            session_settings: h["session_settings"].is_a?(Array) ? h["session_settings"].map(&:to_s) : [])
+            session_settings: h["session_settings"].is_a?(Array) ? h["session_settings"].map(&:to_s) : [],
+            dev: h["dev"] == true)
       end
 
       def self.string(value) = value&.to_s

data/lib/samagotchi/memory_bundle/installer.rb

@@ -40,7 +40,7 @@ module Samagotchi
       # installs from a dir in it only, unless force); ShippedUpdate,
       # Profile and SystemBundle pass the one they install from.
       def initialize(source:, name:, scope: nil, force: false, strict: true, upgrade: false, dry_run: false, prepared: nil,
-                     shipped_dir: SourceNormalizer::SHIPPED_DIR)
+                     shipped_dir: SourceNormalizer::SHIPPED_DIR, dev: false)
         @source = source
         @shipped_dir = shipped_dir
         @prepared = prepared
@@ -50,6 +50,7 @@ module Samagotchi
         @strict = strict
         @upgrade = upgrade
         @dry_run = dry_run
+        @dev = dev
         @results = {}
         @warnings = []
         @placeholder_warnings = []
@@ -98,7 +99,7 @@ module Samagotchi
         installed = AssetInstaller.new(
           name: @name, source_dir: @bundle_dir, manifest: @manifest, provenance: @provenance, existing: @existing,
           results: @results, warnings: @warnings, conflicts: @conflicts,
-          force: @force, strict: @strict, upgrade: @upgrade, dry_run: @dry_run
+          force: @force, strict: @strict, upgrade: @upgrade, dry_run: @dry_run, dev: @dev
         ).run
 
         # Files the previous version shipped and this one doesn't.
@@ -172,10 +173,14 @@ module Samagotchi
       def check_source
         refuse_case_twin
         refuse_shipped_name
+        refuse_dev_mismatch
         now = incoming_identity
         return if now.nil?
 
         was = @existing && SourceIdentity.of(@existing.source)
+        if @dev && @existing&.dev && was != now
+          raise InstallError, "#{@name} is a dev install of #{@existing.source}; uninstall it before installing from #{@source}"
+        end
         return if was.nil? || was == now
         return @source_change = [@existing.source, @source.to_s] if @upgrade
 
@@ -191,6 +196,19 @@ module Samagotchi
         raise InstallError, "#{@name} differs only in case from the installed #{twin}" if twin
       end
 
+      # A dev install (--dev, linked to its source) and a normal one don't
+      # replace each other: neither an upgrade nor a plain install over a
+      # dev bundle, nor --dev over a normal one.
+      def refuse_dev_mismatch
+        return if @existing.nil? || @existing.dev == @dev
+
+        if @existing.dev
+          raise InstallError, "#{@name} is a dev install of #{@existing.source}: it follows its source already " \
+                              "(to leave dev mode: chi bundle uninstall #{@name}, then chi bundle install without --dev)"
+        end
+        raise InstallError, "#{@name} is installed normally; `chi bundle uninstall #{@name}` first, then chi bundle install --dev"
+      end
+
       # A shipped name (in any case) from anything but this chi's own
       # shipped dir. A recorded source may be an older gem's (SourceIdentity
       # matches the path); an incoming one must be a dir in SHIPPED_DIR, so
@@ -421,7 +439,8 @@ module Samagotchi
           scripts_files: installed.script_files,
           context_providers: @manifest.context_providers,
           file_descriptions: @manifest.file_descriptions,
-          session_settings: @manifest.session_settings
+          session_settings: @manifest.session_settings,
+          dev: @dev
         )
       end
 

data/lib/samagotchi/memory_bundle/provenance.rb

@@ -116,9 +116,20 @@ module Samagotchi
         Digest::SHA256.hexdigest(File.binread(path))
       end
 
-      # Whether the file's content is the one recorded (either format).
+      # What a dev install (`chi bundle install --dev`) records instead of
+      # a sha256: its files are links to the source, which change under it.
+      # Not a hex digest, so no file can be mistaken for it.
+      DEV_SHA = "sha256:dev"
+
+      # Whether +recorded+ is DEV_SHA: the file isn't checked.
+      def self.unchecked?(recorded)
+        recorded_sha(recorded) == recorded_sha(DEV_SHA)
+      end
+
+      # Whether the file's content is the one recorded (either format); a
+      # dev install's (DEV_SHA) always is.
       def self.sha_matches?(path, recorded)
-        file_sha(path) == recorded_sha(recorded)
+        unchecked?(recorded) || file_sha(path) == recorded_sha(recorded)
       end
 
       # Writes provenance for an installation: merges into existing manifest.json
@@ -139,9 +150,11 @@ module Samagotchi
       # @param scripts_files [Hash] file name => installed script; the
       #   sha256 of each is recorded (ContextFetch checks it before a run)
       # @param context_providers [Array<ContextProviders::Provider>]
+      # @param dev [Boolean] a dev install: its files are links to the
+      #   source, recorded as DEV_SHA (no sha256 check) with "dev": true
       def write(files:, scope:, version:, source_path:, hooks: {}, trust_level: nil, source_commit: nil, hooks_files: {},
                 guardrails_files: {}, plugin_file: nil, requires_chi: nil, needs: nil, conflicts: [], includes: nil,
-                scripts_files: {}, context_providers: [], file_descriptions: {}, session_settings: [])
+                scripts_files: {}, context_providers: [], file_descriptions: {}, session_settings: [], dev: false)
         FileUtils.mkdir_p(@bundle_dir)
         bases_dir = File.join(@bundle_dir, "bases")
         FileUtils.mkdir_p(bases_dir)
@@ -196,6 +209,7 @@ module Samagotchi
         normalized_hooks.each do |k, hook|
           src = hooks_files[k] || hooks_files[k.to_sym]
           hook = hook.with(sha256: BundleHook.of_file(src.to_s).sha256) if src && File.exist?(src.to_s)
+          hook = hook.with(sha256: DEV_SHA) if dev
           hooks_map[k] = hook.to_record
           next unless src && File.exist?(src.to_s)
 
@@ -216,9 +230,10 @@ module Samagotchi
           "hooks" => hooks_map
         }
         manifest_data["trust_level"] = trust_level.to_s if trust_level && !trust_level.to_s.empty?
+        manifest_data["dev"] = true if dev
         if guardrails_files.is_a?(Hash) && !guardrails_files.empty?
           manifest_data["guardrails"] = guardrails_files.sort.to_h do |basename, path|
-            [basename.to_s, { "sha256" => "sha256:#{Digest::SHA256.hexdigest(File.read(path.to_s))}" }]
+            [basename.to_s, { "sha256" => dev ? DEV_SHA : "sha256:#{Digest::SHA256.hexdigest(File.read(path.to_s))}" }]
           end
         end
         manifest_data["source_commit"] = source_commit.to_s if source_commit && !source_commit.to_s.empty?
@@ -226,7 +241,7 @@ module Samagotchi
         if plugin_file
           content = File.binread(plugin_file.to_s)
           manifest_data["plugin"] = { "file" => File.basename(plugin_file.to_s),
-                                      "sha256" => "sha256:#{Digest::SHA256.hexdigest(content)}" }
+                                      "sha256" => dev ? DEV_SHA : "sha256:#{Digest::SHA256.hexdigest(content)}" }
           FileUtils.mkdir_p(File.join(bases_dir, "plugin"))
           File.binwrite(plugin_base_path(File.basename(plugin_file.to_s)), content)
         end
@@ -235,7 +250,7 @@ module Samagotchi
         manifest_data["includes"] = includes.map(&:to_s) if includes.is_a?(Array)
         unless scripts_files.empty?
           manifest_data["scripts"] = scripts_files.sort.to_h do |file, path|
-            [file.to_s, { "sha256" => "sha256:#{Digest::SHA256.hexdigest(File.binread(path.to_s))}" }]
+            [file.to_s, { "sha256" => dev ? DEV_SHA : "sha256:#{Digest::SHA256.hexdigest(File.binread(path.to_s))}" }]
           end
         end
         manifest_data["context_providers"] = context_providers.map(&:to_h) unless context_providers.empty?

data/lib/samagotchi/session_manager.rb

@@ -263,21 +263,13 @@ module Samagotchi
       # A gem-mode worker activates the newest installed chi itself: under
       # `bundle exec` (a Gemfile that has samagotchi) Bundler's RUBYOPT would
       # hold it to the bundle's version, and its badge would never clear.
-      child_env.merge!(unbundled_env_changes) if InstalledGem.spec
+      child_env.merge!(InstalledGem.unbundled_env_changes) if InstalledGem.spec
       opts[:env] = child_env unless child_env.empty?
       opts
     end
 
-    # What Bundler changed in ENV (RUBYOPT, BUNDLE_*), mapped back to the
-    # values from before it (nil: unset); {} outside Bundler.
-    private_class_method def self.unbundled_env_changes(env = ENV.to_h)
-      return {} unless defined?(::Bundler) && ::Bundler.respond_to?(:unbundled_env)
-
-      clean = ::Bundler.unbundled_env
-      (env.keys | clean.keys).each_with_object({}) { |key, changes| changes[key] = clean[key] unless clean[key] == env[key] }
-    end
-
     GUARDRAILS_ENV_PREFIX = "SAMAGOTCHI_GUARDRAILS_"
+    WORKER_ENV_PREFIX = "SAMAGOTCHI_WORKER_"
     # Tools::Builtins.parent_env's (Tools::TaskRuntime::MARKER_ENV_KEYS).
     SESSION_MARKER_ENV = %w[SAMAGOTCHI_PARENT_SESSION SAMAGOTCHI_SESSION_MODEL SAMAGOTCHI_SESSION_THINKING
                             SAMAGOTCHI_SESSION_REASONING_HISTORY].freeze

data/lib/samagotchi/tool_runner.rb

@@ -76,6 +76,7 @@ module Samagotchi
       call = verdict.call
       params = ToolActivity.tool_activity_params(call[:name], call, registry: tools)
       label = plugin_label(call[:name])
+      # Kept on the raw event for in-worker hooks and metrics, not sent to SSE clients.
       started = { type: :tool_call_started, iteration: iteration, call_count: call_count, call_index: call_index,
                   tool: call[:name], call: call.dup, params: params }
       started[:label] = label if label

data/lib/samagotchi/version.rb

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

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

@@ -3,15 +3,11 @@
 
 import { ACTIVITY_FIELDS, EVENT_FIELDS, pickFields } from "./activity.js";
 
-// The answer text of a :turn_completed event. `turn_summary.output` is the
-// contract; `result` is the KernelLoop result, which reaches the wire as its
-// string form (older servers, other clients' fixtures).
+// Read turn_summary.output; Bridge::ClientEvent omits result for clients.
 export function turnOutput(data) {
   if (!data) return "";
-  const summary = data.turn_summary?.output;
-  const result = typeof data.result === "string" ? data.result : data.result?.output;
-  const out = [summary, result, data.content, data.output].find((v) => typeof v === "string" && v.trim());
-  return out ? out.trim() : "";
+  const output = data.turn_summary?.output;
+  return typeof output === "string" ? output.trim() : "";
 }
 
 // The end line for a turn whose worker went away mid-turn (the footer's

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.90.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -23,6 +23,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +204,9 @@ files:
 - lib/samagotchi/bundle_command/check.rb
 - lib/samagotchi/bundle_command/scaffold.rb
 - lib/samagotchi/bundle_command/test_run.rb
+- lib/samagotchi/bundle_command/try/run.rb
+- lib/samagotchi/bundle_command/try/sandbox.rb
+- lib/samagotchi/bundle_command/try/trace.rb
 - lib/samagotchi/bundle_needs.rb
 - lib/samagotchi/bundle_session_settings.rb
 - lib/samagotchi/bundles/agents-md/manifest.yml