samagotchi 0.151.0 → 0.152.0

data/lib/samagotchi/tools/delegate.rb

@@ -159,7 +159,8 @@ module Samagotchi
       # repository (a worktree the parent meant to pass as cwd:), which makes
       # every write there an ask for the user (child-boundary). One warning
       # line, however many are named; nil when the task names none, or names
-      # only the checkout holding the child's folder (or a subfolder of it).
+      # only the checkout holding the child's folder (or a subfolder of it),
+      # or main while the child itself runs in a worktree of it.
       # Never raises: a started child must not come back as an Error:.
       # @return [String, nil]
       def self.other_checkout(task, folder, parent:, child_id:, no_cwd:)
@@ -180,6 +181,9 @@ module Samagotchi
       # not the one holding +folder+: the first path token in the task that
       # belongs to one (the deepest containing it), else nil. Reads files
       # only, no git process, so a spec stubbing Process.spawn is unaffected.
+      # A child started in a linked worktree is never pointed at main: its
+      # work belongs in the worktree, so naming a main-checkout file - mostly
+      # to read it - is not a cwd: the parent forgot.
       # @return [String, nil] an absolute checkout folder
       def self.foreign_checkout(task, folder)
         common = MemoryPaths.common_git_dir(folder)
@@ -187,17 +191,31 @@ module Samagotchi
 
         checkouts = Guardrails::GitInfo.checkouts(common).map { |checkout| File.realpath(checkout) }
         own = deepest_checkout(File.realpath(folder), checkouts)
+        main = main_checkout(common)
         task.to_s.scan(PATH_TOKEN) do |token|
           path = existing_ancestor(File.expand_path(token.sub(/[.:!?]+\z/, ""), folder))
           next if path.nil?
 
           found = deepest_checkout(path, checkouts)
-          return found if found && found != own
+          next if found.nil? || found == own || found == main
+
+          return found
         end
         nil
       end
       private_class_method :foreign_checkout
 
+      # The main checkout of a common git dir (the folder holding it), nil for
+      # a bare or separate-git-dir layout, which has none.
+      def self.main_checkout(common)
+        return nil unless File.basename(common) == ".git"
+
+        File.realpath(File.dirname(common))
+      rescue StandardError
+        nil
+      end
+      private_class_method :main_checkout
+
       # The checkout containing +path+, matched by whole components (so
       # /x/app is not found in /x/app-fix): the deepest, so a nested worktree's
       # path belongs to that worktree, not to main; nil when none does.

data/lib/samagotchi/update_command.rb

@@ -10,6 +10,7 @@ require_relative "gem_update"
 require_relative "installed_gem"
 require_relative "live_versions"
 require_relative "memory_bundle/file_standing"
+require_relative "memory_bundle/manifest_standing"
 require_relative "memory_bundle/shipped_update"
 require_relative "memory_bundle/system_bundle"
 require_relative "session"
@@ -331,10 +332,20 @@ module Samagotchi
 
       require_relative "bundle_command/installed_check"
       bundles.flat_map do |bundle|
-        BundleCommand::InstalledCheck.run(bundle).map { |found| Row.new(component: bundle.name, status: found.text, level: found.level) }
+        kept = MemoryBundle::ManifestStanding.keep(bundle, dry_run: @dry_run)
+        [manifest_row(kept)].compact +
+          BundleCommand::InstalledCheck.run(kept.bundle).map { |found| Row.new(component: bundle.name, status: found.text, level: found.level) }
       end
     end
 
+    # What an external bundle's manifest.yml came to (ManifestStanding.keep):
+    # kept (or would be) is a change, anything else to say a warning.
+    def manifest_row(kept)
+      return nil unless kept.line
+
+      Row.new(component: kept.bundle.name, status: kept.line, level: kept.kept ? nil : "warn")
+    end
+
     def bundle_row(update)
       row = Row.new(component: update.name, from: update.from, to: update.to)
       earlier = update.status == :failed ? [] : Array(update.earlier)
@@ -343,7 +354,7 @@ module Samagotchi
       when :would_update, :updated
         notes = [adds(update.adds), *notes, replaced(update.replaced), *update.kept_own].compact
         done(row, :update, notes.empty? ? nil : notes.join("; "))
