samagotchi 0.149.0 → 0.151.0

data/lib/samagotchi/bundle_command.rb

@@ -15,17 +15,19 @@ module Samagotchi
         install <source> [--scope system|project] [--force]
           Install a memory bundle from a directory, zip, tar archive, or git URL.
           Source is the path/URL to the bundle (dir/zip/tar.gz/git).
-          --force overwrites existing entries; default skips them.
+          --force overwrites existing entries (one that differs is copied to the trash first); default skips them.
 
         upgrade <source> [--scope system|project] [--force] [--dry-run] [--agent|--no-agent]
-          Upgrade a bundle (3-way merge: auto-merge if not edited, conflict otherwise).
+          Upgrade a bundle (3-way: a file you didn't edit updates; one you edited takes a text
+          merge, the old file in the bundle trash; a real conflict leaves it as it is).
           --dry-run shows what would change. --agent launches interactive session on conflict.
 
         uninstall <bundle> [--scope system|project] [--force]
-          Remove a bundle and its index entries (--force if locally edited).
+          Remove a bundle and its index entries (--force moves a locally edited file to the trash).
 
         status [<bundle>]
-          Show provenance + modification status for bundles.
+          Show provenance and each file's status for bundles. issues= counts what
+          needs you: a file that stays behind, is missing or can't be read, not one you edited.
 
         diff <bundle> [file]
           Show diffs between base/current/incoming for a bundle.
@@ -66,7 +68,7 @@ module Samagotchi
         install <source> [--scope system|project] [--force]
           Install a memory bundle from a directory, zip, tar archive, or git URL,
           or a bundle shipped with chi by name (see: chi bundle list).
-          --force overwrites existing entries; default skips them.
+          --force overwrites existing entries (one that differs is copied to the trash first); default skips them.
         install --dev PATH
           Install the bundle in the local directory PATH as a link to it: its plugin, hooks, rules and scripts
           are PATH's own files (an edit applies at the next worker or chi web restart, with no re-install) and
@@ -231,6 +233,9 @@ module Samagotchi
       run_installer(installer, failed: "Upgrade") do |manifest|
         print_hooks_and_plugin(manifest, plugin: !dry_run)
         next dry_run_done if dry_run
+
+        # Its summary said so, to someone reading.
+        Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).clear_merge_notes([], files: installer.merged_files)
         next upgrade_conflicts(installer, bundle_name, expanded_source, agent) if installer.conflicts.any? && !force
 
         print_provenance(bundle_name, manifest)
@@ -321,42 +326,64 @@ module Samagotchi
     # (scripts already read it so): not CLI::Exit::USAGE by meaning.
     CONFLICTS_KEPT = 2
 
-    # @return [Integer] 0 resolved, CONFLICTS_KEPT kept the edits
+    # @return [Integer] 0 all resolved, CONFLICTS_KEPT kept some edits
     def upgrade_conflicts(installer, bundle_name, expanded_source, agent)
-      @stdout.puts "\n#{installer.conflicts.size} conflict(s) need resolution."
-      installer.conflicts.each { |k, _| @stdout.puts "  conflict: #{k}" }
+      standing = Samagotchi::MemoryBundle::FileStanding
+      @stdout.puts "\n#{standing.stay_behind(installer.behind.size)}: #{installer.behind.map(&:file).join(", ")}"
       launch = if agent.nil? && @stdin.tty?
-                 @stdout.print "Conflicts detected — launch interactive agent to resolve? [y/N] "
+                 @stdout.print "Launch an interactive agent to merge them? [y/N] "
                  ans = begin; @stdin.gets; rescue StandardError => _e; nil; end
                  ans && ans.strip.downcase.start_with?("y")
                elsif agent.nil?
-                 @stdout.puts "Non-interactive terminal: kept your edits in the file(s) above; the rest is upgraded. Re-run with --force to take the bundle's version, or --agent in a TTY to merge."
+                 @stdout.puts "Non-interactive terminal: the rest is upgraded. #{standing::FORCE_TAKES}; --agent in a TTY merges."
                  return CONFLICTS_KEPT
                else
                  agent
                end
       unless launch
-        @stdout.puts "Kept your edits in the file(s) above; the rest is upgraded. chi bundle diff #{bundle_name} FILE shows the base; re-run with --force to take the bundle's version."
+        @stdout.puts "The rest is upgraded. #{standing.diff_hint(bundle_name, "FILE")} shows the base; #{standing::FORCE_TAKES}."
         return CONFLICTS_KEPT
       end
 
       prompt = build_conflict_prompt(bundle_name, installer.conflicts, expanded_source)
-      @stdout.puts "Launching interactive session for conflict resolution… (/exit when done)"
+      before = installer.conflicts.to_h { |key, info| [key, Samagotchi::MemoryBundle::Merger.digest(info[:current])] }
+      @stdout.puts "Launching an interactive session to merge them… (/exit when done)"
       require "samagotchi/terminal_ui"
       Samagotchi::TerminalUI.new(prompt: prompt).run
