samagotchi 0.70.0 → 0.72.0

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

@@ -11,6 +11,7 @@ import { activityDiffTemplate } from "./diff_view.js";
 import { clip, steerSender } from "./format.js";
 import { rowTitleRef } from "./refs.js";
 import { readLinesTemplate } from "./read_view.js";
+import { handedOverId } from "./task_stop.js";
 import { STOPPED_LINE_CLASS, cancelLineText, formatDuration } from "./timing.js";
 import { emptyAnswerLine } from "./turn_events.js";
 
@@ -73,12 +74,63 @@ function llmEditTemplate(row) {
   return html`<div class="activity-edit" title=${hover}>${line}</div>`;
 }
 
+// What a done row shows of its output inline: its first INLINE_CHARS, else
+// for an execute's result and a task_wait with its log's last lines its
+// last ones (a test run's summary, a failing exit line). An execute drops a
+// bare success "exit: 0" (the mark says it) and, with no stderr block, the
+// lone "stdout:" label. A guardrail deny, an approval refused or an
+// execute's error has its reason first, a hand-over its task_id: the head.
+// 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]*\))?$/;
+// 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/;
+const OUTPUT_TAIL = /^output_tail:$/m;
+// A gate-corrected call's first line (ToolRunner#changed_call_line) and the "[tool]" lead after it, which
+// the row's lead strip misses (it isn't first). The inline text drops both; the hover keeps them.
+const RAN_AS_LEAD = /^ran as: [^\n]*\n(?:\[[^\]\s]+\](?:\n| ))?/;
+
+export function inlineOutput(tool, full) {
+  const text = String(full ?? "").replace(RAN_AS_LEAD, "");
+  if (!tailMode(tool, text)) return clip(text, INLINE_CHARS + 1);
+  let shown = text;
+  if (tool === "execute") {
+    shown = shown.replace(SUCCESS_EXIT_LINE, (_, hint) => hint || "");
+    if (!text.includes("\nstderr:\n") && shown.startsWith("stdout:\n")) shown = shown.slice("stdout:\n".length);
+  }
+  shown = shown.replace(/\n+$/, "");
+  return tailClip(shown.trim() ? shown : text);
+}
+
+// Whether a row's output shows its end (its div opens scrolled to the end).
+export function tailMode(tool, text) {
+  if (tool === "task_wait") return OUTPUT_TAIL.test(text);
+  if (tool !== "execute" || handedOverId(text)) return false;
+  return EXECUTE_BLOCK.test(text) || EXIT_LINE.test(text);
+}
+
+// The text's end, as clip keeps its start: whole when it fits, else "…" and
+// its last INLINE_CHARS, never from half an emoji, from a line's start when
+// that keeps at least half of them (ToolOutputCut.cut_block's tail rule).
+function tailClip(text) {
+  if (text.length <= INLINE_CHARS + 1) return text;
+  let kept = text.slice(-INLINE_CHARS);
+  const first = kept.charCodeAt(0);
+  if (first >= 0xdc00 && first <= 0xdfff) kept = kept.slice(1);
+  const nl = kept.indexOf("\n");
+  if (nl >= 0 && kept.length - nl - 1 >= INLINE_CHARS / 2) kept = kept.slice(nl + 1);
+  return `\u2026${kept}`;
+}
+
 // A tool row: its status mark, tool, title (else params; the full command,
 // else the full params line, on hover), the word an exception shows, the
 // call's duration, the full command (an execute/task_create's view, also
 // while it runs), the output once done (its "[tool]" tag dropped, 300 chars,
-// the rest on hover; a read of the file as-is also its numbered lines,
-// closed: read_view.js), its images (+thumbs+(images) draws them) and an
+// an execute/task_wait's last ones (inlineOutput), the rest on hover; a read
+// of the file as-is also its numbered lines, closed: read_view.js), its images (+thumbs+(images) draws them) and an
 // edit's collapsed diff, and a reloaded row's ✂ mark above its output. A
 // part with nothing to say is left out. A reload renders toolRowTemplate;
 // the live view renders toolRowInnerTemplate into its own row element
@@ -107,7 +159,7 @@ export function toolRowInnerTemplate(row, { thumbs = () => nothing, stop = nothi
   const duration = formatDuration(row.duration_ms);
   const full = row.status === "running" ? "" : String(row.output || "").replace(/^\[[^\]]*\]\s*/, "");
   const output = full
-    ? html`<div class="activity-output" title=${full}>${clip(full, 301)}</div>`
+    ? html`<div class=${tailMode(row.tool, full) ? "activity-output tail" : "activity-output"} title=${full}>${inlineOutput(row.tool, full)}</div>`
     : nothing;
   const status = statusParts(row.status, { noMatch: !!row.no_match });
   return html`${statusMarkTemplate(status)}<span class="activity-tool">${toolName(row)}</span>${params}${stop}${alias}${statusWordTemplate(status)}${duration ? html`<span class="activity-duration">${duration}</span>` : nothing}${commandBlockTemplate(row.view, row.title)}${llmEditTemplate(row)}${output}${full ? readLinesTemplate(row) : nothing}${row.images?.length ? thumbs(row.images) : nothing}${row.diff ? activityDiffTemplate(row.diff) : nothing}`;

data/lib/samagotchi/web/session_hub.rb

@@ -172,6 +172,14 @@ module Samagotchi
         end
       end
 
+      # A session's folder as the projection holds it (its file's, read at
+      # the last scan or touch): what a live read that loads no session
+      # file checks refs against. nil for a session the hub hasn't seen.
+      # @return [String, nil]
+      def working_directory(id)
+        @monitor.synchronize { @sessions[id]&.session&.working_directory }
+      end
+
       # Register a sink (#call(event)). With +snapshot:+ the current
       # projection comes back with the handle, taken in the same step, so
       # every event after it is newer than it.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -279,6 +279,7 @@ files:
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
 - lib/samagotchi/engine_peers.rb
+- lib/samagotchi/event_routes.rb
 - lib/samagotchi/events.rb
 - lib/samagotchi/extension_load.rb
 - lib/samagotchi/file_ref.rb
@@ -459,6 +460,7 @@ files:
 - lib/samagotchi/session_inbox.rb
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
+- lib/samagotchi/session_model_settings.rb
 - lib/samagotchi/session_observer.rb
 - lib/samagotchi/session_retention.rb
 - lib/samagotchi/session_setting.rb