samagotchi 0.123.0 → 0.124.0

data/lib/samagotchi/web/app.rb

@@ -4,6 +4,9 @@ require "cgi/escape" # CGI.escapeHTML; Ruby 4.0 ships only cgi/escape
 require "digest"
 require "fileutils"
 require "json"
+require "open3"
+require "rbconfig"
+require "rubygems/version"
 require "time"
 require "uri"
 require "rack"
@@ -67,10 +70,14 @@ require_relative "session_show"
 require_relative "session_create"
 require_relative "session_control"
 require_relative "push_routes"
+require_relative "update_check"
 require_relative "proxy_gate"
 require_relative "../log"
 require_relative "../paths"
 require_relative "../redacted_inspect"
+require_relative "../child_env"
+require_relative "../installed_gem"
+require_relative "../live_versions"
 
 module Samagotchi
   module Web
@@ -113,6 +120,7 @@ module Samagotchi
       # A callable the event loops ask whether the server still runs;
       # Server.start points it at WEBrick's status once it has the server.
       attr_writer :server_running
+      attr_writer :restart_web
 
       # @param bridge_wait_timeout [Float] bounded seconds to wait for a
       #   freshly-spawned worker's bridge before answering POST /api/sessions.
@@ -156,7 +164,8 @@ module Samagotchi
                      events_heartbeat: EVENTS_HEARTBEAT, events_queue: EVENTS_QUEUE,
                      registry: nil, models_wait_timeout: MODELS_WAIT_TIMEOUT, lan: nil,
                      working_set: Config::BY_KEY["web.working_set"].default, wait_poll_interval: ReplyWait::POLL_INTERVAL,
-                     grants: nil, public_url: nil, public_token: nil, push: nil, start_dir: nil)
+                     grants: nil, public_url: nil, public_token: nil, push: nil, start_dir: nil, update_runner: nil,
+                     update_blocked: nil)
         @start_dir = start_dir
         @manager = manager || SessionManager
         @registry = registry
@@ -182,6 +191,10 @@ module Samagotchi
         @refused_logged = {}
         @wait_poll_interval = wait_poll_interval
         @push = push
+        @update_mutex = Mutex.new
+        @update_running = false
+        @update_runner = update_runner || method(:run_update_command)
+        @update_blocked = update_blocked || -> { UpdateCheck.blocked_reason }
         init_participant_access(grants, state_dir)
         init_proxy_gate(public_url, public_token)
       end
@@ -233,6 +246,9 @@ module Samagotchi
         ["GET", %r{\A/api/models\z}, :handle_models, :owner],
         ["GET", %r{\A/api/history\z}, :handle_history, :owner],
         ["GET", %r{\A/api/events\z}, :handle_events, :owner],
+        ["POST", %r{\A/api/update\z}, :handle_update, :owner],
+        ["POST", %r{\A/api/update/restart_workers\z}, :handle_restart_workers, :owner],
+        ["POST", %r{\A/api/update/restart_web\z}, :handle_restart_web, :owner],
         ["POST", %r{\A/api/render\z}, :handle_render, :owner],
         ["GET", %r{\A/api/sessions/([^/]+)/stream\z}, :handle_stream, :participant],
         ["GET", %r{\A/api/sessions/([^/]+)/review\z}, :handle_review, :participant, :session],
@@ -649,6 +665,183 @@ module Samagotchi
       # no token is asked of this request): nothing to do.
       def handle_token(_req) = [204, { "Cache-Control" => "no-store" }, []]
 