-      # The installer already recorded the upgrade (conflicted files kept
-      # their old base); the resolved files now start from the bundle's
-      # version.
-      Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).resolve_conflicts(installer.conflicts)
-      @stdout.puts "Provenance updated after interactive resolution."
-      @stdout.puts "Upgrade resolved interactively."
-      0
+      settle_conflicts(installer.conflicts, before, bundle_name)
     ensure
       # An owned source (git/zip/tar) was kept for the incoming files above;
       # the agent step is done with them now.
       installer.cleanup_source!
     end
 
+    # After the agent step. The installer already recorded the upgrade
+    # (conflicted files kept their old base); a file the step changed, with
+    # no conflict markers left, now starts from the bundle's version. Any
+    # other stays a conflict: moving its base would turn a visible miss into
+    # a kept edit the next upgrade says nothing about.
+    # @param before [Hash{String => String, nil}] each file's digest before the step
+    # @return [Integer] 0 all resolved, CONFLICTS_KEPT some still behind
+    def settle_conflicts(conflicts, before, bundle_name)
+      merger = Samagotchi::MemoryBundle::Merger
+      untouched, changed = conflicts.partition { |key, info| merger.digest(info[:current]) == before[key] }
+      marked, clean = changed.partition { |_, info| merger.markers?(info[:current]) }
+      settled = Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).resolve_conflicts(clean.to_h)
+      gone = clean.map(&:first) - settled
+      standing = Samagotchi::MemoryBundle::FileStanding
+      untouched.each { |key, _| @stdout.puts standing.still_behind(:untouched, key) }
+      marked.each { |key, _| @stdout.puts standing.still_behind(:markers, key) }
+      gone.each { |key| @stdout.puts standing.still_behind(:incoming_gone, key) }
+      if untouched.empty? && marked.empty? && gone.empty?
+        @stdout.puts "Provenance updated after interactive resolution."
+        @stdout.puts "Upgrade resolved interactively."
+        return 0
+      end
+
+      @stdout.puts "Resolved: #{settled.join(", ")}" unless settled.empty?
+      CONFLICTS_KEPT
+    end
+
     def uninstall(rest)
       parsed = parse_flags(UNINSTALL_FLAGS, rest, "uninstall", help: UNINSTALL_HELP)
       return parsed if parsed.is_a?(Integer)
@@ -377,6 +404,7 @@ module Samagotchi
         uninstaller.run
         @stdout.puts "Uninstalled bundle '#{bundle_name}'"
         puts_trashed(uninstaller.trashed_files, uninstaller.trash_dir)
+        @stdout.puts uninstaller.trash_copy_line if uninstaller.trash_copy_line
         @stdout.puts "Removed: #{uninstaller.removed_files.join(", ")}" unless uninstaller.removed_files.empty?
         hook_removed = uninstaller.removed_files.count { |f| f.start_with?("hooks/") }
         @stdout.puts "Hooks removed: #{hook_removed}" if hook_removed > 0
@@ -402,6 +430,7 @@ module Samagotchi
       result.skipped.each { |member, why| lines << "skipped #{member}: #{why}" }
       result.failed.each { |member, why| lines << "failed #{member}: #{why}" }
       lines.concat(result.kept_own_lines)
+      lines.concat(result.trash_copies)
       lines << "nothing new to install" if lines.empty?
       lines.each { |line| @stdout.puts "  #{line}" }
       @stdout.puts "(dry-run: no changes written)" if dry_run
@@ -453,16 +482,21 @@ module Samagotchi
         else
           @stdout.puts "Target: #{st.target_dir}"
         end
+        standing = Samagotchi::MemoryBundle::FileStanding
         st.files.each do |k, info|
           next @stdout.puts("  #{k}: unchecked") if info[:unchecked]
 
           mods = []
-          mods << "conflict (kept your edits over v#{st.provenance.version}: chi bundle diff #{name} #{k})" if info[:conflict]
           mods << "modified" if info[:modified]
           mods << "missing" if info[:missing]
+          mods << "unreadable" if info[:unreadable]
           mods << "no-index" unless info[:index_present] || info[:overlay]
-          label = mods.empty? ? "ok" : mods.join(",")
+          label = mods.join(",")
+          label = "ok" if mods.empty? && !info[:behind]
           label += " (model overlay)" if info[:overlay]
