samagotchi 0.57.0 → 0.59.0

data/lib/samagotchi/tools/task_wait.rb

@@ -10,6 +10,9 @@ module Samagotchi
       TAIL_LINES_DEFAULT = 10
       TAIL_LINES_MAX = 100
       POLL_INTERVAL = 0.5
+      # A handed-over execute keeps stderr in a log of its own: at most this
+      # many of its last lines follow the output tail.
+      STDERR_TAIL_LINES_MAX = 10
 
       def self.name = NAME
 
@@ -41,7 +44,7 @@ module Samagotchi
 
           if completion_pattern
             output_tail = output_tail(record, tail_lines)
-            return format_response(record, wait_result: "pattern_matched", output_tail: output_tail) if completion_pattern.match?(output_tail)
+            return format_response(record, wait_result: "pattern_matched", output_tail: output_tail, tail_lines: tail_lines) if completion_pattern.match?(output_tail)
           end
 
           return cancelled_response(task_id, tail_lines, started) if cancelled.call
@@ -55,7 +58,7 @@ module Samagotchi
         refreshed, = TaskRuntime.get_record(task_id)
         return finished_response(refreshed, tail_lines) unless refreshed.fetch("status") == "running"
 
-        format_response(refreshed, wait_result: "timeout", output_tail: output_tail(refreshed, tail_lines))
+        format_response(refreshed, wait_result: "timeout", output_tail: output_tail(refreshed, tail_lines), tail_lines: tail_lines)
       rescue StandardError => e
         "Error: #{e.message}"
       end
@@ -72,7 +75,8 @@ module Samagotchi
           "  To keep waiting: task_wait #{task_id}. If it is stuck or no longer needed: task_stop #{task_id}.",
           "waited: #{(monotonic_time - started).round}s"
         ]
-        format_response(record, wait_result: "canceled", output_tail: output_tail(record, tail_lines), extra: note)
+        format_response(record, wait_result: "canceled", output_tail: output_tail(record, tail_lines), tail_lines: tail_lines,
+                                extra: note)
       end
       private_class_method :cancelled_response
 
@@ -81,7 +85,8 @@ module Samagotchi
       def self.finished_response(record, tail_lines)
         return format_response(record) unless TaskRuntime.stopped_by_user?(record)
 
-        format_response(record, output_tail: output_tail(record, tail_lines), extra: [TaskRuntime::USER_STOP_NOTE])
+        format_response(record, output_tail: output_tail(record, tail_lines), tail_lines: tail_lines,
+                               extra: [TaskRuntime::USER_STOP_NOTE])
       end
       private_class_method :finished_response
 
@@ -90,7 +95,17 @@ module Samagotchi
       end
       private_class_method :output_tail
 
-      def self.format_response(record, wait_result: nil, output_tail: nil, extra: [])
+      # The last lines of a handed-over execute's stderr log (stderr_path),
+      # "" for a task_create task (one log) or an empty stderr.
+      def self.stderr_tail(record, tail_lines)
+        path = record["stderr_path"]
+        return "" if path.to_s.empty? || tail_lines.nil?
+
+        TaskRuntime.output_tail_lines(path, [tail_lines, STDERR_TAIL_LINES_MAX].min)
+      end
+      private_class_method :stderr_tail
+
+      def self.format_response(record, wait_result: nil, output_tail: nil, tail_lines: nil, extra: [])
         lines = [
           "task_id: #{record.fetch("id")}",
           "status: #{record.fetch("status")}",
@@ -98,12 +113,15 @@ module Samagotchi
           "stop_reason: #{record["stop_reason"]}",
           "output_path: #{record.fetch("output_path")}"
         ]
+        lines << "stderr_path: #{record["stderr_path"]}" if record["stderr_path"]
         return lines.join("\n") unless output_tail
 
         lines << "wait_result: #{wait_result}" if wait_result
         lines.concat(extra)
         lines << "output_tail:"
         lines << output_tail.rstrip unless output_tail.empty?
+        stderr_tail = stderr_tail(record, tail_lines)
+        lines.concat(["stderr_tail:", stderr_tail.rstrip]) unless stderr_tail.empty?
         lines.join("\n")
       end
       private_class_method :format_response

