samagotchi 0.23.0 → 0.24.0

data/lib/samagotchi/waiting_steer.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Samagotchi
+  # A message for the running turn that may cut its generation but came too
+  # early (the generation hadn't streamed only thinking for long enough):
+  # it waits here until the thinking passes steer.cut_after (the Engine
+  # checks on each thinking chunk), or until a drain hands the message to
+  # the model at a boundary, or the turn ends. One cut covers every waiting
+  # message: the first one's source names it.
+  #
+  # The epoch counts the drains that took input. A caller reads it before
+  # it queues its message; a drain after that may have taken the message
+  # already, so the message doesn't wait (it may be in the model's prompt).
+  # Written from the UIs' threads and the turn's; its own Mutex.
+  class WaitingSteer
+    def initialize
+      @mutex = Mutex.new
+      @source = nil
+      @epoch = 0
+    end
+
+    # @return [Integer] the drains that took input so far
+    def epoch
+      @mutex.synchronize { @epoch }
+    end
+
+    # +source+'s message waits for a cut, unless a drain took input since
+    # +epoch+. Returns whether it waits.
+    def wait!(source, epoch: nil)
+      @mutex.synchronize do
+        next false if epoch && epoch != @epoch
+
+        @source ||= source.to_s
+        true
+      end
+    end
+
+    def waiting?
+      @mutex.synchronize { !@source.nil? }
+    end
+
+    # The waiting source, taken (nil when none waits).
+    def take
+      @mutex.synchronize do
+        source = @source
+        @source = nil
+        source
+      end
+    end
+
+    # A drain took input: what waited is delivered.
+    def delivered!
+      @mutex.synchronize do
+        @epoch += 1
+        @source = nil
+      end
+    end
+
+    # The turn ended, or a cut happened: nothing waits.
+    def clear!
+      @mutex.synchronize { @source = nil }
+    end
+  end
+end

data/lib/samagotchi/web/message_parts.rb

@@ -3,6 +3,7 @@
 require_relative "../model_profile"
 require_relative "../tool_call_parser"
 require_relative "../tool_activity"
+require_relative "../tool_view"
 require_relative "../llm/native_tool_normalizer"
 require_relative "../tools/builtins"
 require_relative "../image_store"
@@ -158,6 +159,10 @@ module Samagotchi
         part = { tool: name, params: params.to_s }
         title = ToolActivity.tool_title(name, call, cwd: cwd)
         part[:title] = title if title
+        # Built from the saved call (never saved itself), so older sessions
+        # get it too.
+        view = ToolView.for(name, call)&.to_h
+        part[:view] = view if view
         part[:label] = label if label.is_a?(String) && !label.empty?
         unless output.nil?
           part[:output] = output.length > OUTPUT_MAX ? output[0, OUTPUT_MAX] : output

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

@@ -50,6 +50,7 @@ export function addStarted(model, event = {}) {
     row.label = event.label || row.label;
     row.params = event.params || row.params;
     row.title = event.title || row.title;
+    row.view = event.view || row.view;
     return { row, created: false };
   }
   row = {
@@ -63,6 +64,9 @@ export function addStarted(model, event = {}) {
     // 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 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,
     status: ROW_STATUS.RUNNING,
     output: "",
     output_truncated: false,
@@ -87,6 +91,7 @@ export function addCompleted(model, event = {}) {
       label: event.label,
       params: event.activity?.params || "",
       title: event.activity?.title,
+      view: event.view,
     });
     row = synthesized.row;
   }

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