+          behind = info[:behind] && "#{info[:behind].state} (#{standing.diff_hint(name, k)})"
+          label = [label, behind].reject { |part| part.nil? || part.empty? }.join("; ")
+          label += "; #{info[:merge_note].line}#{" (old copy in #{info[:merge_note].trash})" if info[:merge_note].trash}" if info[:merge_note]
           @stdout.puts "  #{k}: #{label}"
         end
         # Hooks
@@ -499,7 +533,7 @@ module Samagotchi
           next @stdout.puts("  #{bname} (manifest.json unreadable)") if record.error?
 
           st = Samagotchi::MemoryBundle::Status.bundle_status(bname)
-          mods = st.files.values.count { |v| v[:modified] || v[:missing] }
+          mods = st.files.values.count { |v| v[:behind] || v[:missing] || v[:unreadable] }
           hooks_count = st.provenance.hooks.size
           hook_info = hooks_count > 0 ? " hooks=#{hooks_count}" : ""
           plugin = st.plugin
@@ -543,77 +577,62 @@ module Samagotchi
       rescue ArgumentError => e
         @stderr.puts "Bundle '#{bname}': #{e.message}"; return 1
       end
-      files = record.files
       hooks = record.hooks
       plugin_path = prov.plugin_path(record)
       plugin_file = plugin_path && File.basename(plugin_path)
-      show_plugin = lambda do
-        @stdout.puts "=== plugin/#{plugin_file} ==="
-        @stdout.puts "--- base (provenance) ---"
-        base = prov.plugin_base_path(plugin_file)
-        @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
-        @stdout.puts "--- current (on-disk) ---"
-        @stdout.puts File.exist?(plugin_path) ? File.read(plugin_path) : "(missing)"
-        @stdout.puts "--- metadata: sha256=#{record.plugin.sha256}#{" requires_chi=#{record.requires_chi}" if record.requires_chi}"
-      end
       if file_arg
         # Try file first, then hook
         if record.owns?(file_arg)
-          base = prov.base_path(file_arg)
-          cur = File.join(target_dir, file_arg)
-          @stdout.puts "=== #{file_arg} ==="
-          @stdout.puts "--- base (provenance) ---"
-          @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
-          @stdout.puts "--- current (on-disk) ---"
-          @stdout.puts File.exist?(cur) ? File.read(cur) : "(missing)"
+          diff_memory(prov, target_dir, file_arg)
         elsif hooks.key?(file_arg)
-          base = prov.base_path(file_arg)
-          cur = File.join(prov.hooks_dir, file_arg)
-          @stdout.puts "=== hooks/#{file_arg} ==="
-          @stdout.puts "--- base (provenance) ---"
-          @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
-          @stdout.puts "--- current (on-disk) ---"
-          @stdout.puts File.exist?(cur) ? File.read(cur) : "(missing)"
-          # Show hook metadata
-          @stdout.puts hook_metadata_line(hooks[file_arg])
+          diff_hook(prov, file_arg, hooks[file_arg])
         elsif plugin_file && [plugin_file, "plugin/#{plugin_file}"].include?(file_arg)
-          show_plugin.call
+          diff_plugin(prov, record, plugin_path)
         else
           @stdout.puts "=== #{file_arg} ==="
           @stdout.puts "(not found in bundle)"
         end
         @stdout.puts ""
       else
-        files.each_key do |k|
-          base = prov.base_path(k)
-          cur = File.join(target_dir, k)
-          @stdout.puts "=== #{k} ==="
-          @stdout.puts "--- base (provenance) ---"
-          @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
-          @stdout.puts "--- current (on-disk) ---"
-          @stdout.puts File.exist?(cur) ? File.read(cur) : "(missing)"
+        record.files.each_key do |key|
+          diff_memory(prov, target_dir, key)
           @stdout.puts ""
         end
-        # Hooks diff
-        hooks.each do |k, hook|
-          base = prov.base_path(k)
-          cur = File.join(prov.hooks_dir, k)
-          @stdout.puts "=== hooks/#{k} ==="
-          @stdout.puts "--- base (provenance) ---"
-          @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
-          @stdout.puts "--- current (on-disk) ---"
-          @stdout.puts File.exist?(cur) ? File.read(cur) : "(missing)"
-          @stdout.puts hook_metadata_line(hook)
+        hooks.each do |key, hook|
+          diff_hook(prov, key, hook)
           @stdout.puts ""
         end
         if plugin_file
-          show_plugin.call
+          diff_plugin(prov, record, plugin_path)
           @stdout.puts ""
         end
       end
       0
     end
 
+    def diff_memory(prov, target_dir, key)
+      print_base_and_current(key, prov.base_path(key), File.join(target_dir, key))
+    end
+
+    def diff_hook(prov, key, hook)
+      print_base_and_current("hooks/#{key}", prov.base_path(key), File.join(prov.hooks_dir, key))
+      @stdout.puts hook_metadata_line(hook)
+    end
+
+    def diff_plugin(prov, record, plugin_path)
+      file = File.basename(plugin_path)
+      print_base_and_current("plugin/#{file}", prov.plugin_base_path(file), plugin_path)
+      @stdout.puts "--- metadata: sha256=#{record.plugin.sha256}#{" requires_chi=#{record.requires_chi}" if record.requires_chi}"
+    end
+
+    def print_base_and_current(heading, base, current)
+      @stdout.puts "=== #{heading} ==="
+      @stdout.puts "--- base (provenance) ---"
+      @stdout.puts File.exist?(base) ? File.read(base) : "(no base)"
+      @stdout.puts "--- current (on-disk) ---"
+      @stdout.puts File.exist?(current) ? File.read(current) : "(missing)"
+    end
+
     def list
       listing = Samagotchi::MemoryBundle::Listing
       shipped = listing.shipped
@@ -634,6 +653,10 @@ module Samagotchi
           line = "  #{b.name.ljust(name_w)}  #{"v#{b.version || "?"}".ljust(ver_w)}  scope=#{b.scope || "?"}  " \
                  "#{b.includes ? profile_members(b.includes, installed) : "files=#{b.files}"}  installed=#{b.installed_at || "?"}"
           line += "  (shipped v#{b.upgrade.version}: chi bundle upgrade #{b.upgrade.source})" if b.upgrade
+          if b.behind&.any?
+            count = Samagotchi::MemoryBundle::FileStanding.behind_count(b.behind.size, unsure: b.behind.any?(&:unsure))
+            line += "  (#{count}: chi bundle status #{b.name})"
+          end
           @stdout.puts line
         end
         @stdout.puts "  (or all at once: chi update)" if installed.any?(&:upgrade)

data/lib/samagotchi/bundler_env.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Samagotchi
+  # Bundler's variables, in one place. Every chi spawn that must not carry a
+  # `bundle exec` around it takes its names from here.
+  module BundlerEnv
+    # All Bundler's own and its settings (BUNDLE_PATH, BUNDLE_WITHOUT, ...), for
+    # what must take none: a pattern's start (ChiShim, ProjectEnv::RESTORE_NEVER).
+    PREFIX = "BUNDLE"
+    # What `bundle exec` sets for a child (Bundler::SharedHelpers#set_bundle_variables;
+    # bundler_env_spec asks it). Without them, and without Bundler's RUBYOPT, a
+    # child ruby is free of the bundle; BUNDLER_SETUP on its own isn't: RubyGems
+    # requires what it names at boot, and a Gemfile it then finds writes its lock
+    # to BUNDLE_LOCKFILE, the bundle's. A project's own settings (BUNDLE_PATH and
+    # the like) aren't here: its `bundle` keeps them. Nor is BUNDLER_ORIG_*, which
+    # also reaches a tool: a project's `bundle exec` there reads it, for
+    # Bundler.original_env and with_unbundled_env, whose children get the PATH and
+    # GEM_* chi's own `bundle exec` started from.
+    VARS = %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE BUNDLE_LOCKFILE BUNDLER_SETUP BUNDLER_VERSION].freeze
+    # With what else `bundle exec` steers a child ruby by: what a command that
+    # isn't the bundle's runs without (TaskRuntime, ProjectEnv, ChiHome.probe).
+    CHILD_RUBY = (%w[RUBYOPT RUBYLIB] + VARS).freeze
+  end
+end

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

