samagotchi 0.52.0 → 0.54.0

data/lib/samagotchi/memory_bundle/installer.rb

@@ -10,7 +10,7 @@ require_relative "placeholder"
 require_relative "index_updater"
 require_relative "merger"
 require_relative "trash"
-require_relative "../version"
+require_relative "asset_installer"
 require_relative "../bundle_needs"
 require_relative "../model_overlay"
 
@@ -18,13 +18,15 @@ module Samagotchi
   module MemoryBundle
     # Installs a bundle into a scoped memories directory.
     #
-    # Flow:
-    #   1. Normalize source → directory (returns [path, owned])
-    #   2. Read manifest.yml
-    #   3. Copy .md files to target scope dir (skip or force)
-    #   4. Verify checksums (strict mode)
-    #   5. Update index.md for each entry
-    #   6. Write provenance (.bundles/<name>/)
+    # Flow (#run):
+    #   1. Normalize source → directory, read manifest.yml (load_source)
+    #   2. Copy .md files to the target scope dir and update index.md
+    #      (install_memories: plain, dry run, or an upgrade's 3-way merge)
+    #   3. Hooks, guardrail rules, plugin, scripts into .bundles/<name>/
+    #      (AssetInstaller)
+    #   4. An upgrade prunes the files the bundle dropped
+    #   5. Verify checksums (strict mode), warn about missing needs
+    #   6. Write provenance (.bundles/<name>/manifest.json, write_provenance)
     #   7. Detect and report {{placeholders}}
     class Installer
       class InstallError < StandardError; end
@@ -51,8 +53,10 @@ module Samagotchi
       # none moved).
       def trash_dir = @trash.dir
 
-      # The normalized source dir, kept alive past #run when an upgrade has
-      # conflicts (the agent step reads the incoming files); nil once cleaned.
+      # The normalized source dir. An owned one (a git/zip/tar extract) is
+      # removed after #run, or kept until #cleanup_source! when an upgrade
+      # has conflicts (the agent step reads the incoming files); nil once
+      # cleaned.
       attr_reader :source_dir
 
       # Removes the normalized source dir an owned source (git/zip/tar) was
@@ -60,395 +64,49 @@ module Samagotchi
       # conflict prompt and resolve_conflicts can still read the incoming
       # files; the caller runs it once the agent step is done. Idempotent.
       def cleanup_source!
-        return unless @defer_cleanup && @normalized_dir
+        return unless @defer_cleanup && @source_dir
 
-        SourceNormalizer.cleanup(@normalized_dir)
-        @normalized_dir = nil
+        SourceNormalizer.cleanup(@source_dir)
+        @source_dir = nil
         @defer_cleanup = false
       end
 
       def run
-        normalized_dir = nil
-        source_owned = false
-        source_commit = nil
-        manifest = nil
-        begin
-          normalized_dir, source_owned, source_commit = SourceNormalizer.normalize(@source)
-          @bundle_dir = normalized_dir
-          @normalized_dir = normalized_dir
-          manifest = Manifest.read(dir: normalized_dir)
-        rescue SourceNormalizer::UnknownSourceError => e
-          raise InstallError, "Source normalization failed: #{e.message}"
-        rescue Manifest::ValidationError => e
-          raise InstallError, e.message if @strict
-
-          @warnings << "No manifest found — proceeding without strict manifest validation"
-        end
-
-        # Determine target scope (CLI wins over manifest).
-        cli_scope = @scope.to_s.strip.empty? ? nil : @scope
-        target_scope = cli_scope || manifest&.scope || "system"
-        target_dir = MemoryPaths.scope_dir(target_scope) or raise InstallError, "invalid scope: #{target_scope}"
-        FileUtils.mkdir_p(target_dir)
-
-        # Copy .md files and update index for each.
-        @file_descriptions = manifest&.file_descriptions || {}
-        all_files_in_bundle = []
-        provenance = Provenance.new(name: @name)
-        existing_provenance = provenance.read
+        load_source
+        @target_scope, @target_dir = resolve_target
+        @file_descriptions = @manifest&.file_descriptions || {}
+        @provenance = Provenance.new(name: @name)
+        @existing = @provenance.record
         # A plain install over an installed bundle: summary points at upgrade.
