samagotchi 0.96.0 → 0.98.0

data/lib/samagotchi/terminal_ui/attached_loop.rb

@@ -727,6 +727,8 @@ module Samagotchi
           @screen.commit("#{paint("model>", 36)} #{output}")
         end
         prefill_confirm(event)
+        # /title from any client: the row's title follows.
+        @status.update(title: event[:title]) if Array(event[:changed]).include?("title")
         return unless event[:model_name]
 
         # After the output, so the status row changes with the line saying why.

data/lib/samagotchi/terminal_ui/status_row.rb

@@ -5,7 +5,7 @@ require_relative "formatting"
 module Samagotchi
   class TerminalUI
     # The status row under the prompt, the same for both TUIs:
-    # `status> model=… | ↳ parent | ⑂ 2 running · 1 waiting | ctx=12.3% (under20) | mem: … | muted: …`.
+    # `status> Title | model=… | ↳ parent | ⑂ 2 running · 1 waiting | ctx=12.3% (under20) | mem: … | muted: …`.
     # A UI feeds it what it learns (attached mode from the Bridge's events,
     # the REPL from its Engine's) through #update, and the row is redrawn in
     # the surface's status slot only when its text changes.
@@ -15,6 +15,8 @@ module Samagotchi
       # Memory names shown before ", +N".
       MEMORY_LIMIT = 8
       # What the row shows:
+      #   title                 the session's own title (Session#title; not
+      #                         the first message's preview), or nil
       #   model, default_model  the model in use, and the config's default
       #                         (named beside another model)
       #   served                [served, asked, expected]: what the server said it
@@ -29,12 +31,17 @@ module Samagotchi
       #                         records them as used)
       #   muted                 its --mute list
       #   running               a turn runs: the row trails STEER_HINT
-      FIELDS = %i[model default_model served parent_id children context used_memories preloaded muted running].freeze
+      FIELDS = %i[title model default_model served parent_id children context used_memories preloaded muted running].freeze
 
       # The tail while a turn runs: where a typed line goes (the next step)
       # and the two other choices. Dropped whole first when the row is cut.
       STEER_HINT = " · typing goes in at the next step (/cut, /queue)"
 
+      # The longest title shown, and the share of the row it may take on a
+      # narrow terminal: the rest of the row still fits.
+      TITLE_MAX = 32
+      TITLE_SHARE = 3
+
       # The turn events that end a turn (the hint goes).
       TURN_END_EVENTS = %i[turn_completed turn_canceled turn_failed].freeze
 
@@ -74,6 +81,7 @@ module Samagotchi
         fields.merge!(model: state[:model_name], default_model: default_model) if state[:model_name]
         STATE_LISTS.each { |field, key| fields[field] = Array(state[key]) if state.key?(key) }
         fields[:parent_id] = state[:parent_id] if state.key?(:parent_id)
+        fields[:title] = state[:title] if state.key?(:title)
         # The last turn's ctx, so it shows before the next turn's.
         fields[:context] = state[:context_status] if state[:context_status].is_a?(Hash)
         update(**fields)
@@ -126,7 +134,8 @@ module Samagotchi
           model_text = status_model_text(model, @values[:default_model], served: served, served_for: served_for,
                                                                          expected: expected.is_a?(String))
         end
