samagotchi 0.50.0 → 0.51.0

data/lib/samagotchi/terminal_ui.rb

@@ -752,6 +752,14 @@ module Samagotchi
     def run_input_line(session, input)
       return if input.empty?
 
+      # /cut TEXT and /queue TEXT are deliveries only while a turn runs; at
+      # the prompt both run the text as a normal turn, as their usage says.
+      if (choice = steer_choice(input))
+        return @surface.commit(STEER_CHOICE_USAGE) if choice.last.empty?
+
+        input = choice.last
+      end
+
       # /model, /models, !rollback, !cmd, /continue (shared with workers);
       # an anytime command's cards print as it shows them (btw's
       # "thinking…" before the answer).
@@ -1083,6 +1091,10 @@ module Samagotchi
     # plugin's /btw, /model alone) starts now on its own thread; one that
     # runs after the turn (/model X, !cmd) waits in the queue, in arrival
     # order with the other lines that wait; others go back in the prompt.
+    #
+    # A plain line goes in at the running turn's next step boundary and
+    # never cuts; /cut TEXT asks for a cut, /queue TEXT waits for the turn
+    # to end and runs as a turn of its own.
     # @return [Boolean, :back] whether the turn took it, :back to put it back
     def steer_line(line)
       local = local_command(line) unless line.nil?
@@ -1091,6 +1103,12 @@ module Samagotchi
       return detach_note if local == :detach
       return false if @active_cancel_controller&.cancelled?
 
+      # Before every command check: /cut and /queue are the UIs' own words
+      # for a delivery (they are listed for Tab and /help, never run).
+      if (choice = steer_choice(line))
+        return submit_steer_choice(*choice)
+      end
+
       policy = command_registry.mid_turn(line)
       return start_anytime_command(line) if policy == :anytime
       return command_queued(line) if policy == :queue
@@ -1108,12 +1126,37 @@ module Samagotchi
       # Behind a command that waits for the turn's end, a line waits too.
       return wait_for_turn_end(line) if @command_waits
 
-      epoch = @engine.input_epoch
       @pending_input_queue.push(line.strip)
-      # The user's line cuts a generation that has streamed only thinking
-      # for long (steer.cut_after), now or once it has: the model starts the
-      # step again with it.
-      @engine.cut_for_steer(nil, epoch: epoch)
+      @surface.commit(NEXT_STEP_NOTE)
+      true
+    end
+
+    # /cut TEXT and /queue TEXT during a turn, which the REPL would
+    # otherwise read as prompts (SessionCommands registers them for Tab and
+    # help only). A cut asks the engine to cut the generation only thinking
+    # too long; a queue waits for the turn's end (the REPL's own after-turn
+    # list). Empty text gets the usage line. A line with images never steers
+    # (as a plain one doesn't).
+    # @return [Boolean] whether the turn took it
+    def submit_steer_choice(choice, text)
+      if text.empty?
+        @surface.commit(STEER_CHOICE_USAGE)
+        return true
+      end
+      return image_line_waits(text) if ImageInput.extract(text).any?
+
+      # A /queue waits for the turn's end; a /cut behind a command that
+      # already waits there goes after it too.
+      if choice == :queue || @command_waits
+        @surface.commit(COMMAND_QUEUED)
+        return wait_for_turn_end(text)
+      end
+
+      epoch = @engine.input_epoch
+      @pending_input_queue.push(text)
+      # With no session running the cut is :off; the text still waits for
+      # the running turn's next step.
+      @surface.commit(steer_cut_note(@engine.cut_for_steer(nil, epoch: epoch)))
       true
     end
 

data/lib/samagotchi/tool_activity.rb

@@ -47,6 +47,9 @@ module Samagotchi
       }
       title = tool_title(tool_name, call, cwd: cwd)
       event[:title] = title if title
+      # The name the model used when an alias ran a built-in (called_as: "bash"
+      # for an execute), for a UI that shows it.
+      event[:called_as] = call[:called_as] if call.is_a?(Hash) && call[:called_as]
       # The model's own words for a command, which the TUI's tool line
       # shows in place of the cut params.
       description = command_description(tool_name, call)

data/lib/samagotchi/tool_runner.rb

