samagotchi 0.145.0 → 0.147.0

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

@@ -45,9 +45,10 @@ function statusText(model) {
 
 // Both restarts, once a newer chi is installed (an install done here, or the
 // installed notice's toast) and nothing runs: either result keeps the other in reach.
+// Not on an automatic run: it restarts them by itself.
 function restartActions(model) {
   const busy = ["starting", "running", "restarting"].includes(model.state);
-  if (!model.restartable || busy) return nothing;
+  if (!model.restartable || model.auto || busy) return nothing;
   return html`<button type="button" class="ghost" data-act="restart-workers">Restart workers</button>
     <button type="button" class="ghost" data-act="restart-web">Restart chi web</button>`;
 }
@@ -125,6 +126,8 @@ export function createUpdateSheet({ dialog, update, restartWorkers, restartWeb }
     model = {
       ...model,
       ...data,
+      // A frame names auto only when it is true: this run's word, not the last one's.
+      auto: data.auto === true,
       rows: Array.isArray(data.rows) ? data.rows : [],
     };
     if (data.operation === "install" && data.state === "done") restartable = true;

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

@@ -6,6 +6,8 @@
 // module of its own: static JS is cached at unversioned URLs, and a new
 // export on an old module would blank the page.
 
+import { workerPredates } from "./worker_features.js";
+
 export const VERIFY_PRESET = Object.freeze({
   label: "Verify",
   text: "Verify this claim against the code. If this session's context doesn't settle it, say so. "
@@ -14,8 +16,10 @@ export const VERIFY_PRESET = Object.freeze({
 
 export const VERIFY_UNAVAILABLE = "restart this session to use Verify";
 
+// The Verify gate (app.js featureGates): a live worker without "verify"
+// predates Verify turns (worker_features.js's rule).
 export function verifyWorkerUnavailable(workerFeatures, bridgeUp) {
-  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes("verify");
+  return workerPredates(workerFeatures, bridgeUp, "verify");
 }
 
 // +presets+ (annotate_presets.js parsePresets) with Verify after them.

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

@@ -0,0 +1,14 @@
+// One rule for the worker-side feature gates: a worker that is up and whose
+// features lack +feature+ predates it (chi web would answer 409
+// <feature>_unavailable), so the page says so instead of offering the action.
+// A worker that isn't up isn't asked: the send wakes a new one that has it.
+// Used by Verify's gate (verify_preset.js) and Revise's (revise_stack.js).
+//
+// A new module: the page's modules are cached at unversioned URLs, and a new
+// export of an old one (docs/internals/web-frontend.md) leaves a cached copy
+// without it.
+
+// @return [bool] true only for a live worker without the feature.
+export function workerPredates(workerFeatures, bridgeUp, feature) {
+  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes(feature);
+}

data/lib/samagotchi/web/session_access_routes.rb

@@ -274,7 +274,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" }) })
+                             **(@hub&.chi_state || { version: VERSION, installed: nil, available: nil, update_blocked: nil, auto: "off", restart: "idle", auto_offers: nil }) })
       rescue SessionManager::OwnedByTUI => e
         owned_by_tui(e)
       rescue SessionAccess::Refused => e

data/lib/samagotchi/web/session_hub.rb

@@ -41,8 +41,7 @@ module Samagotchi
 
       # What a subscriber gets: `session` with {session: summary} for an
       # upsert, `session_gone` with {id:} for a removal, `chi` with
-      #   {version:, installed:, available:, update_blocked:} when chi version
-      #   state changes. seq is monotonic per
+      #   the #chi_state fields when chi version state changes. seq is monotonic per
       # hub, for the log's sake: there is no replay.
       Event = Struct.new(:type, :seq, :data, keyword_init: true)
 
@@ -76,7 +75,7 @@ module Samagotchi
       # @param installed_versions [#newest] what is installed (InstalledVersions)
       # @param update_auto [String] update.auto, said in the chi state (the page's wording)
       # @param update_restart [String] update.restart, said beside it (whether
-      #   an automatic install's run restarts by itself: no Restart toast)
+      #   a newer installed chi restarts by itself: no Restart toast)
       def initialize(state_dir:, manager: SessionManager, now: nil, scan_interval: SCAN_INTERVAL,
                      full_probe_interval: FULL_PROBE_INTERVAL, installed_versions: InstalledVersions.new,
                      update_auto: Config.get("update.auto"), update_restart: Config.get("update.restart"))
@@ -87,6 +86,7 @@ module Samagotchi
         @installed = nil
         @available = nil
         @update_blocked = nil
+        @auto_offers = nil
         @update_state = nil
         @manager = manager
         @now = now || -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) }
@@ -164,7 +164,7 @@ module Samagotchi
       def chi_state
         @monitor.synchronize do
           { version: VERSION, installed: @installed, available: @available, update_blocked: @update_blocked,
-            auto: @update_auto, restart: @update_restart }
+            auto: @update_auto, restart: @update_restart, auto_offers: @auto_offers }
         end
       end
 
@@ -180,6 +180,19 @@ module Samagotchi
         nil
       end
 
+      # AutoUpdate won't (or hasn't, for long) restart onto +version+ by itself:
+      # the page offers the restarts for it, in spite of update.auto. In memory:
+      # AutoUpdate says it again after a chi web restart.
+      def auto_offer_restart(version)
+        @monitor.synchronize do
+          next if @auto_offers == version
+
+          @auto_offers = version
+          emit("chi", chi_state)
+        end
+        nil
+      end
+
       # Publish the owner-triggered update's progress or result for current
       # tabs, and retain the latest state for a reconnect's snapshot.
       def publish_update(state:, rows:, progress: nil, operation: nil, version: nil, auto: false)

data/lib/samagotchi/working_set.rb

@@ -235,7 +235,8 @@ module Samagotchi
     def shared_with(touch, key) = touch.share > 1 ? found_names(touch.run) - [key] : []
 
     # A memory_read's names (Tools::MemoryRead.parse_names: none for the
-    # index listing), less the ones its output says weren't found.
+    # index listing), less the ones its output says weren't found. Public:
+    # `chi memory usage` counts reads the same way (MemoryUsage).
     def found_names(run)
       names = Tools::MemoryRead.parse_names(run.call[:content].to_s)
       last = run.text.split(ToolResponse::SEPARATOR).last.to_s
@@ -308,6 +309,6 @@ module Samagotchi
 
     def field(hash, key) = hash.key?(key) ? hash[key] : hash[key.to_s]
 
-    private_class_method :all_touches, :touches, :failed?, :found_names, :shared_with, :item, :still_sent?, :dropped?, :with_id, :changed?, :stamp_of, :field
+    private_class_method :all_touches, :touches, :failed?, :shared_with, :item, :still_sent?, :dropped?, :with_id, :changed?, :stamp_of, :field
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.145.0
+  version: 0.147.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -487,6 +487,7 @@ files:
 - lib/samagotchi/memory_command.rb
 - lib/samagotchi/memory_orphans.rb
 - lib/samagotchi/memory_paths.rb
+- lib/samagotchi/memory_usage.rb
 - lib/samagotchi/message_parts.rb
 - lib/samagotchi/message_time.rb
 - lib/samagotchi/model_binding.rb
@@ -958,6 +959,7 @@ files:
 - lib/samagotchi/web/public/verify_card.css
 - lib/samagotchi/web/public/verify_preset.js
 - lib/samagotchi/web/public/verify_target.js
+- lib/samagotchi/web/public/worker_features.js
 - lib/samagotchi/web/public/working_set.js
 - lib/samagotchi/web/public/working_set_rail.js
 - lib/samagotchi/web/public/working_set_view.js