-        @reinstall = existing_provenance && !@upgrade && !@force && !@dry_run
-        # The bundle owns (records, upgrades, removes) only the files it
-        # wrote: these, from an earlier install, and the ones written now.
-        # A same-name file that was already there is the user's: skipped
-        # and never recorded.
-        owned_before = existing_provenance && existing_provenance[:files].is_a?(Hash) ? existing_provenance[:files].keys.map(&:to_s) : []
-        owned = []
-
-        Dir.glob(File.join(normalized_dir, "*.md")).each do |file_path|
-          file_key = File.basename(file_path)
-          all_files_in_bundle << file_key
-          note_overlay(file_key, target_dir)
-          target_path = File.join(target_dir, file_key)
-
-          if @upgrade && existing_provenance && !@force && File.exist?(target_path) && !owned_before.include?(file_key)
-            # Not the bundle's (the user's, or another bundle's): no merge.
-            skip_existing(file_key, file_path, target_path, target_scope)
-          elsif @upgrade && existing_provenance && !@force && !@dry_run
-            # 3-way merge path for upgrades
-            owned << file_key
-            base_path = provenance.base_path(file_key)
-            classification = Merger.classify(base_path: base_path, current_path: target_path, incoming_path: file_path)
-            case classification
-            when :install
-              FileUtils.cp(file_path, target_path)
-              @results[file_key] = { status: "installed" }
-              update_target_index(target_scope, target_path, file_key)
-            when :fast_forward
-              FileUtils.cp(file_path, target_path)
-              @results[file_key] = { status: "updated", reason: "auto-merged (not edited)" }
-              update_target_index(target_scope, target_path, file_key)
-            when :keep
-              @results[file_key] = { status: "kept", reason: "bundle unchanged, local edits preserved" }
-              update_target_index(target_scope, target_path, file_key)
-            when :noop
-              @results[file_key] = { status: "skipped", reason: "already up to date" }
-              update_target_index(target_scope, target_path, file_key)
-            when :conflict
-              @results[file_key] = { status: "conflict", reason: "local edits conflict with bundle update" }
-              @conflicts[file_key] = { base: base_path, current: target_path, incoming: file_path }
-              @warnings << "Conflict in #{file_key}: local edits conflict with bundle update (use --force to overwrite or resolve interactively)"
-              update_target_index(target_scope, target_path, file_key)
-            end
-          elsif @dry_run
-            # Dry-run: classify but do not write
-            if File.exist?(target_path) && !@force
-              if @upgrade && existing_provenance
-                base_path = provenance.base_path(file_key)
-                classification = Merger.classify(base_path: base_path, current_path: target_path, incoming_path: file_path)
-                @results[file_key] = { status: classification.to_s }
-                @conflicts[file_key] = { base: base_path, current: target_path, incoming: file_path } if classification == :conflict
-              elsif FileUtils.identical?(file_path, target_path)
-                @results[file_key] = { status: "skipped", reason: "already up to date" }
-              else
-                @results[file_key] = { status: "would_skip" }
-              end
-            else
-              @results[file_key] = { status: "would_install" }
-            end
-          elsif File.exist?(target_path) && !@force
-            # A re-install keeps what an earlier install wrote.
-            owned << file_key if owned_before.include?(file_key)
-            skip_existing(file_key, file_path, target_path, target_scope, owned: owned_before.include?(file_key))
-          else
-            FileUtils.cp(file_path, target_path) unless @dry_run
-            owned << file_key
-            @results[file_key] = { status: "installed" }
-            # Update index for newly installed files.
-            update_target_index(target_scope, target_path, file_key) unless @dry_run
-          end
-        end
-
-        # ── Hooks: copy hooks/*.rb into <bundle_dir>/hooks/ ───────────────
-        hooks_target = File.join(provenance.bundle_dir, "hooks")
-        all_hooks_in_bundle = []
-        hooks_files_for_provenance = {}
-        if manifest
-          hook_entries = manifest.hooks
-          # Fallback: if manifest has no hooks but source has hooks/*.rb, discover them
-          if hook_entries.empty?
-            discovered = Dir.glob(File.join(normalized_dir, "hooks", "*.rb")).map { |p| File.basename(p) }
-            discovered.each do |bn|
-              # Build minimal metadata so copy still happens (event unknown -> skipped by loader but copied for integrity)
-              hook_entries[bn] = { sha256: "", event: "", on_error: "skip", priority: 100 }
-            end
-          end
-
-          hook_entries.each do |basename, _meta|
-            next unless basename.is_a?(String) && !basename.empty?
-
-            all_hooks_in_bundle << basename
-            src = File.join(normalized_dir, "hooks", basename)
-            next unless File.exist?(src)
-
-            dest = File.join(hooks_target, basename)
-
-            if @dry_run
-              @results[basename] = if File.exist?(dest) && !@force
-                                     { status: "would_skip" }
-                                   else
-                                     { status: "would_install" }
-                                   end
-              next
-            end
-
-            # Local-edit detection for upgrade path (overwrite + warn)
-            if @upgrade && existing_provenance && File.exist?(dest) && !@force
-              prev_meta = existing_provenance[:hooks] ? (existing_provenance[:hooks][basename.to_sym] || existing_provenance[:hooks][basename]) : nil
-              if prev_meta
-                prev_sha = prev_meta[:sha256] || prev_meta["sha256"]
-                if File.exist?(dest) && !Provenance.recorded_sha(prev_sha).empty? && !Provenance.sha_matches?(dest, prev_sha)
-                  @warnings << "Hook #{basename} was locally modified; overwriting"
-                end
-              end
-            end
-
-            FileUtils.mkdir_p(hooks_target)
-            unchanged = File.exist?(dest) && FileUtils.identical?(src, dest)
-            FileUtils.cp(src, dest)
-            @results[basename] = if unchanged
-                                   { status: "skipped", reason: "already up to date" }
-                                 elsif @upgrade && existing_provenance
-                                   { status: "updated" }
-                                 else
-                                   { status: "installed" }
-                                 end
-            hooks_files_for_provenance[basename] = dest
-          end
-        else
-          # No manifest (non-strict): still copy any hooks/*.rb if present
-          Dir.glob(File.join(normalized_dir, "hooks", "*.rb")).each do |src|
-            basename = File.basename(src)
-            all_hooks_in_bundle << basename
-            dest = File.join(hooks_target, basename)
-            if @dry_run
-              @results[basename] = { status: "would_install" }
-            else
-              FileUtils.mkdir_p(hooks_target)
-              FileUtils.cp(src, dest)
-              @results[basename] = { status: "installed" }
-              hooks_files_for_provenance[basename] = dest
-            end
-          end
-        end
-
-        # Prune stale hooks (removed from bundle) — reuse bases pruning via provenance but also remove files
-        if @upgrade && existing_provenance && existing_provenance[:hooks] && !@dry_run
-          existing_provenance[:hooks].keys.each do |old_key|
-            old_key_str = old_key.to_s
-            next if all_hooks_in_bundle.include?(old_key_str)
-
-            old_dest = File.join(hooks_target, old_key_str)
-            if File.exist?(old_dest) && !@force
-              @warnings << "Bundle no longer includes hook #{old_key_str} but local file exists — removing"
-            end
-            FileUtils.rm_f(old_dest)
-          end
-        end
-
-        # Verify hook checksums in strict mode (mirror .md block)
-        if manifest && @strict
-          all_hooks_in_bundle.each do |basename|
-            next if @conflicts.key?(basename)
-
-            expected = manifest.checksum_for_hook(basename)
-            next unless expected
-
-            dest = File.join(hooks_target, basename)
-            next unless File.exist?(dest)
-
-            actual = Digest::SHA256.hexdigest(File.read(dest))
-            if actual != expected
-              @warnings << "Checksum mismatch for hook #{basename}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-            end
-          end
-        end
-
-        # ── Guardrail rules: guardrails/*.yml into <bundle_dir>/guardrails/ ─
-        # The bundle's set replaces what an earlier version installed.
-        guardrails_target = provenance.guardrails_dir
-        guardrail_files_for_provenance = {}
-        incoming_rules = Dir.glob(File.join(normalized_dir, "guardrails", "*.yml")).sort
-        if @dry_run
-          incoming_rules.each { |src| @results["guardrails/#{File.basename(src)}"] = { status: "would_install" } }
-        else
-          # Same bytes as installed: reported as up to date, not "Installed".
-          unchanged = incoming_rules.select do |src|
-            dest = File.join(guardrails_target, File.basename(src))
-            File.file?(dest) && FileUtils.identical?(src, dest)
-          end
-          FileUtils.rm_rf(guardrails_target)
-          unless incoming_rules.empty?
-            FileUtils.mkdir_p(guardrails_target)
-            incoming_rules.each do |src|
-              dest = File.join(guardrails_target, File.basename(src))
-              FileUtils.cp(src, dest)
-              @results["guardrails/#{File.basename(src)}"] =
-                unchanged.include?(src) ? { status: "skipped", reason: "already up to date" } : { status: "installed" }
-              guardrail_files_for_provenance[File.basename(src)] = dest
-            end
-          end
-        end
+        @reinstall = @existing && !@upgrade && !@force && !@dry_run
+        install_memories
 