@@ -1,10 +1,10 @@
 ---
 name: dev
-version: 0.7.5
+version: 0.7.6
 scope: system
 description: "Developer tools"
 trust_level: reviewed
-requires_chi: ">= 0.149.0"
+requires_chi: ">= 0.150.0"
 includes:
 - known-names
 - mcp

data/lib/samagotchi/bundles/github-pr/manifest.yml

@@ -1,17 +1,17 @@
 ---
 name: github-pr
-version: 0.6.2
+version: 0.6.3
 scope: system
 description: Proposes the branch's open GitHub pull request to a session, attached once you mention it (#N, the branch or its URL), and attaches any PR URL with chi context add or the web's "+ URL"; the agent gets a note when reviews, comments, checks or its state change; in the web, a path:line in an answer links to that line of the PR; the auto_attach setting can attach the PR at once instead, or do nothing
 trust_level: reviewed
-requires_chi: ">= 0.140.0"
+requires_chi: ">= 0.150.0"
 needs:
 - command: gh
   why: reads the pull request
   hint: brew install gh, then gh auth login
 plugin:
   file: plugin.rb
-  sha256: sha256:114e999c49d4d427b7570e3f4bec8db5565ee0dd1a99f2f5ec3000748a1aec3a
+  sha256: sha256:82f8c76d38f314c3503eef3a5de0f8c0b20d0bb5bf4a3daebca43b60d00f8c7a
 scripts:
   pr_context.rb: sha256:a883d2780e89c68c0d7b6d5e0fcb22c273f17bb167e79064e0e99db6bd2ee6f0
 context_providers:

data/lib/samagotchi/bundles/github-pr/plugin.rb

@@ -5,6 +5,7 @@ require "json"
 require "open3"
 require "time"
 require "tmpdir"
+require "samagotchi/git_env"
 
 # github-pr: a session on a branch with an open GitHub PR gets the PR
 # proposed as a candidate (docs/context.md, Candidates) when its worker