-      when :would_merge, :merged, :up_to_date then same_version(row, [*notes, update.note].compact, changed: Array(update.merged).any?)
+      when :would_merge, :merged, :up_to_date then same_version(row, [*notes, update.note, update.manifest].compact, changed: Array(update.merged).any?)
       when :skipped then skipped(row, [update.note, *notes].join("; "))
       else failed(row, [update.note, *notes].compact.join("; "))
       end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -62,6 +62,7 @@ require_relative "editor"
 require_relative "../message_parts"
 require_relative "../launch_mode"
 require_relative "session_summary"
+require_relative "session_hub"
 require_relative "project_list"
 require_relative "session_access_routes"
 require_relative "principal"
@@ -1025,7 +1026,7 @@ module Samagotchi
       def handle_info(req)
         return participant_info unless principal(req).owner?
 
-        chi_state = @hub&.chi_state || { version: Samagotchi::VERSION, installed: nil, available: nil, update_blocked: nil, auto: "off", restart: "idle", auto_offers: nil }
+        chi_state = @hub&.chi_state || SessionHub::HUBLESS_STATE
         json_response(200, { app: "chi-web", **chi_state, pid: Process.pid,
                              cwd: Dir.pwd, start_dir: start_dir, features: INFO_FEATURES, lan: @lan && @lan[:ip],
                              proxy: @public_url && { identity_header: @public_url.identity_header } })

data/lib/samagotchi/web/session_access_routes.rb

@@ -14,6 +14,7 @@ require_relative "../client_id"
 require_relative "../children_status"
 require_relative "../session_metrics"
 require_relative "../version"
+require_relative "session_hub"
 
 module Samagotchi
   module Web
@@ -274,7 +275,7 @@ module Samagotchi
                              model_name: session_access.show(id).model_name,
                              default_model: ModelProfile.default_model_name,
                              parent_strategy: strategy_json(session_access.parent_strategy(id)),
-                             **(@hub&.chi_state || { version: VERSION, installed: nil, available: nil, update_blocked: nil, auto: "off", restart: "idle", auto_offers: nil }) })
+                             **(@hub&.chi_state || SessionHub::HUBLESS_STATE) })
       rescue SessionManager::OwnedByTUI => e
         owned_by_tui(e)
       rescue SessionAccess::Refused => e

data/lib/samagotchi/web/session_hub.rb

@@ -32,6 +32,12 @@ module Samagotchi
     # step under it, so no stale upsert can follow a fresh snapshot.
     class SessionHub
       SCAN_INTERVAL = 1.0
+      # What an info route says about updates when there is no hub at all:
+      # this chi's version, and nothing known of the rest. The one place this
+      # is written (Web::App#handle_info and the remote info route).
+      HUBLESS_STATE = { version: Samagotchi::VERSION, installed: nil, available: nil, update_blocked: nil,
+                        auto: "off", restart: "idle", auto_offers: nil }.freeze
+
       # The flock leaves no file trace when its holder dies, so owners are
       # probed: every tick for the sessions the projection believes owned
       # (a handful; OwnerLock.owner is open + LOCK_SH|LOCK_NB + close), and

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.151.0
+  version: 0.152.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -472,15 +472,18 @@ files:
 - lib/samagotchi/memory_bundle/builder.rb
 - lib/samagotchi/memory_bundle/bundle_hook.rb
 - lib/samagotchi/memory_bundle/entry_size.rb
+- lib/samagotchi/memory_bundle/file_digest.rb
 - lib/samagotchi/memory_bundle/file_standing.rb
 - lib/samagotchi/memory_bundle/index_size.rb
 - lib/samagotchi/memory_bundle/index_sync.rb
 - lib/samagotchi/memory_bundle/index_updater.rb
 - lib/samagotchi/memory_bundle/installed_bundle.rb
 - lib/samagotchi/memory_bundle/installed_copy.rb
+- lib/samagotchi/memory_bundle/installed_manifest.rb
 - lib/samagotchi/memory_bundle/installer.rb
 - lib/samagotchi/memory_bundle/listing.rb
 - lib/samagotchi/memory_bundle/manifest.rb
+- lib/samagotchi/memory_bundle/manifest_standing.rb
 - lib/samagotchi/memory_bundle/memory_files.rb
 - lib/samagotchi/memory_bundle/merger.rb
 - lib/samagotchi/memory_bundle/placeholder.rb