samagotchi 0.111.0 → 0.112.0

data/lib/samagotchi/reply_wait.rb

@@ -63,8 +63,31 @@ module Samagotchi
     # @!attribute origin [String, nil] "command" for a :no_reply that a
     #   file-delivered session command settled (no turn ran:
     #   TurnCheckpoint.record_command_outcome); nil otherwise
+    # @!attribute running_look [RunningLook, nil] on a :timeout, the turn
+    #   this wait saw running (call's running_look:, for a wait that goes
+    #   on in a next call: chi web's 30 s slices of a remote wait)
     Result = Struct.new(:status, :text, :file, :question, :outcome, :limit, :error_kind, :retryable, :cancel_reason,
-                        :stopped_by, :kept_steps, :session, :turn_id, :origin, keyword_init: true)
+                        :stopped_by, :kept_steps, :session, :turn_id, :origin, :running_look, keyword_init: true)
+
+    # A turn a wait with no turn: saw running with its checkpoint mark:
+    # last_turn's ended_at then and the names of the input files claimed
+    # then (*.json.processing), so its settle by a next worker tells from
+    # a turn that ended or an input that runs next (Poll#settled_running).
+    # Plain strings, so a remote wait carries it from one slice to the next.
+    RunningLook = Data.define(:last_end, :claimed) do
+      # @return [RunningLook, nil] nil unless +raw+ is {last_end: String or
+      #   nil, claimed: [file names]} (string keys, as JSON parsed it)
+      def self.from_h(raw)
+        return nil unless raw.is_a?(Hash) && raw.keys.sort == %w[claimed last_end]
+
+        last_end = raw["last_end"]
+        claimed = raw["claimed"]
+        return nil unless (last_end.nil? || last_end.is_a?(String)) && claimed.is_a?(Array) &&
+                          claimed.all? { |name| name.is_a?(String) && File.basename(name) == name }
+
+        new(last_end: last_end, claimed: claimed.sort.freeze)
+      end
+    end
 
     # The session as it was before a message went in (call's baseline:,
     # #baseline_of): its message count, the question pending then, and when
@@ -133,13 +156,17 @@ module Samagotchi
     #   sorts at the cursor, not past it, and its end precedes the
     #   baseline, so without it the wait would time out "running" again.
     #   Not for a turn: wait (chi answer) whose own end it waits for.
+    # @param running_look [RunningLook, nil] the running turn an earlier
+    #   call of the same wait saw (its :timeout result's running_look): its
+    #   settle ends this call too, as if this call had seen it running
     # @return [Result]
     # @raise [ArgumentError] no such session
     def call(id, state_dir:, cursor:, timeout: nil, poll_interval: POLL_INTERVAL, cancelled: -> { false },
-             baseline: nil, owner_grace: nil, interject: nil, turn: nil, queued: false, ended_before: false)
+             baseline: nil, owner_grace: nil, interject: nil, turn: nil, queued: false, ended_before: false,
+             running_look: nil)
       Poll.new(id, state_dir: state_dir, cursor: cursor, timeout: timeout, poll_interval: poll_interval,
                    cancelled: cancelled, baseline: baseline, owner_grace: owner_grace, interject: interject, turn: turn,
-                   queued: queued, ended_before: ended_before).run
+                   queued: queued, ended_before: ended_before, running_look: running_look).run
     end
 
     # The session as it was before a message went in (call's baseline:):

data/lib/samagotchi/session.rb

@@ -378,7 +378,8 @@ module Samagotchi
 
     # The question this session waits on, as the lists show it: {id:, kind:}
     # with kind "question" (the model's), "approval", "hook" or "continue"
-    # (the step-limit question, asked between turns); nil with
+    # (the step-limit question, asked between turns), +relayed_to+ and
+    # +created_at+ (iso8601: chi web's push catch-up) when set; nil with
     # none. Only while a worker runs it (+live+): a question saved by a
     # worker that died waits for no one (the next worker drops it). The
     # web's summaries and `chi sessions list` both ask this.
@@ -391,7 +392,8 @@ module Samagotchi
       kind = pending.kind.to_s
       relayed = pending.relayed_to
       relayed_to = relayed.is_a?(Hash) ? (relayed[:parent_short] || relayed["parent_short"]) : nil
-      { id: pending.id, kind: %w[approval hook continue].include?(kind) ? kind : "question", relayed_to: relayed_to }.compact
+      { id: pending.id, kind: %w[approval hook continue].include?(kind) ? kind : "question", relayed_to: relayed_to,
+        created_at: pending.created_at }.compact
     end
 
     # A question saved by a process that no longer runs this session (the

data/lib/samagotchi/session_access/remote.rb