@@ -45,7 +45,7 @@ import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, steerCutLine, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -1861,6 +1861,7 @@ const streamHandlers = {
   // The loop asks again after an empty answer: a row of the empty step
   // (a reload puts it back from the snapshot's cards).
   empty_answer_retry: (data) => { turnDom.notice({ line: emptyRetryLine(data) }); },
+  steer_cut: (data) => { turnDom.notice({ line: steerCutLine(data) }); },
   // The provider is asked again after an error, or the turn waits for
   // plugins' setup: a note on the live timing line until it streams.
   generation_retrying: (data) => setLiveTurnNote(retryStatusLine(data)),

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

@@ -0,0 +1,28 @@
+// A tool call's full command in a richer UI than the TUI's params line:
+// the server's view (ToolView: an execute/task_create's command uncut up to
+// 8,000 chars, the call's cwd: argument). Pure HTML builders, shared by the
+// live row (turn_view.js fillActivityRow) and the reloaded one
+// (reloadRowHtml), so the two can't differ.
+import { copyButtonHtml } from "./copy.js";
+import { escapeHtml } from "./format.js";
+
+// What a row's title hovers: the full command when the call has one,
+// else the params line when the row shows a title in its place.
+export function rowHover(row) {
+  if (row?.view?.command) return row.view.command;
+  return row?.title && row?.params ? row.params : "";
+}
+
+// The expanded row's command block: "in <cwd>" when the call gave one (as
+// given: execute's may be relative to the project root), the command as
+// written (whitespace kept, its own scroll), a copy button, and a line
+// saying how much a cut command left out. "" for a call without a view.
+export function commandBlockHtml(view) {
+  const command = view?.command;
+  if (!command) return "";
+  const cwd = view.cwd ? `<div class="activity-command-cwd">in <span>${escapeHtml(view.cwd)}</span></div>` : "";
+  const cut = view.truncated
+    ? `<div class="activity-command-cut">… (${command.length.toLocaleString("en-US")} of ${Number(view.chars || 0).toLocaleString("en-US")} chars)</div>`
+    : "";
+  return `<div class="activity-command code-wrap">${cwd}<pre><code>${escapeHtml(command)}</code></pre>${copyButtonHtml("code")}${cut}</div>`;
+}

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

@@ -88,6 +88,13 @@ const ICON = '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"
 const BUBBLES = ".bubble.output:not(.streaming), .bubble.user";
 const CODE = ".bubble.output pre";
 
+// The button as markup, for a builder that returns HTML (a tool row's
+// command block, command_view.js); the same click handler answers it.
+export function copyButtonHtml(kind) {
+  const title = kind === "code" ? "Copy code" : "Copy";
+  return `<button type="button" class="copy-btn copy-${kind}" title="${title}" aria-label="${title}">${ICON}</button>`;
+}
+
 function makeButton(doc, kind) {
   const btn = doc.createElement("button");
   btn.type = "button";

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

@@ -134,10 +134,18 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .activity-diff>summary{cursor:pointer;font-size:12px;color:var(--text-muted);width:max-content;font-variant-numeric:tabular-nums}
 .activity-diff>summary:hover{color:var(--text-2)}
 .activity-diff[open]>summary{margin-bottom:4px}
+/* An execute/task_create's full command, above its output and lined up with it: as written, its own scroll. */
+.activity-row>.activity-command{flex:1 1 100%;min-width:0;margin:4px 0 2px 60px}
+.activity-command pre{margin:0;max-height:160px;overflow:auto;white-space:pre-wrap;word-break:break-word;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:1.45;color:var(--text-2);background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;padding:6px 34px 6px 8px}
+.activity-command-cwd,.activity-command-cut{font-size:11px;color:var(--text-faint)}
+.activity-command-cwd{margin-bottom:2px}
+.activity-command-cwd>span{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text-muted)}
+.activity-command-cut{margin-top:2px}
 @media(max-width:600px){
   .activity-params{flex:1 1 0}
   .activity-output{margin-left:0}
   .activity-diff{margin-left:0}
+  .activity-row>.activity-command{margin-left:0}
 }
 .bubble.thinking{border-left:3px solid var(--think);background:color-mix(in srgb,var(--think) 6%,var(--bg-panel));padding:8px 12px}
 .bubble.thinking:not([open]),.bubble.activity:not([open]){padding:3px 10px;background:transparent;border-color:transparent;align-self:flex-start;border-radius:6px;transition:background .12s ease}

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

@@ -78,6 +78,12 @@ function rowTitle(row) {
   return row.title || row.params || "";
 }
 
+// A slot's full command (the row's view), for its hover; none for a tool
+// without one.
+function withCommand(slot, row) {
+  return row.view?.command ? { ...slot, command: row.view.command } : slot;
+}
+
 // While the first step has no thinking and no tool rows the turn is plain:
 // its text streams in the stage's answer slot, as the turn view's
 // chrome-less block streams like a bubble.
@@ -98,9 +104,10 @@ const NO_ANSWER = "no answer";
 //   headline the newest narration sentence (+narration+, the view's sentence
 //            feed), else the newest thinking one (+thinking+, its ticker),
 //            else "…";
-//   tool     the running call ({name, title, kind}) or null;
+//   tool     the running call ({name, title, kind}, and command: its full
+//            command when it has one) or null;
 //   trail    the last three finished calls, newest last (a file's title
-//            without its dir);
+//            without its dir; command as for tool);
 //   ticks    one per call: {kind, status, step (the gen's index)}.
 // +pending+: a card waits for the user; +ended+: the turn's end kind;
 // +emptyAnswer+: a completed turn ended with no answer
@@ -123,13 +130,13 @@ export function liveSlots(turn, { narration = "", thinking = "", pending = false
   else if (thinking) headline = { text: thinking, thinking: true };
   const trail = rows.filter(({ row }) => row.status !== "running").slice(-TRAIL).map(({ row }) => {
     const title = rowTitle(row);
-    return { name: toolName(row), title: FILE_TOOLS.has(row.tool) ? title.split("/").pop() : title, status: row.status };
+    return withCommand({ name: toolName(row), title: FILE_TOOLS.has(row.tool) ? title.split("/").pop() : title, status: row.status }, row);
   });
   return {
     phase,
     step: ended ? gens.filter((g) => !g.answer || g.thinking || g.tools.length).length : gens.length,
     headline,
-    tool: running ? { name: toolName(running), title: rowTitle(running), kind: toolKind(running.tool) } : null,
+    tool: running ? withCommand({ name: toolName(running), title: rowTitle(running), kind: toolKind(running.tool) }, running) : null,
     trail,
     ticks: rows.map(({ row, step }) => ({ kind: toolKind(row.tool), status: row.status, step })),
   };

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

@@ -195,6 +195,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     const elapsed = endKind ? formatDuration(endedAt - startedAt) : "";
     chipLabel.textContent = `${slots.step} step${slots.step === 1 ? "" : "s"} · ${calls} tool call${calls === 1 ? "" : "s"}${elapsed ? ` · ${elapsed}` : ""}`;
     miniTool.textContent = collapsed && slots.tool ? `${slots.tool.name} ${slots.tool.title}` : "";
+    miniTool.title = (collapsed && slots.tool?.command) || "";
 
     live.hidden = plain || !!endKind;
     cloud.hidden = !blockEl || blockEl.parentNode !== cloudBody;
@@ -222,7 +223,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
 
   function drawNow(tool, gen) {
     const quiet = gen?.text && !gen.textDone ? "writing…" : "thinking…";
-    const key = tool ? `run|${tool.name}|${tool.title}` : `quiet|${quiet}`;
+    const key = tool ? `run|${tool.name}|${tool.title}|${tool.command || ""}` : `quiet|${quiet}`;
     if (shown.now === key) return;
     shown.now = key;
     now.replaceChildren();
@@ -233,7 +234,8 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       name.textContent = tool.name;
       const title = node("span", "ts-title", now);
       title.textContent = tool.title;
-      title.title = tool.title;
+      // The full command when the call has one (the title is its first line).
+      title.title = tool.command || tool.title;
     } else {
       const word = node("span", "ts-title quiet", now);
       word.textContent = quiet;
@@ -251,6 +253,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       const failed = item.status === "error";
       const el = node("span", `ts-trail-item${failed ? " error" : ""}`, trail);
       el.textContent = `${failed ? "✕" : "✓"} ${item.name} ${item.title}`.trim();
+      if (item.command) el.title = item.command;
     }
     if (!flashing && !items.length) node("span", "ts-trail-item none", trail).textContent = "no tool calls yet";
   }

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

@@ -123,6 +123,17 @@ export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
   return `↻ ${what}, asking again (${attempt}/${of})`;
 }
 
+// The row a step gets when a message for the running turn cut a generation
+// that was only thinking (steer_cut; source "" is the user's, as is an
+// unknown one). The TUI words it the same (spec/shared/labels_matrix.json).
+const STEER_CUT_FOR = {
+  chi_send: "a message sent with chi send",
+  parent_agent: "the parent agent's message",
+};
+export function steerCutLine({ source } = {}) {
+  return `↪ cut in for ${STEER_CUT_FOR[source] || "your message"}`;
+}
+
 // The one muted line for a turn that ended with no answer (turn_completed's
 // turn_summary.empty_answer, or a reloaded turn's marker): the TUI words
 // it the same (TurnNote.empty_answer_line; spec/shared/labels_matrix.json).
@@ -136,6 +147,7 @@ export function emptyAnswerLine({ retries = 0 } = {}) {
 // 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);
+  if (entry.type === "steer_cut") return steerCutLine(entry);
   return `${hookNoticeLabel(entry.hook)}: ${entry.text || ""}`;
 }
 
@@ -451,7 +463,8 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
           const call = { iteration: part.iteration, call_index: part.call_index, tool: part.tool };
           if (part.label) call.label = part.label;
           const title = part.title ? { title: part.title } : {};
-          events.push({ type: "tool_call_started", ...call, params: part.params, ...title });
+          const view = part.view ? { view: part.view } : {};
+          events.push({ type: "tool_call_started", ...call, params: part.params, ...title, ...view });
           if (part.status !== "running") {
             // The activity as the live event had it; action and duration_ms
             // only in snapshots from a worker that keeps them (the TUI's
@@ -463,6 +476,7 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
             };
             if (part.duration_ms != null) completed.duration_ms = part.duration_ms;
             if (part.diff) completed.diff = part.diff;
+            if (part.view) completed.view = part.view;
             events.push(withImages(completed, part.images));
           }
           break;

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