data/lib/samagotchi/utf8_default.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  # chi's files (memories, AGENT.md, sessions, config.yml) are UTF-8,
+  # chi's files (memories, AGENTS.md, sessions, config.yml) are UTF-8,
   # whatever the locale. Under LC_ALL=C (or with no locale at all: an app
   # started from Finder or launchd, `env -i`) Ruby reads files as US-ASCII,
   # and a UTF-8 memory index then breaks the system prompt

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -45,6 +45,7 @@ require_relative "editor"
 require_relative "message_parts"
 require_relative "session_summary"
 require_relative "../log"
+require_relative "../redacted_inspect"
 
 module Samagotchi
   module Web
@@ -56,6 +57,9 @@ module Samagotchi
     # (the single live client transport); history for any session — including
     # dead ones — is served by GET /api/sessions/:id/output from output/ files.
     class App
+      # @lan holds the LAN access token.
+      include RedactedInspect
+
       DEFAULT_HOST = BridgeClient::HOST
       BRIDGE_WAIT_TIMEOUT = 10.0
       # An uploaded image may be this big before it is downscaled.
@@ -2130,10 +2134,12 @@ module Samagotchi
       # before returning, and a read blocked on a quiet worker would hang
       # Ctrl-C of chi web. The bytes go through unchanged.
       class ProxyStreamBody
+        # @param headers [Hash] the request's Rack env; only its Last-Event-ID
+        #   is kept (the env carries the token cookie, never held or inspected)
         def initialize(host:, port:, session_id:, query:, headers:, server_running: -> { true })
           @client = BridgeClient.new(session_id: session_id, port: port, host: host)
           @query = query
-          @headers = headers
+          @last_event_id = headers["HTTP_LAST_EVENT_ID"]
           @server_running = server_running
         end
 
@@ -2142,7 +2148,7 @@ module Samagotchi
           # Last-Event-ID header over ?from_seq, and the reconnect URL carries a
           # stale initial cursor — without this the bridge would replay content
           # already delivered (duplicate bubbles).
-          @client.stream(query: @query, last_event_id: @headers["HTTP_LAST_EVENT_ID"], running: @server_running, &)
+          @client.stream(query: @query, last_event_id: @last_event_id, running: @server_running, &)
         end
       end
     end

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

@@ -65,7 +65,7 @@ import {
   appendAboveLiveTiming, formatDuration, mergeTiming, normalizeTiming, sessionDurationNow, STOPPED_LINE_CLASS,
 } from "./timing.js";
 import { createLiveTurn } from "./live_turn.js";
-import { installRefClicks, setRefKinds } from "./refs.js";
+import { installRefClicks } from "./refs.js";
 import { linkRefs, touchedFiles } from "./ref_scan.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
 import { isReportClient, hookNoticeLabel, llmContextNotice, newClientId, noticeLine, promptOps, snapshotEvents, workerGoneText } from "./turn_events.js";
@@ -855,13 +855,11 @@ function setMarkdownWarning(warning) {
   markdownWarningEl.hidden = false;
 }
 
-// Both from one payload, together; the body's has-editor and refs-<kind>
-// classes follow (the refs' hover styling keys on refs-<kind>).
+// Both from one payload, together; the body's has-editor class follows.
 function setCapabilities(capabilities, editorUrl) {
   pageCapabilities = capabilities && typeof capabilities === "object" ? capabilities : {};
   pageEditorUrl = pageCapabilities.editor === true && typeof editorUrl === "string" && editorUrl ? editorUrl : null;
   document.body.classList.toggle("has-editor", pageEditorUrl !== null);
-  setRefKinds(document.body, pageViewer());
 }
 
 // What this viewer can do with a ref (refs.js REF_ACTIONS).
@@ -869,8 +867,11 @@ function pageViewer() {
   return { editor: pageCapabilities.editor === true, editorUrl: pageEditorUrl };
 }
 