@@ -57,6 +57,8 @@ module Samagotchi
       # The worker runs in its session's working directory.
       title = ToolActivity.tool_title(call[:name], call, cwd: Dir.pwd)
       started[:title] = title if title
+      # The name the model called it by when that was an alias's (bash).
+      started[:called_as] = call[:called_as] if call[:called_as]
       # The full command for a richer UI (params stays cut at 80).
       view = ToolView.for(call[:name], call)&.to_h
       started[:view] = view if view

data/lib/samagotchi/tools/builtin_calls.rb

@@ -56,6 +56,13 @@ module Samagotchi
         "forget_outputs" => { content: "note", also: %w[note], verbatim: %w[ids keep restore] }
       }.freeze
 
+      # A name the model uses for a built-in, mapped to that built-in (a model
+      # that keeps calling `bash` with execute's arguments; before this such a
+      # call died as an unknown tool). It only takes effect when the
+      # arguments really are the target's shape; the call then carries
+      # called_as: with the model's own spelling.
+      ALIASES = { "bash" => "execute" }.freeze
+
       # One built-in's mapping, resolved from its schema and OVERRIDES.
       Row = Data.define(:name, :content_keys, :path_key, :fields, :aliases, :verbatim, :fallback, :fallback_key,
                         :options) do
@@ -109,6 +116,14 @@ module Samagotchi
       def build(name, args, raw: nil)
         name = name.to_s
         args = args.is_a?(Hash) ? args.transform_keys(&:to_s) : {}
+        # An alias runs its target (bash → execute); the row is the target's,
+        # and the call keeps the model's own spelling on called_as:.
+        # Not the target's shape (a String main argument, only its keys) and
+        # the alias doesn't take: the call passes through as an unknown tool.
+        if (target = ALIASES[name.downcase])
+          return aliasable?(row(target), args) ? aliased(name, target, args, raw) : passthrough(name, args, raw)
+        end
+
         row = row(name)
         return passthrough(name, args, raw) unless row
 
@@ -120,6 +135,24 @@ module Samagotchi
         call
       end
 
+      # An execute-shaped call the model spelled +name+: built as its +target+,
+      # tagged with the model's spelling for the activity event and the log.
+      def aliased(name, target, args, raw)
+        call = build(target, args, raw: raw)
+        call[:called_as] = name
+        call
+      end
+
+      # The alias gate: a String main argument, and every key one the target's
+      # schema knows (its aliases included). More, or differently shaped, the
+      # call is the model's own and passes through as an unknown tool.
+      def aliasable?(row, args)
+        return false unless row
+
+        row.content_keys.map { |key| value(row, args, key) }.any?(String) &&
+          (args.keys - (row.content_keys + [row.path_key].compact + row.fields + row.aliases.keys)).empty?
+      end
+
       def content_value(row, args)
         found = row.content_keys.lazy.map { |key| value(row, args, key) }.find { |v| !v.nil? }
         found.nil? ? "" : found.to_s

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1065,8 +1065,12 @@ module Samagotchi
         images = turn_images(id, body["images"])
         return error_response(400, "bad_images", images) if images.is_a?(String)
 
-        result = SessionManager.deliver_turn(id, prompt: prompt.to_s, client_id: client_id, images: images, state_dir: @state_dir,
-                                             manager: @manager, bridge: -> { live_bridge_client(id) })
+        delivery = body["delivery"] || body[:delivery]
+        return error_response(400, "bad_delivery", "delivery must be a string") unless delivery.nil? || delivery.is_a?(String)
+
+        result = SessionManager.deliver_turn(id, prompt: prompt.to_s, client_id: client_id, images: images,
+                                                 delivery: delivery, state_dir: @state_dir, manager: @manager,
+                                                 bridge: -> { live_bridge_client(id) })
         case result[:status]
         when :accepted
           record_history(body, prompt)

data/lib/samagotchi/web/message_parts.rb

@@ -233,6 +233,9 @@ module Samagotchi
         part = { tool: name, params: params.to_s }
         title = ToolActivity.tool_title(name, call, cwd: cwd)
         part[:title] = title if title
+        # The name the model called it by when that was an alias's (the
+        # saved call is rebuilt by BuiltinCalls, which sets it again).
+        part[:called_as] = call[:called_as] if call[:called_as]
         # Built from the saved call (never saved itself), so older sessions
         # get it too.
         view = ToolView.for(name, call)&.to_h

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