-        segments = [model_text,
+        segments = [title_text(@values[:title], width),
+                    model_text,
                     parent ? "↳ #{parent.to_s[0, 8]}" : "",
                     children_text(@values[:children]),
                     status_context_text(estimate: @values[:context]),
@@ -147,6 +156,18 @@ module Samagotchi
         segments[0..-2] + ["#{segments.last}#{STEER_HINT}"]
       end
 
+      # The title cut to TITLE_MAX, and to a TITLE_SHARE-th of +width+
+      # (the row's other segments come after it); "" without one.
+      def title_text(title, width)
+        title = title.to_s.strip
+        return "" if title.empty?
+
+        max = [TITLE_MAX, width / TITLE_SHARE].min
+        return title if title.length <= max
+
+        max > 1 ? "#{title[0, max - 1]}…" : ""
+      end
+
       # `⑂ 2 running · 1 waiting`, the counts there are; "" with neither (no
       # children, or all ended). Not "not reported": a REPL parent is never
       # given its children's replies (no wakes there), and a worker moves

data/lib/samagotchi/terminal_ui.rb

@@ -889,6 +889,7 @@ module Samagotchi
         if command
           show_command_result(command)
           refresh_status_row(clear_unknown_context: true) if command.changed.include?(:model)
+          refresh_status_row if command.changed.include?(:title)
           persist_recent_history(input) if command.shell
           return
         end

data/lib/samagotchi/testing/bundle.rb

@@ -3,6 +3,7 @@
 require_relative "../plugin/loader"
 require_relative "../plugin/tool_spec"
 require_relative "../hooks"
+require_relative "../question_asked"
 require_relative "../commands/registry"
 require_relative "../session_commands"
 require_relative "../tools/builtins"
@@ -179,7 +180,7 @@ module Samagotchi
         end
         @hooks_namespace = Module.new
         @manifest.hooks.each do |basename, hook|
-          next if hook.event.empty?
+          next if hook.events.empty?
 
           Hooks::BundleLoader.load_hook_file(@name, basename, File.join(@dir, "hooks", basename), hook, hooks,
                                              settings: @settings, namespace: @hooks_namespace)
@@ -203,6 +204,22 @@ module Samagotchi
         payload
       end
 
+      # Fire :question_asked as chi's two seams do (QuestionAsked.fire): a
+      # question (+kind+ "question") or an approval ("approval") asked by a
+      # step whose text is +text+, with the question's +question+ fields.
+      # The hooks' refs are checked as chi checks them (the question caps,
+      # file refs under +cwd+, default the session's folder).
+      # @return [Array<Hash>] the refs the step and its pending question
+      #   get, as stored; [] for none
+      def question_asked(text, kind: "question", question: {}, cwd: nil)
+        step = { role: "model", content: text.to_s }
+        fields = failing do
+          QuestionAsked.fire(hooks: hooks, conversation: [step], kind: kind.to_s, fields: question.to_h,
+                             cwd: cwd || @recorder[:cwd])
+        end
+        Array(fields[:refs])
+      end
+
       # Build the before_tool_call payload from the real Gate, without firing
       # this bundle's hooks.
       # @param call [Hash] the parsed tool call

data/lib/samagotchi/tools/memory.rb

@@ -356,7 +356,7 @@ module Samagotchi
         ([file] + overlay_files(dir, entry_name, index_text)).each { |path| trash.move(path) }
         Samagotchi::MemoryBundle::IndexUpdater.remove_index(resolved_scope, entry_name)
         "Memory '#{entry_name}' removed from #{resolved_scope} scope: moved to #{trash.dir} " \
-          "(`chi bundle trash` lists and empties it); index line dropped."
+          "(`chi bundle trash` lists and empties it)#{"; index line dropped" if line}."
       end
 
       # The entry's model overlays: <name>.<key>.md with a key ModelOverlay

data/lib/samagotchi/turn_checkpoint.rb

@@ -86,6 +86,12 @@ module Samagotchi
       settled_record(id)
     end
 
+    # The settled outcomes past +max_age+ (SessionInbox.prune_old).
+    # @return [Integer] how many went
+    def self.prune_settled(session_dir, max_age: SessionInbox::TOMBSTONE_MAX_AGE)
+      SessionInbox.prune_old(session_dir, SETTLED_DIR, max_age: max_age)
+    end
+
     def self.settled_record(id, ended_at: nil, seconds: nil)
       LastTurn.new(outcome: "canceled", cancel_reason: WORKER_STOPPED, ended_at: ended_at, seconds: seconds, enqueued_id: id)
     end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -14,6 +14,7 @@ require_relative "../client_id"
 require_relative "../delivery"
 require_relative "../answer_tail"
 require_relative "../answer_refs"
+require_relative "../question_asked"
 require_relative "../bridge_client"
 require_relative "../bridge/bounded_queue"
 require_relative "../bridge/card_store"
@@ -839,7 +840,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) }),
+          cards: cards_for_display(live_or_saved(turn_snapshot, "cards") { saved_cards(id) }, 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,
@@ -871,13 +872,28 @@ module Samagotchi
       # dead worker saved can't be answered (its turn is gone), nor a chi
       # REPL's (it shares nothing with the web).
       # A question between turns (the step-limit one) is the snapshot's own.
+      # Its refs (the asking reply's, QuestionAsked) are checked again.
       def shown_pending_question(session, turn_snapshot, owner)
-        if turn_snapshot
-          current_turn = turn_snapshot["current_turn"]
-          current_turn ? current_turn["pending_question"] : turn_snapshot["pending_question"]
-        elsif owner&.worker?
-          session.pending_question&.to_h
-        end
+        pending = if turn_snapshot
+                    current_turn = turn_snapshot["current_turn"]
+                    current_turn ? current_turn["pending_question"] : turn_snapshot["pending_question"]
+                  elsif owner&.worker?
+                    session.pending_question&.to_h
+                  end
+        with_question_refs(pending, cwd: session.working_directory)
+      end
+
+      # A pending question (a snapshot's, the session file's or a saved
+      # card's) with its refs checked again, under a question's caps
+      # (QuestionAsked): a stored file is never trusted, and what isn't
+      # valid any more is dropped. The question as it was without refs.
+      def with_question_refs(pending, cwd:)
+        return pending unless pending.is_a?(Hash)
+
+        key = [:refs, "refs"].find { |name| pending.key?(name) } or return pending
+        refs = Samagotchi::AnswerRefs.for_display(pending[key], cwd: cwd, max_refs: Samagotchi::QuestionAsked::MAX_REFS,
+                                                                max_bytes: Samagotchi::QuestionAsked::MAX_BYTES)
+        refs.empty? ? pending.except(key) : pending.merge(key => refs)
       end
 
       # The full show's session part: the file's, with what a live worker's
@@ -1031,11 +1047,16 @@ module Samagotchi
       # cards: CardStore#list), else (no live worker) the ones the last
       # worker saved in the session's folder (#saved_cards), a card's body as
       # body_html: rendered markdown when the renderer is on, else the
-      # escaped text in a <pre>.
+      # escaped text in a <pre>, and a question card's refs checked again
+      # (#with_question_refs; +cwd+ the session's folder, nil where the
+      # session file isn't read: a file ref then stays only absolute).
       # @return [Array<Hash>]
-      def cards_for_display(cards)
+      def cards_for_display(cards, cwd: nil)
         Array(cards).filter_map do |card|
           next unless card.is_a?(Hash)
+          if card["type"].to_s == "question" && card["pending_question"].is_a?(Hash)
+            next card.merge("pending_question" => with_question_refs(card["pending_question"], cwd: cwd))
+          end
           next card unless card["type"].to_s == "card"
 
           card.merge("body_html" => card_body_html(card["body"].to_s))

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

@@ -61,13 +61,13 @@ import { createStripGrip } from "./strip_grip.js";
 import { waitingOn } from "./notify.js";
 import { applySessionEvent, sortedByUpdated } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
-import { tabTitle, topBarTitle } from "./session_title.js";
+import { renameShown, tabTitle, topBarTitle } from "./session_title.js";
 import { restartConfirmText, versionNotice } from "./update_notice.js";
 import {
   appendAboveLiveTiming, mergeTiming, normalizeTiming,
 } from "./timing.js";
 import { createLiveTurn } from "./live_turn.js";
-import { applyFinalAnswer, pairAnswerRefs } from "./answer_refs.js";
+import { applyFinalAnswer, pairAnswerRefs, setAnswerRefs } from "./answer_refs.js";
 import { installRefClicks } from "./refs.js";
 import { linkRefs, touchedFiles } from "./ref_scan.js";
 import { DONE_MS, applyInitEvent, dropDone, fadeDone, initRowTemplate, newInitTasks, seedInitTasks } from "./init_row.js";
@@ -97,6 +97,8 @@ const composerEl = $("#composer");
 // The open session's title in the top bar, when no strip card in sight
 // shows it; the tab's base ("Chi · <project>"), set by renderScope.
 const sessionTitleEl = $("#sessionTitle");
+const sessionTitleRowEl = $("#sessionTitleRow");
+const titleRenameBtn = $("#titleRenameBtn");
 let tabBase = null;
 let tabShown = null;
 const infoTextEl = $("#infoText");
@@ -210,8 +212,9 @@ const markdownPlace = createMarkdownPlace({
   findInTurnRoots: (selector) => findInTurnRoots(selector),
   normalize,
   pairAnswerRefs,
+  setAnswerRefs,
 });
-const { renderMarkdown, linkRefsIn, applyFinalMarkdown, linkTextRefs } = markdownPlace;
+const { renderMarkdown, pairRefsIn, linkRefsIn, applyFinalMarkdown, linkTextRefs } = markdownPlace;
 const turnDom = view === "stage"
   ? createStageView({
     ...viewArgs, isNearBottom: () => atHistoryEnd(), dockEl: $("#dock"), centerEl: $("#center"), composerEl,
@@ -291,6 +294,7 @@ const questionCards = createQuestionCards({
   askingText: () => turnDom.askingText(),
   renderMarkdown,
   linkRefs: linkRefsIn,
+  pairRefs: pairRefsIn,
 });
 // The history's bubbles (bubbles.js): output, end lines, every client's
 // prompts, the recap, warnings and notices, command and note bubbles.
@@ -473,6 +477,9 @@ const lists = createListsView({
   allViewOpen: () => allViewOpen(),
   openAllView: () => openAllView(),
   leaveAllView: (hash) => leaveAllView(hash),
+  renameShown,
+  onRename: () => rename.open(),
+  renaming: () => rename.isOpen(),
 });
 
 // Continue, Archive, Delete and Stop, and the start page when the open
@@ -496,13 +503,31 @@ const sessionActions = createSessionActions({
   closeLiveStream: () => streamControl?.close(),
   workerGone,
 });
-// ✎: /title through the chips' path (session_rename.js).
+// The title's ✎: /title through the chips' path (session_rename.js), the
+// input over the title row on screen: the top bar's when it shows the
+// title, else the active strip card's (updateSessionTitle decides which).
 const rename = createRename({
-  button: $("#infoRenameBtn"),
+  doc: document,
+  anchor: () => {
+    if (!sessionTitleRowEl.hidden) return sessionTitleRowEl;
+    const row = topStripEl.querySelector(".card.active .preview-row");
+    return row && row.getClientRects().length ? row : null; // not in the All sessions view's hidden strip
+  },
   session: () => selected,
   titleOf: (id) => lists.sessionsById().get(id)?.title || null,
+  shownTitle: () => shownTitle(),
+  closePopovers: () => {
+    lists.familyPop.close();
+    lists.chainPop.close();
+  },
+  // Not from inside a strip draw (its paintActive repositions, which may
+  // close): the held strip catches up after it.
+  onClose: () => queueMicrotask(() => lists.catchUp()),
   run: (line) => runSessionCommand(line),
 });
+titleRenameBtn.addEventListener("click", () => rename.open());
+document.addEventListener("scroll", () => rename.reposition(), true);
+window.addEventListener("resize", () => rename.reposition());
 
 const { confirmDelete, leaveGoneSession, continueSelected, archiveOne, setArchived } = sessionActions;
 
@@ -871,6 +896,8 @@ function renderSessionView(data, { kept = [] } = {}) {
   snapshotCards.during.forEach((card) => upsertCard(card));
   // A question the worker is blocked on (also after a reload).
   if (data.pending_question && data.pending_question.id && data.pending_question.status === "pending") {
+    // Its refs on the asking step, as question_requested puts them.
+    if (data.pending_question.refs) turnDom.questionRefs?.(data.pending_question.refs);
     questionCards.renderQuestion(data.pending_question);
     // The turn's replay drew it as asked; the snapshot knows whether it is
     // relayed to the parent now.
@@ -1055,9 +1082,6 @@ function updateInfoBar() {
   const deleteBtn = document.getElementById("infoDeleteBtn");
   const archiveBtn = document.getElementById("infoArchiveBtn");
   const continueBtn = document.getElementById("infoContinueBtn");
-  const renameBtn = document.getElementById("infoRenameBtn");
-  if (renameBtn) renameBtn.style.display = buttons.rename.shown ? "" : "none";
-  rename.follow(buttons.rename.shown ? selected : null);
   if (continueBtn) {
     continueBtn.style.display = buttons.continue.shown ? "" : "none";
     continueBtn.disabled = buttons.continue.disabled;
@@ -1087,11 +1111,16 @@ function updateInfoBar() {
 // card says it when the strip is shown and has one; else the top bar. The
 // browser tab names it too. It follows the card's (openTitle): a chain link
 // reads its card's title (cardTitle), whatever opener it was sent.
-function updateSessionTitle() {
+function shownTitle() {
   const shown = selected ? lists.sessionsById().get(selected) : null;
   const first = current.firstPreview || "";
   const raw = !selected ? "" : openTitle({ shown, first, cardTitle: (s) => lists.cardTitle(s) });
-  const title = raw === "\u2014" ? "" : raw; // "—": no first message yet
+  return raw === "\u2014" ? "" : raw; // "—": no first message yet
+}
+// The top bar's ✎ follows it (not a plain terminal's session), and an open
+// rename input follows the title row on screen (or closes, none showing).
+function updateSessionTitle() {
+  const title = shownTitle();
   const text = topBarTitle({
     title,
     cardShown: !!topStripEl.querySelector(".card.active"),
@@ -1099,7 +1128,9 @@ function updateSessionTitle() {
     allView: allViewOpen(),
   });
   if (sessionTitleEl.textContent !== text) sessionTitleEl.textContent = text;
-  if (sessionTitleEl.hidden !== !text) sessionTitleEl.hidden = !text;
+  if (sessionTitleRowEl.hidden !== !text) sessionTitleRowEl.hidden = !text;
+  const renamable = !!text && renameShown(current.owner);
+  if (titleRenameBtn.hidden !== !renamable) titleRenameBtn.hidden = !renamable;
   const tip = text ? title : "";
   if (sessionTitleEl.title !== tip) sessionTitleEl.title = tip;
   const tab = tabBase === null ? null : tabTitle({ title, base: tabBase });
@@ -1107,6 +1138,8 @@ function updateSessionTitle() {
     tabShown = tab;
     notifications.setBaseTitle(tab);
   }
+  rename.follow(selected);
+  rename.reposition();
 }
 
 // The stage takes a running turn's rows (its extras); else the history.

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

@@ -779,6 +779,10 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
    text, then its markdown when web.markdown is on (.markdown, stage_slots.js drawAsking); capped so the card keeps
    its room, read from the top. */
 .ts-asking{max-height:calc(var(--stage-max,60vh) * .35);overflow:auto;scrollbar-width:thin;white-space:pre-wrap;overflow-wrap:anywhere;font-size:14px;line-height:1.55;color:var(--narr);border-left:2px solid var(--border-strong);padding-left:10px}
+/* The question room (stage_view.js drawRoom): a model's own question whose asking text overflows that cap. The slot loses its
+   cap and its own scroll, and the stage's one scroll covers the whole reply (the stage's cap rises for the turn, stage_frame.js).
+   --stage-max also scales the extras, the cloud and the queued slot: a ceiling only, content that fit stays as it is. */
+.turn-stage.question-room .ts-asking{max-height:none;overflow:visible}
 .turn-stage.asking .ts-headline{display:none}
 @keyframes ts-fade{from{opacity:.35}}
 .ts-now{height:var(--ts-now-h);display:flex;align-items:center;gap:8px;min-width:0;padding:0 9px;border-radius:8px;background:var(--accent-tint);font-size:13px}
@@ -820,7 +824,12 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 .ts-answer>.bubble.output>.copy-btn{top:0;right:0}
 /* The cloud: one chip (steps, calls, a tick per call), the turn view's block behind it. */
 /* The footer: the chip at the stage's bottom edge (the cloud's steps open above it, the scroller's last slot). */
-.ts-foot{flex:none;padding:0 14px 10px}
+.ts-foot{position:relative;flex:none;padding:0 14px 10px}
+/* The question room's jump pill (stage_view.js drawPill): at the scroller's bottom edge, above the chip, while the waiting
+   card is out of the stage's view; absolute, so the frame never counts it. */
+.ts-room-pill{position:absolute;bottom:100%;right:14px;margin-bottom:6px;padding:4px 11px;border:1px solid var(--warn-border);border-radius:999px;background:var(--warn-bg);color:var(--warn-text);font-size:12.5px;font-weight:600;line-height:1.4;white-space:nowrap;box-shadow:0 2px 8px var(--shadow-strong);animation:ts-fade .2s ease}
+.ts-room-pill:hover:not(:disabled){filter:none;color:var(--warn-bright);border-color:var(--warn);background:var(--warn-bg)}
+.ts-room-pill[hidden]{display:none}
 /* Below the turn's card: the lines queued for after it (each a turn of its own), apart from the turn by a dashed rule. */
 .ts-queued{flex:none;display:flex;flex-direction:column;gap:6px;padding:8px 14px 10px;border-top:1px dashed var(--border-strong);max-height:calc(var(--stage-max,60vh) * .3);overflow:auto;scrollbar-width:thin}
 .ts-queued:empty{display:none}
@@ -887,10 +896,6 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 #infoBar #infoStopBtn{background:var(--bg-raised);color:var(--warn-text);border:1px solid var(--border-strong)}
 #infoBar #infoStopBtn:hover{background:var(--warn-bg);border-color:var(--warn-border)}
 #infoBar #infoArchiveBtn{background:transparent;color:var(--text-muted);border:1px solid var(--border-strong)}
-#infoBar #infoRenameBtn{background:transparent;color:var(--text-muted);border:1px solid transparent}
-#infoBar #infoRenameBtn:hover{color:var(--text);background:var(--bg-hover)}
-/* ✎'s input (session_rename.js), in the button's place. */
-#infoBar .rename-input{flex:0 1 18em;min-width:6em;font:inherit;font-size:12px;padding:3px 8px;border-radius:8px;border:1px solid var(--accent-border);background:var(--bg-raised);color:var(--text);outline:none}
 #infoBar #infoArchiveBtn:hover{color:var(--text);background:var(--bg-hover)}
 #infoBar #infoDeleteBtn{background:transparent;color:var(--text-muted);border:1px solid transparent}
 #infoBar #infoDeleteBtn:hover{color:var(--on-solid);background:var(--danger-bg);border-color:var(--danger-bg)}
@@ -980,8 +985,6 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
   #infoBar>button{font-size:0;line-height:0;padding:5px 7px}
   #infoBar>button::before{content:"";display:block;width:14px;height:14px;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
   #infoBar #infoArchiveBtn{--icon:var(--icon-archive)}
-  #infoBar #infoRenameBtn{--icon: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%3Cpath d='M10.5 2.5l3 3L5.5 13.5H2.5v-3z'/%3E%3C/svg%3E")}
-  #infoBar .rename-input{flex:1 1 8em;font-size:16px}
   #infoBar #infoArchiveBtn.archived{--icon:var(--icon-unarchive)}
   #infoBar #infoContinueBtn{--icon: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%3Cpath d='M3 8h9M8.5 4.5 12 8l-3.5 3.5'/%3E%3C/svg%3E")}
   #infoBar #infoCancelBtn{--icon: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='4' y='4' width='8' height='8' rx='1.5'/%3E%3C/svg%3E")}
@@ -1031,16 +1034,32 @@ body.has-session #scope .scope-where{display:none}
   #newBtn .brand-new{font-size:16px}
 }
 /* The bell (notifications): quiet at the top bar's right end; filled in the accent when on, struck through when the browser blocks it. */
-/* The open session's title, when no strip card in sight shows it (session_title.js): the bar's middle, cut with an ellipsis; the whole first message in its tooltip. */
-#sessionTitle{flex:1;min-width:0;font-size:13px;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-#sessionTitle[hidden]{display:none}
+/* The open session's title, when no strip card in sight shows it (session_title.js): the bar's middle, cut with an ellipsis; the whole first message in its tooltip.
+   Its row holds it and its ✎ (session_rename.js), the ✎ right after the text (the text doesn't grow, the row does). */
+#sessionTitleRow{flex:1;min-width:0;display:flex;align-items:center;gap:2px}
+#sessionTitleRow[hidden]{display:none}
+#sessionTitle{flex:0 1 auto;min-width:0;font-size:13px;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+/* The title's ✎ (the top bar's and the active strip card's): quiet, the text's colour on hover. */
+.title-rename,.card-rename{flex-shrink:0;min-height:0;padding:0 5px;border:1px solid transparent;border-radius:6px;background:transparent;color:var(--text-muted);font-size:13px;line-height:20px;cursor:pointer}
+.title-rename:hover,.card-rename:hover{color:var(--text);background:var(--bg-hover)}
+.title-rename[hidden]{display:none}
+/* The rename input (session_rename.js): fixed over the title row it renames, at the end of body (the strip draws its cards
+   anew on every session event); above the selection bar (20), under the popovers (40). */
+.rename-input{position:fixed;z-index:30;box-sizing:border-box;margin:0;font:inherit;font-size:var(--rename-font,14px);padding:0 8px;border-radius:8px;border:1px solid var(--accent-border);background:var(--bg-raised);color:var(--text);outline:none;box-shadow:var(--glass-shadow)}
+.rename-input::placeholder{color:var(--text-faint)}
+/* Over the top bar's title row (as wide as the bar's middle): a title's width, not a field to the bell. */
+.rename-input.over-bar{max-width:32em}
 /* A phone: the title is its own row under the bar, so "chi + · pill · bell" stay one line. Nothing on that line wraps to a
    row of its own when the pill's text grows mid-turn ("· 1 waiting"): the scope chip and the pill have a base size of 0 (what
    a wrapping line counts) and grow to their text, the pill first; the scope chip cuts with an ellipsis before the pill does.
    The pill drops its session count while it says live or waiting, so the scope chip keeps its words. */
 @media(max-width:600px){
   #topBar{flex-wrap:wrap;row-gap:2px}
-  #sessionTitle{flex-basis:100%;order:10;font-size:12px}
+  #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}
@@ -1223,6 +1242,11 @@ body.all-view #center, body.all-view #topStrip{display:none}
 @media (hover:none){.card-tools button{opacity:1}}
 .card.active{background:var(--accent-bg);border-color:var(--accent-border)}
 .card .preview{font-size:14px;line-height:1.4;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+/* A strip card's title line with its ✎, shown on the active card alone (lists_view.js draws it on each, a select only paints). */
+.card .preview-row{display:flex;align-items:center;gap:2px;min-width:0}
+.card .preview-row .preview{flex:1;min-width:0}
+.card .card-rename{display:none}
+#topStrip .card.active .card-rename{display:block}
 .card .time{font-variant-numeric:tabular-nums;white-space:nowrap}
 .card .ctx{font-variant-numeric:tabular-nums;white-space:nowrap;color:var(--text-3)}
 #topStrip .card .preview{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
@@ -1262,7 +1286,7 @@ a{color:var(--accent)}
     <button type="button" id="newBtn" class="brand" title="New session"><span class="brand-name">chi</span><span class="brand-new">+<span class="brand-new-word"> new session</span></span></button>
     <div id="scope" hidden></div>
     <button type="button" class="strip-toggle" id="stripStatus" title="All sessions, with search"><span class="pill-count">sessions</span></button>
-    <span id="sessionTitle" hidden></span>
+    <span id="sessionTitleRow" hidden><span id="sessionTitle"></span><button type="button" id="titleRenameBtn" class="title-rename" title="Rename this session" aria-label="Rename this session" hidden>✎</button></span>
     <button type="button" id="notifyBtn" aria-label="Notifications" aria-pressed="false" hidden><svg viewBox="0 0 16 16" width="15" height="15" aria-hidden="true"><path class="bell" d="M8 1.75a4 4 0 0 0-4 4v2.6L2.75 10.6v.9h10.5v-.9L12 8.35v-2.6a4 4 0 0 0-4-4Z"/><path class="clapper" d="M6.5 13a1.5 1.5 0 0 0 3 0"/><path class="slash" d="M2.5 2.5l11 11"/></svg></button>
   </div>
   <section id="topStrip" aria-label="Latest sessions" class="loading"><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div></section>
@@ -1306,7 +1330,6 @@ a{color:var(--accent)}
         <div class="info" id="infoText"></div>
         <div id="contextChips" aria-label="Attached context" hidden></div>
         <button class="ghost" id="infoCancelBtn" title="Cancel the running turn, whoever sent it" style="display:none">Stop turn</button>
-        <button class="ghost" id="infoRenameBtn" title="Rename this session" aria-label="Rename this session" style="display:none">✎</button>
         <button class="ghost" id="infoContinueBtn" title="Continue: start the next link of this session's chain from its recap (this one is archived)" style="display:none">continue →</button>
         <button class="ghost" id="infoArchiveBtn" title="Archive: hide from the lists, keep for good" style="display:none">archive</button>
         <button class="ghost" id="infoStopBtn" title="Stop session (terminate worker)" style="display:none">stop session</button>

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

@@ -42,8 +42,6 @@ export function infoButtons({ id, state, chain, archived, continuing, streaming
   const busy = !!id && continuing;
   return {
     continue: { shown: !!id && !chain.next && state.owner !== "tui", disabled: busy, text: busy ? "continuing…" : "continue →" },
-    // ✎: /title from the web (a plain terminal's session takes no commands).
-    rename: { shown: !!id && state.owner !== "tui" },
     delete: { shown: !!id },
     archive: {
       shown: !!id,

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

@@ -21,6 +21,9 @@
 //   confirmDelete(id), setArchived(id, archive), archiveOne(id, archive)
 //   updateInfoBar(), updateSessionTitle(), showToast(text, action)
 //   allViewOpen(), openAllView(), leaveAllView(hash)
+//   renameShown(owner)    whether a card's title has its ✎ (session_title.js)
+//   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 { html, nothing, render } from "./vendor/lit-html.js";
@@ -134,7 +137,9 @@ export function cardAnimStyle({ enterMs = null, now = null } = {}, period = DOT_
 // +ctx+: title (cardTitle), projectName (the page's scope), activeId (the
 // open session), chainOpen (its chain's popover is open), parent (the
 // delegating session, or null).
-export function cardTemplate(s, { deletable = false, archivable = false, selectable = false, picked = false, skipReason = null, family = null, open = false, rows = false, matchIds = null, entering = false, anim = "" } = {}, { title = "", projectName = null, activeId = null, chainOpen = false, parent = null } = {}) {
+// renamable: the title line ends in a ✎ (the strip's cards; CSS shows it on
+// the active one alone, since a select only paints the cards again).
+export function cardTemplate(s, { deletable = false, archivable = false, selectable = false, picked = false, skipReason = null, family = null, open = false, rows = false, matchIds = null, entering = false, anim = "", renamable = false } = {}, { title = "", projectName = null, activeId = null, chainOpen = false, parent = null } = {}) {
   const fam = family && family.members.length ? family : null;
   const ts = s.updated_at || s.created_at || "";
   const tip = `${s.id} · updated ${ts} · ${s.status}`;
@@ -164,8 +169,11 @@ export function cardTemplate(s, { deletable = false, archivable = false, selecta
   const memberIds = [...(fam ? fam.members.map((m) => m.session.id) : []),
     ...(family?.chain ? family.chain.links.map((x) => x.id).filter((id) => id !== s.id) : [])];
   const cls = `card${s.archived ? " archived" : ""}${waiting || familyWaiting ? " waiting" : ""}${selectable && picked ? " picked" : ""}${fam && rows && open ? " family-open" : ""}${entering ? " entering" : ""}`;
+  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;
-  return html`<div class=${cls} data-id=${s.id} data-members=${memberIds.length ? memberIds.join(" ") : nothing} style=${anim || nothing} title=${`${tip}${memTitle ? ` · ${memTitle}` : ""}`}><div class="preview">${title}</div>${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>`;
+  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>`;
 }
 
 function cardToolsTemplate(s, { deletable, archivable }) {
@@ -223,7 +231,7 @@ export function createListsView(deps) {
   const {
     doc, win, topStripEl, allListEl, sessions, selected, scope, scopeError, eventsLive, refresh, select,
     confirmDelete, setArchived, archiveOne, updateInfoBar, updateSessionTitle, showToast,
-    allViewOpen, openAllView, leaveAllView,
+    allViewOpen, openAllView, leaveAllView, renameShown = () => false, onRename = () => {}, renaming = () => false,
   } = deps;
   const $ = (s) => doc.querySelector(s);
 
@@ -261,9 +269,11 @@ export function createListsView(deps) {
     return chainTitle(s, sessionsById());
   }
 
+  // A card with no title yet ("—": no first message) has no ✎ either.
   function cardFor(s, opts) {
-    return cardTemplate(s, opts, {
-      title: cardTitle(s),
+    const title = cardTitle(s);
+    return cardTemplate(s, { ...opts, renamable: !!opts.renamable && title !== "\u2014" }, {
+      title,
       projectName: scope.projectName,
       activeId: selected(),
       chainOpen: !!opts.family?.chain && chainOpenHead() === s.id,
@@ -294,9 +304,10 @@ export function createListsView(deps) {
   const canHover = win.matchMedia?.("(hover: hover)").matches ?? false;
   function listOrder(el, next, idOf = (s) => s.id) {
     // The strip's popover holds it too (the pointer leaves the strip for it,
-    // and a touch screen has no hover at all).
+    // and a touch screen has no hover at all), and so does a rename typed
+    // over its active card (the card doesn't jump away under the input).
     const holding = el.getClientRects().length > 0
-      && ((canHover && el.matches(":hover")) || (el === topStripEl && familyPop.isOpen()) || chainPopIn(el));
+      && ((canHover && el.matches(":hover")) || (el === topStripEl && (familyPop.isOpen() || renaming())) || chainPopIn(el));
     const held = holding ? drawnOrder.get(el) : null;
     const ordered = held ? heldOrder(held, next, idOf) : next;
     if (held && ordered.some((x, i) => idOf(x) !== idOf(next[i]))) heldLists.add(el);
@@ -429,6 +440,12 @@ export function createListsView(deps) {
           onFamily(el.dataset.id, chip, e);
           return;
         }
+        const ren = e.target.closest(".card-rename");
+        if (ren) {
+          e.stopPropagation();
+          onRename();
+          return;
+        }
         const del = e.target.closest(".card-del");
         if (del) {
           e.stopPropagation();
@@ -497,7 +514,7 @@ export function createListsView(deps) {
     }
     const anim = enteringFor(topStripEl, [...cards.map(familyId), STRIP_TILE]);
     const tile = stripTileTemplate(stripCountText(shownSessions().length, all.length), anim(STRIP_TILE));
-    draw(topStripEl, html`${cards.map((f) => cardFor(f.head, { family: f, open: familyPop.openHead() === f.head.id, ...anim(familyId(f)) }))}${tile}`);
+    draw(topStripEl, html`${cards.map((f) => cardFor(f.head, { family: f, open: familyPop.openHead() === f.head.id, renamable: renameShown(f.head.owner), ...anim(familyId(f)) }))}${tile}`);
     bindCards(topStripEl, select, {
       onFamily: (id, _chip, e) => {
         familyPop.toggle(id);
@@ -769,6 +786,13 @@ export function createListsView(deps) {
   return {
     render,
     renderAll,
+    // The rename input closed: a strip held for it catches up (unless the
+    // pointer or a popover holds it still).
+    catchUp() {
+      if (heldLists.has(topStripEl) && !(canHover && topStripEl.matches(":hover")) && !familyPop.isOpen() && !chainPopIn(topStripEl)) {
+        renderTop(stripCards());
+      }
+    },
     paintActive,
     cardTitle,
     sessionsById,