-// Refs anywhere on the page (a tool row's file, its diff lines): one listener.
-installRefClicks(document.body, pageViewer);
+// Refs anywhere on the page (a tool row's file, its diff lines, an
+// answer's path:line): one listener set; "Copy path" says so in a toast.
+installRefClicks(document.body, pageViewer, {
+  copy: async (text) => showToast((await copyText(text)) ? "Path copied" : "Couldn't copy the path"),
+});
 
 async function readTurnEnd() {
   if (!selected) return;

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

@@ -380,13 +380,26 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .diff{margin:0;padding:4px 0;background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;font-size:12px;line-height:1.45;overflow:auto;max-height:420px}
 .diff code{display:block;min-width:max-content}
 .diff-line{display:block;padding:0 10px;white-space:pre;color:var(--text-2)}
-/* Refs (refs.js): text until hovered, and only for a kind this viewer has an action for (body.refs-file). */
-.refs-file .ref[data-ref-kind="file"]:hover{color:var(--accent);text-decoration:underline dotted;text-underline-offset:3px;cursor:pointer}
-.refs-file .ref[data-ref-kind="file"]:hover::after{content:"\2197";margin-left:.3em;color:var(--text-faint);display:inline-block}
-.refs-file :is(.activity-row,.bubble.approval):has(.ref[data-ref-kind="file"]) .diff-line[data-line]:hover{cursor:pointer;box-shadow:inset 2px 0 var(--accent)}
-.refs-file :is(.activity-row,.bubble.approval):has(.ref[data-ref-kind="file"]) .diff-line[data-line]:hover::after{content:"\2197  " attr(data-line);float:right;padding-left:12px;color:var(--text-faint)}
-.refs-file .activity-row:has(.ref[data-ref-kind="file"]) .read-line[data-line]:hover{cursor:pointer;box-shadow:inset 2px 0 var(--accent)}
-.refs-file .activity-row:has(.ref[data-ref-kind="file"]) .read-line[data-line]:hover::before{color:var(--accent)}
+/* Refs (refs.js): text until hovered or focused, and only with a target for this viewer (refs.js marks it: data-ref-main, the main one). A link ref keeps its link look. */
+.ref[data-ref-main]:not(a):is(:hover,:focus-visible){color:var(--accent);text-decoration:underline dotted;text-underline-offset:3px;cursor:pointer}
+.ref[data-ref-main="editor"]:not(a):is(:hover,:focus-visible)::after{content:"\2197";margin-left:.3em;color:var(--text-faint);display:inline-block}
+.ref[data-ref-kind]:focus-visible{outline:2px solid var(--accent);outline-offset:2px;border-radius:3px}
+:is(.activity-row,.bubble.approval) .diff-line[data-ref-main]:hover{cursor:pointer;box-shadow:inset 2px 0 var(--accent)}
+:is(.activity-row,.bubble.approval) .diff-line[data-ref-main]:hover::after{content:"\2197  " attr(data-line);float:right;padding-left:12px;color:var(--text-faint)}
+.activity-row .read-line[data-ref-main]:hover{cursor:pointer;box-shadow:inset 2px 0 var(--accent)}
+.activity-row .read-line[data-ref-main]:hover::before{color:var(--accent)}
+/* A ref's ▾ and its menu (ref_menu.js): one each, placed next to the ref. */
+.ref-more{position:fixed;z-index:60;display:inline-flex;align-items:center;justify-content:center;width:20px;height:20px;padding:0;border:1px solid var(--border-strong);border-radius:5px;background:var(--bg-panel);color:var(--text-muted);font-size:12px;line-height:1;cursor:pointer;box-shadow:0 1px 3px var(--shadow-strong)}
+.ref-more[hidden]{display:none}
+.ref-more:hover{color:var(--accent);border-color:var(--accent)}
+.ref-menu{position:fixed;z-index:61;min-width:160px;max-width:calc(100vw - 16px);padding:4px;border:1px solid var(--border-strong);border-radius:8px;background:var(--bg-panel);box-shadow:var(--toast-shadow);animation:fadeIn .12s ease-out}
+.ref-menu [role="menuitem"]{display:block;width:100%;padding:6px 10px;border:0;border-radius:5px;background:none;color:var(--text);font:inherit;font-size:13px;text-align:left;cursor:pointer;white-space:nowrap}
+.ref-menu [role="menuitem"]:is(:hover,:focus-visible){background:var(--accent-bg);color:var(--text-bright);outline:none}
+@media (pointer:coarse){.ref-menu [role="menuitem"]{padding:11px 14px;font-size:15px}}
+/* Show in turn: the row (and its line) flash once. */
+@keyframes ref-flash{0%,35%{background:color-mix(in srgb,var(--accent) 22%,transparent)}100%{background:transparent}}
+.ref-flash{animation:ref-flash 1.6s ease-out}
+@media (prefers-reduced-motion:reduce){.ref-menu{animation:none}.ref-flash{animation:none;outline:2px solid var(--accent);outline-offset:2px}}
 .diff-add{background:var(--diff-add-bg);color:var(--diff-add-text)}
 .diff-del{background:var(--diff-del-bg);color:var(--diff-del-text)}
 .diff-hunk{color:var(--text-faint)}

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

@@ -67,8 +67,10 @@ export function readLinesHtml(row) {
   const first = numbered[0].line;
   const last = numbered.at(-1).line;
   const label = first === last ? `line ${first}` : `lines ${first}–${last}`;
+  // A blank line of the file holds no text, only a <br>: an empty block
+  // drops out of a copied selection, a space would be copied as one.
   const spans = lines.map(({ text, line }) => line === null
     ? `<span class="read-line read-meta">${escapeHtml(text)}</span>`
-    : `<span class="read-line" data-line="${line}">${escapeHtml(text) || " "}</span>`).join("");
+    : `<span class="read-line" data-line="${line}">${escapeHtml(text) || "<br>"}</span>`).join("");
   return `<details class="activity-read"><summary>${label}</summary><pre class="read-lines"><code>${spans}</code></pre></details>`;
 }

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