+      def handle_update(req)
+        return error_response(503, "no_hub", "this chi web has no session hub") unless @hub
+
+        raw = request_body(req, 16_385)
+        return error_response(413, "body_too_large", "update request is too large") if raw.bytesize > 16_384
+
+        payload = parse_json(raw)
+        return error_response(400, "invalid_update", "expected a JSON object with a version") unless payload.is_a?(Hash)
+
+        version = payload["version"]
+        # Gem::Version.correct? lets surrounding whitespace through; argv gets none.
+        unless version.is_a?(String) && !version.match?(/\s/) && Gem::Version.correct?(version)
+          return error_response(400, "invalid_version", "version must be a gem version")
+        end
+
+        version = Gem::Version.new(version).to_s
+        if Gem::Version.new(version) <= Gem::Version.new(VERSION)
+          return error_response(409, "update_not_newer", "version #{version} is not newer than this chi")
+        end
+
+        # Found out here, not from the hub: UpdateCheck (off with update.notify: off) is what tells it.
+        blocked = @update_blocked.call
+        return json_response(409, { error: "update_blocked", reason: blocked }) if blocked
+
+        already_running = @update_mutex.synchronize do
+          if @update_running
+            true
+          else
+            @update_running = true
+            false
+          end
+        end
+        return error_response(409, "update_running", "an update is already running") if already_running
+
+        @hub.publish_update(state: "running", rows: [], operation: "install", version: version)
+        Thread.new { perform_update(version) }
+        json_response(202, { state: "running", version: version })
+      rescue ThreadError => e
+        @update_mutex.synchronize { @update_running = false }
+        Log.warn(:web, "update_start_failed", error: e.class.name, msg: e.message)
+        @hub&.publish_update(state: "failed", rows: [
+          { "component" => "chi update", "status" => "failed (couldn't start update)", "failed" => true, "kept" => [] }
+        ], operation: "install")
+        error_response(503, "update_start_failed", "couldn't start chi update")
+      end
+
+      def perform_update(version)
+        argv = [RbConfig.ruby, InstalledGem.wrapper, "update", "--to", version, "--no-desktop", "--json"]
+        said = nil
+        output, success = @update_runner.call(argv, env: ChildEnv.unbundled,
+                                              progress: lambda { |line|
+                                                said = line unless line.strip.empty?
+                                                @hub.publish_update(state: "running", rows: [], progress: line,
+                                                                    operation: "install", version: version)
+                                              })
+        rows = update_rows(output)
+        # No rows (a usage error, a refusal): what the child said is the reason.
+        raise UpdateFailed, said || output.lines.map(&:strip).find { |line| !line.empty? } || "chi update printed no rows" unless rows
+
+        # The installed version as of now (the hub's own look is up to a probe interval old), before "done".
+        @hub.refresh_installed if success
+        @hub.publish_update(state: success ? "done" : "failed", rows: rows, operation: "install", version: version)
+      rescue StandardError => e
+        Log.exception(:web, "update_failed", e)
+        @hub.publish_update(state: "failed", rows: [
+          { "component" => "chi update", "status" => "failed (#{e.message.lines.first.to_s.strip})",
+            "failed" => true, "kept" => [] }
+        ], operation: "install", version: version)
+      ensure
+        @update_mutex.synchronize { @update_running = false }
+      end
+
+      # chi update's own words when it printed no rows.
+      class UpdateFailed < StandardError; end
+
+      # chi update --json's rows, or nil when it printed none.
+      def update_rows(output)
+        rows = JSON.parse(output)
+        rows if rows.is_a?(Array) && rows.all?(Hash)
+      rescue JSON::ParserError
+        nil
+      end
+
+      def run_update_command(argv, env:, progress:)
+        Open3.popen3(env, *argv) do |stdin, stdout, stderr, wait_thread|
+          stdin.close
+          stderr_thread = Thread.new { stderr.each_line { |line| progress.call(line.chomp) } }
+          output = stdout.read
+          stderr_thread.value
+          [output, wait_thread.value.success?]
+        end
+      end
+
+      def handle_restart_workers(_req)
+        return error_response(503, "no_hub", "this chi web has no session hub") unless @hub
+
+        already_running = @update_mutex.synchronize do
+          if @update_running
+            true
+          else
+            @update_running = true
+            false
+          end
+        end
+        return error_response(409, "update_running", "a chi update operation is already running") if already_running
+
+        @hub.publish_update(state: "running", rows: [], operation: "workers")
+        Thread.new { perform_worker_restarts }
+        json_response(202, { state: "running" })
+      rescue ThreadError => e
+        @update_mutex.synchronize { @update_running = false }
+        Log.warn(:web, "worker_restart_start_failed", error: e.class.name, msg: e.message)
+        @hub&.publish_update(state: "failed", rows: [
+          { "state" => "failed", "reason" => "couldn't start worker restarts" }
+        ], operation: "workers")
+        error_response(503, "restart_start_failed", "couldn't start worker restarts")
+      end
+
+      def perform_worker_restarts
+        # Installed now: the hub's own look is up to a full probe old (nil right after chi web started).
+        target = @hub.refresh_installed || VERSION
+        rows = []
+        LiveVersions.stale_workers(target, state_dir: default_state_dir).each do |worker|
+          row = begin
+            restarted = @manager.restart_session(worker.session_id, state_dir: @state_dir, client_id: ClientId::WEB_RESTART)
+            @hub.touch(worker.session_id)
+            { "session_id" => restarted.session_id, "state" => "restarted", "from_version" => restarted.from_version,
+              "version" => restarted.version }
+          rescue SessionManager::RestartRefused => e
+            # detail: the refusal's own words (RestartRefused.words), the reason code for clients.
+            { "session_id" => worker.session_id, "state" => "refused", "reason" => e.reason.to_s,
+              "detail" => e.message, "holds" => e.holds.map(&:to_s) }
+          rescue SessionManager::OwnedByTUI => e
+            { "session_id" => worker.session_id, "state" => "owned_by_tui", "detail" => e.message }
+          rescue StandardError => e
+            Log.exception(:web, "worker_restart_failed", e, sid: worker.session_id)
+            { "session_id" => worker.session_id, "state" => "failed", "reason" => e.class.name, "detail" => e.message }
+          end
+          rows << row
+          @hub.publish_update(state: "running", rows: rows.dup, operation: "workers")
+        end
+        state = rows.any? { |row| row["state"] == "failed" } ? "failed" : "done"
+        @hub.publish_update(state: state, rows: rows, operation: "workers")
+      rescue StandardError => e
+        Log.exception(:web, "worker_restart_failed", e)
+        @hub.publish_update(state: "failed", rows: [
+          { "state" => "failed", "reason" => e.class.name, "detail" => e.message }
+        ], operation: "workers")
+      ensure
+        @update_mutex.synchronize { @update_running = false }
+      end
+
+      # The exec replaces this process: an update's chi update child (its
+      # pipes read here) or a worker restart pass would die mid-way, so
+      # neither may run, and none starts once the restart is asked for.
+      def handle_restart_web(_req)
+        return error_response(503, "restart_unavailable", "chi web cannot restart itself in this process") unless @restart_web
+
+        busy = @update_mutex.synchronize do
+          next true if @update_running
+
+          @update_running = true # held for good once restarting: the exec ends this process
+          false
+        end
+        return error_response(409, "update_running", "a chi update operation is running; restart chi web when it ends") if busy
+
+        case @restart_web.call
+        when true then return json_response(202, { state: "restarting" })
+        when :no_wrapper
+          refusal = error_response(409, "restart_unavailable", "no chi wrapper to restart into (installed with --bindir?); " \
+                                                               "restart chi web in its terminal")
+        else refusal = error_response(409, "restart_requested", "chi web is already restarting")
+        end
+        @update_mutex.synchronize { @update_running = false }
+        refusal
+      end
+
       def unauthorized(req)
         reason = req.env[REFUSED_ENV]
         log_refused(refused_peer(req), req.path_info, reason)