-        # ── Plugin: <file> into <bundle_dir>/plugin/ (docs/plugins.md) ────
-        # Like the rules, the bundle's plugin replaces an earlier one.
-        plugin_file_for_provenance = install_plugin(manifest, normalized_dir, provenance)
-        # ── Scripts: scripts/<file> into <bundle_dir>/scripts/ ────────────
-        scripts_for_provenance = install_scripts(manifest, normalized_dir, provenance)
-        warn_hooks_requires_chi(manifest, all_hooks_in_bundle)
-        warn_rules_requires_chi(manifest, incoming_rules)
+        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
+        ).run
 
         # Files the previous version shipped and this one doesn't.
-        if @upgrade && existing_provenance && existing_provenance[:files]
-          prune_dropped_files(existing_provenance[:files], all_files_in_bundle, target_dir, target_scope, provenance)
-        end
-
-        # Verify checksums if we have a manifest (strict).
-        if manifest && @strict
-          all_files_in_bundle.each do |file_key|
-            next if @conflicts.key?(file_key)
-
-            status = @results[file_key] ? @results[file_key][:status].to_s : nil
-            # skipped: not copied, so a local edit isn't a bad download.
-            next if %w[kept kept_pruned fast_forward updated skipped].include?(status)
-
-            # For dry-run, fast_forward would appear as "fast_forward", updated not yet
-            target_path = File.join(target_dir, file_key)
-            next unless File.exist?(target_path)
-
-            expected = manifest.checksum_for(file_key)
-            next unless expected
-
-            actual = Digest::SHA256.hexdigest(File.read(target_path))
-            if actual != expected
-              @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-            end
-          end
+        prune_dropped_files(@existing.files, @bundle_md, @target_dir, @target_scope, @provenance) if @upgrade && @existing
+        verify_memory_checksums if @manifest && @strict
+        warn_missing_needs(@manifest) if @manifest
+        if @manifest && !@dry_run
+          write_provenance(installed)
         end
