samagotchi 0.143.0 → 0.145.0

data/lib/samagotchi/testing/boundary.rb

@@ -171,6 +171,82 @@ module Samagotchi
           name == entry.name || name.start_with?("#{entry.name}.", "#{entry.name}::")
         end
       end
+
+      # A reference this chi still has, read as a constant path and, when the
+      # source names one, the method on it. Anything else is a form we can't
+      # read, and #gone? answers "still there" for it.
+      NAME_AND_METHOD = /\A(?<name>Samagotchi(?:::[A-Z]\w*)+)(?:\.(?<method>[a-z_]\w*[?!]?))?\z/
+
+      # Every .rb of this chi's library. Shipped bundles' own code is not chi's
+      # internals: loading it here would run a bundle's plugin twice.
+      CORE_FILES = Dir.glob(File.join(LIB_DIR, "**", "*.rb"))
+                      .reject { |file| file.start_with?(File.join(LIB_DIR, "samagotchi", "bundles") + File::SEPARATOR) }
+                      .sort.freeze
+
+      # Whether this chi no longer has a reference #scan found: its constant
+      # does not resolve, or the object behind it has no method the name
+      # names. That is the one question `chi update` asks of a bundle it
+      # didn't write (Check with installed: true); a name that still resolves
+      # breaks nothing, so it gets no row.
+      #
+      # The trap: lib/samagotchi loads lazily — each command requires what it
+      # uses — so the running process may simply not have a name yet, and
+      # asking it directly would call that "gone". When a name does not
+      # resolve, #load_chi requires every file of this chi's library and asks
+      # again, so the answer does not depend on what happened to be loaded. It
+      # is lazy: a bundle reaching nothing internal, or reaching only names
+      # this process already has, never pays for it; and the load happens in
+      # the forked child, not in the update itself. A name that still fails
+      # after that is "gone" only if this chi's source defines it nowhere: a
+      # file the child could not require says nothing either way.
+      def gone?(reference)
+        match = NAME_AND_METHOD.match(reference)
+        return gone_require?(reference) if match.nil?
+        return false if resolves?(match[:name], match[:method])
+
+        load_chi
+        return false if resolves?(match[:name], match[:method])
+
+        !defined_in_source?(match[:name])
+      end
+
+      def resolves?(name, method)
+        object = Object.const_get(name)
+        method.nil? || object.respond_to?(method)
+      rescue NameError
+        false
+      end
+      private_class_method :resolves?
+
+      # A require of one of chi's files is gone only when the file is not
+      # there; a require_relative the scan accepted points at a file it found.
+      def gone_require?(reference)
+        match = %r{\Arequire "samagotchi(?:/([\w/]+))?"\z}.match(reference)
+        match ? !File.file?(File.join(LIB_DIR, "#{["samagotchi", match[1]].compact.join("/")}.rb")) : false
+      end
+      private_class_method :gone_require?
+
+      def load_chi
+        return if @chi_loaded
+
+        @chi_loaded = true
+        @unloadable = []
+        CORE_FILES.each do |file|
+          require file
+        rescue StandardError, ScriptError # ScriptError: a LoadError, as the kit's adapters give with no rspec installed
+          @unloadable << file
+        end
+      end
+      private_class_method :load_chi
+
+      # A name that failed to resolve is "gone" only when no file of this chi
+      # defines it: one the child could not require (a gem missing, say) says
+      # nothing about what chi has.
+      def defined_in_source?(path)
+        last = path.split("::").last
+        @unloadable.any? { |file| File.read(file).match?(/\b(?:module|class)\s+#{last}\b|\b#{last}\s*=/) }
+      end
+      private_class_method :defined_in_source?
     end
   end
 end

data/lib/samagotchi/testing/env_not_shown.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "pp"
+
+# A failing matcher or assertion that meets the process ENV prints this
+# instead of its contents, which hold real API keys: RSpec and Minitest format
+# with #inspect and diff with pp. Loaded by the bundle kit and by chi's own
+# spec suite; it needs nothing else of chi's. A stub_const("ENV", ENV.to_h...)
+# is a plain Hash and isn't covered.
+module Samagotchi
+  module Testing
+    ENV_NOT_SHOWN = "#<the process ENV, contents not shown>"
+  end
+end
+
+def ENV.inspect = Samagotchi::Testing::ENV_NOT_SHOWN
+def ENV.pretty_print(printer) = printer.text(Samagotchi::Testing::ENV_NOT_SHOWN)

data/lib/samagotchi/testing.rb

@@ -12,6 +12,7 @@
 #   require "samagotchi/testing/rspec"      # RSpec helpers
 #   require "samagotchi/testing/minitest"   # Samagotchi::Testing::Case
 require_relative "version"
+require_relative "testing/env_not_shown"
 require_relative "testing/sandbox"
 require_relative "testing/recorder"
 require_relative "testing/host"

data/lib/samagotchi/update_command.rb

@@ -14,6 +14,7 @@ require_relative "memory_bundle/system_bundle"
 require_relative "session"
 require_relative "version"
 require_relative "web/lan"
+require_relative "web/running"
 require "json"
 
 module Samagotchi
@@ -106,7 +107,7 @@ module Samagotchi
       @platform = platform || Desktop::MacOS.method(:from_config)
       @supported = supported
       @state_dir = state_dir
-      @web = web || [Web::Lan.local_host(Config.get("web.host")), Config.get("web.port").to_i]
+      @web = web || [Web::Lan.local_host(Config.get("web.host")), LiveVersions.configured_web_port]
     end
 
     # @return [Integer] 0 nothing failed, 1 a part failed (or a checkout), 2 usage
@@ -369,13 +370,13 @@ module Samagotchi
       rows = []
       stale = LiveVersions.stale_workers(VERSION, state_dir: @state_dir)
       rows << Row.new(component: "workers", status: workers_status(stale)) unless stale.empty?
-      host, port = @web
-      info = LiveVersions.web_info(host, port)
-      web = info && info["version"].to_s
-      if web && !web.empty? && web != VERSION
+      host, configured = @web
+      answer = LiveVersions.web_answering(host, configured, path: Web::Running.path(state_dir: @state_dir))
+      web = answer&.info&.fetch("version", nil).to_s
+      if !web.empty? && web != VERSION
         # Since newest_workers, the sessions it starts run the newest chi.
-        spreads = !Array(info["features"]).include?("newest_workers")
-        rows << Row.new(component: "chi web :#{port}", from: web,
+        spreads = !Array(answer.info["features"]).include?("newest_workers")
+        rows << Row.new(component: "chi web :#{answer.port}", from: web,
                         status: "running old code#{": new sessions it starts run #{web} too" if spreads}; restart it")
       end
       rows

data/lib/samagotchi/version.rb

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

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

@@ -4,7 +4,7 @@
 // quote (with where it came from) to the composer, a preset the quote with
 // its text as the note. Nothing is sent. The bar lives outside #history,
 // which is re-rendered whole. The selection is read when it changes: a live
-// bubble rewrites its text every frame, which would collapse it by the time
+// bubble rewrites its text at every flush, which would collapse it by the time
 // a button is clicked.
 //
 // A bundle's pills (chi.annotation) come after the presets: each prepares

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

@@ -37,6 +37,7 @@ import { createContextChips } from "./context_chips.js";
 import { createParticipantsControl } from "./participants_panel.js";
 import { createSettingsControl } from "./settings_chip.js";
 import { renderInfoBar } from "./info_bar.js";
+import { createMoreSheet } from "./more_sheet.js";
 import { sessionBar, workerBadgeFor } from "./info_bar_model.js";
 import { createShownTexts } from "./shown_texts.js";
 import { emptySessionState, sessionStateFrom } from "./session_state.js";
@@ -170,6 +171,8 @@ const settingsControl = createSettingsControl({
   running: () => liveTurn.running,
   run: (line) => runSessionCommand(line),
 });
+// A phone's ⋯ on the info bar, and its sheet: the chips and buttons the row has no room for.
+const moreSheet = createMoreSheet({ el: $("#infoBar"), button: $("#infoMoreBtn"), session: () => store.selected, hash: sessionHash });
 // The open session's participants chip in the info bar, and its panel
 // (Invite, revoke, caps, the participant view).
 const participantsControl = createParticipantsControl({
@@ -886,7 +889,11 @@ window.addEventListener("hashchange", () => {
 const narrowScreen = window.matchMedia("(max-width: 600px)");
 // An input the store doesn't hold, with the composer as its only reader: a
 // direct call (the bar doesn't read it).
-narrowScreen.addEventListener("change", () => updateComposerMode());
+narrowScreen.addEventListener("change", () => {
+  updateComposerMode();
+  // ⋯ is a phone's alone: a window grown past it takes its sheet along.
+  if (!narrowScreen.matches && moreSheet.isOpen()) moreSheet.close();
+});
 function setPlaceholder(long, short) {
   promptEl.placeholder = narrowScreen.matches ? short : long;
 }
@@ -1501,11 +1508,15 @@ async function restartWorker() {
 
 // The session bar (info_bar_model.js sessionBar): its buttons, and the
 // info line rendered by info_bar.js.
+// The open session waits on the user: its summary says so, or its card is up.
+function sessionWaits() {
+  return !!(waitingOn(store.sessions.find((s) => s.id === store.selected)) || questionCards.pendingQuestion());
+}
 function updateInfoBar() {
   annotateBar?.refresh();
   const { buttons, bar } = sessionBar({
     id: store.selected, state: store.current, sessions: store.sessions, versions, cardTitle: (s) => lists.cardTitle(s),
-    continuing: sessionActions.continuing, restarting: restartingIds, streaming: !!streamControl, running: liveTurn.running,
+    continuing: sessionActions.continuing, restarting: restartingIds, streaming: !!streamControl, running: liveTurn.running, waiting: sessionWaits(),
     workingSet: workingSet ? workingSet.chip() : undefined, participants: participantsControl.chip(),
   });
   const stopBtn = document.getElementById("infoStopBtn");
@@ -1533,6 +1544,7 @@ function updateInfoBar() {
   // lit writes its text alone, the bar's other nodes (a tooltip, a button
   // mid-press) stay.
   renderInfoBar(infoTextEl, bar);
+  moreSheet.update({ bar, buttons });
   updateSessionTitle();
   // A fresh link's picker follows what the bar follows: its model, its
   // owner, a next link continued from elsewhere.
@@ -1939,7 +1951,7 @@ const composer = mountComposer({
   fold: {
     infoBarEl: $("#infoBar"),
     session: () => store.selected,
-    waiting: () => !!(waitingOn(store.sessions.find((s) => s.id === store.selected)) || questionCards.pendingQuestion()),
+    waiting: sessionWaits,
     allViewOpen,
     lightboxOpen: () => !lightboxEl.hidden,
   },

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

@@ -8,7 +8,9 @@
 // +sheet+, a window narrower than SHEET_MAX gets it as a bottom sheet. An
 // open one is placed again when the window (or a phone's visual viewport:
 // its keyboard) resizes.
-// It is modal as every popover is (popover_modal.js).
+// It is modal as every popover is (popover_modal.js). A chip with no box (the
+// phone's bar folds it behind ⋯, display:none) is placed and focused at the
+// page's [data-anchor-stand-in] (that ⋯; shownAnchor).
 
 import { nothing, render } from "./vendor/lit-html.js";
 import { focusBack, modalDialog } from "./popover_modal.js";
@@ -50,6 +52,14 @@ export function sheetPlace({ innerWidth, innerHeight }, { share = SHEET_SHARE, v
            maxHeight: Math.round(height * share) };
 }
 
+// Where a popover at +anchor+ goes and gives focus back: the anchor, or for
+// one with no box the page's stand-in, when that has a box itself.
+function shownAnchor(anchor, doc) {
+  if (!anchor?.getClientRects || anchor.getClientRects().length) return anchor;
+  const standIn = doc.querySelector("[data-anchor-stand-in]");
+  return standIn?.getClientRects().length ? standIn : anchor;
+}
+
 // id, className: the popover's; width: its widest (px); el: where the chip
 // is drawn; anchor: the chip's selector; openers: the selector of every
 // element that opens it (a click there is not a click outside; default the
@@ -107,7 +117,7 @@ export function createChipPopover({ id, className, width: widest, el, anchor: an
     const width = Math.min(widest, win.innerWidth - 32);
     pop.style.width = `${width}px`;
     pop.style.maxHeight = "";
-    const at = popoverPlace(anchor.getBoundingClientRect(), { width, height: pop.offsetHeight,
+    const at = popoverPlace(shownAnchor(anchor, doc).getBoundingClientRect(), { width, height: pop.offsetHeight,
                                                               innerWidth: win.innerWidth, innerHeight: win.innerHeight });
     pop.style.left = `${at.left}px`;
     pop.style.top = at.top === undefined ? "" : `${at.top}px`;
@@ -124,7 +134,7 @@ export function createChipPopover({ id, className, width: widest, el, anchor: an
     openFor = session();
     opener = anchor;
     returnTo = from;
-    expanded([anchor, from]);
+    expanded([anchor, from, shownAnchor(anchor, doc)]);
     show(data, true);
     pop.hidden = false;
     place(anchor);
@@ -144,7 +154,7 @@ export function createChipPopover({ id, className, width: widest, el, anchor: an
     returnTo = null;
     onClose();
     render(nothing, pop);
-    back(to);
+    back(shownAnchor(to, doc));
   }
 
   function isOpen() { return !pop.hidden; }

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

@@ -3,13 +3,16 @@
 // unfold is saved per browser (chi_composer_collapsed); an archived
 // session opens folded for that visit; the page expanding it by itself (a
 // focus, a restored line, a quote) opens it for the visit only. A visit is
-// one select() call.
+// one select() call. A card's text field with the focus on a narrow or touch
+// screen folds it for that time, on top of all of these (+cardField+): the
+// keyboard is up and the card needs the rows; nothing is saved.
 
 export const COMPOSER_FOLD_KEY = "chi_composer_collapsed";
 
 // Whether the composer is folded: the saved choice or an archived visit,
 // unless this visit opened it.
-export function composerFolded({ saved, archivedVisit, visitOpen }) {
+export function composerFolded({ saved, archivedVisit, visitOpen, cardField = false }) {
+  if (cardField) return true;
   if (visitOpen) return false;
   return !!saved || !!archivedVisit;
 }

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

@@ -7,6 +7,13 @@ import { readStored, removeStored, writeStored } from "./storage.js";
 // the box's height (fitPrompt) and the grip's floor (+floor+ / +setFloor+), which
 // fitPrompt reads; the floor is saved under GRIP_KEY.
 export const GRIP_KEY = "chi_composer_floor";
+// A card's text field with the focus folds the composer on these screens.
+const CARD_FIELD_SCREEN = "(max-width: 600px), (hover: none) and (pointer: coarse)";
+const CARD_FIELD = '.bubble.question input[type="text"], .bubble.continue input[type="text"]';
+// Whether it still has the focus is looked at this often, twice before the
+// composer comes back: a field an answer disables or removes fires no blur,
+// and a tap on Submit must land before the card moves under the finger.
+const CARD_FIELD_CHECK_MS = 150;
 
 // +session+: the open session's id, or null (the start page). +draft+,
 // +waiting+, +allViewOpen+, +lightboxOpen+: what the page shows now.
@@ -36,6 +43,9 @@ export function createComposerGrip({
   // first getSession answer).
   const newFoldVisit = () => ({ open: false, archived: false, decided: false });
   let foldVisit = newFoldVisit();
+  // The card's text field folding the composer now (watchCardField), or null.
+  let cardField = null;
+  let cardFieldWatch = null;
 
   function cancelPendingFold() {
     if (!pendingFold) return;
@@ -175,7 +185,7 @@ export function createComposerGrip({
     return readStored(COMPOSER_FOLD_KEY) === "1";
   }
   function isComposerFolded() {
-    return !!session() && composerFolded({ saved: composerFoldSaved(), archivedVisit: foldVisit.archived, visitOpen: foldVisit.open });
+    return !!session() && composerFolded({ saved: composerFoldSaved(), archivedVisit: foldVisit.archived, visitOpen: foldVisit.open, cardField: !!cardField });
   }
   function applyComposerFolded() {
     const folded = isComposerFolded();
@@ -187,9 +197,37 @@ export function createComposerGrip({
     if (was && !folded) fitPrompt();
     drawFoldControls();
   }
+  // A card's text field took the focus: the composer folds until it lets go.
+  // On top of the fold's state, which it never writes: the saved choice and
+  // the visit's come back as they were, and the box keeps its draft. Only the
+  // reader's own focus gets here while a draft is there: a card doesn't take
+  // the focus then (question_cards.js focusWhenIdle).
+  function watchCardField(field) {
+    releaseCardField();
+    cardField = field;
+    let missed = 0;
+    cardFieldWatch = setInterval(() => {
+      const held = doc.activeElement === field && !field.disabled && field.isConnected;
+      missed = held ? 0 : missed + 1;
+      if (missed < 2) return;
+      releaseCardField();
+      applyComposerFolded();
+    }, CARD_FIELD_CHECK_MS);
+    applyComposerFolded();
+  }
+  function releaseCardField() {
+    clearInterval(cardFieldWatch);
+    cardFieldWatch = null;
+    cardField = null;
+  }
+  doc.addEventListener("focusin", (e) => {
+    if (!session() || !e.target?.matches?.(CARD_FIELD) || !win.matchMedia?.(CARD_FIELD_SCREEN).matches) return;
+    watchCardField(e.target);
+  });
   // The user's own fold or unfold (the grip, typing): saved, unless this
   // is an archived visit (both are for the visit then).
   function setComposerFolded(folded) {
+    releaseCardField();
     if (foldVisit.archived) {
       foldVisit.open = !folded;
     } else {
@@ -200,7 +238,11 @@ export function createComposerGrip({
   }
   // The page opens it for this visit: nothing saved.
   function openForVisit() {
-    if (!isComposerFolded()) return;
+    releaseCardField();
+    if (!isComposerFolded()) {
+      applyComposerFolded();
+      return;
+    }
     foldVisit.open = true;
     applyComposerFolded();
   }
@@ -264,6 +306,7 @@ export function createComposerGrip({
     drawFoldControls,
     // A new visit (select(), the start page): nothing opened, not decided.
     newVisit() {
+      releaseCardField();
       foldVisit = newFoldVisit();
       applyComposerFolded();
     },

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

@@ -123,7 +123,7 @@ function decorate(root) {
 // Watch +historyEl+ and answer clicks on its buttons.
 export function installCopy(historyEl) {
   // Only what changed is looked at: a streaming bubble rewrites its text
-  // every frame, and a long history shouldn't be walked for that.
+  // at every flush, and a long history shouldn't be walked for that.
   const roots = new Set();
   const run = () => {
     const batch = [...roots];