@@ -1805,7 +1998,10 @@ module Samagotchi
 
         def each
           # The page compares this full chi state with the one it was served by.
-          yield frame(nil, "snapshot", { sessions: @snapshot }.merge(@chi_state))
+          snapshot = { sessions: @snapshot }.merge(@chi_state)
+          update_state = @hub.update_state
+          snapshot[:chi_update] = update_state if update_state
+          yield frame(nil, "snapshot", snapshot)
           last_write = monotonic
           loop do
             event = @queue.pop([@heartbeat, EVENTS_POLL].min)

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

@@ -26,6 +26,9 @@ import {
   addContext,
   renderText,
   getWorkingSet,
+  updateChi,
+  restartWorkers,
+  restartWeb,
   onAuthLost,
 } from "./data.js";
 import { authProbe, createAuthLost } from "./auth_lost.js";
@@ -100,6 +103,7 @@ import { createUnqueue } from "./unqueue.js";
 import { createStartPage } from "./start_page.js";
 import { createSessionActions } from "./session_actions.js";
 import { createStopSheet } from "./stop_sheet.js";
+import { createUpdateSheet } from "./update_sheet.js";
 import { createRename } from "./session_rename.js";
 import { createSendTurn } from "./send_turn.js";
 import { createMarkdownTip } from "./markdown_tip.js";
