samagotchi 0.73.0 → 0.75.0

data/lib/samagotchi/session_chain.rb

@@ -6,7 +6,7 @@ require_relative "recap_store"
 
 module Samagotchi
   # Session chains: a session that continues an earlier one (Session#continues),
-  # "the next day of the same routine". The chain is derived, never stored:
+  # "the next run of the same routine". The chain is derived, never stored:
   # follow +continues+ back for the earlier links, forward (the session whose
   # +continues+ names this one) for the later ones. A link is continued at
   # most once (SessionManager.continue_session refuses a second), so the
@@ -69,7 +69,7 @@ module Samagotchi
     # @param recap [Hash, nil] RecapStore.read's
     # @return [String]
     def note_text(previous, recap:)
-      head = "This session continues #{previous.id[0, 8]} (#{day(previous.created_at)}), the previous link of its chain."
+      head = "This session continues #{previous.id[0, 8]} (#{clock(previous.created_at) || previous.created_at}), the previous link of its chain."
       text = recap && recap[:text].to_s.strip
       return "#{head} It left no recap." if text.nil? || text.empty?
 
@@ -102,12 +102,6 @@ module Samagotchi
       nil
     end
 
-    def day(iso)
-      Time.iso8601(iso.to_s).localtime.strftime("%Y-%m-%d")
-    rescue ArgumentError
-      iso.to_s
-    end
-
     def clock(iso)
       iso && Time.iso8601(iso.to_s).localtime.strftime("%Y-%m-%d %H:%M")
     rescue ArgumentError

data/lib/samagotchi/session_manager.rb

@@ -25,6 +25,7 @@ require_relative "worker_sidecar"
 require_relative "worker_signals"
 require_relative "log"
 require_relative "log_path"
+require_relative "paths"
 require_relative "model_profile"
 require_relative "installed_gem"
 require_relative "installed_versions"
@@ -213,6 +214,8 @@ module Samagotchi
     # SAMAGOTCHI_GUARDRAILS_* and the session markers (SESSION_MARKER_ENV).
     # XDG_CONFIG_HOME passes: whoever starts or
     # wakes the worker picks which config.yml it reads (docs/guardrails.md).
+    # XDG_STATE_HOME and XDG_CONFIG_HOME, when set, pass made absolute
+    # (Paths): the worker starts in the session's directory.
     private_class_method def self.spawn_options(session)
       # Own process group: workers outlive `chi web`, and a Ctrl-C in its
       # terminal must not reach them (the worker then leaves the process
@@ -239,6 +242,10 @@ module Samagotchi
       else
         child_env["SAMAGOTCHI_LOG_DISABLE"] = "true"
       end
+      # And the spawner's XDG dirs, absolute: a relative XDG_STATE_HOME or
+      # XDG_CONFIG_HOME would otherwise be read from the session's directory.
+      child_env["XDG_STATE_HOME"] = Paths.state_home unless ENV.fetch("XDG_STATE_HOME", "").to_s.strip.empty?
+      child_env["XDG_CONFIG_HOME"] = Paths.config_home unless ENV.fetch("XDG_CONFIG_HOME", "").to_s.strip.empty?
       # The spawner's environment must not reach the worker's guardrails (a
       # parent agent starting or waking a session): Process.spawn unsets a
       # key mapped to nil. config.yml no longer reads them; this keeps an

data/lib/samagotchi/tool_output_cut.rb

@@ -64,7 +64,8 @@ module Samagotchi
     # command has none: its output isn't all there is. A command a signal
     # ended (a segfault, an OOM kill) has an exit line with no number
     # ("exit: "): it ended, so its output is all there is. The JS twin is
-    # turn_html.js's EXIT_LINE.
+    # turn_html.js's EXIT_LINE; spec/fixtures/exit_lines.json holds the
+    # cases both must answer alike (both specs run it).
     STDOUT_LABEL = "\nstdout:\n"
     STDERR_LABEL = "\nstderr:\n"
     EXIT_LINE = /\nexit: (?:-?\d+)?[^\n]*(?:\n\([^\n]*\))?\z/

data/lib/samagotchi/tools/builtins.rb

@@ -2,6 +2,7 @@
 
 require_relative "registry"
 require_relative "../tool_declarations"
+require_relative "../paths"
 require_relative "execute"
 require_relative "read"
 require_relative "write"
@@ -127,6 +128,8 @@ module Samagotchi
       # level (SAMAGOTCHI_SESSION_REASONING_HISTORY, the same way). A
       # worker's `chi --model X` default (ModelProfile::MODEL_FROM_CLI_ENV)
       # is unset: it was that run's, not the default of a chi run here.