@@ -334,7 +335,7 @@ class Plugin
 
   # stdout of a command that succeeded within COMMAND_SECONDS, else nil.
   def run(ctx, *command, chdir: ctx.cwd)
-    Open3.popen2(*command, chdir: chdir, err: File::NULL, pgroup: true) do |stdin, stdout, wait|
+    Open3.popen2(Samagotchi::GitEnv::UNSET, *command, chdir: chdir, err: File::NULL, pgroup: true) do |stdin, stdout, wait|
       stdin.close
       reader = Thread.new { stdout.read }
       unless wait.join(COMMAND_SECONDS)

data/lib/samagotchi/bundles/known-names/hooks/known_names.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "samagotchi/git_env"
+
 # A before_tool_call guard against near-misses of protected identifiers in
 # a tool call's command or paths: the user's home folder name, login, git
 # name and email, the repo name, and any names from config. A local model
@@ -187,7 +189,7 @@ class KnownNames
   end
 
   def git_config(root, key)
-    IO.popen(["git", "-C", root, "config", "--get", key], err: File::NULL, &:read).to_s.strip
+    IO.popen(Samagotchi::GitEnv::UNSET, ["git", "-C", root, "config", "--get", key], err: File::NULL, &:read).to_s.strip
   rescue StandardError
     ""
   end

data/lib/samagotchi/bundles/known-names/manifest.yml

@@ -1,6 +1,7 @@
 ---
 name: known-names
-version: 0.1.8
+version: 0.1.9
+requires_chi: ">= 0.150.0"
 scope: system
 description: Catches a near-miss of a protected name (home folder, login, git name, repo name, names from config) in a tool call and rejects it with the right spelling; mode ask / correct optional
 trust_level: reviewed
@@ -8,7 +9,7 @@ files:
   known_names.md: sha256:d5348b95b6c655017b541910b36e384220da280818160201f6ec9a50e1e4287c
 hooks:
   known_names.rb:
-    sha256: sha256:a851637e9292f825dc5b8877cd060184de976aa4297b114dab412a89fa3cf091
+    sha256: sha256:d7eed0dd0f418d8099a147ed124c6e6062b8c752035dd6b5aa5e926e29941c8b
     event: before_tool_call
     on_error: log
     priority: 50

data/lib/samagotchi/bundles/source-links/hooks/source_links.rb

@@ -2,6 +2,7 @@
 
 # Loaded through module_eval: it requires what it uses.
 require "open3"
+require "samagotchi/git_env"
 require "samagotchi/ref"
 
 # An after_turn (and question_asked) hook that links the source refs the
@@ -621,8 +622,7 @@ class SourceLinks
   end
 
   def read_remote(dir, name)
-    out, status = Open3.capture2({ "GIT_DIR" => nil, "GIT_WORK_TREE" => nil },
-                                 "git", "-C", dir, "remote", "get-url", name, err: File::NULL)
+    out, status = Open3.capture2(Samagotchi::GitEnv::UNSET, "git", "-C", dir, "remote", "get-url", name, err: File::NULL)
     unless status.success?
       Samagotchi::Log.debug(:hooks, "source_links_no_remote", remote: name, exit: status.exitstatus)
       return nil

data/lib/samagotchi/bundles/source-links/manifest.yml

@@ -1,15 +1,15 @@
 ---
 name: source-links
-version: 0.6.2
+version: 0.6.3
 scope: system
 description: Links source refs (JIRA tickets, GitHub issues, …) in the model's answer — inline links in the web, refs in a waiting question's reply, and a one-line note after the turn (note false turns it off); sources are configured patterns
 trust_level: reviewed
-requires_chi: ">= 0.98.0"
+requires_chi: ">= 0.150.0"
 files:
   source_links.md: sha256:ace01a0f7c308a0ae54ece714c31c0e6d7a49c372d98111030e6d268320bed3a
 hooks:
   source_links.rb:
-    sha256: sha256:7e3fafb843f1a9006b1a42f4ec647b41a358d814515cd0be73b60eb08b898992
+    sha256: sha256:21d7a9f7c381c653b126b625feed0e0b6422eaa84c8dfe716b6c5b41644a33b3
     events: [after_turn, question_asked]
     on_error: log
     priority: 90

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

@@ -1,11 +1,11 @@
 ---
 name: samagotchi-system
-version: 0.149.0
+version: 0.151.0
 scope: system
 description: Default system memories — identity, self map, config modification protocol, memory guide and the delegated-session rules
 files:
   identity.md: sha256:29c2f7df9f6c5acbc5ec17000a4490741e55e426af15ca0d81c8706edd9bd027
-  self_map.md: sha256:c9ece2d56c63fb0f9842963cb0b123e89abadec888645d7a765a2578ceefee3a
+  self_map.md: sha256:e695f78f858c29ccfef2ed6f9d6dd86d0ec067ed704a5a1956c01e53617948a1
   config_modification_protocol.md: sha256:8896d1d364ce835040f69b504518d43dbdf959b93fdd9b10f87a8de61cae84a8
