samagotchi 0.5.0 → 0.6.0

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

@@ -11,8 +11,7 @@
 // reload. Slots are patched in place, never rebuilt from HTML: a selection
 // and annotate survive. The rules are pure in stage_model.js.
 import { createTurnView } from "./turn_view.js";
-import { handOffDue, handOffOrder, inUseFrom, isPlain, liveSlots, placeFor } from "./stage_model.js";
-import { splitSentences } from "./sentences.js";
+import { handOffDue, handOffOrder, headlineOf, inUseFrom, isPlain, liveSlots, placeFor } from "./stage_model.js";
 import { formatDuration } from "./timing.js";
 
 const COLLAPSE_KEY = "chi_stage_collapsed";
@@ -23,6 +22,10 @@ const SETTLE_CAP_MS = 8000;
 const FOLD_MS = 420;
 const FLASH_MS = 4000;
 const PENDING = ".bubble.question:not(.answered):not(.cancelled), .bubble.continue:not(.resolved)";
+// A running turn's card with actions (check-in's Nudge / Keep going / Stop)
+// asks the user too, but the turn goes on: it waits only while the turn runs
+// and never holds the hand-off (a turn cut short can leave it open).
+const ASKS = ".plugin-card[data-in-turn] .card-action";
 const MARKS = { answered: "✓", canceled: "■", failed: "✕" };
 
 function node(tag, cls, parent = null) {
@@ -32,16 +35,6 @@ function node(tag, cls, parent = null) {
   return el;
 }
 
-// The step's newest narration sentence: the end of a finished text is a
-// boundary (its last line may have no period), a live one's not yet.
-function headlineOf(text, done) {
-  const { sentences, rest } = splitSentences(text, { atEnd: true });
-  const fragment = rest.replace(/\s+/g, " ").trim();
-  if (done && fragment) return fragment;
-  if (sentences.length) return sentences[sentences.length - 1];
-  return fragment.length > 160 ? fragment : "";
-}
-
 function readCollapsed() {
   try { return localStorage.getItem(COLLAPSE_KEY) === "1"; } catch (_) { return false; }
 }
@@ -153,6 +146,13 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     return !!(extras.querySelector(PENDING) || tail.querySelector(PENDING));
   }
 
