samagotchi 0.23.0 → 0.25.0

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, row.title));
+    else el.insertAdjacentHTML("beforeend", commandBlockHtml(row.view, row.title));
+  }
   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, r.title)}${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.25.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -131,6 +131,7 @@ files:
 - docs/internals/background-tasks.md
 - docs/internals/context-telemetry.md
 - docs/internals/gemma4-contract.md
+- docs/internals/prompt-caching.md
 - docs/internals/tool-guardrails.md
 - docs/memory.md
 - docs/plugins.md
@@ -196,6 +197,7 @@ files:
 - lib/samagotchi/cli/flags.rb
 - lib/samagotchi/cli/parent_wait.rb
 - lib/samagotchi/client.rb
+- lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
 - lib/samagotchi/config.rb
 - lib/samagotchi/config_text_edit.rb
@@ -223,6 +225,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
@@ -372,6 +375,7 @@ files:
 - lib/samagotchi/terminal_ui/version_lines.rb
 - lib/samagotchi/text_diff.rb
 - lib/samagotchi/thinking.rb
+- lib/samagotchi/thinking_tails.rb
 - lib/samagotchi/thinking_ticker.rb
 - lib/samagotchi/thought_stream_splitter.rb
 - lib/samagotchi/token_usage.rb
@@ -380,6 +384,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
@@ -400,6 +405,7 @@ files:
 - lib/samagotchi/tools/register_reminder.rb
 - lib/samagotchi/tools/registry.rb
 - lib/samagotchi/tools/send_note.rb
+- lib/samagotchi/tools/shell.rb
 - lib/samagotchi/tools/task_create.rb
 - lib/samagotchi/tools/task_get.rb
 - lib/samagotchi/tools/task_list.rb
@@ -420,6 +426,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 +441,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