-  memory_guide.md: sha256:64c3fa0703a3bdd8ae33b9e7cb341caa88a205c289d767f4877b38dfa6629fda
+  memory_guide.md: sha256:bfe9f13e8a6c929056fe531c4c74c7e05d0f17f025191c1a111c8e7dfd224fd6
   delegated.md: sha256:a0d6ddcd4a8be06526d964898611775fd251cfd9d145a9d16afaccaa503597bd

data/lib/samagotchi/bundles/system/memory_guide.md

@@ -114,9 +114,9 @@ Bundles are versioned directories/zips/tar.gz/git URLs with a `manifest.yml` and
 | Command | Purpose |
 |---------|---------|
 | `install <source> [--scope system\|project] [--force]` | Install from dir/zip/tar.gz/git URL. `--force` overwrites existing entries, otherwise skips them; a skipped file stays the user's (not recorded, never upgraded or removed by the bundle). Writes provenance to `.bundles/<name>/` (base snapshots + `manifest.json`) and updates `index.md`. Warns on double-brace placeholders and checksum mismatches (strict mode). |
-| `upgrade <source> [--force] [--dry-run] [--agent]` | 3-way merge upgrade (base vs current vs incoming) per `Merger.classify`: `install` (new file), `noop` (current==incoming), `fast_forward` (current==base, not edited → auto-update), `keep` (incoming==base → preserve local edits), `conflict` (both edited → warn, needs `--force` or interactive `memory_write` resolution). Pruned files (removed from new bundle) are kept if locally edited, otherwise warned. |
+| `upgrade <source> [--force] [--dry-run] [--agent]` | 3-way merge upgrade (base vs current vs incoming) per `Merger::Upgrade#outcome` (`Merger.classify`, then a text merge where both sides changed): `install` (new file), `noop` (current==incoming), `fast_forward` (current==base, not edited → auto-update), `keep` (incoming==base → preserve local edits), `merged` (both edited, a text merge with `git` comes out clean → the file takes it, the old one goes to the bundle trash, and entries both sides added under a `Changelog` heading are kept), `conflict` (both edited, a real conflict, or no `git` or base → the file stays untouched and marked, reported as `X stays behind 0.8.0: …` with why and what it missed, needs a retry, `--force`, which copies it to the trash first, or interactive `memory_write` resolution). A marked file is retried at the same version: the system bundle's at each chi start and on `chi update`, another shipped bundle's on `chi update`, any other bundle's on `chi bundle upgrade`. A file marked by an older chi merges normally when its recorded base is a version chi shipped (an installed samagotchi gem still has it); otherwise it merges only if the bundle takes out or rewords no line it still holds, and if it does, it stays behind until resolved by hand, with `--agent` or with `--force`, and the retry can't fix that. Pruned files (removed from new bundle) are kept if locally edited, otherwise warned. |
 | `uninstall <bundle> [--force]` | Moves the bundle's memory files to `.bundles/.trash/<bundle>-<time>/` (refuses locally edited ones unless `--force`; keeps a file another installed bundle also lists), removes their `index.md` lines, deletes the provenance dir. |
-| `status [<bundle>]` | Provenance + per-file `ok|modified|missing|no-index` vs stored checksum and base snapshot; a model overlay (`<name>.<key>.md`) has no index line and reads `ok (model overlay)`. |
+| `status [<bundle>]` | Provenance + per-file `ok|modified|missing|unreadable|no-index` vs stored checksum and base snapshot, and what stays behind or merged at a chi start; `issues=` counts files behind, missing or unreadable, not edits; a model overlay (`<name>.<key>.md`) has no index line and reads `ok (model overlay)`. |
 | `diff <bundle> [file]` | Prints `base` (provenance snapshot) vs `current` (on-disk) for each file. |
 | `list` | Lists installed bundles (`name v<version> scope files installed_at`, plus the shipped version when newer) and the bundles shipped with chi that are not installed (`install <name>` installs one), grouped under their profile; an installed profile shows `includes=` and `left out=`. |
 | `build [--scope system\|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]` | **Inverse of install** — builds a shareable bundle from local memories and installed hooks. Infers `zip` vs `dir`/`tar.gz` from `--out` extension; default `chi_system_memories.zip` (system) or `chi_<repo>_memories.zip` (project, named after the project root) v`1.0.0` in `Dir.pwd`. `FILES...` is an optional allowlist of memory basenames (`identity` or `identity.md`); if omitted, all `*.md` except `index.md`/hidden/non-md and the memories other installed bundles own (each named in a `Left out` line) are included. Installed hooks are copied to `hooks/` with their manifest metadata. Computes `sha256:` checksums and writes `manifest.yml` via `Manifest.write`. No provenance write. |