@@ -0,0 +1,188 @@
+// A ref's menu (refs.js): the small ▾ that shows next to a hovered or
+// focused ref with more than one target, and the menu of its targets it
+// opens (a tap and ↓ open it too). One of each per page, placed next to
+// the ref (position: fixed); a scroll, a resize, a click elsewhere, Esc or
+// Tab closes them. Keyboard: ↑/↓ (Home/End) move, Enter picks, Esc closes
+// back to the ref.
+
+// How long the ▾ stays after the pointer leaves the ref: long enough to
+// reach it.
+const HIDE_MS = 300;
+// Kept from the viewport's edges (a phone's width).
+const EDGE = 8;
+
+// +doc+'s ▾ and menu. open(el, items, {focus}) shows +items+ ({id, label,
+// run}) under +el+; showMore(el, onOpen) puts the ▾ after +el+, whose click
+// calls +onOpen+; hideMoreSoon(el) takes it away unless the pointer reaches
+// it; close({refocus}) closes the menu.
+export function createRefMenu(doc = globalThis.document) {
+  let more = null;
+  let menu = null;
+  let moreFor = null;
+  let menuFor = null;
+  let onMore = null;
+  let hideTimer = null;
+  const win = doc.defaultView || globalThis;
+
+  function moreButton() {
+    if (more) return more;
+    more = doc.createElement("button");
+    more.type = "button";
+    more.className = "ref-more";
+    more.textContent = "▾";
+    more.title = "More for this ref";
+    more.setAttribute("aria-label", "More for this ref");
+    more.setAttribute("aria-haspopup", "menu");
+    more.tabIndex = -1;
+    more.hidden = true;
+    more.addEventListener("mouseenter", () => clearTimeout(hideTimer));
+    more.addEventListener("mouseleave", () => hideMoreSoon(moreFor));
+    more.addEventListener("mousedown", (e) => e.preventDefault()); // keeps the ref's focus
+    more.addEventListener("click", (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      onMore?.();
+    });
+    doc.body.appendChild(more);
+    return more;
+  }
+
+  function showMore(el, onOpen) {
+    clearTimeout(hideTimer);
+    const button = moreButton();
+    moreFor = el;
+    onMore = onOpen;
+    button.hidden = false;
+    const rect = lastRect(el);
+    const top = rect.top + (rect.height - (button.offsetHeight || rect.height)) / 2;
+    button.style.left = `${Math.min(rect.right + 2, win.innerWidth - (button.offsetWidth || 16) - 2)}px`;
+    button.style.top = `${top}px`;
+  }
+
+  function hideMore() {
+    clearTimeout(hideTimer);
+    if (more) more.hidden = true;
+    moreFor = null;
+  }
+
+  function hideMoreSoon(el) {
+    if (!more || (el && el !== moreFor)) return;
+    clearTimeout(hideTimer);
+    hideTimer = setTimeout(() => {
+      if (menu && menuFor === moreFor) return;
+      if (doc.activeElement && doc.activeElement === moreFor) return;
+      hideMore();
+    }, HIDE_MS);
+  }
+
+  function open(el, items, { focus = true } = {}) {
+    close();
+    menuFor = el;
+    menu = doc.createElement("div");
+    menu.className = "ref-menu";
+    menu.setAttribute("role", "menu");
+    for (const item of items) {
+      const button = doc.createElement("button");
+      button.type = "button";
+      button.setAttribute("role", "menuitem");
+      button.tabIndex = -1;
+      button.dataset.target = item.id;
+      button.textContent = item.label;
+      button.addEventListener("click", (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        close({ refocus: false });
+        hideMore();
+        item.run();
+      });
+      menu.appendChild(button);
+    }
+    menu.addEventListener("keydown", onMenuKey);
+    menu.addEventListener("focusout", (e) => {
+      if (menu && !menu.contains(e.relatedTarget) && e.relatedTarget) close({ refocus: false });
+    });
+    doc.body.appendChild(menu);
+    place(menu, el);
+    el.setAttribute("aria-expanded", "true");
+    doc.addEventListener("pointerdown", onOutside, true);
+    win.addEventListener("scroll", onScroll, true);
+    win.addEventListener("resize", onScroll);
+    if (focus) menuItems()[0]?.focus();
+    return menu;
+  }
+
+  function close({ refocus = false } = {}) {
+    if (!menu) return;
+    const el = menuFor;
+    menu.remove();
+    menu = null;
+    menuFor = null;
+    el?.removeAttribute("aria-expanded");
+    doc.removeEventListener("pointerdown", onOutside, true);
+    win.removeEventListener("scroll", onScroll, true);
+    win.removeEventListener("resize", onScroll);
+    if (refocus) el?.focus?.();
+  }
+
+  function menuItems() {
+    return menu ? [...menu.querySelectorAll('[role="menuitem"]')] : [];
+  }
+
+  function onMenuKey(e) {
+    const items = menuItems();
+    const at = items.indexOf(doc.activeElement);
+    const go = (index) => items[(index + items.length) % items.length]?.focus();
+    if (e.key === "ArrowDown") go(at + 1);
+    else if (e.key === "ArrowUp") go(at < 0 ? -1 : at - 1);
+    else if (e.key === "Home") go(0);
+    else if (e.key === "End") go(-1);
+    else if (e.key === "Escape") close({ refocus: true });
+    else if (e.key === "Tab") { close({ refocus: true }); return; }
+    else return;
+    e.preventDefault();
+    e.stopPropagation();
+  }
+
+  function onOutside(e) {
+    if (menu?.contains(e.target) || more?.contains(e.target)) return;
+    close();
+  }
+
+  function onScroll(e) {
+    if (menu?.contains(e?.target)) return;
+    close();
+    hideMore();
+  }
+
+  // Under the ref's last line, flipped above it when there is no room
+  // below, kept inside the viewport.
+  function place(box, el) {
+    const rect = lastRect(el);
+    const first = el.getClientRects?.()[0] || rect;
+    const width = box.offsetWidth;
+    const height = box.offsetHeight;
+    const left = Math.max(EDGE, Math.min(rect.left, win.innerWidth - width - EDGE));
+    const below = rect.bottom + 4;
+    const top = below + height > win.innerHeight - EDGE && first.top - height - 4 >= EDGE ? first.top - height - 4 : below;
+    box.style.left = `${left}px`;
+    box.style.top = `${top}px`;
+  }
+
+  return {
+    open,
+    close,
+    showMore,
+    hideMore,
+    hideMoreSoon,
+    get isOpen() { return !!menu; },
+    get element() { return menu; },
+    get moreButton() { return more; },
+  };
+}
+
+// The ref's last line box (a ref wrapped over two lines ends on the
+// second); its whole box when it has none.
+function lastRect(el) {
+  const rects = el.getClientRects?.() || [];
+  return rects.length ? rects[rects.length - 1] : el.getBoundingClientRect();
+}

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