@@ -12,6 +12,7 @@
 import { toolName } from "./activity.js";
 import { leavesBlock } from "./card.js";
 import { copySourceAttr } from "./copy.js";
+import { commandBlockHtml, rowHover } from "./command_view.js";
 import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
 import { thumbsHtml } from "./images.js";
@@ -45,11 +46,17 @@ function fillActivityRow(el, row, sessionId) {
   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.
+    // The title in place of the params; the full command (else the full
+    // params line) on hover.
     paramsEl.textContent = row.title || row.params || "";
-    paramsEl.title = row.title && row.params ? row.params : "";
+    paramsEl.title = rowHover(row);
   }
   const outEl = el.querySelector(".activity-output");
+  // The call's full command, above its output (running too).
+  if (row.view?.command && !el.querySelector(".activity-command")) {
+    if (outEl) outEl.insertAdjacentHTML("beforebegin", commandBlockHtml(row.view));
+    else el.insertAdjacentHTML("beforeend", commandBlockHtml(row.view));
+  }
   if (outEl) {
     if (row.status === "running") {
       outEl.style.display = "none";
@@ -667,14 +674,15 @@ function defaultPlaceAnswer(appendToHistory) {
   };
 }
 
-// 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.
+// A reloaded tool row, the live row's markup (fillActivityRow): status, tool, params, the full command (an
+// execute/task_create's view), 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
 // only. +thumbs(images)+ draws the images, as the live row does.
 function reloadRowHtml(r, thumbs) {
   const shown = r.title || r.params;
-  const hover = r.title && r.params ? ` title="${escapeHtml(r.params)}"` : "";
+  const hover = rowHover(r) ? ` title="${escapeHtml(rowHover(r))}"` : "";
   const params = shown ? `<span class="activity-params"${hover}>${escapeHtml(shown)}</span>` : "";
   const duration = formatDuration(r.duration_ms);
   const full = String(r.output || "").replace(/^\[[^\]]*\]\s*/, "");
@@ -682,7 +690,8 @@ function reloadRowHtml(r, thumbs) {
     ? `<div class="activity-output" title="${escapeHtml(full)}">${escapeHtml(full.length > 300 ? `${full.slice(0, 300)}…` : full)}</div>`
     : "";
   return `<div class="activity-row" data-key="${escapeHtml(r.key)}"><span class="activity-status ${activityStatusClass(r.status)}">${activityStatusLabel(r.status)}</span>` +
-    `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}${output}` +
+    `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
+    `${commandBlockHtml(r.view)}${output}` +
     `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
 

data/lib/samagotchi/worker.rb

@@ -7,6 +7,7 @@ require_relative "session"
 require_relative "session_inbox"
 require_relative "turn_note"
 require_relative "context_note"
+require_relative "steer"
 require_relative "worker_idle_exit"
 require_relative "session_manager"
 require_relative "archive_store"
@@ -571,7 +572,9 @@ module Samagotchi
           @engine.announce(type: :input_merged, count: merged.size, origins: merged.filter_map(&:last))
           @merged_this_turn.concat(merged)
         end
-        merged.map(&:first)
+        # Each line keeps its sender (Steer.source_for_client): a chi send or
+        # a delegating parent's line is saved and shown to the model as theirs.
+        merged.map { |prompt, origin| Steer::Line.new(text: prompt, source: Steer.source_for_client(origin&.dig(:client_id))) }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -223,6 +223,7 @@ files:
 - lib/samagotchi/engine.rb
 - lib/samagotchi/events.rb
 - lib/samagotchi/gem_update.rb
+- lib/samagotchi/generation_phase.rb
 - lib/samagotchi/guardrail_wiring.rb
 - lib/samagotchi/guardrails.rb
 - lib/samagotchi/guardrails/approval.rb
@@ -380,6 +381,7 @@ files:
 - lib/samagotchi/tool_declarations.rb
 - lib/samagotchi/tool_response.rb
 - lib/samagotchi/tool_runner.rb
+- lib/samagotchi/tool_view.rb
 - lib/samagotchi/tools/args.rb
 - lib/samagotchi/tools/ask_user_question.rb
 - lib/samagotchi/tools/builtin_calls.rb
@@ -420,6 +422,7 @@ files:
 - lib/samagotchi/version.rb
 - lib/samagotchi/vision_context.rb
 - lib/samagotchi/vision_support.rb
+- lib/samagotchi/waiting_steer.rb
 - lib/samagotchi/web/app.rb
 - lib/samagotchi/web/info_probe.rb
 - lib/samagotchi/web/lan.rb
@@ -434,6 +437,7 @@ files:
 - lib/samagotchi/web/public/chunk_router.js
 - lib/samagotchi/web/public/command_complete.js
 - lib/samagotchi/web/public/command_list.js
+- lib/samagotchi/web/public/command_view.js
 - lib/samagotchi/web/public/composer_size.js
 - lib/samagotchi/web/public/copy.js
 - lib/samagotchi/web/public/ctx.js