@@ -138,7 +138,7 @@ chi bundle install https://github.com/org/bundle.git#v1.2.0 --scope system --for
 
 # check what would change and upgrade
 chi bundle upgrade ./my-bundle --dry-run
-chi bundle upgrade ./my-bundle  # auto-merges, warns on conflicts
+chi bundle upgrade ./my-bundle  # merges your edits, warns on a real conflict
 
 # share again after editing
 chi bundle build --scope system --out updated.zip
@@ -155,9 +155,9 @@ chi bundle build --scope system --out updated.zip
 2. **Prefer project scope** for repo decisions; `system` for cross-project identity/preferences.
 3. **One concept per file:** small files merge and share better than monoliths.
 4. **Use bundles for sharing:** `build` → zip → share → `install`. Do not copy raw `~/.config` paths in docs — give `chi bundle install <url>` instructions.
-5. **Respect local edits:** installs skip existing files by default; use `--force` only when the user explicitly wants overwrite. Upgrades preserve edits (`keep`) or report `conflict` — guide the user to resolve via `memory_read`/`memory_write` or `chi bundle diff <bundle>` + `--force`.
+5. **Respect local edits:** installs skip existing files by default; use `--force` only when the user explicitly wants overwrite. Upgrades preserve edits (`keep`, `merged`) or report `conflict`, leaving the file behind — guide the user to resolve via `memory_read`/`memory_write` or `chi bundle diff <bundle>` + `--force`.
 6. **Keep secrets out:** never write tokens/keys to memories — they are plain files and go into bundles.
 
 ## Current system bundle
 
-`samagotchi-system` (`lib/samagotchi/bundles/system/manifest.yml`) ships `identity.md` + `self_map.md` + `config_modification_protocol.md` + `delegated.md` + this guide itself. It is auto-installed/upgraded on first `Engine` creation (`SystemBundle.ensure!`) — no manual install needed. Its files are managed by chi: a newer chi upgrades them (a 3-way merge keeps local edits and reports conflicts), so put your own preferences in separate memories rather than editing these.
+`samagotchi-system` (`lib/samagotchi/bundles/system/manifest.yml`) ships `identity.md` + `self_map.md` + `config_modification_protocol.md` + `delegated.md` + this guide itself. It is auto-installed/upgraded on first `Engine` creation (`SystemBundle.ensure!`) — no manual install needed. Its files are managed by chi: a newer chi upgrades them (a text merge keeps local edits, and a real conflict leaves the file behind), so put your own preferences in separate memories rather than editing these.

data/lib/samagotchi/bundles/system/self_map.md

@@ -83,7 +83,7 @@
   `file:line`. Read the source `chi self` reports, not some other checkout on disk.
 - Installed gem files and bundled memories (`identity`, `memory_guide`,
   `config_modification_protocol`, `self_map`, `delegated`) are managed: don't edit them
-  (local edits conflict on upgrade).
+  (an upgrade merges local edits when it can, and a real conflict leaves the file behind).
   Put notes in my own memories. Guidance for some models only is a model note
   (`model_notes_<name>`, first line `models: <glob>`; memory_guide); a model-only
   addition to one memory is an overlay on it (`current_model_only: true`), and it

data/lib/samagotchi/chi_home.rb

@@ -6,6 +6,7 @@ require "open3"
 require "rbconfig"
 require "time"
 require_relative "atomic_file"
+require_relative "bundler_env"
 require_relative "installed_gem"
 require_relative "log"
 require_relative "paths"
@@ -33,8 +34,9 @@ module Samagotchi
     # Where `mise` usually is when PATH doesn't have it (launchd's bare PATH).
     MISE_DIRS = ["/opt/homebrew/bin", "/usr/local/bin", File.join(Dir.home, ".local", "bin")].freeze
     # What a probe of another Ruby must not inherit: they would move it off