@@ -442,6 +446,8 @@ function openSessionEvents() {
   eventsControl = openEvents({
     snapshot: (data) => {
       noticeVersions(data);
+      if (updateSheet.reconnected(data.version)) showToast(`chi web reconnected on chi ${data.version}`);
+      if (data.chi_update) updateFrame(data.chi_update, { snapshot: true });
       notifications.noticeSessions("snapshot", data);
       allSessions = applySessionEvent(allSessions, "snapshot", data);
       lists.render();
@@ -469,6 +475,7 @@ function openSessionEvents() {
       leaveGoneSession(data.id, "deleted");
     },
     chi: (data) => noticeVersions(data),
+    chi_update: (data) => updateFrame(data),
   }, {
     dir: scope.dir,
     onError: () => {
@@ -503,6 +510,8 @@ const AVAILABLE_SHOWN_KEY = "chi_update_available_shown";
 const versionNoticesShown = new Set();
 const availableShown = readStored(AVAILABLE_SHOWN_KEY);
 if (availableShown) versionNoticesShown.add(`available:${availableShown}`);
+let versionToast = null;
+
 function noticeVersions(data) {
   Object.assign(versions, mergeVersionState(versions, data));
   const notice = versionNotice({ loaded: document.body.dataset.version, served: versions.served,
@@ -517,10 +526,34 @@ function noticeVersions(data) {
     : notice.text;
   const action = notice.reload
     ? { label: "Reload", run: () => location.reload() }
+    : notice.updateVersion
+      ? { label: "Update", run: () => updateSheet.install(notice.updateVersion) }
+      : notice.actions
+        ? notice.actions.map((name) => ({
+          label: name === "restartWorkers" ? "Restart workers" : "Restart chi web",
+          run: () => (name === "restartWorkers" ? updateSheet.restartWorkers() : updateSheet.restartWeb()),
+        }))
     : notice.command
       ? { label: "Copy", run: () => copyUpdateCommand(notice.command) }
       : null;
-  showToast(text, action, { sticky: true });
+  // One version toast at a time: a newer notice (Reload after a restart)
+  // supersedes the one before it.
+  toasts.dismiss(versionToast);
+  versionToast = toasts.show(text, action, { sticky: true });
+}
+
+function updateFrame(data, { snapshot = false } = {}) {
+  const wasOpen = updateSheet.isOpen();
+  if (!updateSheet.receive(data)) return;
+  if (data.operation === "install" && data.state === "done" && data.version) noticeVersions({ installed: data.version });
+  if (!wasOpen && data.state === "running") {
+    const label = data.operation === "install" ? "Chi update" : "Worker restart";
+    showToast(`${label} in progress`, { label: "View", run: () => updateSheet.view() }, { sticky: true });
+  } else if (!snapshot && !wasOpen && ["done", "failed"].includes(data.state)
+    && !(data.operation === "install" && data.state === "done")) {
+    const label = data.operation === "install" ? "Chi update" : "Worker restart";
+    showToast(`${label} ${data.state}`, { label: "View", run: () => updateSheet.view() }, { sticky: true });
+  }
 }
 
 function copyUpdateCommand(command) {
@@ -1778,6 +1811,12 @@ function restoreDraft(draft, opener) {
 }
 
 const toasts = createToasts({ el: $("#toast"), onChange: placeToast });
+const updateSheet = createUpdateSheet({
+  dialog: $("#updateSheet"),
+  update: updateChi,
+  restartWorkers,
+  restartWeb,
+});
 
 function showToast(text, action = null, options = {}) { toasts.show(text, action, options); }
 

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

@@ -88,6 +88,23 @@ export function listModels(opts = {}) {
   return api("/api/models", opts);
 }
 
+// Update chi to this exact version; progress and component rows arrive as
+// `chi_update` events on the page's events stream.
+export function updateChi(version, opts = {}) {
+  return api("/api/update", { method: "POST", body: JSON.stringify({ version }), ...opts });
+}
+
+// Restart every worker running an older chi; results arrive as
+// `chi_update` events on the page's events stream.
+export function restartWorkers(opts = {}) {
+  return api("/api/update/restart_workers", { method: "POST", body: JSON.stringify({}), ...opts });
+}
+
+// Ask this chi web to shut down and exec the installed version.
+export function restartWeb(opts = {}) {
+  return api("/api/update/restart_web", { method: "POST", body: JSON.stringify({}), ...opts });
+}
+
 // The prompt history the composer's ↑/↓ walk (the TUI's too), oldest first.
 export function fetchHistory(opts = {}) {
   return api("/api/history", opts).then((j) => (Array.isArray(j.entries) ? j.entries : []));

data/lib/samagotchi/web/public/index.html

@@ -1182,6 +1182,23 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .ss-foot{font-size:11.5px;color:var(--text-muted);margin-top:6px}
 .ctx-pop-head{display:flex;align-items:baseline;gap:8px}
 .ctx-pop-head strong{font-family:ui-monospace,monospace;color:var(--text-bright)}
+#updateSheet{width:calc(100vw - 32px);max-width:560px;max-height:calc(100dvh - 32px);overflow:auto;margin:auto;padding:14px 16px;border:1px solid var(--border-strong);border-radius:14px;background:var(--bg-panel);color:var(--text);box-shadow:var(--toast-shadow)}
+#updateSheet::backdrop{background:var(--backdrop);backdrop-filter:blur(3px)}
+.us-head{display:flex;align-items:center;gap:10px}
+.us-head h2{flex:1;min-width:0;font-size:16px;font-weight:650;color:var(--text-bright);overflow-wrap:anywhere}
+.us-close{flex:none;padding:0 6px;background:transparent;color:var(--text-muted);font-size:19px;line-height:1.2}
+.us-status{margin:8px 0;color:var(--text-2);font-size:13px;overflow-wrap:anywhere}
+.us-rows{display:flex;flex-direction:column;gap:7px;list-style:none;margin:10px 0;padding:0}
+.us-row{min-width:0;padding:9px 10px;border-radius:9px;background:var(--bg-inset);overflow-wrap:anywhere}
+.us-row-head{display:flex;align-items:baseline;justify-content:space-between;gap:8px;min-width:0}
+.us-row-head strong{flex:none;max-width:100%;color:var(--text-bright);overflow-wrap:anywhere}
+.us-row-head span{flex:1 1 0;min-width:0;text-align:right;color:var(--text-2);font-size:12px;overflow-wrap:anywhere}
+.us-detail{margin-top:4px;color:var(--text-muted);font-size:12px;overflow-wrap:anywhere}
+.us-kept{margin-top:6px;color:var(--warn-text);font-size:12px}
+.us-kept ul{margin:3px 0 0;padding-left:18px;color:var(--text-2)}
+.us-kept li{overflow-wrap:anywhere}
+.us-foot{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:8px;margin-top:10px}
+@media(max-width:600px){#updateSheet{position:fixed;inset:auto 8px 8px;width:auto;max-width:none;max-height:min(80dvh,calc(100dvh - 16px));margin:0}}
 .ctx-pop-kind{font-size:11px;color:var(--text-muted)}
 .ctx-pop-close{margin-left:auto;padding:0 6px;border:none;background:transparent;color:var(--text-muted);font-size:16px;line-height:1}
 .ctx-pop-close:hover{color:var(--text)}
@@ -1448,8 +1465,9 @@ body.all-view #center, body.all-view #topStrip{display:none}
 /* bottom: above the session's composer card when one shows (--toast-bottom, dock_reserve.js placeToast). */
 #toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;flex-direction:column;align-items:center;gap:8px}
 #toast[hidden]{display:none}
-#toast .toast-item{display:flex;gap:12px;align-items:center;width:max-content;max-width:100%;box-sizing:border-box;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
-#toast .toast-action{background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
+#toast .toast-item{display:flex;flex-wrap:wrap;gap:8px 12px;align-items:center;width:max-content;max-width:100%;box-sizing:border-box;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
+#toast .toast-message{flex:1 1 180px;min-width:0;overflow-wrap:anywhere}
+#toast .toast-action{flex:0 0 auto;white-space:nowrap;background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
 #toast .toast-close{background:transparent;border:0;color:var(--text-muted);cursor:pointer;padding:2px 4px;margin-left:-6px}
 #toast .toast-close:hover{color:var(--text)}
 /* Each row is as tall as its tallest card. An `auto` row in a grid that overflows its
@@ -1608,6 +1626,7 @@ a{color:var(--accent)}
     <div id="allList"></div>
   </section>
 </main>
+<dialog id="updateSheet" aria-labelledby="updateSheetTitle"></dialog>
 <div id="toast" role="status" aria-live="polite" hidden></div>
 <script type="module" src="/assets/app.js"></script>
 </body>

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

@@ -30,9 +30,11 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
   }
 
   function draw(entry, text, action, sticky) {
-    render(html`<span class="toast-message" @click=${(e) => { if (e.target.closest?.("a[href]")) remove(entry); }}>${text}</span>${action
-      ? html`<button type="button" class="toast-action" @click=${() => { remove(entry); action.run(); }}>${action.label}</button>`
-      : nothing}${sticky ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${() => remove(entry)}>✕</button>` : nothing}`,
+    const actions = Array.isArray(action) ? action : action ? [action] : [];
+    render(html`<span class="toast-message" @click=${(e) => { if (e.target.closest?.("a[href]")) remove(entry); }}>${text}</span>${actions.map((item) =>
+      html`<button type="button" class="toast-action" @click=${() => { remove(entry); item.run(); }}>${item.label}</button>`)}${sticky
+      ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${() => remove(entry)}>✕</button>`
+      : nothing}`,
     entry.el);
   }
 
@@ -61,7 +63,7 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
       el.appendChild(duplicate.el);
       if (!duplicate.sticky) duplicate.timer = setTimeout(() => remove(duplicate), TOAST_MS);
       sync();
-      return;
+      return duplicate;
     }
 
     if (entries.length === MAX_TOASTS) {
@@ -72,7 +74,13 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
     el.appendChild(entry.el);
     if (!sticky) entry.timer = setTimeout(() => remove(entry), TOAST_MS);
     sync();
+    return entry;
+  }
+
+  // Takes down a toast show returned (gone already: nothing).
+  function dismiss(entry) {
+    if (entry) remove(entry);
   }
 
-  return { show };
+  return { show, dismiss };
 }

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

@@ -45,8 +45,8 @@ 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;
-//   only its terminal can restart it;
-// - available newer than served: run chi update, unless the install is blocked.
+//   restart its workers or chi web;
+// - available newer than served: install it, unless the install is blocked.
 // 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}
@@ -57,8 +57,8 @@ export function versionNotice({ loaded, served, installed, available, updateBloc
   } else if (newerVersion(installed, served)) {
     notice = {
       key: `installed:${installed}`,
-      text: `chi ${installed} is installed; this chi web runs ${served}. ` +
-        "Restart it: Ctrl-C in its terminal, then chi web",
+      text: `chi ${installed} is installed; this chi web runs ${served}.`,
+      actions: ["restartWorkers", "restartWeb"],
       reload: false,
     };
   } else if (newerVersion(available, served)) {
@@ -73,8 +73,8 @@ export function versionNotice({ loaded, served, installed, available, updateBloc
       key: `available:${available}`,
       text: blocked
         ? `chi ${available} is available (you run ${served}); ${blocked[0]}. Run ${command}.`
-        : `chi ${available} is available (you run ${served}). Run ${command}.`,
-      command,
+        : `chi ${available} is available (you run ${served}).`,
+      ...(blocked ? { command } : { updateVersion: available }),
       releaseUrl: `https://rubygems.org/gems/samagotchi/versions/${encodeURIComponent(available)}`,
       reload: false,
     };

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

@@ -0,0 +1,158 @@
+import { html, nothing, render } from "./vendor/lit-html.js";
+
+function installRow(row) {
+  const kept = Array.isArray(row.kept) ? row.kept.map(String) : [];
+  const versions = [row.from, row.to].filter(Boolean).join(" → ");
+  return html`<li class="us-row">
+    <div class="us-row-head"><strong>${row.component || "chi update"}</strong><span>${row.status || "working"}</span></div>
+    ${versions ? html`<div class="us-detail">${versions}</div>` : nothing}
+    ${kept.length ? html`<div class="us-kept"><strong>Kept edited files:</strong><ul>${kept.map((file) => html`<li>${file}</li>`)}</ul></div>` : nothing}
+  </li>`;
+}
+
+function workerRow(row) {
+  const sessionId = String(row.session_id || "unknown");
+  const detail = row.detail || row.reason;
+  const holds = Array.isArray(row.holds) ? row.holds.map((hold) => String(hold).replaceAll("_", " ")).join(", ") : "";
+  const version = row.version ? `chi ${row.version}` : "";
+  return html`<li class="us-row">
+    <div class="us-row-head"><strong title=${sessionId}>${sessionId.slice(0, 8)}</strong>
+      <span>${String(row.state || "working").replaceAll("_", " ")}</span></div>
+    ${version ? html`<div class="us-detail">${version}</div>` : nothing}
+    ${detail ? html`<div class="us-detail">${detail}</div>` : nothing}
+    ${holds ? html`<div class="us-detail">Holds: ${holds}</div>` : nothing}
+  </li>`;
+}
+
+function operationTitle(model) {
+  if (model.operation === "install") return `Update chi${model.version ? ` to ${model.version}` : ""}`;
+  if (model.operation === "workers") return "Restart workers";
+  return "Restart chi web";
+}
+
+// A running operation's last progress line; the end's own words after it
+// (a done frame carries no progress, and the last line would stay).
+function statusText(model) {
+  if (model.error) return model.error;
+  if (model.operation === "web" && model.state === "restarting") return "Waiting for chi web to reconnect…";
+  if (model.operation === "web" && model.state === "done") return `Reconnected${model.version ? ` on chi ${model.version}` : ""}.`;
+  if (model.state === "starting") return "Starting…";
+  if (model.state === "running") return model.progress || (model.operation === "install" ? "Installing…" : "Restarting…");
+  if (model.state === "done") return model.operation === "install" ? "Update complete." : "Worker restart results.";
+  return "Operation failed.";
+}
+
+// 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.
+function restartActions(model) {
+  const busy = ["starting", "running", "restarting"].includes(model.state);
+  if (!model.restartable || 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>`;
+}
+
+export function updateSheetTemplate(model) {
+  const rows = Array.isArray(model.rows) ? model.rows : [];
+  const rowTemplate = model.operation === "workers" ? workerRow : installRow;
+  return html`<header class="us-head">
+    <h2 id="updateSheetTitle">${operationTitle(model)}</h2>
+    <button type="button" class="us-close" data-act="close" aria-label="Close">×</button>
+  </header>
+  <p class="us-status" aria-live="polite">${statusText(model)}</p>
+  ${rows.length ? html`<ol class="us-rows">${rows.map(rowTemplate)}</ol>` : nothing}
+  <footer class="us-foot">${restartActions(model)}<button type="button" class="ghost" data-act="close">Close</button></footer>`;
+}
+
+// The update progress/result sheet; operations continue if it is dismissed.
+export function createUpdateSheet({ dialog, update, restartWorkers, restartWeb }) {
+  let model = null;
+  let requestId = 0;
+  let restartable = false;
+
+  function draw() {
+    if (model) render(updateSheetTemplate({ ...model, restartable }), dialog);
+  }
+
+  function show(next) {
+    model = { ...next, requestId: ++requestId };
+    draw();
+    if (!dialog.open) dialog.showModal();
+  }
+
+  function fail(error, expectedId) {
+    if (!model || model.requestId !== expectedId) return;
+    model = { ...model, state: "failed", error: error?.message || String(error) };
+    draw();
+  }
+
+  function request(action) {
+    const expectedId = model.requestId;
+    Promise.resolve().then(action).catch((error) => fail(error, expectedId));
+  }
+
+  dialog.addEventListener("click", (event) => {
+    const act = event.target.closest?.("[data-act]")?.dataset.act;
+    if (act === "close") dialog.close();
+    else if (act === "restart-workers") openWorkers();
+    else if (act === "restart-web") openWeb();
+  });
+
+  function openInstall(version) {
+    show({ operation: "install", version, state: "starting", rows: [] });
+    request(() => update(version));
+  }
+
+  function openWorkers() {
+    restartable = true;
+    show({ operation: "workers", state: "starting", rows: [] });
+    request(restartWorkers);
+  }
+
+  function openWeb() {
+    restartable = true;
+    show({ operation: "web", state: "restarting", rows: [] });
+    request(restartWeb);
+  }
+
+  function receive(data) {
+    if (!["install", "workers"].includes(data?.operation)) return false;
+    if (model?.operation === "web" && model.state === "restarting") return false;
+    if (!model || (model.operation !== data.operation && ["done", "failed"].includes(model.state))) {
+      model = { operation: data.operation, state: data.state, rows: [], version: data.version };
+    }
+    if (model.operation !== data.operation) return false;
+    model = {
+      ...model,
+      ...data,
+      rows: Array.isArray(data.rows) ? data.rows : [],
+    };
+    if (data.operation === "install" && data.state === "done") restartable = true;
+    draw();
+    return true;
+  }
+
+  function reconnected(version) {
+    if (model?.operation !== "web" || model.state !== "restarting") return false;
+    model = { ...model, state: "done", version };
+    draw();
+    return true;
+  }
+
+  function view() {
+    if (!model) return false;
+    draw();
+    if (!dialog.open) dialog.showModal();
+    return true;
+  }
+
+  return {
+    install: openInstall,
+    restartWorkers: openWorkers,
+    restartWeb: openWeb,
+    receive,
+    reconnected,
+    view,
+    close: () => dialog.close(),
+    isOpen: () => dialog.open,
+  };
+}