@@ -333,7 +333,9 @@ module Samagotchi
       end
 
       # ReplyWait on the server, asked again each WAIT_SLICE until it ends
-      # or +timeout+ passes.
+      # or +timeout+ passes. Each slice is a fresh ReplyWait there: the
+      # running turn a slice saw (its timeout's running_look) goes into the
+      # next, so a settle between two slices ends the wait as it would here.
       # @return [ReplyWait::Result]
       # @raise [ArgumentError] the session is gone
       def wait_reply(id, cursor:, timeout:, baseline:, owner_grace: nil, turn: nil, queued: false, ended_before: false,
@@ -356,6 +358,8 @@ module Samagotchi
           @strategies[id] = strategy_of(reply.json["parent_strategy"])
           result = result_of(reply.json)
           return result unless result.status == :timeout
+
+          body[:running_look] = reply.json["running_look"]
         end
       end
 

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -271,7 +271,10 @@ module Samagotchi
         ["GET", %r{\A/api/push\z}, :handle_push_info, :owner],
         ["POST", %r{\A/api/push/subscriptions\z}, :handle_push_subscribe, :owner],
         ["DELETE", %r{\A/api/push/subscriptions\z}, :handle_push_unsubscribe, :owner],
+        # The id checked in the handler (participant_gate_spec fills ([^/]+) captures only).
+        ["PATCH", %r{\A/api/push/subscriptions/([^/]+)\z}, :handle_push_prefs, :owner],
         ["POST", %r{\A/api/push/test\z}, :handle_push_test, :owner],
+        ["POST", %r{\A/api/push/presence\z}, :handle_push_presence, :owner],
         ["GET", %r{\A/api/sessions/([^/]+)\z}, :handle_show, :participant, :session],
         ["DELETE", %r{\A/api/sessions/([^/]+)\z}, :handle_delete, :owner, :session]
       ].freeze

data/lib/samagotchi/web/participant_access.rb

@@ -341,7 +341,7 @@ module Samagotchi
         grant = principal(req).grant
         return not_permitted_for(req, principal(req)) unless own_turn?(grant, id, options[:turn])
 
-        options = options.merge(queued: true, cursor: nil)
+        options = options.merge(queued: true, cursor: nil, running_look: nil)
         session = session_access.show(id)
         result = session_access.wait_reply(id, **options, poll_interval: @wait_poll_interval,
                                                cancelled: -> { !@server_running.call || !@grants.active?(grant.id) })

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

