samagotchi 0.150.0 → 0.152.0

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

@@ -325,12 +325,14 @@ export function showClaim(container, claim, { roots: rootSelector, opts = {}, do
   const hit = findClaim(texts.map((t) => t.text), claim, opts);
   if (!hit && !turn) return null;
   const el = hit ? roots[hit.at] : turn.anchor;
+  const start = hit && pointAt(texts[hit.at], hit.start);
+  const end = hit && pointAt(texts[hit.at], hit.end, true);
   revealInHistory(el);
+  // The text can be somewhere its root isn't: a drawn block's hidden source.
+  if (start) revealInHistory(start.node.parentElement);
   el.classList.add(HIT_CLASS);
   el.scrollIntoView?.({ block: "center" });
   if (hit) {
-    const start = pointAt(texts[hit.at], hit.start);
-    const end = pointAt(texts[hit.at], hit.end, true);
     const highlights = win?.CSS?.highlights;
     if (start && end && highlights && typeof win.Highlight === "function") {
       const range = doc.createRange();

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

@@ -2,7 +2,8 @@
 // hides +el+ unfolds: a closed <details> around it (a turn's steps block, a
 // step, a diff), an answer or a delegate report folded (answer_fold.js: its row follows
 // the bubble's class; the jump's unfold isn't saved), a superseded version
-// of a Revise stack (revise_stack.js: its stub opens, not saved). Every
+// of a Revise stack (revise_stack.js: its stub opens, not saved), a drawn
+// block's source (block_source.js). Every
 // jump goes through it (claim_link.js showClaim, refs.js showRow and so the
 // working set's step tags, verdict_card.js "View check"), so a new way to
 // hide history is opened in one place.
@@ -11,6 +12,7 @@
 // own: static JS is cached at unversioned URLs, and a new export on an old
 // module would blank the page.
 
+import { revealBlockSource } from "./block_source.js";
 import { openStubOver } from "./revise_stack.js";
 
 // Opens each closed <details> that holds +el+ (not +el+ itself: a fold the
@@ -19,6 +21,7 @@ import { openStubOver } from "./revise_stack.js";
 export function revealInHistory(el) {
   if (!el) return null;
   openStubOver(el);
+  revealBlockSource(el);
   el.closest?.(".bubble.folded")?.classList.remove("folded");
   for (let details = el.parentElement?.closest("details"); details; details = details.parentElement?.closest("details")) {
     details.open = true;

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

@@ -15,6 +15,7 @@
 <link rel="stylesheet" href="/assets/composer.css">
 <link rel="stylesheet" href="/assets/forms.css">
 <link rel="stylesheet" href="/assets/objectives.css">
+<link rel="stylesheet" href="/assets/block_renderers.css">
 <style>
 /* Icon masks shared by the phone info bar and the all view's cards (the stroke only shapes the mask; the icon takes currentColor); the image icon is composer.css's. */
 :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")}
@@ -609,6 +610,7 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .card-head{display:flex;align-items:baseline;gap:8px;margin-bottom:4px}
 .card-title{font-size:14px;font-weight:600;color:var(--text-bright)}
 .card-source{font-size:11px;color:var(--text-faint);font-family:ui-monospace,SFMono-Regular,Menlo,monospace}
+.card-label{font-size:11px;color:var(--text-faint)}
 .card-body{font-size:13.5px;color:var(--text-2);white-space:normal;line-height:1.5}
 .card-body p{margin:0 0 6px}.card-body p:last-child{margin-bottom:0}
 .card-body ul,.card-body ol{margin:0 0 6px 20px}

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

@@ -4,9 +4,8 @@
 // page's state comes in as getters (capabilities, roots, currentDir), read
 // at each call.
 
-// The texts whose refs linkTextRefs links: the answers and the closed
-// steps' texts.
-const TEXTS = ".bubble.output, .gen:not(.live) > .gen-text";
+import { TEXTS } from "./text_roots.js";
+
 // The closed steps' texts still shown raw: a live turn's (a reload's come
 // rendered, turn_block.js textTemplate).
 const RAW_STEPS = ".gen:not(.live) > .gen-text:not(.markdown)";

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

@@ -0,0 +1,6 @@
+// The texts the page treats as text it wrote out of a model's words: the
+// answers and the closed steps' texts. Cards, question replies, the asking
+// slot and delegate reports aren't among them. markdown_place.js links refs on
+// these; block_host.js draws in these. A module of its own: static JS is cached
+// at unversioned URLs, and a new export on an old module would blank the page.
+export const TEXTS = ".bubble.output, .gen:not(.live) > .gen-text";

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

@@ -284,7 +284,10 @@ export function answerBubbleTemplate(message, { cls = "", at = null, turnId = nu
 export function noteBubbleTemplate(note) {
   if (note?.objectives) return objectivesEntryTemplate(note, timeTitle(note.at));
   const from = note?.label ? `note from ${note.label}` : "note";
-  return html`<div class="bubble note" title=${timeTitle(note?.at)}><div class="note-line">${from}</div><div class="note-text">${note?.content ?? ""}</div></div>`;
+  // A wake turn's note opens that turn (TURN_PROMPT, bubbles.js); a class, not
+  // data-turn-id, which marks a claim's anchor (claim_link.js).
+  const cls = note?.turn_start ? "bubble note turn-start" : "bubble note";
+  return html`<div class=${cls} title=${timeTitle(note?.at)}><div class="note-line">${from}</div><div class="note-text">${note?.content ?? ""}</div></div>`;
 }
 
 // A plugin's steer (a nudge put into the running turn): one line that

data/lib/samagotchi/web/session_access_routes.rb

@@ -14,6 +14,7 @@ require_relative "../client_id"
 require_relative "../children_status"
 require_relative "../session_metrics"
 require_relative "../version"
+require_relative "session_hub"
 
 module Samagotchi
   module Web
@@ -274,7 +275,7 @@ module Samagotchi
                              model_name: session_access.show(id).model_name,
                              default_model: ModelProfile.default_model_name,
                              parent_strategy: strategy_json(session_access.parent_strategy(id)),
-                             **(@hub&.chi_state || { version: VERSION, installed: nil, available: nil, update_blocked: nil, auto: "off", restart: "idle", auto_offers: nil }) })
+                             **(@hub&.chi_state || SessionHub::HUBLESS_STATE) })
       rescue SessionManager::OwnedByTUI => e
         owned_by_tui(e)
       rescue SessionAccess::Refused => e

data/lib/samagotchi/web/session_hub.rb

@@ -32,6 +32,12 @@ module Samagotchi
     # step under it, so no stale upsert can follow a fresh snapshot.
     class SessionHub
       SCAN_INTERVAL = 1.0
+      # What an info route says about updates when there is no hub at all:
+      # this chi's version, and nothing known of the rest. The one place this
+      # is written (Web::App#handle_info and the remote info route).
+      HUBLESS_STATE = { version: Samagotchi::VERSION, installed: nil, available: nil, update_blocked: nil,
+                        auto: "off", restart: "idle", auto_offers: nil }.freeze
+
       # The flock leaves no file trace when its holder dies, so owners are
       # probed: every tick for the sessions the projection believes owned
       # (a handful; OwnerLock.owner is open + LOCK_SH|LOCK_NB + close), and

data/lib/samagotchi/web/session_show.rb

@@ -80,7 +80,7 @@ module Samagotchi
           plugin_warning: turn_snapshot && turn_snapshot["plugin_warning"],
           # Plugins' slow setup still running (chi.init): the page's init row.
           init_tasks: snapshot_list(turn_snapshot, "init_tasks"),
-          cards: cards_for_display(live_or_saved(turn_snapshot, "cards") { saved_cards(id) }, cwd: session.working_directory),
+          cards: cards_for_display(live_or_saved(turn_snapshot, "cards") { saved_cards(id, messages: raw_messages) }, cwd: session.working_directory),
           # The composer's / autocomplete; the built-ins until a worker
           # names its plugins' too.
           commands: turn_snapshot&.fetch("commands", nil) || SessionCommands.builtin_registry.listing,

data/lib/samagotchi/worker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "securerandom"
 
 require_relative "client_id"
 require_relative "config"
@@ -1263,14 +1264,15 @@ module Samagotchi
       # a fresh worker's first), so the list is this turn's from the start.
       @merged_this_turn = []
       origin = fresh_origin(turn_args[:origin])
-      turn_args = turn_args.merge(origin: origin)
+      # Settled here: the checkpoint's prompt carries it from the start.
+      turn_args = turn_args.merge(origin: origin, id: turn_args[:id] || SecureRandom.uuid)
       verdicts_before = @session.verdicts.size
       @reporting_turn = reports_to_parent?(origin)
       # A participant's review turn merges no input (#pending_input_drain).
       @participant_turn = origin.participant?
       restores = @turn_flow.restores
       begin
-        @checkpoint.begin_turn(prompt: prompt, enqueued_id: origin.enqueued_id, author: turn_author_fields(origin))
+        @checkpoint.begin_turn(prompt: prompt, turn_id: turn_args[:id], enqueued_id: origin.enqueued_id, author: turn_author_fields(origin))
         @session.status = Session::STATUS_RUNNING
         # A continue that moved this session to the chain's new link wrote
         # the new parent beside it (Session::PARENT_FILE): this turn's

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.150.0
+  version: 0.152.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -155,6 +155,7 @@ files:
 - docs/internals/anthropic.md
 - docs/internals/attached-context.md
 - docs/internals/background-tasks.md
+- docs/internals/block-renderers.md
 - docs/internals/bridge.md
 - docs/internals/bundles.md
 - docs/internals/context-telemetry.md
@@ -186,12 +187,14 @@ files:
 - lib/samagotchi/answer_tail.rb
 - lib/samagotchi/archive_store.rb
 - lib/samagotchi/atomic_file.rb
+- lib/samagotchi/block_renderers.rb
 - lib/samagotchi/bootstrap/bundles.rb
 - lib/samagotchi/bootstrap/config_writer.rb
 - lib/samagotchi/bootstrap/probe.rb
 - lib/samagotchi/bootstrap_command.rb
 - lib/samagotchi/bridge.rb
 - lib/samagotchi/bridge/bounded_queue.rb
+- lib/samagotchi/bridge/card_places.rb
 - lib/samagotchi/bridge/card_store.rb
 - lib/samagotchi/bridge/client_event.rb
 - lib/samagotchi/bridge/event_id.rb
@@ -469,15 +472,18 @@ files:
 - lib/samagotchi/memory_bundle/builder.rb
 - lib/samagotchi/memory_bundle/bundle_hook.rb
 - lib/samagotchi/memory_bundle/entry_size.rb
+- lib/samagotchi/memory_bundle/file_digest.rb
 - lib/samagotchi/memory_bundle/file_standing.rb
 - lib/samagotchi/memory_bundle/index_size.rb
 - lib/samagotchi/memory_bundle/index_sync.rb
 - lib/samagotchi/memory_bundle/index_updater.rb
 - lib/samagotchi/memory_bundle/installed_bundle.rb
 - lib/samagotchi/memory_bundle/installed_copy.rb
+- lib/samagotchi/memory_bundle/installed_manifest.rb
 - lib/samagotchi/memory_bundle/installer.rb
 - lib/samagotchi/memory_bundle/listing.rb
 - lib/samagotchi/memory_bundle/manifest.rb
+- lib/samagotchi/memory_bundle/manifest_standing.rb
 - lib/samagotchi/memory_bundle/memory_files.rb
 - lib/samagotchi/memory_bundle/merger.rb
 - lib/samagotchi/memory_bundle/placeholder.rb
@@ -799,6 +805,7 @@ files:
 - lib/samagotchi/web/app.rb
 - lib/samagotchi/web/auto_update.rb
 - lib/samagotchi/web/auto_update_record.rb
+- lib/samagotchi/web/block_renderer_routes.rb
 - lib/samagotchi/web/capabilities.rb
 - lib/samagotchi/web/editor.rb
 - lib/samagotchi/web/grants.rb
@@ -828,7 +835,11 @@ files:
 - lib/samagotchi/web/public/app.js
 - lib/samagotchi/web/public/apple-touch-icon.png
 - lib/samagotchi/web/public/auth_lost.js
+- lib/samagotchi/web/public/block_frame.js
+- lib/samagotchi/web/public/block_host.js
 - lib/samagotchi/web/public/block_open.js
+- lib/samagotchi/web/public/block_renderers.css
+- lib/samagotchi/web/public/block_source.js
 - lib/samagotchi/web/public/bubbles.js
 - lib/samagotchi/web/public/card.js
 - lib/samagotchi/web/public/cards_place.js
@@ -953,6 +964,7 @@ files:
 - lib/samagotchi/web/public/system_one_wrong.js
 - lib/samagotchi/web/public/tally.js
 - lib/samagotchi/web/public/task_stop.js
+- lib/samagotchi/web/public/text_roots.js
 - lib/samagotchi/web/public/thinking_chip.js
 - lib/samagotchi/web/public/thinking_ticker.js
 - lib/samagotchi/web/public/time_gaps.js