@@ -118,10 +118,20 @@ export function touchedFiles(roots) {
 // Wraps the refs in +el+'s text in span.ref (refs.js clicks and
 // hover them as it does a row title). Text inside pre, a link or a ref is
 // left alone; an inline code element is wrapped whole when it is a ref
-// alone. Runs again over the same element without wrapping twice.
+// alone. A link whose text is a ref alone (github-pr's PR diff link) is
+// that ref itself: its href stays the plain click's, the ref's other
+// targets join it in the menu (refs.js). Runs again over the same element
+// without wrapping twice.
 export function linkRefs(el, touched, cwd) {
   if (!el || !touched?.size) return;
   const doc = el.ownerDocument;
+  for (const link of [...el.querySelectorAll("a[href]:not([data-ref-kind])")]) {
+    if (link.parentElement?.closest("pre, a, [data-ref-kind]")) continue;
+    const ref = aloneRef(link.textContent, touched, cwd);
+    if (!ref) continue;
+    link.classList.add("ref");
+    for (const [name, value] of Object.entries(refSpan(doc, ref).dataset)) link.dataset[name] = value;
+  }
   for (const code of [...el.querySelectorAll("code")]) {
     if (code.closest(SKIP)) continue;
     const ref = aloneRef(code.textContent, touched, cwd);