+  function asksCard() {
+    return !endKind && !!extras.querySelector(ASKS);
+  }
+  // A card answered or redrawn in place (its buttons gone) changes the
+  // status without a turn event.
+  new MutationObserver(() => scheduleRefresh()).observe(extras, { childList: true, subtree: true });
+
   function refresh() {
     rafPending = false;
     const { turn, blockEl } = view.current();
@@ -169,12 +169,14 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     if (blockEl && blockEl.parentNode === cloudBody) blockEl.open = true;
     const narration = gen?.text ? headlineOf(gen.text, gen.textDone || gen.closed) : "";
     const thinking = thinkingLine && thinkingLine.step === turn.gens.length ? thinkingLine.text : "";
-    const pending = pendingCard();
-    const slots = liveSlots(turn, { narration, thinking, pending, ended: endKind });
+    // A question blocks the turn: its card takes the live slots' room. An
+    // asking card's turn goes on: the status waits, the slots stay.
+    const blocked = pendingCard();
+    const slots = liveSlots(turn, { narration, thinking, pending: blocked || asksCard(), ended: endKind });
 
     stage.classList.toggle("plain", plain);
     stage.classList.toggle("ended", !!endKind);
-    stage.classList.toggle("waiting", pending);
+    stage.classList.toggle("waiting", blocked);
     stage.dataset.phase = slots.phase;
     mark.textContent = MARKS[slots.phase] || "";
     phaseEl.textContent = slots.phase;
@@ -521,6 +523,11 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     turnEnded(args) {
       const kept = view.turnEnded(args) || [];
       if (!holding) return kept;
+      // The warn cards the extras kept in sight leave the turn with the
+      // block's (card.js leavesBlock): after the end line, as a reload has them.
+      const warn = [...extras.querySelectorAll(":scope > .plugin-card.warn")];
+      warn.forEach((el) => el.remove());
+      kept.push(...warn);
       view.chronological();
       endKind = args.kind;
       endedAt = Date.now();
@@ -542,7 +549,9 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       return placed;
     },
     steer: (data) => view.steer(data),
-    card: (el) => view.card(el),
+    // A warn card (a plugin's warning) stays in sight: false puts it in the
+    // extras (place), not in its step inside the closed cloud.
+    card: (el) => !el.classList.contains("warn") && view.card(el),
     flush: () => view.flush(),
     answerReady() {
       settled = true;
@@ -564,7 +573,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       const stick = slot.scrollHeight - slot.scrollTop - slot.clientHeight < 24;
       slot.appendChild(el);
       slot.hidden = false;
-      if (stick || el.matches?.(PENDING)) slot.scrollTop = slot.scrollHeight;
+      if (stick || el.matches?.(PENDING) || el.querySelector?.(ASKS)) slot.scrollTop = slot.scrollHeight;
       scheduleRefresh();
       return true;
     },

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

@@ -88,7 +88,9 @@ export function timedTurnIndexes(items) {
 // the last, in order; a text-less iteration leaves no message, so a text
 // can sit one step early: inspection, not truth) and its answer (the last
 // assistant message). Assistant messages before any prompt are answers on
-// their own. The turn index counts prompts, as timedTurnIndexes does.
+// their own. The turn index counts prompts, as timedTurnIndexes does. The
+// user's lines merged into the running turn (`merged`, the server's
+// Steer::INPUT_KIND) stay in it: the turn's `merged` list.
 export function turnGroups(items, timing) {
   const groups = [];
   let turnIndex = -1;
@@ -99,9 +101,11 @@ export function turnGroups(items, timing) {
     } else if (item?.role === "steer") {
       if (turn) turn.steers.push(i);
       else groups.push({ kind: "steer", i });
+    } else if (item?.role === "user" && item.merged && turn) {
+      turn.merged.push(i);
     } else if (item?.role === "user") {
       turnIndex += 1;
-      turn = { kind: "turn", turnIndex, user: i, texts: [], steers: [] };
+      turn = { kind: "turn", turnIndex, user: i, texts: [], steers: [], merged: [] };
       groups.push(turn);
     } else if (item?.role === "assistant") {
       if (turn) turn.texts.push(i);
@@ -110,7 +114,9 @@ export function turnGroups(items, timing) {
   });
   return groups.map((g) => {
     if (g.kind !== "turn") return g;
-    return withSteers(turnGroup(g, items, timing), g.steers, items);
+    const group = withSteers(turnGroup(g, items, timing), g.steers, items);
+    // A turn with no merged lines keeps its shape.
+    return g.merged.length ? { ...group, merged: g.merged } : group;
   });
 }
 

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

@@ -55,9 +55,18 @@ export function hookNoticeLabel(hook) {
   return /^[a-z][a-z0-9-]*$/.test(name) ? name : "hook";
 }
 
-// The row a step gets when the loop asks again after an empty answer.
-export function emptyRetryLine({ attempt, of } = {}) {
-  return `↻ empty answer, asking again (${attempt}/${of})`;
+// The row a step gets when the loop asks again after an empty answer, or
+// after a plugin cut the generation (stopped_by: the bundle).
+export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
+  const what = stoppedBy ? `cut by ${stoppedBy}` : "empty answer";
+  return `↻ ${what}, asking again (${attempt}/${of})`;
+}
+
+// The text of a turn's row from a snapshot entry (CardStore): a hook's
+// notice as "<label>: text", the loop's asking-again row as its line.
+export function noticeLine(entry = {}) {
+  if (entry.type === "empty_answer_retry") return emptyRetryLine(entry);
+  return `${hookNoticeLabel(entry.hook)}: ${entry.text || ""}`;
 }
 
 // The live turn's status while the provider is asked again after an error
@@ -211,6 +220,7 @@ export function promptOps(event, { myId, known, unmatchedMerge = false }) {
 // parts in order), then the prompts queued behind it. app.js feeds these to
 // its stream handlers, so a join renders exactly like watching live.
 // `merged_input` is the one synthetic type: a prompt merged into the turn.
+// A `notice` part carries its event as it came (TurnNotice).
 export function snapshotEvents({ current_turn: turn = null, queued = [], started_at = undefined } = {}) {
   const events = [];
   if (turn) {
@@ -256,9 +266,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
           closeText();
           events.push({ type: "reminder_injected", reminders: part.reminders || [] });
           break;
-        case "hook_notice":
+        // One of the turn's rows (a hook's notice, an empty-answer retry, a
+        // question and its answer): the event itself, which the live
+        // handler draws where it drew it live.
+        case "notice":
           closeText();
-          events.push({ type: "hook_notice", hook: part.hook, text: part.text, level: part.level });
+          if (part.event?.type) events.push({ ...part.event });
           break;
         // A plugin's steer: a steer-only merge, as live.
         case "steer":

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

@@ -1,20 +1,20 @@
-// The turn view of a running turn (web.turn_view): one <details
-// class="turn-work"> per turn holding one <details class="gen"> per
-// generation, the current one live (open, at the bottom), the earlier ones
-// collapsed to one line each. At the turn's end the last generation's
-// narration moves out of the block as the answer bubble, so markdown,
-// annotate and the turn output dedupe work as in the chat view. The same
-// interface as chat_view.js; the grouping rules live in turn_model.js.
+// The turn view of a running turn (web.view: turn, and the stage's block):
+// one <details class="turn-work"> per turn holding one <details
+// class="gen"> per generation, the current one live (open, at the bottom),
+// the earlier ones collapsed to one line each. At the turn's end the last
+// generation's narration moves out of the block as the answer bubble, so
+// markdown, annotate and the turn output dedupe work on a plain bubble.
+// The grouping rules live in turn_model.js.
 //
 // A block that holds one gen with no thinking and no tool rows hides its
 // chrome (CSS :has), so a plain answer streams like today's bubble, and is
 // removed at the end: the answer bubble takes its place.
 import { toolName } from "./activity.js";
 import { leavesBlock } from "./card.js";
-import { activityStatusClass, activityStatusLabel, fillActivityRow } from "./chat_view.js";
 import { copySourceAttr } from "./copy.js";
 import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
+import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
 import { hookNoticeLabel } from "./turn_events.js";
 import { cancelLineHtml, formatDuration, turnGroups, turnTimingText } from "./timing.js";
@@ -23,6 +23,55 @@ import { createTicker } from "./thinking_ticker.js";
 import * as model from "./turn_model.js";
 import { createHold } from "./hold.js";
 
+// A row's status (live, or a saved tool record's on reload): running,
+// error, stopped (a task_wait the user's Stop ended), else ok ("done").
+function activityStatusClass(status) {
+  if (status === "running") return "running";
+  if (status === "error") return "error";
+  if (status === "stopped") return "stopped";
+  return "ok";
+}
+
+function activityStatusLabel(status) {
+  if (status === "running") return "running";
+  if (status === "error") return "error";
+  if (status === "stopped") return "stopped";
+  return "done";
+}
+
+// A live tool row filled from its activity row (status, title, output).
+function fillActivityRow(el, row, sessionId) {
+  const statusEl = el.querySelector(".activity-status");
+  statusEl.className = `activity-status ${activityStatusClass(row.status)}`;
+  statusEl.textContent = activityStatusLabel(row.status);
+  const toolEl = el.querySelector(".activity-tool");
+  if (toolEl) toolEl.textContent = toolName(row);
+  const paramsEl = el.querySelector(".activity-params");
+  if (paramsEl) {
+    // The title in place of the params; the full params line on hover.
+    paramsEl.textContent = row.title || row.params || "";
+    paramsEl.title = row.title && row.params ? row.params : "";
+  }
+  const outEl = el.querySelector(".activity-output");
+  if (outEl) {
+    if (row.status === "running") {
+      outEl.style.display = "none";
+      outEl.textContent = "";
+      outEl.title = "";
+    } else {
+      // dispatch prefixes output with "[tool]"; strip that noise for display.
+      const full = (row.output || "").replace(/^\[[^\]]*\]\s*/, "");
+      outEl.title = full;
+      outEl.textContent = full.length > 300 ? `${full.slice(0, 300)}…` : full;
+      outEl.style.display = full ? "" : "none";
+    }
+  }
+  // The images a tool returned (a reloaded row has them too, reloadRowHtml).
+  if (row.images?.length && !el.querySelector(".thumbs")) el.insertAdjacentHTML("beforeend", thumbsHtml(sessionId, row.images));
+  // An edit/write's change, collapsed: "diff +3 −1".
+  if (row.diff && !el.querySelector(".activity-diff")) el.insertAdjacentHTML("beforeend", activityDiffHtml(row.diff));
+}
+
 // The container seams (the stage view composes this view, stage_view.js):
 //   blockHost(el)  puts the turn's block in the page (default: the history);
 //   follow()       keeps the live part in view (default: the history's
@@ -102,7 +151,7 @@ export function createTurnView({
     const text = document.createElement("div");
     text.className = "gen-text streaming";
     // A step after the first shows "…" until its text comes (the first one
-    // only for a prompt, as the chat view's bubble).
+    // only for a prompt).
     if (turn.gens.length > 1) text.textContent = "…";
     el.appendChild(text);
     const entry = { el, summary, thinking: null, text, activity: null, rows: new Map(), toggled: false,
@@ -308,13 +357,25 @@ export function createTurnView({
     }
     entry.summary.textContent = model.genLabel(gen);
     if (!entry.toggled) entry.el.open = false;
-    // The chat view puts every generation's text in seenContent.
+    // Every generation's text goes into seenContent (the turn output dedupe).
     const k = normalize(gen.text);
     if (k) sawText(k);
   }
 
+  // A step that closes mid-turn (the next one starts) collapses: a warn card
+  // in it would go out of sight until the turn ends. It moves out of the
+  // step, right after it in the block (open while the turn runs), where
+  // turnEnded still finds it and takes it out of the block (leavesBlock).
+  function liftWarnCards(gen) {
+    const entry = genEls.get(gen);
+    if (!entry) return;
+    const cards = [...entry.el.querySelectorAll(".plugin-card.warn")];
+    if (cards.length) entry.el.after(...cards);
+  }
+
   function apply(r) {
     if (!r) return;
+    if (r.closed && r.opened) liftWarnCards(r.closed);
     if (r.closed) closeGenEl(r.closed);
     if (r.opened) createGenEl(r.gen);
     if (r.closed || r.opened) updateBlockSummary();
@@ -437,8 +498,8 @@ export function createTurnView({
     cards.forEach((el) => { if (!el.classList.contains("plugin-card")) el.classList.add("bubble"); });
     if (leaving) entry.el.remove();
     if (plain) {
-      // A plain answer: no block, the bubble where it was (as the chat
-      // view); its thinking, if any, as the chat view's collapsed block.
+      // A plain answer: no block, the bubble where it was; its thinking, if
+      // any, as a collapsed thinking block above it.
       const pieces = [];
       if (gen.thinking) {
         if (!entry.thinkingWrap) thinkingEl(gen);
@@ -473,7 +534,7 @@ export function createTurnView({
     const last = model.currentGen(turn);
     // A completed turn's answer is its last generation's text; a one-step
     // turn without tools leaves the block in any case (canceled, it is the
-    // partial text bubble the chat view leaves).
+    // partial text bubble).
     const promoting = last && (kind === "completed" || (turn.gens.length === 1 && last.tools.length === 0));
     // The box's height, measured while it is still in the DOM and the step
     // still open: the apply below swaps it for the full text and collapses
@@ -601,8 +662,7 @@ function defaultPlaceAnswer(appendToHistory) {
   };
 }
 
-// A reloaded tool row, the live row's markup (chat_view.js
-// fillActivityRow): status, tool, params, output (its "[tool]" tag dropped,
+// A reloaded tool row, the live row's markup (fillActivityRow): status, tool, params, output (its "[tool]" tag dropped,
 // 300 chars, the rest on hover), plus the call's duration from its record.
 // Params, output and the call's images come from the saved messages'
 // parts; without them the row has the record's name, status and duration
@@ -651,7 +711,7 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     const noBlock = !group.steps.length ||
       (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking);
     if (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking) {
-      // A plain answer with thinking: the chat view's collapsed block, as live.
+      // A plain answer with thinking: the collapsed thinking block, as live.
       parts.push(`<details class="bubble thinking"><summary>thinking</summary><div class="thinking-body">${escapeHtml(only.thinking)}</div></details>`);
     } else if (group.steps.length) {
       const gens = group.steps.map((step) => ({ text: step.i === null ? "" : String(items[step.i].content ?? ""), thinking: step.thinking || "", tools: step.tools }));
@@ -672,6 +732,10 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     // their own after the prompt.
     const loose = noBlock ? [...group.steps.flatMap((step) => step.steers || []), ...(group.steers || [])] : group.steers || [];
     parts.push(loose.map((i) => steerHtml(i, true)).join(""));
+    // The user's lines merged into the turn: the live "steered" bubbles,
+    // after its steps and before its answer.
+    parts.push((group.merged || []).map((i) =>
+      `<div class="bubble user steered" data-user-state="steered"${items[i].step ? ` data-step="${Number(items[i].step)}"` : ""}${copySourceAttr(items[i], false)}><div class="user-message">${messageBodyHtml(items[i]).body}${thumbs(items[i].images)}</div><span class="state-badge">steered</span></div>`).join(""));
     // A turn with no answer (canceled, or running: no record yet) shows its
     // timing after its prompt and steps, where the live view leaves it.
     if (group.answer === null) parts.push(timingHtml(group));

data/lib/samagotchi/web/server.rb

@@ -59,8 +59,9 @@ module Samagotchi
       # @param new_token [Boolean] replace the LAN access token first
       #   (--new-token): a running server takes the new one at once
       # @return [Integer] the exit status
-      def self.launch(port: nil, host: nil, scope: "project", dir: Dir.pwd, open_browser: false, markdown: false, view: "turn",
-                      annotate_presets: Config::BY_KEY["web.annotate_presets"].default, new_token: false)
+      def self.launch(port: nil, host: nil, scope: "project", dir: Dir.pwd, open_browser: false, markdown: false,
+                      view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default,
+                      new_token: false)
         rotate_token if new_token
         setting = host_setting(host)
         lan = Lan.wanted?(setting) ? Lan.choose(setting) : nil
@@ -108,7 +109,7 @@ module Samagotchi
       # @param token_path [String] the LAN access token's file
       # @return [Boolean] false when the port was taken (said so on stderr)
       def self.start(port: nil, host: nil, url: nil, open_browser: false, state_dir: nil, manager: nil, markdown: false,
-                     view: "turn", annotate_presets: Config::BY_KEY["web.annotate_presets"].default, hub: nil, lan: nil,
+                     view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default, hub: nil, lan: nil,
                      token_path: Token.path)
         port = resolve_port(port)
         host = resolve_host(host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -150,9 +150,11 @@ files:
 - lib/samagotchi/bridge/ring_buffer.rb
 - lib/samagotchi/bridge/sse_writer.rb
 - lib/samagotchi/bridge/turn_accumulator.rb
+- lib/samagotchi/bridge/turn_notice.rb
 - lib/samagotchi/bridge_client.rb
 - lib/samagotchi/bridge_client/event_stream.rb
 - lib/samagotchi/bridge_client/sse_parser.rb
+- lib/samagotchi/bundle_command.rb
 - lib/samagotchi/bundle_needs.rb
 - lib/samagotchi/bundles/btw/manifest.yml
 - lib/samagotchi/bundles/btw/plugin.rb
@@ -201,6 +203,7 @@ files:
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
 - lib/samagotchi/gem_update.rb
+- lib/samagotchi/guardrail_wiring.rb
 - lib/samagotchi/guardrails.rb
 - lib/samagotchi/guardrails/approval.rb
 - lib/samagotchi/guardrails/approvals.rb
@@ -216,6 +219,7 @@ files:
 - lib/samagotchi/hooks/bundle_loader.rb
 - lib/samagotchi/hooks/loader.rb
 - lib/samagotchi/hooks/registry.rb
+- lib/samagotchi/hooks/stream_watch.rb
 - lib/samagotchi/host_registry.rb
 - lib/samagotchi/idle_client.rb
 - lib/samagotchi/idle_recap.rb
@@ -269,9 +273,12 @@ files:
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
 - lib/samagotchi/plugin/tool_result.rb
+- lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_literal_guard.rb
+- lib/samagotchi/question_desk.rb
+- lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/reminder_store.rb
 - lib/samagotchi/reply_wait.rb
@@ -286,6 +293,7 @@ files:
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_observer.rb
+- lib/samagotchi/sessions_command.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/system_prompt.rb
 - lib/samagotchi/terminal_ui.rb
@@ -360,7 +368,6 @@ files:
 - lib/samagotchi/web/public/annotations.js
 - lib/samagotchi/web/public/app.js
 - lib/samagotchi/web/public/card.js
-- lib/samagotchi/web/public/chat_view.js
 - lib/samagotchi/web/public/chunk_router.js
 - lib/samagotchi/web/public/command_complete.js
 - lib/samagotchi/web/public/composer_size.js