samagotchi 0.146.0 → 0.148.0

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

@@ -17,12 +17,7 @@ export function mergeVersionState(current = {}, frame = {}) {
   if (has(frame, "update_blocked")) next.updateBlocked = known(frame.update_blocked) ? frame.update_blocked : null;
   if (has(frame, "auto")) next.auto = frame.auto === "install" ? "install" : "off";
   if (has(frame, "restart")) next.restart = frame.restart === "never" ? "never" : "idle";
-  // The last install's chi_update state (a snapshot's, or a frame's): the
-  // version an automatic one installs, while it hasn't failed.
-  const run = frame.chi_update;
-  if (run && run.operation === "install" && known(run.version)) {
-    next.autoInstall = run.auto === true && run.state !== "failed" ? run.version : null;
-  }
+  if (has(frame, "auto_offers")) next.autoOffers = known(frame.auto_offers) ? frame.auto_offers : null;
   return next;
 }
 
@@ -53,22 +48,23 @@ export function newerVersion(a, b) {
 // The toast for the versions as the page knows them, or null:
 // - loaded ≠ served: chi web restarted on another version; reload the page;
 // - installed newer than served: chi web runs an older chi than installed;
-//   restart its workers or chi web; not for the version an automatic install
-//   (+autoInstall+) brought with update.restart: idle, whose run restarts
-//   them by itself (and pushes how it went);
+//   restart its workers or chi web; not with update.auto: install and
+//   update.restart: idle (and not blocked), where chi web restarts them by
+//   itself and pushes how it went, however that chi got installed, unless
+//   chi web says it won't or has been held for long (+autoOffers+);
 // - available newer than served: install it, unless the install is blocked;
 //   with update.auto: install (and not blocked) chi web installs it by itself
 //   once no turn runs: the notice says so, with no Update button.
 // Each has a key; one in +shown+ (a Set: what this tab already showed, as
 // every reconnect's snapshot says it again) is not shown twice.
 // @return {{key, text, reload: boolean} | null}
-export function versionNotice({ loaded, served, installed, available, updateBlocked, auto, restart, autoInstall,
+export function versionNotice({ loaded, served, installed, available, updateBlocked, auto, restart, autoOffers,
   shown = new Set() } = {}) {
   let notice = null;
   if (known(loaded) && known(served) && loaded !== served) {
     notice = { key: `reload:${served}`, text: `chi was updated to ${served}`, reload: true };
   } else if (newerVersion(installed, served)) {
-    const restartsByItself = auto === "install" && restart !== "never" && autoInstall === installed;
+    const restartsByItself = auto === "install" && restart !== "never" && !updateBlocked && autoOffers !== installed;
     if (!restartsByItself) {
       notice = {
         key: `installed:${installed}`,
@@ -101,6 +97,21 @@ export function versionNotice({ loaded, served, installed, available, updateBloc
   return notice && !shown.has(notice.key) ? notice : null;
 }
 
+// The toast's words for an update operation's frame, or null: what runs and how
+// it ended, for a tab whose sheet isn't open. An automatic run's worker passes
+// say something only when one fails (the run ends in the Reload toast); a done
+// install leaves it to the version toast; a snapshot repeats no ending.
+export function updateFrameToast(data, { wasOpen = false, snapshot = false } = {}) {
+  if (wasOpen) return null;
+  if (data.auto && data.operation === "workers" && data.state !== "failed") return null;
+  const label = `${data.auto ? "Automatic " : ""}${data.operation === "install" ? "chi update" : "worker restart"}`
+    .replace(/^./, (c) => c.toUpperCase());
+  if (data.state === "running") return `${label} in progress`;
+  if (snapshot || !["done", "failed"].includes(data.state)) return null;
+  if (data.operation === "install" && data.state === "done") return null;
+  return `${label} ${data.state}`;
+}
+
 // The info bar's badge for the open session's worker when it runs an older
 // chi than the newest installed (or than chi web, while that is unknown),
 // else null. A worker with the "restart" feature offers Restart; an older

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/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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.146.0
+  version: 0.148.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -241,6 +241,7 @@ files:
 - lib/samagotchi/bundles/codex-peer/scripts/chi-peer-SKILL.md
 - lib/samagotchi/bundles/codex-peer/scripts/pair
 - lib/samagotchi/bundles/codex-peer/skill_codex_peer.md
+- lib/samagotchi/bundles/coordinator/guardrails/merge.yml
 - lib/samagotchi/bundles/coordinator/manifest.yml
 - lib/samagotchi/bundles/coordinator/plugin.rb
 - lib/samagotchi/bundles/coordinator/skill_coordinator.md