@@ -53,6 +53,7 @@ export function addStarted(model, event = {}, now = null) {
     row.label = event.label || row.label;
     row.params = event.params || row.params;
     row.title = event.title || row.title;
+    row.called_as = event.called_as || row.called_as;
     row.view = event.view || row.view;
     markStart(row, event, now);
     return { row, created: false };
@@ -68,6 +69,9 @@ export function addStarted(model, event = {}, now = null) {
     // project-relative path, a command without its "cd … &&"); rows show it
     // in place of the params when there is one.
     title: event.title || null,
+    // The name the model called the tool by when it was an alias's ("bash"
+    // run as execute); the row says so.
+    called_as: event.called_as || null,
     // The call's full arguments for the expanded row and the hovers (the
     // server's ToolView: an execute/task_create's command, its cwd).
     view: event.view || null,
@@ -104,6 +108,7 @@ export function addCompleted(model, event = {}, now = null) {
       label: event.label,
       params: event.activity?.params || "",
       title: event.activity?.title,
+      called_as: event.activity?.called_as,
       view: event.view,
     });
     row = synthesized.row;
@@ -113,6 +118,7 @@ export function addCompleted(model, event = {}, now = null) {
   row.output_truncated = !!event.output_truncated;
   if (event.activity?.params) row.params = event.activity.params;
   if (event.activity?.title) row.title = event.activity.title;
+  if (event.activity?.called_as) row.called_as = event.activity.called_as;
   // The images the tool returned (a reload in the turn view draws them from
   // the saved parts, turn_html.js toolRowHtml).
   if (event.images?.length) row.images = event.images;

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

@@ -56,6 +56,7 @@ import { shouldFollowScroll, keepFollowing } from "./scroll.js";
 import { SHORT_WINDOW_QUERY, stripAutoHidden, stripColumns, stripShowParts } from "./strip.js";
 import { applySessionEvent, batchCounts, batchTargets, batchToastText, families, familyId, familyOpen, familyWaits, filterFamilies, flattenFamilies, heldOrder, inTree, rangeIds, runBatch, listedSessions, sortedByUpdated, stoppedBadge, waitingBadge, waitingFirst, waitingSearchText } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
+import { tabTitle, topBarTitle } from "./session_title.js";
 import { restartConfirmText, versionNotice, workerBadge } from "./update_notice.js";
 import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, STOPPED_LINE_CLASS,
@@ -71,7 +72,11 @@ const historyEl = $("#history");
 const emptyEl = $("#empty");
 const composerEl = $("#composer");
 const infoBarEl = $("#infoBar");
-const firstPeekEl = $("#firstPeek");
+// 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");
+let tabBase = null;
+let tabShown = null;
 const infoTextEl = $("#infoText");
 // The open session's attached context, in its own row of the session bar
 // (updateInfoBar redraws #infoText every tick; the chips keep their popover).
@@ -342,7 +347,9 @@ function renderScope() {
     el.innerHTML = `<span class="scope-name" title="Sessions of every project">all projects</span>${backLink}${where ? `<span class="scope-where" title="New chats start in ${escapeHtml(where)}">new chat in<span class="path"><bdi>${escapeHtml(where)}</bdi></span></span>` : ""}`;
   }
   el.hidden = false;
-  notifications.setBaseTitle(scope.projectName ? `Chi · ${scope.projectName}` : "Chi");
+  // The tab: "<session title> · Chi · <project>" (updateSessionTitle).
+  tabBase = scope.projectName ? `Chi · ${scope.projectName}` : "Chi";
+  updateSessionTitle();
   // The links follow the hash (an open session, the all-sessions view).
   el.querySelector(".scope-all:not(.scope-back)")?.addEventListener("click", (e) => {
     e.currentTarget.href = allScopeHref(location.hash, scope.dir, location.search);
@@ -642,6 +649,8 @@ function paintActive() {
   document.querySelectorAll(".family-row[data-id]").forEach((el) => {
     el.classList.toggle("active", !!selected && el.dataset.id === selected);
   });
+  // The open session's card may have come into the strip or left it.
+  updateSessionTitle();
 }
 
 // The latest sessions (as many as fit, a family one card), then the way
@@ -693,11 +702,11 @@ function noteChainFamilies(fams) {
 }
 
 // The hidden strip's pill: "▾ 5 sessions · ● 1 live · ● 1 waiting",
-// following the list: its cards (a family is one), the live and waiting
-// sessions (a waiting delegate too).
+// following the list: its sessions, the number the All sessions tile
+// shows, and the live and waiting ones (a waiting delegate too).
 function renderStripShow() {
   const shown = shownSessions();
-  const { count, live, waiting } = stripShowParts(shown, { cards: foldChains(families(shown), allSessions).length });
+  const { count, live, waiting } = stripShowParts(shown);
   const liveHtml = live ? ` · <span class="live"><span class="live-dot" aria-hidden="true"></span>${escapeHtml(live)}</span>` : "";
   const waitingHtml = waiting ? ` · <span class="waiting"><span class="waiting-dot" aria-hidden="true"></span>${escapeHtml(waiting)}</span>` : "";
   $("#stripShow").innerHTML = `<span class="pill-arrow" aria-hidden="true">\u25BE</span> ${escapeHtml(count)}${liveHtml}${waitingHtml}`;
@@ -999,6 +1008,7 @@ function applyView() {
     topStripEl.scrollLeft = 0; // a phone's strip scrolls sideways to the tile
   }
   document.body.classList.toggle("all-view", open);
+  updateSessionTitle();
   // Its chip was in the list just hidden (the strip, or all sessions).
   chainPop.close();
   if (open) {
@@ -1037,6 +1047,7 @@ function updateComposerMode() {
   if (document.body.classList.toggle("has-session", !!selected) !== hadSession) {
     hadSession = !hadSession;
     fitPrompt();
+    placeToast();
   }
   if (selected) {
     modelPicker.close();
@@ -1148,7 +1159,6 @@ function clearSelection() {
   setCapabilities(null);
   updateComposerMode();
   updateInfoBar();
-  updateFirstPeek();
   promptEl.focus();
 }
 
@@ -1182,7 +1192,6 @@ async function select(id) {
   closeStream();
   resetSessionState();
   resetTurnView();
-  updateFirstPeek();
   updateInfoBar();
   contextChips.load(id);
   updateComposerMode();
@@ -1334,7 +1343,6 @@ function renderSessionView(data) {
   // A turn ran out of iterations and waits for a yes or no.
   if (data.continue_offer) questionCards.renderContinue(data.continue_offer);
   updateInfoBar();
-  updateFirstPeek();
   updateComposerMode();
 }
 
@@ -1922,11 +1930,11 @@ function updateInfoBar() {
     renderStable(infoTextEl, "");
     infoTextEl.title = "";
     if (stopBtn) stopBtn.style.display = "none";
+    updateSessionTitle();
     return;
   }
   if (stopBtn) stopBtn.style.display = canStopSession({ owner: current.owner, streaming: !!streamControl }) ? "" : "none";
   const idShort = selected.slice(0,8);
-  const memText = current.usedMemories.length ? current.usedMemories.join(", ") : "—";
   const ctxText = ctxBarText(current.ctxPct, current.ctxWindowSource);
   const tokens = current.timing.tokens;
   const ctxTip = tokensTipText(tokens, undefined, current.timing.memoryIndex,
@@ -1958,15 +1966,37 @@ function updateInfoBar() {
   const copied = Date.now() - attachCopiedAt < 2000;
   const copyHtml = `<button type="button" class="copy-attach" title="Copy &quot;${escapeHtml(attachCmd)}&quot; to attach a terminal">${copied ? "copied ✓" : "copy chi --attach"}</button>`;
   const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${chainHtml}${parentHtml}${kidsHtml}${llmContextChipHtml(current.llmContext, escapeHtml)}${notesHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model session-time"></span>` : ""}${workerBadgeHtml()}</div>`;
-  // The title line follows the card's: a chain link opened with the opener
-  // reads its chain's first link's title (cardTitle).
-  const shown = sessionsById().get(selected);
-  const titleText = shown && isOpener(current.firstPreview) ? cardTitle(shown) : current.firstPreview;
-  const previewHtml = `<div class="preview-line"><span class="preview">${escapeHtml(titleText || "—")}</span> · <span class="mem" title="${escapeHtml(current.usedMemories.join(", "))}">mem: ${escapeHtml(memText)}</span></div>`;
   // The session clock ticks every second while a turn runs: only its text
   // changes, the bar's other nodes (a tooltip, a button mid-press) stay.
-  renderStable(infoTextEl, metaHtml + previewHtml, { ".session-time": timingText });
+  renderStable(infoTextEl, metaHtml, { ".session-time": timingText });
   infoTextEl.title = memoriesTooltip(current.usedMemories, current.preloadedMemories, current.mutedMemories);
+  updateSessionTitle();
+}
+
+// The open session's title, once on screen (session_title.js): its strip
+// 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: a chain link opened with
+// the opener reads its chain's first link's title (cardTitle).
+function updateSessionTitle() {
+  const shown = selected ? sessionsById().get(selected) : null;
+  const first = current.firstPreview || "";
+  const raw = !selected ? "" : (shown && isOpener(first) ? cardTitle(shown) : first);
+  const title = raw === "\u2014" ? "" : raw; // "—": no first message yet
+  const text = topBarTitle({
+    title,
+    cardShown: !!topStripEl.querySelector(".card.active"),
+    stripHidden: document.body.classList.contains("strip-hidden"),
+    allView: allViewOpen(),
+  });
+  if (sessionTitleEl.textContent !== text) sessionTitleEl.textContent = text;
+  if (sessionTitleEl.hidden !== !text) sessionTitleEl.hidden = !text;
+  const tip = text ? title : "";
+  if (sessionTitleEl.title !== tip) sessionTitleEl.title = tip;
+  const tab = tabBase === null ? null : tabTitle({ title, base: tabBase });
+  if (tab !== null && tab !== tabShown) {
+    tabShown = tab;
+    notifications.setBaseTitle(tab);
+  }
 }
 
 // The info bar's ← / → link to a chain's link (chains.js chainNeighbours):
@@ -2024,16 +2054,6 @@ async function mergeTurnTiming(id, data) {
   return true;
 }
 
-function updateFirstPeek() {
-  if (current.ctxPct !== null && current.ctxPct > 20 && current.firstPreview) {
-    firstPeekEl.textContent = current.firstPreview;
-    firstPeekEl.classList.add("visible");
-  } else {
-    firstPeekEl.textContent = "";
-    firstPeekEl.classList.remove("visible");
-  }
-}
-
 function setUsedMemories(names) {
   current.usedMemories = names.slice();
   updateInfoBar();
@@ -2119,7 +2139,6 @@ const streamHandlers = {
     if (pct !== null && !Number.isNaN(pct)) {
       current.ctxPct = pct;
       updateInfoBar();
-      updateFirstPeek();
     }
   },
   generation_started: (data) => {
@@ -2308,7 +2327,6 @@ const streamHandlers = {
     if (pct !== null) {
       current.ctxPct = pct;
       updateInfoBar();
-      updateFirstPeek();
     }
   },
   question_requested: (data) => {
@@ -2469,7 +2487,6 @@ async function handleSendTurn() {
   if (!current.firstPreview || current.firstPreview==="—") {
     current.firstPreview = normalize(prompt).slice(0,80) + (normalize(prompt).length>80?"…":"");
     updateInfoBar();
-    updateFirstPeek();
   }
   actionBtn.disabled = true;
   try {
@@ -2771,7 +2788,9 @@ new ResizeObserver(() => {
   const follow = atHistoryEnd();
   centerEl.style.setProperty("--dock-h", `${dockEl.offsetHeight}px`);
   if (follow) historyEl.scrollTop = historyEl.scrollHeight;
+  placeToast();
 }).observe(dockEl);
+window.addEventListener("resize", () => placeToast());
 
 promptEl.addEventListener("paste", (e) => {
   const files = imageFiles(e.clipboardData);
@@ -2981,6 +3000,23 @@ async function setArchived(id, archive, { undo = true } = {}) {
   showToast(`${what} ${short}`, undo ? { label: "Undo", run: () => setArchived(id, !archive, { undo: false }) } : null);
 }
 
+// The toast sits above the session's composer card (measured: it grows with
+// a wrapping footer or a taller box), so it never covers the card's
+// controls; with no card in sight (the start page, all sessions) the CSS's
+// 24 px from the bottom.
+function placeToast() {
+  const gap = 12;
+  const dock = document.getElementById("dock");
+  const r = dock.getBoundingClientRect();
+  const over = document.body.classList.contains("has-session") && r.height > 0;
+  const bottom = over ? `${Math.round(window.innerHeight - r.top + gap)}px` : "";
+  const root = document.documentElement.style;
+  if (root.getPropertyValue("--toast-bottom") !== bottom) {
+    if (bottom) root.setProperty("--toast-bottom", bottom);
+    else root.removeProperty("--toast-bottom");
+  }
+}
+
 // sticky: stays until its action or its ✕ (else gone after 6 s).
 let toastTimer = null;
 // html: +text+ is markup this page built (its parts escaped), not words.
@@ -2988,6 +3024,7 @@ function showToast(text, action = null, { sticky = false, html = false } = {}) {
   const el = $("#toast");
   el.innerHTML = `<span>${html ? text : escapeHtml(text)}</span>${action ? `<button type="button" class="toast-action">${escapeHtml(action.label)}</button>` : ""}` +
     (sticky ? `<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss">✕</button>` : "");
+  placeToast();
   el.hidden = false;
   el.querySelector(".toast-action")?.addEventListener("click", () => {
     el.hidden = true;
@@ -3047,6 +3084,7 @@ function applyStripHidden() {
   document.body.classList.toggle("strip-hidden", stripAutoHidden({
     saved: stripHiddenSaved(), short: shortWindow.matches, shownWhileShort: stripShownWhileShort,
   }));
+  updateSessionTitle();
 }
 function setStripHidden(hidden) {
   if (hidden) familyPop.close();

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

@@ -45,8 +45,6 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 #topStrip:empty{display:grid}
 #center{flex:1;display:flex;flex-direction:column;min-height:45vh;background:var(--bg-panel);border:1px solid var(--border);border-radius:12px;overflow:hidden}
 #stage{flex:1;display:flex;flex-direction:column;position:relative;min-height:160px;background:var(--bg);overflow:hidden}
-#firstPeek{display:none;padding:8px 12px;background:var(--accent-bg);color:var(--text);border-bottom:1px solid var(--border);font-size:13px;line-height:1.4;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-#firstPeek.visible{display:block}
 #composer #cancelBtn{order:2;background:var(--danger-bg)}
 #history{flex:1;overflow:auto;padding:16px max(16px,calc((100% - 960px)/2));display:flex;flex-direction:column;gap:12px;background:var(--bg);min-height:160px}
 /* No child shrinks to fit: a held (overflow:hidden) answer bubble would, clipped under the dock with nothing to scroll. */
@@ -158,6 +156,7 @@ button.task-stop{flex:none;margin-left:auto;padding:1px 8px;border:1px solid col
 button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:none}
 .ts-now button.task-stop{align-self:center}
 .activity-params{color:var(--text-muted);overflow-wrap:anywhere}
+.activity-alias{color:var(--text-faint);white-space:nowrap}
 .activity-duration{color:var(--text-faint);font-size:11px;font-variant-numeric:tabular-nums;white-space:nowrap}
 .activity-output{margin:4px 0 2px var(--row-gutter);font-size:12px;color:var(--text-muted);white-space:pre-wrap;word-break:break-word;background:var(--bg);border-radius:6px;padding:6px 8px;max-height:160px;overflow:auto}
 /* A row's status and tool name never wrap (a phone broke them letter by
@@ -681,8 +680,6 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #infoBar .meta .dir{font-family:ui-monospace,monospace;font-size:11px;color:var(--text-muted);max-width:48ch;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;direction:rtl;text-align:left}
 /* The footer sits on the card's glass: its chips are tinted, not solid, so the glass reads through them. */
 #infoBar .meta .model{font-size:11px;padding:2px 6px;border-radius:6px;background:color-mix(in srgb,var(--bg-hover) 55%,transparent);color:var(--text-3)}
-/* The memory chip ("mem 2", when the session used some): phones only, where the "mem: …" line is hidden. */
-#infoBar .meta .mem-chip{display:none}
 #infoBar .meta .model.served-mismatch{background:var(--warn-bg);color:var(--warn-bright);border:1px solid var(--warn-border)}
 /* The open session's worker runs an older chi: its version, and Restart when it can. */
 #infoBar .meta .worker-badge{display:inline-flex;align-items:center;gap:6px;font-size:11px;padding:2px 2px 2px 6px;border-radius:6px;background:var(--warn-bg);color:var(--warn-bright);border:1px solid var(--warn-border);white-space:nowrap}
@@ -690,9 +687,6 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #infoBar .meta .worker-restart{padding:1px 8px;border-radius:5px;font-size:11px;font-weight:600;background:var(--bg-raised);color:var(--warn-bright);border:1px solid var(--warn-border)}
 #infoBar .meta .worker-restart:hover:not(:disabled){background:var(--warn-border);color:var(--on-warn)}
 #infoBar .meta .worker-restart:disabled{opacity:.7;cursor:default}
-#infoBar .preview-line{font-size:13px;word-break:break-word;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;line-clamp:1;overflow:hidden;line-height:1.4;max-height:1.4em}
-#infoBar .preview-line .preview, #infoBar .preview-line .mem{word-break:break-word}
-#infoBar .mem{font-size:12px;color:var(--text-muted)}
 #infoBar button{padding:4px 12px;border-radius:8px;font-size:12px;font-weight:600}
 #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)}
@@ -744,12 +738,11 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .ctx-pop-actions button:hover{color:var(--text-hover)}
 .ctx-pop-actions .ctx-pop-detach{color:var(--text-muted);background:transparent}
 .ctx-pop-actions .ctx-pop-detach:hover{color:var(--danger-text);border-color:color-mix(in srgb,var(--danger) 55%,transparent)}
-/* Phones: the footer is one line; its meta scrolls sideways (all of it stays reachable) and the first-message line, the strip card's title, goes. */
+/* Phones: the footer is one line; its meta scrolls sideways (all of it stays reachable). */
 @media(max-width:600px){
   /* The key hint: cut off at this width, and phones have no Shift+Enter. */
   #composeHint{display:none}
   #infoBar{flex-wrap:nowrap;align-items:center;gap:6px;padding:6px 10px 8px}
-  #infoBar .preview-line{display:none}
   /* No terminal on a phone to attach from. */
   #infoBar .meta .copy-attach{display:none}
   #infoBar .meta{flex-wrap:nowrap;overflow-x:auto;scrollbar-width:none;white-space:nowrap}
@@ -757,8 +750,8 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
   #infoBar .meta>*{flex-shrink:0}
   #infoBar .meta .id{order:-2}
   #infoBar .meta .status{order:-1}
-  /* After the status (same order, later in the DOM): the meta scrolls, and only its start is in sight. */
-  #infoBar .meta .mem-chip{display:inline;order:-1}
+  /* The memory chip right after the status (same order, later in the DOM): the meta scrolls, and only its start is in sight. */
+  #infoBar .meta .mem-chip{order:-1}
   /* A parent's children chip too: its waiting part is what to see. */
   #infoBar .meta .children-chip{order:-1}
   /* A chain's ← → links too: the way to the other days. */
@@ -825,6 +818,14 @@ body.has-session #scope .scope-where{display:none}
 /* The ▾ glyph draws tiny at the pill's 11 px: at 20 px it is about as tall
    as the pill text's capitals (phone and desktop alike). */
 /* 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}
+/* A phone: the title is its own row under the bar, so "chi + · pill · bell" stay one line. */
+@media(max-width:600px){
+  #topBar{flex-wrap:wrap;row-gap:2px}
+  #sessionTitle{flex-basis:100%;order:10;font-size:12px}
+}
 #notifyBtn{margin-left:auto;flex-shrink:0;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;padding:0;min-height:0;background:transparent;border:1px solid transparent;border-radius:999px;color:var(--text-muted)}
 #notifyBtn[hidden]{display:none}
 #notifyBtn:hover{color:var(--text-2);border-color:var(--border)}
@@ -947,7 +948,8 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card.archived{opacity:.6}
 .card.archived:hover{opacity:.85}
 .card .archived-badge,.family-row .archived-badge{font-size:10px;padding:1px 6px;border-radius:6px;border:1px solid var(--border-strong);color:var(--text-muted)}
-#toast{position:fixed;left:50%;bottom:24px;transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
+/* bottom: above the session's composer card when one shows (--toast-bottom, app.js placeToast). */
+#toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
 #toast[hidden]{display:none}
 #toast .toast-action{background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
 #toast .toast-close{background:transparent;border:0;color:var(--text-muted);cursor:pointer;padding:2px 4px;margin-left:-6px}
@@ -1016,11 +1018,11 @@ a{color:var(--accent)}
     <div id="scope" hidden></div>
     <button type="button" class="strip-toggle" id="stripShow" title="Show the latest sessions"><span class="pill-arrow" aria-hidden="true">▾</span> sessions</button>
     <button type="button" class="strip-toggle" id="stripHideTop" title="Hide the latest sessions"><span class="pill-arrow" aria-hidden="true">▴</span> hide</button>
+    <span id="sessionTitle" hidden></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>
   <section id="center">
-    <div id="firstPeek"></div>
     <div id="stage">
       <div id="markdownWarning" class="markdown-warning" hidden></div>
       <div id="history"></div>
@@ -1045,7 +1047,7 @@ a{color:var(--accent)}
           <button type="button" id="modelPick" class="model-pick" title="The model the new chat starts on" aria-label="Model for the new chat" aria-haspopup="listbox" aria-expanded="false" hidden><span class="model-pick-name"></span></button>
           <button type="button" id="llmContextNew" class="llmctx-new" aria-haspopup="dialog" hidden></button>
           <div id="composeHint">Enter to start · Shift+Enter for a newline</div>
-          <button id="cancelBtn" title="Cancel the running turn, whoever sent it" style="display:none">Cancel</button>
+          <button id="cancelBtn" title="Cancel the running turn, whoever sent it" style="display:none">Stop turn</button>
           <div class="split">
             <button id="actionBtn">Start</button>
           </div>
@@ -1056,7 +1058,7 @@ a{color:var(--accent)}
         <div id="contextChips" aria-label="Attached context" hidden></div>
         <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</button>
+        <button class="ghost" id="infoStopBtn" title="Stop session (terminate worker)" style="display:none">stop session</button>
         <button class="ghost" id="infoDeleteBtn" title="Delete session (for good)" style="display:none">delete</button>
       </div>
     </div>

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

@@ -0,0 +1,26 @@
+import { normalize } from "./format.js";
+
+// Where the open session's title shows: once on screen. Its strip card says
+// it when the strip is shown and has an `.active` card for it; otherwise
+// (strip hidden, an older session without a card, a delegate folded into its
+// parent's card) the top bar does. The All sessions view shows none.
+// Plain rules, no DOM; app.js wires them (updateSessionTitle).
+
+const TAB_TITLE_CHARS = 40;
+
+// The top bar's text, or "" when it shows no title.
+export function topBarTitle({ title, cardShown, stripHidden, allView }) {
+  const text = normalize(title);
+  if (!text || allView) return "";
+  if (cardShown && !stripHidden) return "";
+  return text;
+}
+
+// The browser tab: "<title, cut at 40> · <base>", the base alone without a
+// session title (base = "Chi · <project>" or "Chi").
+export function tabTitle({ title, base }) {
+  const text = normalize(title);
+  if (!text) return base;
+  const cut = text.length > TAB_TITLE_CHARS ? `${text.slice(0, TAB_TITLE_CHARS)}…` : text;
+  return `${cut} · ${base}`;
+}

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

@@ -18,13 +18,11 @@ export function stripColumns(width) {
 // And how many wait on the user (notify.js waitingOn: a question, an
 // approval, a card), so a hidden strip still says one needs an answer.
 // Plain text parts; live and waiting are "" when none. Zero sessions keep
-// the bare label.
-// @param cards how many cards the list makes (a parent's delegates fold
-//   into its card: one), the count's number; live and waiting count every
-//   session, a waiting delegate is still one thing waiting on the user
-export function stripShowParts(sessions, { cards = null } = {}) {
+// the bare label. The count is sessions (a folded delegate counts), the
+// number the "All sessions" tile shows.
+export function stripShowParts(sessions) {
   const list = sessions || [];
-  const n = cards ?? list.length;
+  const n = list.length;
   const liveN = list.filter((s) => s && s.owner === "worker").length;
   const waitingN = list.filter((s) => waitingOn(s)).length;
   return {