+        detect_placeholders
 
-        warn_missing_needs(manifest) if manifest
-
-        # Write provenance (only if we had a manifest and not dry_run). An
-        # upgrade with conflicts writes it too: the new version, the plugin's
-        # and hooks' new shas, and the old base for each conflicted file,
-        # marked conflict (chi bundle status shows it). Skipping it left the
-        # replaced plugin failing its sha check.
-        if manifest && !@dry_run
-          provenance_files = {}
-          if @upgrade && existing_provenance
-            owned.each do |file_key|
-              target_path = File.join(target_dir, file_key)
-              next unless File.exist?(target_path)
-
-              status = @results[file_key] ? @results[file_key][:status].to_s : nil
-              if %w[kept noop conflict kept_pruned].include?(status)
-                # Keep old base snapshot — do not overwrite with edited current
-                # Use base snapshot as source if it exists to preserve old checksum
-                base_path = provenance.base_path(file_key)
-                provenance_files[file_key] = if File.exist?(base_path)
-                                               # Keep existing provenance entry by re-using base content
-                                               # We still need to include it to prevent pruning, but with base content
-                                               base_path
-                                             else
-                                               target_path
-                                             end
-              else
-                # installed, updated, skipped — use current target (which is incoming for updated)
-                provenance_files[file_key] = target_path
-              end
-            end
-            # Handle pruned but kept files (bundle removed file but local kept)
-            if existing_provenance[:files]
-              existing_provenance[:files].keys.each do |old_key|
-                old_key_str = old_key.to_s
-                next if all_files_in_bundle.include?(old_key_str)
-
-                # If it was kept_pruned, include it with base content to prevent pruning
-                next unless @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
-
-                base_path = provenance.base_path(old_key_str)
-                target_path = File.join(target_dir, old_key_str)
-                # Use base if exists to keep old checksum, else target
-                src = File.exist?(base_path) ? base_path : target_path
-                provenance_files[old_key_str] = src if File.exist?(src)
-              end
-            end
-          else
-            owned.each do |file_key|
-              target_path = File.join(target_dir, file_key)
-              next unless File.exist?(target_path)
-
-              # Skipped for a local edit: keep the installed base, so the
-              # next upgrade still sees the edit (not a fast-forward over it).
-              base_path = provenance.base_path(file_key)
-              kept = existing_provenance && @results.dig(file_key, :reason) == "already exists" && File.exist?(base_path)
-              provenance_files[file_key] = kept ? base_path : target_path
-            end
-          end
-          # Build hooks metadata for provenance
-          hooks_for_provenance = {}
-          if manifest && manifest.hooks && !manifest.hooks.empty?
-            hooks_for_provenance = manifest.hooks
-          elsif hooks_files_for_provenance.any?
-            hooks_files_for_provenance.each do |basename, path|
-              next unless File.exist?(path)
-
-              sha = Digest::SHA256.hexdigest(File.read(path))
-              hooks_for_provenance[basename] = { "sha256" => "sha256:#{sha}", "event" => "", "on_error" => "skip", "priority" => 100 }
-            end
-          end
-          Provenance.new(name: @name).write(
-            files: provenance_files,
-            scope: target_scope,
-            version: manifest.version,
-            source_path: @source,
-            hooks: hooks_for_provenance,
-            trust_level: manifest.trust_level,
-            source_commit: source_commit,
-            hooks_files: hooks_files_for_provenance,
-            guardrails_files: guardrail_files_for_provenance,
-            plugin_file: plugin_file_for_provenance,
-            requires_chi: manifest.requires_chi,
-            needs: manifest.needs,
-            conflicts: @conflicts.keys,
-            scripts_files: scripts_for_provenance,
-            context_providers: manifest.context_providers,
-            file_descriptions: manifest.file_descriptions
-          )
-        end
-
-        # Detect placeholders.
-        all_files_in_bundle.each do |file_key|
-          file_path = File.join(target_dir, file_key)
-          next unless File.exist?(file_path)
-
-          names = Placeholder.detect_in_file(file_path)
-          if names.any?
-            @placeholder_warnings << "#{file_key}: {{#{names.join("}}, {{")}}}"
-          end
-        end
-
-        [normalized_dir, manifest]
+        [@bundle_dir, @manifest]
       ensure
         # An owned source (git/zip/tar) is cleaned up here, unless an upgrade
         # kept conflicts: the agent step still needs the incoming files, so
         # the caller runs #cleanup_source! when it is done.
-        if source_owned
+        if @source_owned
           if @conflicts.any? && !@dry_run
             @defer_cleanup = true
           else
-            SourceNormalizer.cleanup(normalized_dir)
-            @normalized_dir = nil
+            SourceNormalizer.cleanup(@source_dir)
+            @source_dir = nil
           end
         end
       end
@@ -483,6 +141,217 @@ module Samagotchi
 
       private
 
+      # The source normalized to a dir (@bundle_dir; an owned one, extracted
+      # from git/zip/tar, is cleaned up after #run) and its manifest.yml
+      # (@manifest, nil when it has none and the install isn't strict).
+      def load_source
+        @bundle_dir, @source_owned, @source_commit = SourceNormalizer.normalize(@source)
+        @source_dir = @bundle_dir
+        @manifest = Manifest.read(dir: @bundle_dir)
+      rescue SourceNormalizer::UnknownSourceError => e
+        raise InstallError, "Source normalization failed: #{e.message}"
+      rescue Manifest::ValidationError => e
+        raise InstallError, e.message if @strict
+
+        @warnings << "No manifest found — proceeding without strict manifest validation"
+      end
+
+      # The scope the files go to (the CLI's wins over the manifest's) and
+      # its dir, created.
+      # @return [Array(String, String)] scope, dir
+      def resolve_target
+        cli_scope = @scope.to_s.strip.empty? ? nil : @scope
+        scope = cli_scope || @manifest&.scope || "system"
+        dir = MemoryPaths.scope_dir(scope) or raise InstallError, "invalid scope: #{scope}"
+        FileUtils.mkdir_p(dir)
+        [scope, dir]
+      end
+
+      # Copies the bundle's *.md files into the target dir and refreshes
+      # their index lines: an upgrade merges (merge_memory), a dry run only
+      # classifies (preview_memory), a plain install writes the new ones.
+      # Sets @bundle_md (every file the bundle ships) and @owned: the bundle
+      # owns (records, upgrades, removes) only the files it wrote, these
+      # from an earlier install and the ones written now. A same-name file
+      # that was already there is the user's: skipped and never recorded.
+      def install_memories
+        owned_before = @existing ? @existing.files.keys : []
+        @bundle_md = []
+        @owned = []
+        Dir.glob(File.join(@bundle_dir, "*.md")).each do |file_path|
+          file_key = File.basename(file_path)
+          @bundle_md << file_key
+          note_overlay(file_key, @target_dir)
+          target_path = File.join(@target_dir, file_key)
+          merging = @upgrade && @existing && !@force
+
+          if merging && File.exist?(target_path) && !owned_before.include?(file_key)
+            # Not the bundle's (the user's, or another bundle's): no merge.
+            skip_existing(file_key, file_path, target_path, @target_scope)
+          elsif merging && !@dry_run
+            @owned << file_key
+            merge_memory(file_key, file_path, target_path)
+          elsif @dry_run
+            preview_memory(file_key, file_path, target_path)
+          elsif File.exist?(target_path) && !@force
+            # A re-install keeps what an earlier install wrote.
+            @owned << file_key if owned_before.include?(file_key)
+            skip_existing(file_key, file_path, target_path, @target_scope, owned: owned_before.include?(file_key))
+          else
+            FileUtils.cp(file_path, target_path)
+            @owned << file_key
+            @results[file_key] = { status: "installed" }
+            update_target_index(@target_scope, target_path, file_key)
+          end
+        end
+      end
+
+      # An upgrade's 3-way merge of one file (Merger.classify against the
+      # base the last install recorded); a conflict leaves the local file
+      # and is recorded in @conflicts for the agent step.
+      def merge_memory(file_key, file_path, target_path)
+        base_path = @provenance.base_path(file_key)
+        case Merger.classify(base_path: base_path, current_path: target_path, incoming_path: file_path)
+        when :install
+          FileUtils.cp(file_path, target_path)
+          @results[file_key] = { status: "installed" }
+        when :fast_forward
+          FileUtils.cp(file_path, target_path)
+          @results[file_key] = { status: "updated", reason: "auto-merged (not edited)" }
+        when :keep
+          @results[file_key] = { status: "kept", reason: "bundle unchanged, local edits preserved" }
+        when :noop
+          @results[file_key] = { status: "skipped", reason: "already up to date" }
+        when :conflict
+          @results[file_key] = { status: "conflict", reason: "local edits conflict with bundle update" }
+          @conflicts[file_key] = { base: base_path, current: target_path, incoming: file_path }
+          @warnings << "Conflict in #{file_key}: local edits conflict with bundle update (use --force to overwrite or resolve interactively)"
+        end
+        update_target_index(@target_scope, target_path, file_key)
+      end
+
+      # A dry run's verdict for one file, nothing written: an upgrade
+      # classifies as merge_memory would (its status is the classification).
+      def preview_memory(file_key, file_path, target_path)
+        unless File.exist?(target_path) && !@force
+          @results[file_key] = { status: "would_install" }
+          return
+        end
+
+        if @upgrade && @existing
+          base_path = @provenance.base_path(file_key)
+          classification = Merger.classify(base_path: base_path, current_path: target_path, incoming_path: file_path)
+          @results[file_key] = { status: classification.to_s }
+          @conflicts[file_key] = { base: base_path, current: target_path, incoming: file_path } if classification == :conflict
+        elsif FileUtils.identical?(file_path, target_path)
+          @results[file_key] = { status: "skipped", reason: "already up to date" }
+        else
+          @results[file_key] = { status: "would_skip" }
+        end
+      end
+
+      # Strict mode: a memory written from the bundle whose sha256 differs
+      # from its manifest's warns. One that wasn't copied (kept, skipped:
+      # a local edit isn't a bad download) or was merged isn't checked.
+      def verify_memory_checksums
+        @bundle_md.each do |file_key|
+          next if @conflicts.key?(file_key)
+
+          status = @results[file_key] ? @results[file_key][:status].to_s : nil
+          next if %w[kept kept_pruned fast_forward updated skipped].include?(status)
+
+          target_path = File.join(@target_dir, file_key)
+          next unless File.exist?(target_path)
+
+          expected = @manifest.checksum_for(file_key)
+          next unless expected
+
+          actual = Digest::SHA256.hexdigest(File.read(target_path))
+          if actual != expected
+            @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
+          end
+        end
+      end
+
+      # One line per memory with {{placeholders}} left to fill in.
+      def detect_placeholders
+        @bundle_md.each do |file_key|
+          file_path = File.join(@target_dir, file_key)
+          next unless File.exist?(file_path)
+
+          names = Placeholder.detect_in_file(file_path)
+          @placeholder_warnings << "#{file_key}: {{#{names.join("}}, {{")}}}" if names.any?
+        end
+      end
+
+      # The install's record (Provenance#write), only with a manifest and
+      # not on a dry run. An upgrade with conflicts writes it too: the new
+      # version, the plugin's and hooks' new shas, and the old base for each
+      # conflicted file, marked conflict (chi bundle status shows it).
+      # Skipping it left the replaced plugin failing its sha check.
+      # @param installed [AssetInstaller::Installed]
+      def write_provenance(installed)
+        @provenance.write(
+          files: @upgrade && @existing ? upgrade_provenance_files : install_provenance_files,
+          scope: @target_scope,
+          version: @manifest.version,
+          source_path: @source,
+          # AssetInstaller added the discovered hooks/*.rb to manifest.hooks.
+          hooks: @manifest.hooks,
+          trust_level: @manifest.trust_level,
+          source_commit: @source_commit,
+          hooks_files: installed.hook_files,
+          guardrails_files: installed.guardrail_files,
+          plugin_file: installed.plugin_file,
+          requires_chi: @manifest.requires_chi,
+          needs: @manifest.needs,
+          conflicts: @conflicts.keys,
+          scripts_files: installed.script_files,
+          context_providers: @manifest.context_providers,
+          file_descriptions: @manifest.file_descriptions
+        )
+      end
+
+      # file key => the file whose content becomes its base. A file the
+      # upgrade left as the user has it (kept, noop, conflict, kept_pruned)
+      # keeps its old base, so the next upgrade still sees the local edit;
+      # the rest (installed, updated, skipped) take what is on disk now. A
+      # file the bundle dropped but the user kept stays recorded too.
+      def upgrade_provenance_files
+        files = {}
+        @owned.each do |file_key|
+          target_path = File.join(@target_dir, file_key)
+          next unless File.exist?(target_path)
+
+          status = @results[file_key] ? @results[file_key][:status].to_s : nil
+          base_path = @provenance.base_path(file_key)
+          files[file_key] = %w[kept noop conflict kept_pruned].include?(status) && File.exist?(base_path) ? base_path : target_path
+        end
+        @existing.files.each_key do |old_key_str|
+          next if @bundle_md.include?(old_key_str)
+          next unless @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
+
+          base_path = @provenance.base_path(old_key_str)
+          src = File.exist?(base_path) ? base_path : File.join(@target_dir, old_key_str)
+          files[old_key_str] = src if File.exist?(src)
+        end
+        files
+      end
+
+      # file key => its base's content source for a plain install. Skipped
+      # for a local edit: keep the installed base, so the next upgrade still
+      # sees the edit (not a fast-forward over it).
+      def install_provenance_files
+        @owned.each_with_object({}) do |file_key, files|
+          target_path = File.join(@target_dir, file_key)
+          next unless File.exist?(target_path)
+
+          base_path = @provenance.base_path(file_key)
+          kept = @existing && @results.dig(file_key, :reason) == "already exists" && File.exist?(base_path)
+          files[file_key] = kept ? base_path : target_path
+        end
+      end
+
       # A file already in the target dir that the install doesn't write: the
       # same bytes are "already up to date", others are skipped with a
       # --force hint (a dry run: would_skip). Its index line is refreshed
@@ -505,8 +374,7 @@ module Samagotchi
       # matches what was installed, or with --force; one the user edited is
       # kept with a note.
       def prune_dropped_files(previous_files, bundle_files, target_dir, scope, provenance)
-        previous_files.each do |old_key, meta|
-          key = old_key.to_s
+        previous_files.each do |key, meta|
           next if bundle_files.include?(key)
 
           target = File.join(target_dir, key)
@@ -532,7 +400,7 @@ module Samagotchi
       # Whether the file on disk is what the previous install wrote: its
       # recorded checksum, else the base snapshot. Unknown counts as edited.
       def installed_unchanged?(target, meta, base_path)
-        recorded = meta.is_a?(Hash) ? meta[:checksum] || meta["checksum"] : nil
+        recorded = meta[:checksum]
         return Provenance.sha_matches?(target, recorded) unless Provenance.recorded_sha(recorded).empty?
 
         File.exist?(base_path) && Provenance.file_sha(target) == Provenance.file_sha(base_path)
@@ -555,110 +423,6 @@ module Samagotchi
         end
       end
 
-      # The hook loader skips every hook of a bundle whose requires_chi this
-      # chi doesn't meet (Hooks::BundleLoader); say so at install, as
-      # install_plugin does for the plugin.
-      def warn_hooks_requires_chi(manifest, hook_files)
-        return if manifest.nil? || hook_files.empty?
-
-        if (failure = Manifest.requires_chi_failure(manifest.requires_chi, Samagotchi::VERSION))
-          @warnings << "Bundle #{@name}: its hooks won't load: #{failure}"
-        end
-      end
-
-      # GuardrailWiring#bundle_rules doesn't read the rules of a bundle whose
-      # requires_chi this chi doesn't meet, and a session that never loaded
-      # them records a required load failure (the gate refuses guarded calls
-      # until chi is updated): say so at install, as the hooks warning does.
-      def warn_rules_requires_chi(manifest, rule_files)
-        return if manifest.nil? || rule_files.empty?
-
-        if (failure = Manifest.requires_chi_failure(manifest.requires_chi, Samagotchi::VERSION))
-          @warnings << "Bundle #{@name}: its guardrail rules won't load: #{failure}; until chi is updated " \
-                       "(chi update), guarded tool calls are refused"
-        end
-      end
-
-      # Copy the manifest's plugin file into the bundle's plugin/ dir,
-      # warning when its sha256 differs from the declared one or this chi
-      # doesn't meet requires_chi (the Engine then won't load it).
-      # @return [String, nil] the installed file (nil: none, or a dry run)
-      def install_plugin(manifest, source_dir, provenance)
-        plugin = manifest&.plugin
-        unless plugin
-          FileUtils.rm_rf(provenance.plugin_dir) unless @dry_run
-          return nil
-        end
-
-        src = File.join(source_dir, plugin[:file])
-        raise InstallError, "the manifest names plugin #{plugin[:file]}, which the bundle doesn't have" unless File.file?(src)
-
-        if (failure = Manifest.requires_chi_failure(manifest.requires_chi, Samagotchi::VERSION))
-          @warnings << "Plugin #{plugin[:file]} won't load: #{failure}"
-        end
-        if @dry_run
-          @results[plugin[:file]] = { status: "would_install" }
-          return nil
-        end
-
-        dest = File.join(provenance.plugin_dir, plugin[:file])
-        unchanged = File.file?(dest) && FileUtils.identical?(src, dest)
-        FileUtils.rm_rf(provenance.plugin_dir)
-        FileUtils.mkdir_p(provenance.plugin_dir)
-        FileUtils.cp(src, dest)
-        @results[plugin[:file]] = if unchanged
-                                    { status: "skipped", reason: "already up to date" }
-                                  elsif @upgrade && provenance.read
-                                    { status: "updated" }
-                                  else
-                                    { status: "installed" }
-                                  end
-        expected = manifest.checksum_for_plugin
-        actual = Digest::SHA256.hexdigest(File.binread(dest))
-        if @strict && expected && actual != expected
-          @warnings << "Checksum mismatch for plugin #{plugin[:file]}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-        end
-        dest
-      end
-
-      # The manifest's scripts, copied into <bundle_dir>/scripts/ (the
-      # folder replaced: a script the new version dropped goes). A declared
-      # sha256 that differs warns, as a plugin's does.
-      # @return [Hash{String => String}] file name => installed path
-      def install_scripts(manifest, source_dir, provenance)
-        scripts = manifest&.scripts || {}
-        scripts.each_key do |file|
-          next if File.file?(File.join(source_dir, "scripts", file))
-
-          raise InstallError, "the manifest names scripts/#{file}, which the bundle doesn't have"
-        end
-        return {} if @dry_run
-
-        unchanged = scripts.keys.select do |file|
-          dest = File.join(provenance.scripts_dir, file)
-          File.file?(dest) && FileUtils.identical?(File.join(source_dir, "scripts", file), dest)
-        end
-        FileUtils.rm_rf(provenance.scripts_dir)
-        return {} if scripts.empty?
-
-        FileUtils.mkdir_p(provenance.scripts_dir)
-        scripts.to_h do |file, declared|
-          dest = File.join(provenance.scripts_dir, file)
-          FileUtils.cp(File.join(source_dir, "scripts", file), dest)
-          @results["scripts/#{file}"] = if unchanged.include?(file) then { status: "skipped", reason: "already up to date" }
-                                        elsif @upgrade && provenance.read then { status: "updated" }
-                                        else { status: "installed" }
-                                        end
-          FileUtils.chmod(0o755, dest)
-          actual = Digest::SHA256.hexdigest(File.binread(dest))
-          expected = declared.to_s.delete_prefix("sha256:")
-          if @strict && !expected.empty? && actual != expected
-            @warnings << "Checksum mismatch for script #{file}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-          end
-          [file, dest]
-        end
-      end
-
       # A model overlay (<name>.<key>.md, docs/memory.md) loads only with
       # its base, under the matching model: it gets no index line (every
       # model would see it as a memory of its own). Its base is looked for