+      # A set XDG_STATE_HOME / XDG_CONFIG_HOME goes in absolute (Paths), so
+      # a chi run in another cwd (chi send) reads this chi's dirs.
       def parent_env(kctx, env: ENV)
         peers = kctx.peers
         id = peers.respond_to?(:session_id) ? peers.session_id.to_s : ""
@@ -136,7 +139,16 @@ module Samagotchi
         { Guardrails::ParentApprovals::PARENT_SESSION_ENV => id.empty? ? "chi" : id,
           SESSION_MODEL_ENV => model.empty? ? nil : model,
           SESSION_THINKING_ENV => thinking,
-          SESSION_REASONING_HISTORY_ENV => history }.merge(cli_model_unset(env))
+          SESSION_REASONING_HISTORY_ENV => history }.merge(cli_model_unset(env)).merge(xdg_absolute(env))
+      end
+
+      # The XDG dirs set in +env+, made absolute (nothing for an unset one).
+      def xdg_absolute(env = ENV)
+        set = ->(key) { !env.fetch(key, "").to_s.strip.empty? }
+        dirs = {}
+        dirs["XDG_STATE_HOME"] = Paths.state_home(env: env) if set.call("XDG_STATE_HOME")
+        dirs["XDG_CONFIG_HOME"] = Paths.config_home(env: env) if set.call("XDG_CONFIG_HOME")
+        dirs
       end
 
       # The unsets that keep a `chi --model X` worker's default from passing
@@ -151,11 +163,12 @@ module Samagotchi
       SESSION_THINKING_ENV = "SAMAGOTCHI_SESSION_THINKING"
       SESSION_REASONING_HISTORY_ENV = "SAMAGOTCHI_SESSION_REASONING_HISTORY"
 
-      # task_create's parent_env, less the unsets of a variable the model
-      # set in its env (a SAMAGOTCHI_DEFAULT_MODEL it asked for stays).
+      # task_create's parent_env, less what the model set in its env (a
+      # SAMAGOTCHI_DEFAULT_MODEL or an XDG dir it asked for stays; chi's own
+      # markers are reserved, the model's env can't set them).
       def task_marker_env(kctx, env)
         given = env.is_a?(Hash) ? env.keys.map(&:to_s) : []
-        parent_env(kctx).reject { |key, value| value.nil? && given.include?(key) }
+        parent_env(kctx).reject { |key, _| given.include?(key) }
       end
 
       # Stop flips the turn's controller, seen through the Engine's PeerView

data/lib/samagotchi/tools/task_runtime.rb

@@ -99,6 +99,8 @@ module Samagotchi
       # status. Only while this chi runs. A record a refresh finished in
       # between (failed, no exit code) is corrected; a stopped task (its
       # stop flag on disk) is left as task_stop records it.
+      # The thread is named EXIT_STATUS_THREAD (a spec joins them before it
+      # removes the tasks' folder).
       # @return [Thread]
       def record_exit_status(waiter, path, task_id:)
         # Absolute now: safe against a later chdir.
@@ -106,6 +108,7 @@ module Samagotchi
         path = File.expand_path(path)
         Thread.new do
           Thread.current.report_on_exception = false
+          Thread.current.name = EXIT_STATUS_THREAD
           code = status_code(waiter.value)
           next if code.nil? || record_at(record_path)&.stop_requested_by
 
@@ -124,6 +127,9 @@ module Samagotchi
         status.exitstatus || (status.termsig && (128 + status.termsig))
       end
 
+      # record_exit_status's threads' name.
+      EXIT_STATUS_THREAD = "task_exit_status"
+
       # Reasons a refresh finishes a record with when it read no exit code.
       MISSING_CODE_REASONS = ["process_ended_without_exit_code", NOT_CHIS_PROCESS].freeze
 

data/lib/samagotchi/version.rb

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

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

@@ -1,9 +1,9 @@
 // Session chains on the page (docs/sessions.md, Session chains): a session
-// that continues an earlier one (its summary's `continues`), "the next day of
+// that continues an earlier one (its summary's `continues`), "the next run of
 // the same routine". The chain is derived from the list, never stored: back
 // through `continues`, forward through the session whose `continues` names
 // this one. The lists fold a chain into its latest listed link's card (a
-// `day N` chip, its earlier links in a popover); the session page links the
+// `#N` chip, its earlier links in a popover); the session page links the
 // previous and the next link. Pure: lists_view.js places the chip and rows
 // (lit-html templates) and app.js the toast's markup, and they bind them.
 import { normalize, previewForCard, relativeTime } from "./format.js";
