samagotchi 0.88.0 → 0.89.0

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/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.88.0"
+  VERSION = "0.89.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.88.0
+  version: 0.89.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