@@ -60,11 +60,12 @@ export function isOpener(text) {
 // reads its chain's first link's title instead, so the links of a chain
 // keep its name. Its own title when the first link isn't in +byId+ (id →
 // session; deleted, or a walk a missing link cut short) or is the opener too.
-// A link with a title of its own (/title; a new link inherits it) reads it,
-// and a titled first link names its chain.
+// A link with a title of its own (/title; a new link inherits it), an auto
+// title or a recap of its own reads it, and a first link with any of them
+// names its chain.
 export function chainTitle(s, byId) {
   const own = previewForCard(s);
-  if (s?.title || !s?.continues || !isOpener(s.first_preview || s.last_prompt)) return own;
+  if (s?.title || s?.auto_title || s?.recap || !s?.continues || !isOpener(s.first_preview || s.last_prompt)) return own;
   const seen = new Set([s.id]);
   let at = s;
   while (at.continues) {
@@ -73,7 +74,8 @@ export function chainTitle(s, byId) {
     seen.add(prev.id);
     at = prev;
   }
-  return !at.title && isOpener(at.first_preview || at.last_prompt) ? own : previewForCard(at);
+  const named = at.title || at.auto_title || at.recap;
+  return !named && isOpener(at.first_preview || at.last_prompt) ? own : previewForCard(at);
 }
 
 // The open session's title (app.js updateSessionTitle: the top bar and the
@@ -81,10 +83,11 @@ export function chainTitle(s, byId) {
 // (+shown+, its summary, has continues) reads +cardTitle+(shown) whatever
 // its first message: a web link inherits its chain's title, and its first
 // message is an opener (the constant or the user's own). Else +first+,
-// unless it is the opener. A titled session (/title) reads its card's too.
+// unless it is the opener. A titled session (/title), or one with an auto
+// title or a recap (its card's name then), reads its card's too.
 // +shown+ null: not listed yet, +first+.
 export function openTitle({ shown, first, cardTitle }) {
-  if (shown && (shown.title || shown.continues || isOpener(first))) return cardTitle(shown);
+  if (shown && (shown.title || shown.auto_title || shown.recap || shown.continues || isOpener(first))) return cardTitle(shown);
   return first;
 }
 

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

@@ -57,11 +57,26 @@ export function firstPreview(text) {
   return clip(n, FIRST_PREVIEW_CHARS + 1);
 }
 
+// What names a session's card, first found: its title (/title), its auto
+// title (from the recap call), its recap's first sentence (+recap+), its
+// first message, its last prompt. Display only.
+function cardName(session) {
+  return session.title || session.auto_title || session.recap || session.first_preview || session.last_prompt || "";
+}
+
 export function previewForCard(session) {
-  // Unified card preview: its title (/title), else its first message (80),
-  // else its last prompt.
-  const raw = session.title || session.first_preview || session.last_prompt || "";
-  return firstPreview(raw) || "\u2014";
+  // Unified card preview: cardName, cut at 80.
+  return firstPreview(cardName(session)) || "\u2014";
+}
+
+// Where previewForCard's words came from: "title", "auto" (auto_title),
+// "recap" (the card then drops its recap line: the same sentence twice),
+// "preview" (the first message or last prompt, or none).
+export function cardTitleSource(session) {
+  if (session.title) return "title";
+  if (session.auto_title) return "auto";
+  if (session.recap) return "recap";
+  return "preview";
 }
 
 const DELETE_PREVIEW_CHARS = 40;
@@ -70,7 +85,7 @@ const DELETE_PREVIEW_CHARS = 40;
 // list's owner can be stale (a worker idle-exits), so a worker is only
 // "stopped if it's still running", never promised.
 export function deleteConfirmText(session) {
-  const n = normalize(session.title || session.first_preview || session.last_prompt || "");
+  const n = normalize(cardName(session));
   const preview = clip(n, DELETE_PREVIEW_CHARS + 1);
   const shortId = session.short_id || String(session.id).slice(0, 8);
   const lines = [

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

@@ -15,6 +15,8 @@
 :root{--icon-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='10.5' rx='1.5'/%3E%3Ccircle cx='5.75' cy='6.25' r='1.1'/%3E%3Cpath d='m2.5 12.5 3.75-3.75 2.5 2.5 1.75-1.75 3 3'/%3E%3C/svg%3E")}
 :root{--icon-archive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E");--icon-unarchive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
 *{box-sizing:border-box;margin:0;padding:0}
+/* No iOS text autosizing: it grows text in a box sized for the text as written (it clipped the session cards). */
+html{-webkit-text-size-adjust:100%;text-size-adjust:100%}
 body{font-family: ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif;background:radial-gradient(1100px 700px at 8% 0%,color-mix(in srgb,var(--accent) 13%,transparent),transparent 70%),radial-gradient(900px 700px at 100% 100%,color-mix(in srgb,var(--think) 9%,transparent),transparent 70%),var(--bg);background-attachment:fixed;color:var(--text);height:100vh;display:flex;flex-direction:column}
 /* Glass: the composer card, the strip cards, the all-sessions cards and the question cards (by selector, so app.js is untouched). */
 #dock,.turn-stage,.dock-card,#topStrip .card,#allList .card,.bubble.question,.bubble.plugin-card{background:var(--glass-bg);-webkit-backdrop-filter:blur(18px) saturate(1.35);backdrop-filter:blur(18px) saturate(1.35);border:1px solid var(--glass-border);box-shadow:inset 0 1px 0 var(--glass-highlight),var(--glass-shadow)}
@@ -710,7 +712,7 @@ body.has-session.fresh-link #composer .actions-col .model-pick:not([hidden]){dis
 #modelList .model-option.unavailable:not(.chosen) .model-id,#modelList .model-option.unavailable .model-host{color:var(--text-faint)}
 #modelList .model-option.unavailable .model-note{color:var(--warn-text)}
 #modelList .model-empty{padding:10px;font-size:13px;color:var(--text-faint)}
-@media(max-width:600px){#modelPanel{left:6px;width:calc(100% - 12px)}#modelSearch{font-size:16px}#modelList .model-option{padding-top:8px;padding-bottom:8px}}
+@media(max-width:600px){#modelPanel{left:6px;width:calc(100% - 12px)}#modelList .model-option{padding-top:8px;padding-bottom:8px}}
 /* The / autocomplete: a list over the composer card's top edge. It wears the glass edge and shadow, but opaque:
    inside the dock's own backdrop-filter a second blur sees nothing, and the history would show through its text. */
 #commandList{position:absolute;left:10px;width:min(640px,calc(100% - 20px));bottom:calc(100% + 8px);max-height:min(260px,40vh);overflow-y:auto;border-radius:12px;padding:4px;z-index:20;display:flex;flex-direction:column;gap:1px;background:var(--bg-panel);border:1px solid var(--glass-border);box-shadow:inset 0 1px 0 var(--glass-highlight),var(--glass-shadow)}
@@ -1105,7 +1107,7 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .llmctx-form .ctx-pop-head strong{font-family:inherit}
 .llmctx-field{display:flex;align-items:center;gap:8px}
 .llmctx-field>span{flex:0 0 58px;font-size:12px;color:var(--text-muted)}
-.llmctx-field select,.llmctx-field input{flex:1;min-width:0;box-sizing:border-box;padding:5px 8px;border-radius:7px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font:13px/1.4 inherit}
+.llmctx-field select,.llmctx-field input{flex:1;min-width:0;box-sizing:border-box;padding:5px 8px;border-radius:7px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font:inherit;font-size:13px;line-height:1.4}
 .llmctx-field select:focus,.llmctx-field input:focus{outline:none;border-color:var(--accent-border)}
 /* The settings selects draw their own closed box (each browser's native one differs) with the model picker's drawn caret on the label; the open list stays the OS menu. */
 .llmctx-field select{appearance:none;-webkit-appearance:none;padding-right:26px;cursor:pointer}
@@ -1122,7 +1124,7 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 #infoBar .ctx-chip.ctx-add{border-style:dashed;color:var(--text-muted);background:transparent}
 .ctx-add-form{display:flex;flex-direction:column;gap:6px;margin:0}
 .ctx-add-form .ctx-pop-head strong{font-family:inherit}
-.ctx-add-input{width:100%;box-sizing:border-box;padding:6px 8px;border-radius:7px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font:13px/1.4 inherit}
+.ctx-add-input{width:100%;box-sizing:border-box;padding:6px 8px;border-radius:7px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font:inherit;font-size:13px;line-height:1.4}
 .ctx-add-input:focus{outline:none;border-color:var(--accent-border)}
 #infoBar .ctx-chip{display:inline-flex;align-items:center;gap:5px;padding:2px 9px;border-radius:999px;font:600 11px/1.5 ui-monospace,monospace;background:color-mix(in srgb,var(--bg-hover) 55%,transparent);color:var(--text-3);border:1px solid var(--border-strong);white-space:nowrap}
 #infoBar .ctx-chip:hover,#infoBar .ctx-chip.open{color:var(--text);border-color:var(--accent-border);background:var(--accent-bg)}
@@ -1300,8 +1302,6 @@ body.has-session #scope .scope-where{display:none}
   #sessionTitleRow{flex-basis:100%;order:10}
   #sessionTitle{font-size:12px}
   .title-rename{font-size:12px;line-height:18px}
-  /* Under 16px iOS Safari zooms the page on focus. */
-  .rename-input{font-size:16px}
   #scope,#stripStatus{flex:1 1 0;min-width:0;max-width:max-content}
   #stripStatus{flex-grow:1000;overflow:hidden;text-overflow:ellipsis}
   #scope .scope-name{flex-shrink:1;min-width:0}
@@ -1471,6 +1471,9 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card{padding:12px;border-radius:10px;background:var(--bg-panel);border:1px solid var(--border);cursor:pointer;display:flex;flex-direction:column;gap:6px;min-height:72px}
 .card:hover{border-color:var(--border-strong);background:var(--bg-hover)}
 #allList .card{position:relative}
+/* Every row keeps its content's height: a card shorter than its rows (seen on iOS) cut the clamped preview and the
+   single-line title and recap through the middle. */
+#allList .card > *{flex-shrink:0}
 /* A card's tools in the all view: archive (or unarchive) and delete, shown on hover, always under hover:none. */
 #allList .card-tools{position:absolute;top:6px;right:6px;display:flex;gap:2px}
 .card-tools button{padding:2px 7px;border-radius:6px;border:1px solid transparent;background:transparent;color:var(--text-muted);font-size:12px;line-height:1.2;cursor:pointer;opacity:0;transition:opacity .15s}
@@ -1520,6 +1523,14 @@ body.all-view #center, body.all-view #topStrip{display:none}
   #topStrip #allTile{width:auto}
 }
 a{color:var(--accent)}
+/* Under 16px iOS Safari zooms the page on focus (and a Home Screen app never zooms back), at any width: every text
+   field gets 16px on a phone or a touch device. Last in the sheet so it wins over each field's own size; keep new text
+   fields in this list (stage.spec.js's phone step checks the visible ones). */
+@media (max-width:600px),(pointer:coarse){
+  #composer textarea,.question-freeform,.continue-reason,.participants-popover input,.participants-popover select,
+  .rs-form textarea,.pp-link input,.llmctx-field select,.llmctx-field input,.ctx-add-input,.ws-add-in,.rename-input,
+  #modelSearch{font-size:16px}
+}
 </style>
 </head>
 <body>

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

@@ -25,7 +25,7 @@
 //   onRename()            the active card's ✎ clicked (session_rename.js open)
 //   renaming()            whether that rename input is open (the strip holds)
 
-import { ownerBadge, relativeTime, delegatedBy } from "./format.js";
+import { ownerBadge, relativeTime, delegatedBy, cardTitleSource } from "./format.js";
 import { html, nothing, render } from "./vendor/lit-html.js";
 import { cardCtxText, ctxBarTip } from "./ctx.js";
 import { allScopeHref, cardFolder } from "./scope.js";
@@ -172,7 +172,8 @@ export function cardTemplate(s, { deletable = false, archivable = false, selecta
   const preview = renamable
     ? html`<div class="preview-row"><div class="preview">${title}</div><button type="button" class="card-rename" data-rename=${s.id} title="Rename this session" aria-label="Rename this session">\u270e</button></div>`
     : html`<div class="preview">${title}</div>`;
-  const recap = s.recap ? html`<div class="recap" title=${s.recap}>${s.recap}</div>` : nothing;
+  // No recap line when the title is the recap's first sentence (D5).
+  const recap = s.recap && cardTitleSource(s) !== "recap" ? html`<div class="recap" title=${s.recap}>${s.recap}</div>` : nothing;
   return html`<div class=${cls} data-id=${s.id} data-members=${memberIds.length ? memberIds.join(" ") : nothing} style=${anim || nothing} title=${`${tip}${memTitle ? ` · ${memTitle}` : ""}`}>${preview}${recap}<div class="meta"><span class=${`status dot ${s.status}${waiting ? " waiting" : ""}`} title=${dotWord} aria-label=${dotWord}></span>${waitingT}${stoppedT}${time}${ctxT}${folderT}${parentChipTemplate(s, parent)}${chain}${kids}${ownerBadgeTemplate(s)}${archived}</div>${famRows}${skip}${pick}${selectable ? nothing : cardToolsTemplate(s, { deletable, archivable })}</div>`;
 }
 

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

@@ -6,25 +6,45 @@
 // (notify.js, Several tabs).
 //
 // In the Home Screen app (push.js pushSupported) the bell means "push to
-// this device" instead (Web Push): chi web pushes approvals and questions to
-// it while the app is closed. chi web without push (no https public URL)
+// this device" instead (Web Push): chi web pushes what needs the user (an
+// approval, a question, a step-limit continue, a card, a failed turn) to it
+// while the app is closed. chi web without push (no https public URL)
 // leaves the bell as it is in a tab. With the bell on, the app also tidies
 // the device (syncDevice): it closes the pushed notifications whose
-// question isn't open any more and sets the app's badge, as chi web sends
-// no close push (WebKit's silent-push quota).
+// question or card isn't open any more and sets the app's badge, as chi
+// web sends no close push (WebKit's silent-push quota).
+//
+// Every page, in a tab or the app, also tells chi web whether the user is
+// at it (POST /api/push/presence, reportPresence): chi web pushes nothing
+// while one is in front, as the user is looking (the iPhone's service
+// worker can't see the app in front, so chi web decides).
 //
 // The browser parts come in as deps (globals by default) so the specs can
 // drive it without a DOM.
 
 import { sessionHash } from "./route.js";
 import {
-  NOTIFY_CHANNEL, attentionText, createNotifyGate, initialAttentionState, notifyState as bellState, trackAttention,
+  NOTIFY_CHANNEL, attentionText, createNotifyGate, initialAttentionState, notifyState as bellState, randomTabId,
+  trackAttention,
 } from "./notify.js";
 import {
-  isQuestionTag, openPushKeys, pushSupported, subscribe as pushSubscribe, unsubscribe as pushUnsubscribe,
+  isWaitingTag, openPushKeys, pushSupported, subscribe as pushSubscribe, unsubscribe as pushUnsubscribe,
 } from "./push.js";
 
 export const NOTIFY_KEY = "chi_notify";
+// The device id chi web gave this app's subscription (POST subscribe's
+// answer): the next subscribe sends it as replaces, so a subscription iOS
+// revoked silently (its push service keeps answering 201) leaves the store.
+export const PUSH_DEVICE_KEY = "chi_push_device";
+// A long-lived Home Screen app checks for a new sw.js at most this often
+// when it comes back in front (reg.update()).
+export const SW_UPDATE_MS = 60 * 60 * 1000;
+// Presence: a page in front reports this often (chi web counts a report
+// 45 s), and is in front only if touched this recently (a tab left focused
+// on a screen nobody watches stops quieting the phone).
+export const PRESENCE_PATH = "/api/push/presence";
+export const PRESENCE_EVERY_MS = 30 * 1000;
+export const TOUCH_FRESH_MS = 2 * 60 * 1000;
 
 const NOTIFY_TITLES = {
   on: "Notifications on: a session that needs you while this tab is in the background. Click to turn off",
@@ -33,8 +53,8 @@ const NOTIFY_TITLES = {
 };
 
 const PUSH_TITLES = {
-  on: "Notifications to this phone: on (approvals and questions, also while the app is closed). Tap to turn off",
-  off: "Notify this phone when a session needs approval or an answer, also while the app is closed",
+  on: "Notifications to this phone: on (a session that needs you or failed, also while the app is closed). Tap to turn off",
+  off: "Notify this phone when a session needs you or a turn fails, also while the app is closed",
   denied: "Notifications are blocked for this app in the phone's settings",
 };
 
@@ -50,6 +70,21 @@ async function defaultApi(method, path, body) {
   return data;
 }
 
+// How a presence report goes: a beacon when the page is leaving (it
+// outlives the page; same origin, so the cookie goes), else the api's
+// fetch. Errors swallowed: a lost report only means a push or a quiet one.
+// @return (body, leaving) => void
+export function presenceSender({ nav, api, BlobApi = globalThis.Blob }) {
+  return (body, leaving) => {
+    if (leaving && typeof nav?.sendBeacon === "function" && typeof BlobApi === "function") {
+      try {
+        if (nav.sendBeacon(PRESENCE_PATH, new BlobApi([JSON.stringify(body)], { type: "application/json" }))) return;
+      } catch (_) {}
+    }
+    try { api("POST", PRESENCE_PATH, body)?.catch?.(() => {}); } catch (_) {}
+  };
+}
+
 function defaultChannel() {
   try {
     if (typeof globalThis.BroadcastChannel === "function") return new BroadcastChannel(NOTIFY_CHANNEL);
@@ -68,6 +103,11 @@ function defaultChannel() {
 // @param api (method, path, body) => Promise of chi web's JSON
 // @param scoped the page shows one project's sessions (?dir=): it never
 //   tidies the device, as it doesn't see the others'
+// @param now () => ms (the service worker update's spacing, presence's
+//   touch; specs)
+// @param sendPresence (body, leaving) => void (presenceSender's by default)
+// @param every (fn, ms) => void, a repeating timer (presence's tick)
+// @param pageId this page load's id in its presence reports
 // @return {noticeSessions(type, data), noticeList(sessions), setBaseTitle(title), clearBadge()}
 export function createNotifications({
   button,
@@ -80,6 +120,10 @@ export function createNotifications({
   nav = globalThis.navigator,
   api = defaultApi,
   scoped = false,
+  now = () => Date.now(),
+  sendPresence = presenceSender({ nav, api }),
+  every = (fn, ms) => setInterval(fn, ms),
+  pageId = randomTabId(),
 }) {
   let attention = initialAttentionState();
   // Web Push in the Home Screen app: null until chi web says it pushes
@@ -88,6 +132,8 @@ export function createNotifications({
   let pushBusy = false;
   let syncing = null;
   let syncAgain = false;
+  // When this page last had the browser check for a newer sw.js.
+  let swCheckedAt = null;
   const badgeKeys = new Set();
   let baseTitle = "Chi";
 
@@ -101,6 +147,17 @@ export function createNotifications({
     return doc.visibilityState === "visible" && doc.hasFocus();
   }
 
+  function stored(key) {
+    try { return storage().getItem(key); } catch (_) { return null; }
+  }
+
+  function store(key, value) {
+    try {
+      if (value == null) storage().removeItem(key);
+      else storage().setItem(key, value);
+    } catch (_) {}
+  }
+
   function notifyWanted() {
     try { return storage().getItem(NOTIFY_KEY) === "1"; } catch (_) { return false; }
   }
@@ -148,13 +205,19 @@ export function createNotifications({
     let failed = null;
     try {
       if (push.on) {
-        await pushUnsubscribe({ reg: push.reg, del: (endpoint) => api("DELETE", "/api/push/subscriptions", { endpoint }) });
+        const had = await pushUnsubscribe({ reg: push.reg, del: (endpoint) => api("DELETE", "/api/push/subscriptions", { endpoint }) });
+        // Without a subscription to delete (revoked meanwhile) the id stays
+        // for the next subscribe to replace.
+        if (had) store(PUSH_DEVICE_KEY, null);
         push.on = false;
         setDeviceBadge(0);
       } else if (NotificationApi.permission === "granted" || (await NotificationApi.requestPermission()) === "granted") {
-        const { subscription } = await pushSubscribe({
-          reg: push.reg, key: push.key, post: (json) => api("POST", "/api/push/subscriptions", { subscription: json }),
+        const replaces = stored(PUSH_DEVICE_KEY);
+        const { subscription, answer } = await pushSubscribe({
+          reg: push.reg, key: push.key,
+          post: (json) => api("POST", "/api/push/subscriptions", replaces ? { subscription: json, replaces } : { subscription: json }),
         });
+        if (answer?.id) store(PUSH_DEVICE_KEY, answer.id);
         push.on = true;
         api("POST", "/api/push/test", { endpoint: subscription.endpoint }).catch(() => {});
         syncDevice();
@@ -180,11 +243,23 @@ export function createNotifications({
       const info = await api("GET", `/api/push${query}`);
       if (!info?.enabled || !info.public_key) return;
       push = { reg, key: info.public_key, on: !!(sub && info.this) };
+      // register() has just checked for a newer sw.js.
+      swCheckedAt = now();
       renderNotifyBtn();
     } catch (_) {}
     syncDevice();
   }
 
+  // A Home Screen app can stay open for days: when it comes back in front
+  // it asks for a newer sw.js, at most once per SW_UPDATE_MS.
+  function updateWorker() {
+    if (!push || typeof push.reg?.update !== "function") return;
+    const at = now();
+    if (swCheckedAt !== null && at - swCheckedAt < SW_UPDATE_MS) return;
+    swCheckedAt = at;
+    try { push.reg.update()?.catch?.(() => {}); } catch (_) {}
+  }
+
   function setDeviceBadge(count) {
     try {
       const done = count > 0 && typeof nav?.setAppBadge === "function" ? nav.setAppBadge(count)
@@ -194,7 +269,8 @@ export function createNotifications({
   }
 
   // The Home Screen app with the bell on: closes the pushed notifications
-  // whose question isn't open (chi's own, chi:test, stay) and sets the
+  // whose question or card isn't open (chi's own, chi:test, and a failed
+  // or done turn's stay) and sets the
   // app's badge. Never before the first snapshot (an empty byId would close
   // them all) nor on a project's page (its byId lacks the others). One at a
   // time; asked again meanwhile, it runs once more after.
@@ -210,7 +286,7 @@ export function createNotifications({
         const open = new Set(openPushKeys(attention.byId));
         try {
           const shown = await push.reg.getNotifications();
-          for (const n of shown || []) if (isQuestionTag(n.tag) && !open.has(n.tag)) n.close();
+          for (const n of shown || []) if (isWaitingTag(n.tag) && !open.has(n.tag)) n.close();
         } catch (_) {}
         if (push?.on) setDeviceBadge(open.size);
       } while (syncAgain);
@@ -279,7 +355,33 @@ export function createNotifications({
     if (doc.visibilityState !== "visible") return;
     clearBadge();
     syncDevice();
+    updateWorker();
+  }
+  // ── Presence ──────────────────────────────────────────────────────────
+  // Loading the page counts as a touch.
+  let touchedAt = now();
+  let reportedFront = null;
+  const atPage = () => tabInFront() && now() - touchedAt < TOUCH_FRESH_MS;
+  function reportPresence(front = atPage(), leaving = false) {
+    reportedFront = front;
+    sendPresence({ page: pageId, front }, leaving);
   }
+  // The first touch that brings the page to the front (after being idle,
+  // or behind) says so at once; the tick has the rest.
+  function touched() {
+    touchedAt = now();
+    if (reportedFront !== true && atPage()) reportPresence(true);
+  }
+  // Every 30 s while in front, and once more when it no longer is (no
+  // touch for 2 min).
+  every(() => { if (reportedFront || atPage()) reportPresence(); }, PRESENCE_EVERY_MS);
+  doc.addEventListener("visibilitychange", () => (doc.visibilityState === "visible" ? reportPresence() : reportPresence(false, true)));
+  win.addEventListener("focus", () => reportPresence());
+  win.addEventListener("blur", () => reportPresence(false));
+  win.addEventListener("pagehide", () => reportPresence(false, true));
+  for (const type of ["pointerdown", "keydown", "touchstart"]) doc.addEventListener(type, touched, { capture: true, passive: true });
+  if (atPage()) reportPresence(true);
+
   doc.addEventListener("visibilitychange", backInFront);
   win.addEventListener("focus", backInFront);
   doc.addEventListener("pointerdown", clearBadge, true);

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

@@ -96,7 +96,7 @@ const cardKey = (sessionId, cardId) => `${sessionId}:card:${cardId}`;
 // @param prev the summary held before (null for a session not seen yet)
 // @param next the new summary (null when the session is gone)
 // @return [String] keys, maybe none
-function closedKeys(prev, next) {
+export function closedKeys(prev, next) {
   const keys = [];
   const q = prev?.pending_question;
   const nq = next?.pending_question;
@@ -152,7 +152,7 @@ export function trackAttention(state, type, data = {}) {
 // The notification's words: a short title (the session) and the reason.
 // No question or answer text (it would show on a lock screen).
 export function attentionText(session, attention) {
-  const name = String(session?.title || session?.first_preview || session?.last_prompt || "chi session").trim();
+  const name = String(session?.title || session?.auto_title || session?.first_preview || session?.last_prompt || "chi session").trim();
   const title = clip(name, 61);
   const seconds = Math.round(Number(session?.last_turn?.seconds) || 0);
   const body = {
@@ -262,7 +262,7 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
   };
 }
 
-function randomTabId() {
+export function randomTabId() {
   try {
     if (typeof globalThis.crypto?.randomUUID === "function") return globalThis.crypto.randomUUID();
   } catch (_) {}

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

@@ -11,6 +11,8 @@
    (the Plan): beside the thread on a wide screen, a Plan | Thread toggle on a narrow one (the composer pinned in both).
    The owner's participant view is the same page with no composer. Colours are tokens.css's. */
 *{box-sizing:border-box;margin:0;padding:0}
+/* No iOS text autosizing (index.html's twin). */
+html{-webkit-text-size-adjust:100%;text-size-adjust:100%}
 html,body{height:100%;height:100dvh}
 .p-body{flex:1;min-height:0;display:flex}
 .p-col{flex:1;min-width:0;min-height:0;display:flex;flex-direction:column}
@@ -126,6 +128,8 @@ button.small{font-size:12px;padding:2px 8px}
   .p-bubble{padding:9px 12px}
   .p-hint,.p-note{display:none}
 }
+/* Under 16px iOS Safari zooms the page on focus (and a Home Screen app never zooms back). */
+@media (max-width:600px),(pointer:coarse){.p-compose textarea{font-size:16px}}
 </style>
 </head>
 <body>

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

@@ -6,31 +6,30 @@
 // a browser tab keeps the in-tab notifications). See
 // docs/internals/web-push.md.
 
-import { questionReason } from "./notify.js";
-
-// The reasons chi web pushes (Web::Push::Attention::PUSHED).
-const PUSHED = new Set(["approval", "question"]);
-
-// The keys still open in a byId (notify.js trackAttention's: session id →
-// summary): a pending question with an id, not relayed, of a reason chi
-// web pushes. Attention.open_keys's rule, so the page, the worker's open
-// list and the badge agree.
-// @return [String] "<session id>:<question id>" keys
+// The waiting keys still open in a byId (notify.js trackAttention's:
+// session id → summary): a pending question with an id, not relayed (any
+// reason: a step-limit continue too), and a card with actions.
+// Attention.open_keys's rule, so the page, the worker's open list and the
+// badge agree.
+// @return [String] "<session id>:<question id>" and "<session id>:card:<card id>" keys
 export function openPushKeys(byId) {
   const keys = [];
   for (const summary of Object.values(byId || {})) {
     const q = summary?.pending_question;
-    if (!q || !q.id || q.relayed_to || !PUSHED.has(questionReason(q))) continue;
-    keys.push(`${summary.id}:${q.id}`);
+    if (q && q.id && !q.relayed_to) keys.push(`${summary.id}:${q.id}`);
+    const card = summary?.pending_card;
+    if (card && card.id) keys.push(`${summary.id}:card:${card.id}`);
   }
   return keys;
 }
 
-// A pushed question's tag ("<session id>:<question id>"), not one of chi's
-// own (chi:test, chi:other): only these are ever cleaned up. sw.js keeps
-// the same pattern (a classic script imports nothing).
-export const QUESTION_TAG = /^(?!chi:)[^:]+:[^:]+$/;
-export const isQuestionTag = (tag) => typeof tag === "string" && QUESTION_TAG.test(tag);
+// A pushed waiting key's tag: a question's "<session id>:<question id>" or
+// a card's "<session id>:card:<card id>", not one of chi's own (chi:test,
+// chi:other) nor a failed or done turn's "<session id>:<ended_at>" (its
+// time has colons): only these are ever cleaned up. sw.js keeps the same
+// pattern (a classic script imports nothing).
+export const WAITING_TAG = /^(?!chi:)[^:]+:(?:card:)?[^:]+$/;
+export const isWaitingTag = (tag) => typeof tag === "string" && WAITING_TAG.test(tag);
 
 // A standalone app with a service worker and PushManager, on a secure
 // context (chi web's https public URL; the LAN's plain http has none).