samagotchi 0.126.0 → 0.128.0

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

@@ -53,6 +53,7 @@ export function emptySessionState() {
     // worker_version / worker_features): the info bar's stale-worker badge.
     workerVersion: null,
     workerFeatures: [],
+    bridgeUp: false,
     // The LLM context strategy, apply rule and budget the next turn runs
     // under, each with its source (the info bar's llm ctx chip), or null.
     llmContext: null,
@@ -95,6 +96,7 @@ export function sessionStateFrom(data) {
     // not at the session's next hub event (followSelectedSession).
     workerVersion: s.worker_version || null,
     workerFeatures: Array.isArray(s.worker_features) ? s.worker_features : [],
+    bridgeUp: s.bridge_up === true,
     timing: normalizeTiming(data.timing),
   };
   // The saved fill, so a reloaded or stopped session shows it before its

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

@@ -66,7 +66,7 @@ export function createStageView({
   // The dock becomes a clear column: the stage's card, then the composer's
   // (its rows moved into .dock-card, which wears the glass and the focus ring).
   document.body.classList.add("stage-view");
-  const card = node("div", "dock-card");
+  const card = node("div", "dock-card composer-card");
   card.append(...dockEl.children);
   dockEl.appendChild(card);
   const stage = node("section", "turn-stage");

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

@@ -26,6 +26,7 @@
 //                         guess (takeGuess: whether, and forget it); restart:
 //                         close the stream and resync
 //   composer: {empty(), refill(text), setChips(chips)}
+//   restoreVerify(anchor) a restored Verify turn's claim, armed again for its resend
 //   getSession(id, opts)  data.js
 //   resync(), updateInfoBar(), applyPromptOps(data), showSteers(steers),
 //   markRecapStale(), setTurnRunning(running), setLiveStatus(status),
@@ -54,6 +55,7 @@ import {
 import { commandView, drawCommandBubble, historyHasCommandBubble } from "./commands.js";
 import { keepEarlyRestore, restoreAction } from "./restore.js";
 import { PAIR, setBadgeMode } from "./participant_names.js";
+import { isParticipantAuthor } from "./participant_model.js";
 
 export function createStreamHandlers(deps) {
   const {
@@ -162,12 +164,13 @@ export function createStreamHandlers(deps) {
       // A participant's review turn: its id and author, for Apply at its end
       // (turn_completed names neither). A pair turn acted itself: no Apply.
       const author = data.author || data.origin?.author;
+      const participant = isParticipantAuthor(author);
       const pair = data.participant_mode === PAIR;
-      liveTurn.review = author && author !== "owner" && data.turn_id && !pair ? { turn_id: data.turn_id, author, author_name: data.author_name } : null;
+      liveTurn.review = participant && data.turn_id && !pair ? { turn_id: data.turn_id, author, author_name: data.author_name } : null;
       // Its prompt drawn while queued takes the turn's mode now.
       if (data.participant_mode) setBadgeMode(promptBubble, data.participant_mode);
       // The owner's input queues behind it (the composer's delivery line).
-      liveTurn.participantTurn = !!(author && author !== "owner");
+      liveTurn.participantTurn = participant;
       setTurnRunning(true);
       setLiveStatus("running");
       liveTurn.timing.detach();
@@ -244,8 +247,9 @@ export function createStreamHandlers(deps) {
     prompt_restored: async (data) => {
       const id = selected();
       keepEarlyRestore(data, earlyRestores, { myId: clientId, sentIds });
-      const { refill, label, images: restoredImages } = restoreAction(data, { myId: clientId, sentIds, composerEmpty: composer.empty() });
+      const { refill, label, images: restoredImages, verify } = restoreAction(data, { myId: clientId, sentIds, composerEmpty: composer.empty() });
       if (refill) composer.refill(refill);
+      if (refill && verify) deps.restoreVerify?.(verify);
       if (restoredImages?.length) composer.setChips(restoredChips(selected(), restoredImages));
       const failedText = liveTurn.failedText;
       liveTurn.failedText = null;

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

@@ -1,10 +1,23 @@
+import { ownerClaimHash } from "./claim_link.js";
+
 const TYPES = Object.freeze({
   confirmed: { icon: "✅", label: "confirmed" },
   refuted: { icon: "❌", label: "refuted" },
   unclear: { icon: "❓", label: "unclear" },
 });
 
-export function placeVerdict(root, record, { who = "Owner", author = null } = {}) {
+export const CHECK_NOT_ON_PAGE = "That check is no longer on this page.";
+
+export function ownerCheckHash(sessions, currentSessionId, checkTurnId) {
+  if (!Array.isArray(sessions) || typeof checkTurnId !== "string") return null;
+  const session = sessions.find((candidate) =>
+    candidate?.id !== currentSessionId
+    && Array.isArray(candidate.verdicts)
+    && candidate.verdicts.some((verdict) => verdict?.check_turn_id === checkTurnId));
+  return session ? ownerClaimHash(session.id, { turnId: checkTurnId }) : null;
+}
+
+export function placeVerdict(root, record, { who = "Owner", author = null, onMissingCheck = null } = {}) {
   const anchor = record?.anchor;
   const type = TYPES[record?.verdict];
   if (!root || !type || typeof anchor?.turn_id !== "string" || typeof anchor?.quote !== "string"
@@ -47,8 +60,10 @@ export function placeVerdict(root, record, { who = "Owner", author = null } = {}
   link.textContent = "View check";
   link.addEventListener("click", (event) => {
     event.preventDefault();
-    [...root.querySelectorAll("[data-turn-id]")].find((element) => element.dataset.turnId === record.check_turn_id)
-      ?.scrollIntoView?.({ behavior: "smooth", block: "center" });
+    const check = [...root.querySelectorAll("[data-turn-id]")]
+      .find((element) => element.dataset.turnId === record.check_turn_id);
+    if (check) check.scrollIntoView?.({ behavior: "smooth", block: "center" });
+    else onMissingCheck?.(record);
   });
   card.append(heading, quote, reason, link);
 

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

@@ -79,6 +79,17 @@ export function renderFresh(card, fresh = {}) {
     const link = childLink(typeof run === "string" ? null : run.child_id);
     if (link) line.append(" ", link);
     part.append(line);
+  } else if (card.classList.contains("unclear") && fresh.unavailableReason) {
+    const button = doc.createElement("button");
+    button.type = "button";
+    button.className = "verify-fresh-btn";
+    button.textContent = "Verify fresh";
+    button.title = fresh.unavailableReason;
+    button.disabled = true;
+    const note = doc.createElement("p");
+    note.className = "verify-fresh-unavailable";
+    note.textContent = fresh.unavailableReason;
+    part.append(button, note);
   } else if (card.classList.contains("unclear") && fresh.canStart && fresh.start) {
     const button = doc.createElement("button");
     button.type = "button";

data/lib/samagotchi/web/public/verify_card.css

@@ -11,6 +11,7 @@
 .verify-fresh-result{font-weight:600;color:var(--text-bright)}
 .verify-fresh-running{color:var(--text-muted);font-style:italic}
 .verify-fresh-error{color:var(--danger-text)}
+.verify-fresh-unavailable{color:var(--text-muted)}
 .verify-fresh-link{color:var(--accent);font-weight:400}
 .verify-fresh-btn{font:inherit;font-size:12px;font-weight:600;padding:3px 12px;border-radius:8px;cursor:pointer;background:var(--accent-bg);color:var(--accent);border:1px solid var(--accent-border)}
 .verify-fresh-btn:hover{border-color:var(--accent)}

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

@@ -12,6 +12,12 @@ export const VERIFY_PRESET = Object.freeze({
     + "End with a line `Verdict: confirmed|refuted|unclear — <one-line reason>`.",
 });
 
+export const VERIFY_UNAVAILABLE = "restart this session to use Verify";
+
+export function verifyWorkerUnavailable(workerFeatures, bridgeUp) {
+  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes("verify");
+}
+
 // +presets+ (annotate_presets.js parsePresets) with Verify after them.
 export function withVerify(presets) {
   return [...(presets || []), VERIFY_PRESET];

data/lib/samagotchi/web/push/attention.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../steer"
+
 module Samagotchi
   module Web
     module Push
@@ -118,15 +120,31 @@ module Samagotchi
         # @return [Array<String>]
         def open_keys(by_id)
           by_id.each_value.flat_map do |summary|
-            question = summary[:pending_question]
-            card = summary[:pending_card]
+            question = open_question(summary)
+            card = open_card(summary)
             keys = []
-            keys << key(summary[:id], question[:id]) if question.is_a?(Hash) && question[:id] && !question[:relayed_to]
-            keys << card_key(summary[:id], card[:id]) if card.is_a?(Hash) && card[:id]
+            keys << key(summary[:id], question[:id]) if question
+            keys << card_key(summary[:id], card[:id]) if card
             keys
           end
         end
 
+        # Whether this summary contributes to the project's waiting count:
+        # the same open question or card #open_keys badges.
+        def waits?(summary) = !!(open_question(summary) || open_card(summary))
+
+        # The summary's unanswered question not relayed elsewhere, or nil.
+        def open_question(summary)
+          question = summary[:pending_question]
+          question if question.is_a?(Hash) && question[:id] && !question[:relayed_to]
+        end
+
+        # The summary's pending card, or nil.
+        def open_card(summary)
+          card = summary[:pending_card]
+          card if card.is_a?(Hash) && card[:id]
+        end
+
         def key(session_id, id) = "#{session_id}:#{id}"
         def card_key(session_id, card_id) = "#{session_id}:card:#{card_id}"
 
@@ -151,7 +169,8 @@ module Samagotchi
           result = verdict[:verdict].to_s
           icon = { "confirmed" => "✅", "refuted" => "❌", "unclear" => "❓" }.fetch(result, "")
           by = verdict[:by_name]
-          by = verdict[:by].nil? ? "You" : "A participant" unless present?(by)
+          # An owner's verdict has no participant author (nil, "" or "owner").
+          by = Steer.participant_author?(verdict[:by]) ? "A participant" : "You" unless present?(by)
           reason = clip(verdict[:reason].to_s, 120)
           "#{by}: #{icon} #{result} — #{reason}"
         end

data/lib/samagotchi/web/verify_fresh_routes.rb

@@ -33,14 +33,18 @@ module Samagotchi
       def handle_verify_fresh(req, id, of)
         clicker = principal(req).owner? ? nil : principal(req).grant
         session = @session_class.load(id, state_dir: default_state_dir)
-        if clicker && (refused = participant_cap_refusal(clicker) || fresh_worker_refusal(session))
+        if clicker && (refused = participant_cap_refusal(clicker) || fresh_worker_refusal(session, participant: true))
           return verify_fresh_refused(clicker, of, *refused)
         end
 
         by = Steer.sender_author(field_of(VerifyFresh.original(session.verdicts, of), :by))
         runner = by ? verdict_author_grant(id, by) : clicker
         return author_link_ended(clicker, id, of, by) if by && runner.nil?
-        if runner && runner != clicker && (refused = participant_cap_refusal(runner) || fresh_worker_refusal(session))
+        if runner && runner != clicker && (refused = participant_cap_refusal(runner) ||
+                                                   fresh_worker_refusal(session, participant: true))
+          return verify_fresh_refused(clicker, of, *refused, runner: runner)
+        end
+        if (refused = fresh_worker_refusal(session))
           return verify_fresh_refused(clicker, of, *refused, runner: runner)
         end
 
@@ -76,12 +80,13 @@ module Samagotchi
 
       def field_of(record, key) = record && (record[key] || record[key.to_s])
 
-      # A live worker of the session that predates participants' turns runs
-      # no participant's turn (Delivery::REVIEW_UNAVAILABLE): no fresh
-      # child for one either. nil to go on.
-      def fresh_worker_refusal(session)
+      # A live worker must support VerifyFresh's parent checks. For a
+      # participant's child it must also have the review boundary.
+      def fresh_worker_refusal(session, participant: false)
         features = ParticipantMode.live_features(session, default_state_dir)
-        return nil if features.nil? || features.include?(Delivery::REVIEW_FEATURE)
+        return nil if features.nil?
+        return [409, VerifyAnchor::UNAVAILABLE["error"], VerifyAnchor::UNAVAILABLE["detail"]] if VerifyAnchor.worker_unavailable?(features)
+        return nil unless participant && !features.include?(Delivery::REVIEW_FEATURE)
 
         [409, Delivery::REVIEW_UNAVAILABLE["error"], Delivery::REVIEW_UNAVAILABLE["detail"]]
       end

data/lib/samagotchi/worker.rb

@@ -697,7 +697,7 @@ module Samagotchi
                                    images: prompt.images, **(prompt.verify ? { verify: prompt.verify } : {})) do |result, error|
         if error
           # The Engine announced :turn_failed (with the error's one line).
-          restore_failed_turn([[prompt.text, origin, prompt.images], *@merged_this_turn], error: error)
+          restore_failed_turn([[prompt.text, origin, prompt.images, prompt.verify], *@merged_this_turn], error: error)
         else
           @continue_offer.after_turn(result, no_interrupt: prompt.no_interrupt)
         end
@@ -1383,8 +1383,10 @@ module Samagotchi
     # or the restored ones, never the one without the other. A turn that
     # got somewhere stays instead (TurnFlow#prompt_turn_failed), with the
     # prompts it took: nothing goes back.
-    # @param prompts [Array<Array(String, TurnOrigin|nil, Array|nil)>] [prompt,
-    #   origin, images] (a web client gets its image chips back)
+    # @param prompts [Array<Array(String, TurnOrigin|nil, Array|nil, VerifyAnchor|nil)>]
+    #   [prompt, origin, images, verify] (a web client gets its image chips
+    #   back, and a Verify turn's claim, so sending it again still records
+    #   a verdict)
     # @param error [Exception, nil] what failed: its one line stays in the
     #   conversation as a turn note
     # Not saved here: run_engine_turn saves after its block.
@@ -1392,9 +1394,10 @@ module Samagotchi
       @engine.synchronize_events do
         next if @turn_flow.prompt_turn_failed(error: error) == :kept
 
-        prompts.each do |prompt, origin, images|
+        prompts.each do |prompt, origin, images, verify|
           restored = { type: :prompt_restored, prompt: prompt, origin: origin.wire }
           restored[:images] = images unless Array(images).empty?
+          restored[:verify] = verify.to_h if verify
           @engine.announce(restored)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.126.0
+  version: 0.128.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -623,6 +623,7 @@ files:
 - lib/samagotchi/terminal_ui/local_link.rb
 - lib/samagotchi/terminal_ui/model_segments_text.rb
 - lib/samagotchi/terminal_ui/one_shot_sink.rb
+- lib/samagotchi/terminal_ui/own_turns.rb
 - lib/samagotchi/terminal_ui/participant_commands.rb
 - lib/samagotchi/terminal_ui/plain_surface.rb
 - lib/samagotchi/terminal_ui/question_prompt.rb
@@ -752,6 +753,7 @@ files:
 - lib/samagotchi/web/participants_admin.rb
 - lib/samagotchi/web/principal.rb
 - lib/samagotchi/web/private_files.rb
+- lib/samagotchi/web/project_list.rb
 - lib/samagotchi/web/proxy_gate.rb
 - lib/samagotchi/web/public/activity.js
 - lib/samagotchi/web/public/annotate_actions.js
@@ -822,6 +824,7 @@ files:
 - lib/samagotchi/web/public/participant_names.js
 - lib/samagotchi/web/public/participants_panel.js
 - lib/samagotchi/web/public/plain_line.js
+- lib/samagotchi/web/public/project_picker.js
 - lib/samagotchi/web/public/prompt_history.js
 - lib/samagotchi/web/public/push.js
 - lib/samagotchi/web/public/push_devices.js