-    # its own gems.
-    PROBE_UNSET = %w[GEM_HOME GEM_PATH RUBYOPT RUBYLIB BUNDLE_GEMFILE BUNDLE_BIN_PATH].freeze
+    # its own gems. BUNDLER_SETUP alone does: RubyGems requires what it names at
+    # boot, and a bundle with a path then replaces GEM_HOME and GEM_PATH.
+    PROBE_UNSET = (%w[GEM_HOME GEM_PATH] + BundlerEnv::CHILD_RUBY).freeze
     PROBE = "require 'json'; print JSON.generate('ruby' => RbConfig.ruby, 'gem_home' => Gem.dir, " \
             "'gem_path' => Gem.path.join(File::PATH_SEPARATOR))"
     GEMSPEC = /\Asamagotchi-(#{Gem::Version::VERSION_PATTERN})\.gemspec\z/

data/lib/samagotchi/chi_shim.rb

@@ -3,6 +3,7 @@
 require "fileutils"
 require "shellwords"
 require_relative "atomic_file"
+require_relative "bundler_env"
 require_relative "chi_home"
 require_relative "log"
 require_relative "paths"
@@ -25,7 +26,7 @@ module Samagotchi
     # ruby: unset before the exec.
     UNSET = "unset RUBYOPT RUBYLIB RUBYGEMS_GEMDEPS GEMRC LD_PRELOAD LD_LIBRARY_PATH DYLD_INSERT_LIBRARIES " \
             "DYLD_LIBRARY_PATH\n" \
-            "for v in $(/usr/bin/env | /usr/bin/sed -n 's/^\\(BUNDLE[A-Za-z0-9_]*\\)=.*/\\1/p'); do unset \"$v\"; done\n"
+            "for v in $(/usr/bin/env | /usr/bin/sed -n 's/^\\(#{BundlerEnv::PREFIX}[A-Za-z0-9_]*\\)=.*/\\1/p'); do unset \"$v\"; done\n"
 
     module_function
 

data/lib/samagotchi/child_env.rb

@@ -20,16 +20,23 @@ module Samagotchi
     # (Tools::Builtins.parent_env): that session's, not a child chi's.
     SESSION_MARKERS = %w[SAMAGOTCHI_PARENT_SESSION SAMAGOTCHI_SESSION_MODEL SAMAGOTCHI_SESSION_THINKING
                          SAMAGOTCHI_SESSION_REASONING_HISTORY].freeze
+    # "1" in the chi update an automatic run starts (Web::UpdateOps): no person
+    # reads its rows. An env marker, so it reaches the chi a hand-over or the home
+    # execs, and an older chi that doesn't know it simply ignores it.
+    UNATTENDED_UPDATE = "SAMAGOTCHI_UPDATE_UNATTENDED"
 
     module_function
 
     # The keys of +env+ a child chi must not inherit: the guardrails
     # settings, the session markers, a smoke's fake "newest installed"
-    # (InstalledVersions::ENV_KEY, for the spawner's notices only) and the
-    # worker's project env marker and record (a child worker applies its own).
+    # (InstalledVersions::ENV_KEY, for the spawner's notices only), the
+    # worker's project env marker and record (a child worker applies its own) and
+    # an automatic update's marker (a session someone starts from one isn't it; the
+    # update's own hand-over execs, which this doesn't touch).
     # @return [Array<String>]
     def spawner_keys(env = ENV)
-      env.each_key.select { |key| key.start_with?(GUARDRAILS_PREFIX) } + SESSION_MARKERS + [InstalledVersions::ENV_KEY, ProjectEnv::MARKER_ENV, ProjectEnv::ORIG_ENV]
+      env.each_key.select { |key| key.start_with?(GUARDRAILS_PREFIX) } + SESSION_MARKERS +
+        [InstalledVersions::ENV_KEY, ProjectEnv::MARKER_ENV, ProjectEnv::ORIG_ENV, UNATTENDED_UPDATE]
     end
 
     # #spawner_keys mapped to nil: Process.spawn unsets a key mapped to nil.

data/lib/samagotchi/engine.rb

@@ -1107,6 +1107,8 @@ module Samagotchi
     # @raise [ArgumentError] a card without a title, or a bad action
     def show_card(source:, title:, body: "", actions: [], level: :info, id: nil)
       card = Plugin::Card.build(source: source, title: title, body: body, actions: actions, level: level, id: id)
+      command = Thread.current[running_command_key]
+      card[:command] = command if command
       @event_routes.route(card, **EventRoutes::CARD_MARKS)
       card[:id]
     end
@@ -1126,6 +1128,20 @@ module Samagotchi
       Thread.current[key] = outer
     end
 
+    # Run a session command's dispatch: a card shown on this thread says
+    # it's that command's (:card's command:), for a reload that no longer has
+    # the command's line above it (Bridge::CardStore). A thread of its own
+    # isn't the command, nor a card shown after it.
+    # @param name [String] the command, "/short"
+    # @return the block's value
+    def running_command(name)
+      outer = Thread.current[running_command_key]
+      Thread.current[running_command_key] = name
+      yield
+    ensure
+      Thread.current[running_command_key] = outer
+    end
+
     # Whether an anytime command (/btw) still runs on its thread.
     def anytime_running?
       @lifecycle_mutex.synchronize { @anytime_threads.any?(&:alive?) }
@@ -2266,7 +2282,7 @@ module Samagotchi
 
       messages = @session&.messages || []
       covered = state[:covered].to_i
-      turns_since = Array(messages).drop(covered).count { |m| Steer.turn_prompt?(m) }
+      turns_since = Array(messages).drop(covered).count { |m| Steer.turn_opening?(m) }
       { text: state[:text], covered: covered, turns_since: turns_since, created_at: state[:created_at] }
     end
 
@@ -2974,6 +2990,8 @@ module Samagotchi
 
     private
 
+    def running_command_key = :"samagotchi_command_#{object_id}"
+
     # The one named seam for replacing a session's conversation (the
     # array is replaced, never mutated in place). No lock: a reader gets
     # the old array or the new one, and both are whole.