@@ -33,7 +33,7 @@ export function isOpener(text) {
 
 // A link's card title (format.js previewForCard), display only: a link
 // whose title is the opener, as every link's first message is once sent,
-// reads its chain's first link's title instead, so the days of a chain
+// reads its chain's first link's title instead, so the links of a chain
 // keep its name. Its own title when the first link isn't in +byId+ (id →
 // session; deleted, or a walk a missing link cut short) or is the opener too.
 export function chainTitle(s, byId) {
@@ -112,13 +112,32 @@ export function chainNeighbours(list, id, { continues = null } = {}) {
   return { prev, next };
 }
 
-// A link's day as the carry note writes it: the local YYYY-MM-DD of its
-// start; "" when it has none.
-export function chainDate(iso) {
+const pad = (n) => String(n).padStart(2, "0");
+const localDate = (iso) => {
   const d = new Date(iso || "");
-  if (Number.isNaN(d.getTime())) return "";
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+  return Number.isNaN(d.getTime()) ? null : d;
+};
+
+// A link's day as the carry note writes its date: the local YYYY-MM-DD of
+// its start; "" when it has none.
+export function chainDate(iso) {
+  const d = localDate(iso);
+  return d ? `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}` : "";
+}
+
+// A link's start as a local HH:MM; "" when it has none.
+export function chainClock(iso) {
+  const d = localDate(iso);
+  return d ? `${pad(d.getHours())}:${pad(d.getMinutes())}` : "";
+}
+
+// A link's start as a chain list shows it: its date (chainDate), with its
+// HH:MM when one of +otherIsos+ (the chain's other links' starts) is on the
+// same local day, so two links of one day tell apart. "" when it has none.
+export function chainStamp(iso, otherIsos = []) {
+  const date = chainDate(iso);
+  if (!date) return "";
+  return otherIsos.some((o) => chainDate(o) === date) ? `${date} ${chainClock(iso)}` : date;
 }
 
 // The families (sessions_list.js families) with the chains folded in: a
@@ -129,7 +148,7 @@ export function chainDate(iso) {
 // index). +all+: every session the page holds, archived ones too (the links
 // the list leaves out). The same array when no chain is in it.
 // @param fold false: every family stays (each link's card carries its
-//   chip, "day 1 of 3"; folded false), for a search or the archived ones
+//   chip, "#1 of 3"; folded false), for a search or the archived ones
 export function foldChains(fams, all, { fold = true } = {}) {
   if (!all.some((s) => s.continues)) return fams;
   const nexts = nextsOf(all);
@@ -160,15 +179,15 @@ export function allViewChains(fams, all, { query = "", includeArchived = false }
 }
 
 // The links a family's chain list shows: the chain but its head, newest
-// first, each {session, day} (day: its 1-based place in the chain).
+// first, each {session, n} (n: its 1-based place in the chain).
 function chainOthers(f) {
   const links = f?.chain?.links || [];
-  return links.map((session, i) => ({ session, day: i + 1 }))
+  return links.map((session, i) => ({ session, n: i + 1 }))
     .filter(({ session }) => session.id !== f.head.id)
     .reverse();
 }
 
-// The chip in a chain's card: "day 3" (the head's place; "day 2 of 3" when
+// The chip in a chain's card: "#3" (the head's place; "#2 of 3" when
 // later links aren't listed), with a live dot / "waiting" when one of the
 // other links has a worker / waits on the user (typing in an archived link
 // brings it back, but it stays folded here). nothing for a family in no
@@ -180,12 +199,12 @@ export function chainChipTemplate(f, { open = false } = {}) {
   const others = chainOthers(f);
   const live = others.filter(({ session: s }) => s.owner === "worker").length;
   const waiting = others.filter(({ session: s }) => waitingOn(s)).length;
-  const day = at + 1;
-  const text = day === links.length ? `day ${day}` : `day ${day} of ${links.length}`;
+  const n = at + 1;
+  const text = n === links.length ? `#${n}` : `#${n} of ${links.length}`;
   const earlier = at;
   const later = links.length - 1 - at;
   const parts = [earlier ? `${earlier} earlier ${earlier === 1 ? "link" : "links"}` : "", later ? `${later} later` : ""].filter(Boolean);
-  const title = `Session chain: day ${day} of ${links.length} (${parts.join(", ")}); open the list`;
+  const title = `Session chain: link ${n} of ${links.length} (${parts.join(", ")}); open the list`;
   const liveT = live ? html`<span class="cc-live"> · <span class="live-dot" aria-hidden="true"></span>${live} live</span>` : nothing;
   const waitingT = waiting ? html` · <span class="cc-waiting">${waiting} waiting</span>` : nothing;
   return html`<button type="button" class=${`chain-chip${waiting ? " waiting" : ""}`} aria-expanded=${open ? "true" : "false"}
@@ -193,24 +212,26 @@ export function chainChipTemplate(f, { open = false } = {}) {
 }
 
 // The chain's list (the chip's popover): one row per other link, newest
-// first: status dot, "day N", its date, its recap's first sentence (else
+// first: status dot, "#N", its date (with its HH:MM when another link of
+// the chain, the head too, started the same day: chainStamp), its recap's first sentence (else
 // its preview), the waiting / stopped badge, archived. A row's click opens
 // that link (families_view.js's popover binds .family-row[data-id]).
 // @param activeId the open session's id (its row is .active)
 export function chainRowsTemplate(f, { activeId = null, now = Date.now() } = {}) {
   const byId = new Map((f?.chain?.links || []).map((s) => [s.id, s]));
-  const rows = chainOthers(f).map(({ session: s, day }) => {
+  const links = f?.chain?.links || [];
+  const rows = chainOthers(f).map(({ session: s, n }) => {
     const cls = ["family-row", "chain-row"];
     if (activeId && s.id === activeId) cls.push("active");
     if (s.archived) cls.push("archived");
     const waiting = waitingBadge(s, { inFamily: true });
     const stopped = waiting ? null : stoppedBadge(s);
-    const date = chainDate(s.created_at);
+    const date = chainStamp(s.created_at, links.filter((l) => l !== s).map((l) => l.created_at));
     const ago = relativeTime(s.updated_at || s.created_at || "", now);
     const tip = `${s.id} · ${s.status || ""}${ago ? ` · updated ${ago}` : ""}`;
     return html`<div class=${cls.join(" ")} data-id=${s.id} style=${"--depth:1"} role=${"listitem"}><button type="button" class="fr-open"
-      title=${tip}>${rowDotTemplate(s, waiting)}<span class="cr-day">day ${day}</span>${
-      date ? html`<span class="cr-date">${date}</span>` : nothing}<span class="fr-preview">${s.recap || chainTitle(s, byId)}</span>${
+      title=${tip}>${rowDotTemplate(s, waiting)}<span class="cr-day">#${n}</span>${
+      date ? html`<span class=${date.length > 10 ? "cr-date timed" : "cr-date"}>${date}</span>` : nothing}<span class="fr-preview">${s.recap || chainTitle(s, byId)}</span>${
       rowBadgesTemplate(waiting, stopped)}${s.archived ? archivedBadge : nothing}</button></div>`;
   });
   return html`<div class="family-rows chain-rows" role="list">${rows}</div>`;

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

@@ -1033,6 +1033,8 @@ body.no-glass :is(#familyPop,#chainPop){background:var(--bg-panel);-webkit-backd
 .chain-chip .cc-waiting{font-family:system-ui,sans-serif;font-weight:600}
 .chain-row .cr-day{font-family:ui-monospace,monospace;font-size:11px;color:var(--accent);white-space:nowrap}
 .chain-row .cr-date{font-family:ui-monospace,monospace;font-size:11px;color:var(--text-muted);white-space:nowrap;font-variant-numeric:tabular-nums}
+/* A row with its time (chainStamp): every row's date as wide, so the previews line up. */
+.chain-rows:has(.cr-date.timed) .cr-date{min-width:16ch}
 /* The session page's links to the previous and the next link of its chain. */
 #infoBar .meta a.chain-link{text-decoration:none;font-family:ui-monospace,monospace;white-space:nowrap;color:var(--accent)}
 #infoBar .meta a.chain-link:hover{background:var(--accent-bg)}

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

@@ -21,12 +21,12 @@ import { chipTemplate as toolkitChip } from "./toolkit_chip.js";
 export const PREV = "←";
 export const NEXT = "→";
 
-// A chain's ← / → link (chains.js chainNeighbours): its date (else its short
-// id), its preview and id in the tooltip. +link+: {id, date, preview,
-// archived}.
+// A chain's ← / → link (chains.js chainNeighbours): its date or time (else
+// its short id), its id, full start and preview in the tooltip. +link+:
+// {id, date, stamp, preview, archived} (info_bar_model.js chainLinkView).
 export function chainLinkTemplate(link, arrow, what) {
   const short = String(link.id).slice(0, 8);
-  const title = `${what}: ${short}${link.preview ? ` · ${link.preview}` : ""}${link.archived ? " (archived)" : ""}`;
+  const title = `${what}: ${short}${link.stamp ? ` · ${link.stamp}` : ""}${link.preview ? ` · ${link.preview}` : ""}${link.archived ? " (archived)" : ""}`;
   const text = arrow === PREV ? `${arrow} ${link.date || short}` : `${link.date || short} ${arrow}`;
   return html`<a class="model chain-link" href=${sessionHash(link.id)} title=${title}>${text}</a>`;
 }

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

@@ -4,7 +4,7 @@
 // its list and its in-flight actions. Pure: app.js's updateInfoBar applies
 // it, every second while a turn runs (the session clock).
 import { canStopSession, childrenSummary, delegatedBy, modelLabel, promptNotesChip } from "./format.js";
-import { chainDate, chainNeighbours } from "./chains.js";
+import { chainClock, chainDate, chainNeighbours } from "./chains.js";
 import { ctxBarText, ctxBarTip, lastSpeedText, speedText } from "./ctx.js";
 import { formatDuration, sessionDurationNow } from "./timing.js";
 import { workerBadge } from "./update_notice.js";
@@ -21,12 +21,18 @@ export function workerBadgeFor(id, state, versions) {
 }
 
 // A chain's link (chains.js chainNeighbours) as the info bar's ← / →
-// shows it (info_bar.js chainLinkTemplate), or null. +cardTitle+: the
-// lists' title for a session (a chain's opener reads its first link's).
-export function chainLinkView(link, cardTitle) {
+// shows it (info_bar.js chainLinkTemplate), or null. Its date: its local
+// HH:MM when it started on the open link's day (+selfIso+: the open
+// session's created_at; the day is implied), else its YYYY-MM-DD; its
+// stamp (the tooltip's) always both. +cardTitle+: the lists' title for a
+// session (a chain's opener reads its first link's).
+export function chainLinkView(link, cardTitle, selfIso = null) {
   if (!link) return null;
-  return { id: link.id, date: chainDate(link.session?.created_at), preview: link.session ? cardTitle(link.session) : "",
-           archived: !!link.session?.archived };
+  const iso = link.session?.created_at;
+  const day = chainDate(iso);
+  const clock = chainClock(iso);
+  return { id: link.id, date: day && day === chainDate(selfIso) ? clock : day, stamp: day ? `${day} ${clock}` : "",
+           preview: link.session ? cardTitle(link.session) : "", archived: !!link.session?.archived };
 }
 
 // The bar's buttons: continue (not on a link continued already, which has
@@ -66,6 +72,9 @@ export function infoBarModel({ id, state, sessions, chain, cardTitle, badge, res
   const avgSpeed = speedText(tokens?.avg_decode_tps, tokens?.tps_source);
   const sessionDuration = sessionDurationNow(state.timing, running);
   // A delegated session names its parent, as a link to it.
+  // The open link's start: the payload's, else its list entry's (a fresh
+  // link may not be listed yet: then neither, and its links show dates).
+  const selfIso = state.createdAt || sessions.find((x) => x.id === id)?.created_at || null;
   const parentChip = delegatedBy(state.parentId, sessions.find((x) => x.id === state.parentId) || null);
   return {
     id,
@@ -74,7 +83,7 @@ export function infoBarModel({ id, state, sessions, chain, cardTitle, badge, res
     model: modelLabel(state.model, ...(state.served || [])),
     // A link of a session chain: ← the previous link, → the next one (each
     // only while the list holds it).
-    chain: { prev: chainLinkView(chain.prev, cardTitle), next: chainLinkView(chain.next, cardTitle) },
+    chain: { prev: chainLinkView(chain.prev, cardTitle, selfIso), next: chainLinkView(chain.next, cardTitle, selfIso) },
     parent: parentChip ? { id: state.parentId, title: parentChip.title } : null,
     // A parent names its delegates; the link opens all sessions.
     kids: childrenSummary({ id }, sessions),

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

@@ -129,7 +129,7 @@ export function cardAnimStyle({ enterMs = null, now = null } = {}, period = DOT_
 // member does; with rows (all sessions) an open family lists its members
 // inline, the strip's opens in a popover; matchIds: a search's matching
 // members. A family in a session chain (chains.js foldChains) carries its
-// `day N` chip, which opens the other links in a popover. entering: a card
+// `#N` chip, which opens the other links in a popover. entering: a card
 // new to its list (enteringCards: it fades in); anim: its inline animation
 // phases (cardAnimStyle).
 // +ctx+: title (cardTitle), projectName (the page's scope), activeId (the
@@ -342,7 +342,7 @@ export function createListsView(deps) {
   doc.addEventListener("scroll", () => familyPop.reposition(), true);
 
   // A chain's popover (chains.js): the other links of the chain a card's
-  // `day N` chip stands for, under the chip, in the strip or all sessions
+  // `#N` chip stands for, under the chip, in the strip or all sessions
   // (the list it was opened from: chainFrom). A row opens that link.
   const chainFamilies = new Map(); // head id → family, as the lists last drew it
   let chainFrom = null; // the list element the open popover's chip is in

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

@@ -0,0 +1,55 @@
+// Markdown out of the web UI's plain one-line places: the stage's live
+// headline (stage_model.js), a closed step's title (turn_model.js
+// genLabel), an answered question card's kept-reply line (question_cards.js).
+// Pure, no DOM, so `node --test` covers it; the places that render markdown
+// (step bodies, the card's open copy) keep the text as written.
+
+// One line as plain text: the markdown a reply carries (headings, quotes,
+// bullets and item numbers, table pipes, emphasis, code ticks, links) goes,
+// and a line that is only syntax (a code fence, a table's separator row, a
+// rule) is empty. A small pass, no renderer: a one-line
+// preview only needs to read well, and an unclosed "**" mid-stream goes too.
+export function plainLine(line) {
+  let s = String(line ?? "").trim();
+  if (/^(```|~~~)/.test(s)) return "";
+  if (/^\|?\s*:?-{2,}:?\s*(\|\s*:?-{2,}:?\s*)*\|?$/.test(s)) return "";
+  if (/^([-*_])(\s*\1){2,}$/.test(s)) return "";
+  s = s.replace(/^(>\s*)+/, "").replace(/^#{1,6}\s+/, "").replace(/^([-*+]|\d{1,9}[.)])\s+(\[[ xX]\]\s+)?/, "");
+  // A table row: a pipe at either end (a pipe mid-prose, "a || b", stays).
+  if (/^\||\|$/.test(s)) {
+    s = s.replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim()).filter(Boolean).join(" · ");
+  }
+  // Code spans keep their text as is; an unclosed tick just goes.
+  const code = [];
+  s = s.replace(/`+([^`]+)`+/g, (_, c) => `\u0000${code.push(c) - 1}\u0000`);
+  s = s
+    .replace(/!\[([^\]]*)\]\([^)]*\)?/g, "$1")
+    .replace(/\[([^\]]*)\]\([^)]*\)?/g, "$1")
+    .replace(/<(https?:\/\/[^>\s]+)>/g, "$1")
+    .replace(/`+/g, "")
+    .replace(/(^|[^\w])__(?=\S)(.*?\S)__(?=$|[^\w])/g, "$1$2")
+    .replace(/(\*\*|~~)/g, "")
+    .replace(/(^|[^\w*])\*(?=\S)([^*]*?\S)\*(?=$|[^\w*])/g, "$1$2")
+    .replace(/(^|[^\w])_(?=\S)([^_]*?\S)_(?=$|[^\w])/g, "$1$2")
+    .replace(/\u0000(\d+)\u0000/g, (_, i) => code[Number(i)]);
+  return s.replace(/\s+/g, " ").trim();
+}
+
+// A reply as one plain line (each of its lines plainLine's), for a preview
+// that clamps it: blank and syntax-only lines go; the lines inside a code
+// fence stay as written (code's "*" and "_" are not emphasis), the fences
+// themselves go. A line that ends a sentence (or a clause: ":", ",") runs on
+// with a space, one that doesn't (a heading, an item) with " · ", so
+// "## Plan" and the line under it don't read as one sentence.
+export function plainText(text) {
+  let out = "";
+  let fenced = false;
+  for (const raw of String(text ?? "").split("\n")) {
+    if (/^\s*(```|~~~)/.test(raw)) { fenced = !fenced; continue; }
+    const line = fenced ? raw.trim() : plainLine(raw);
+    if (!line) continue;
+    if (out) out += /[.!?…:;,]["')\]]*$/.test(out) ? " " : " · ";
+    out += line;
+  }
+  return out;
+}

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

@@ -22,6 +22,7 @@ import {
 import { sessionHash } from "./route.js";
 import { clientLabel, isOwn } from "./turn_events.js";
 import { continueLine } from "./commands.js";
+import { plainText } from "./plain_line.js";
 
 // @param sessionId () => the open session's id (answers go there)
 // @param clientId this tab's id in the session's events
@@ -404,7 +405,8 @@ export function createQuestionCards({
     // The reply that asked, kept with the card: what made the question
     // answerable stays with it in the history. Muted under the "Q → A" line
     // in two lines while the card is closed (a copy screen readers skip: not
-    // the toggle's label), and whole, selectable, at the top of the body
+    // the toggle's label; plain text, plain_line.js: no "##" or "**" in a
+    // clamped line), and whole, selectable, at the top of the body
     // when it is open (a drag in the summary would toggle the card).
     const asked = saidOf.get(questionEl);
     let full = null;
@@ -412,7 +414,7 @@ export function createQuestionCards({
       const line = doc.createElement("div");
       line.className = "question-said";
       line.setAttribute("aria-hidden", "true");
-      line.textContent = asked;
+      line.textContent = plainText(asked);
       summary.appendChild(line);
       full = doc.createElement("div");
       full.className = "question-said-full";

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

@@ -23,6 +23,9 @@ export function emptySessionState() {
     parentId: null,
     // The previous link of its chain (its `continues`), or null.
     continues: null,
+    // Its start (the summary's created_at; the info bar's chain links are
+    // times on its day), or null.
+    createdAt: null,
     ctxPct: null,
     // Window the kernel resolved for the running generation (:generation_started).
     ctxWindow: null,
@@ -107,6 +110,7 @@ export function sessionStateFrom(data) {
   state.toolkit = s.toolkit || null;
   state.parentId = s.parent_id || null;
   state.continues = s.continues || null;
+  state.createdAt = s.created_at || null;
   state.commands = Array.isArray(data.commands) ? data.commands : [];
   return state;
 }

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

@@ -7,6 +7,7 @@ import { splitSentences } from "./sentences.js";
 import { steerSender } from "./format.js";
 import { hookNoticeLabel } from "./turn_events.js";
 import { askingText } from "./turn_model.js";
+import { plainLine } from "./plain_line.js";
 
 const READ_LIKE = new Set(["read", "memory_read", "web_fetch", "task_get", "task_list", "list_sessions"]);
 const EDITS = new Set(["edit", "write", "memory_write"]);
@@ -19,37 +20,6 @@ const QUIET_MS = 1500;
 // A touch, wheel or scroll counts as use this long (phones have no hover).
 const TOUCH_MS = 4000;
 
-// One headline sentence as plain text: the markdown a streaming answer
-// carries (headings, quotes, bullets, table pipes, emphasis, code ticks,
-// links) goes, and a line that is only syntax (a code fence, a table's
-// separator row, a rule) is empty. A small pass, no renderer: a live line
-// only needs to read well, and an unclosed "**" mid-stream goes too.
-export function plainHeadline(line) {
-  let s = String(line ?? "").trim();
-  if (/^(```|~~~)/.test(s)) return "";
-  if (/^\|?\s*:?-{2,}:?\s*(\|\s*:?-{2,}:?\s*)*\|?$/.test(s)) return "";
-  if (/^([-*_])(\s*\1){2,}$/.test(s)) return "";
-  s = s.replace(/^(>\s*)+/, "").replace(/^#{1,6}\s+/, "").replace(/^[-*+]\s+(\[[ xX]\]\s+)?/, "");
-  // A table row: a pipe at either end (a pipe mid-prose, "a || b", stays).
-  if (/^\||\|$/.test(s)) {
-    s = s.replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim()).filter(Boolean).join(" · ");
-  }
-  // Code spans keep their text as is; an unclosed tick just goes.
-  const code = [];
-  s = s.replace(/`+([^`]+)`+/g, (_, c) => `\u0000${code.push(c) - 1}\u0000`);
-  s = s
-    .replace(/!\[([^\]]*)\]\([^)]*\)?/g, "$1")
-    .replace(/\[([^\]]*)\]\([^)]*\)?/g, "$1")
-    .replace(/<(https?:\/\/[^>\s]+)>/g, "$1")
-    .replace(/`+/g, "")
-    .replace(/(^|[^\w])__(?=\S)(.*?\S)__(?=$|[^\w])/g, "$1$2")
-    .replace(/(\*\*|~~)/g, "")
-    .replace(/(^|[^\w*])\*(?=\S)([^*]*?\S)\*(?=$|[^\w*])/g, "$1$2")
-    .replace(/(^|[^\w])_(?=\S)([^_]*?\S)_(?=$|[^\w])/g, "$1$2")
-    .replace(/\u0000(\d+)\u0000/g, (_, i) => code[Number(i)]);
-  return s.replace(/\s+/g, " ").trim();
-}
-
 // The step's newest narration sentence, as plain text: the end of a
 // finished text is a boundary (its last line may have no period), a live
 // one's not yet. A sentence that is only markdown syntax is skipped, and so
@@ -61,9 +31,9 @@ export function headlineOf(text, done) {
   const plain = [];
   for (const sentence of sentences) {
     if (/^(```|~~~)/.test(sentence)) fenced = !fenced;
-    else if (!fenced && plainHeadline(sentence)) plain.push(plainHeadline(sentence));
+    else if (!fenced && plainLine(sentence)) plain.push(plainLine(sentence));
   }
-  const fragment = fenced ? "" : plainHeadline(rest);
+  const fragment = fenced ? "" : plainLine(rest);
   if (done && fragment) return fragment;
   if (plain.length) return plain[plain.length - 1];
   return fragment.length > 160 ? fragment : "";

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

@@ -83,8 +83,9 @@ function llmEditTemplate(row) {
 // A gate-corrected call's `ran as:` line shows on hover only.
 const INLINE_CHARS = 300;
 // The JS twin of ToolOutputCut::EXIT_LINE (tool_output_cut.rb): an exit line, then maybe a hint; a
-// signal-killed command's has no number ("exit: ").
-const EXIT_LINE = /\nexit: (?:-?\d+)?[^\n]*(?:\n\([^\n]*\))?$/;
+// signal-killed command's has no number ("exit: "). spec/fixtures/exit_lines.json holds the cases both
+// must answer alike (exported for turn_html.test.js).
+export const EXIT_LINE = /\nexit: (?:-?\d+)?[^\n]*(?:\n\([^\n]*\))?$/;
 // A bare success exit line; group 1 is the hint line after it, if any.
 const SUCCESS_EXIT_LINE = /\nexit: 0(\n\([^\n]*\))?$/;
 const EXECUTE_BLOCK = /(?:^|\n)(?:stdout|stderr):\n/;

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

@@ -26,6 +26,7 @@
 import { addCompleted, addStarted, newActivity, toolName } from "./activity.js";
 import { tallyText } from "./tally.js";
 import { clip, leadTrimmed } from "./format.js";
+import { plainLine } from "./plain_line.js";
 
 const LABEL_MAX = 80;
 const LABEL_TOOLS = 3;
@@ -210,9 +211,11 @@ export function failedCount(rows) {
   return rows.filter((r) => r.status === "error").length;
 }
 
-// The collapsed row of a gen: its narration's first line, else its first
-// call's title ("edit lib/a.rb"), else the tools it worked with, else
-// "thinking"; then its call count and how many failed.
+// The collapsed row of a gen: its narration's first line as plain text
+// (plain_line.js: "## Plan" reads "Plan"; a line that is only syntax, a rule
+// or a fence, gives way to the next), else its first call's title ("edit
+// lib/a.rb"), else the tools it worked with, else "thinking"; then its call
+// count and how many failed.
 export function genLabel(gen) {
   const { head, calls } = genLabelParts(gen);
   return calls ? `${head} · ${calls}` : head;
@@ -223,7 +226,7 @@ export function genLabel(gen) {
 // starts with (its narration, its first call's title), so an open step's
 // summary can say only its calls (turn_view.js labelHtml).
 export function genLabelParts(gen) {
-  const line = String(gen.text || "").trim().split("\n")[0].trim();
+  const line = String(gen.text || "").split("\n").map(plainLine).find(Boolean) || "";
   const calls = gen.tools.length ? toolCallsText(gen.tools) : "";
   const first = gen.tools[0];
   if (line) return { head: cut(line), calls, repeats: true };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.75.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -380,6 +380,7 @@ files:
 - lib/samagotchi/memory_bundle/installer.rb
 - lib/samagotchi/memory_bundle/listing.rb
 - lib/samagotchi/memory_bundle/manifest.rb
+- lib/samagotchi/memory_bundle/memory_files.rb
 - lib/samagotchi/memory_bundle/merger.rb
 - lib/samagotchi/memory_bundle/placeholder.rb
 - lib/samagotchi/memory_bundle/plugin_ref.rb
@@ -617,6 +618,7 @@ files:
 - lib/samagotchi/web/public/notice_links.js
 - lib/samagotchi/web/public/notifications.js
 - lib/samagotchi/web/public/notify.js
+- lib/samagotchi/web/public/plain_line.js
 - lib/samagotchi/web/public/prompt_history.js
 - lib/samagotchi/web/public/question_card.js
 - lib/samagotchi/web/public/question_cards.js