samagotchi 0.22.0 → 0.24.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));
+    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/web/qr.rb

@@ -21,7 +21,13 @@ module Samagotchi
         rows = matrix(text, quiet: quiet)
         rows << Array.new(rows.first.size, false) if rows.size.odd?
         rows.each_slice(2).map do |top, bottom|
-          line = top.zip(bottom).map { |t, b| t ? (b ? "█" : "▀") : (b ? "▄" : " ") }.join
+          line = top.zip(bottom).map do |t, b|
+            if t
+              b ? "█" : "▀"
+            else
+              (b ? "▄" : " ")
+            end
+          end.join
           color ? "#{COLORS}#{line}#{RESET}" : line
         end
       end

data/lib/samagotchi/web/server.rb

@@ -94,8 +94,12 @@ module Samagotchi
             puts lan_off_line(setting)
             return 0
           end
-          start(port: port, host: host, url: url, open_browser: open_browser, markdown: markdown, view: view,
-                annotate_presets: annotate_presets, lan: lan) ? 0 : 1
+          if start(port: port, host: host, url: url, open_browser: open_browser, markdown: markdown, view: view,
+                   annotate_presets: annotate_presets, lan: lan)
+            0
+          else
+            1
+          end
         end
       rescue Lan::Error => e
         warn "Error: #{e.message}"

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"
@@ -166,6 +167,7 @@ module Samagotchi
         # A session stopped before this worker took the lock (e.g. a stop
         # right after create) must not run its initial prompt.
         return :stopped if stopped_on_disk?
+
         # Plugins' slow setup (chi.init: an MCP server's first start), in
         # the background, shown by the UIs; a turn waits only for the ones
         # that bring tools.
@@ -483,15 +485,22 @@ module Samagotchi
     # queued while it ran are refused, then the caller's block takes the
     # result (or the error the Engine announced as :turn_failed), the
     # answer goes to the output file and the session is saved.
+    # A failure before the Engine's turn began (this save, say) goes to the
+    # block too, with no :turn_failed: it is logged, the session idle again.
     # @yieldparam result [Object, nil] Engine#run_turn's, nil on a failure
     # @yieldparam error [StandardError, nil]
     def run_engine_turn(prompt, **turn_args)
-      @session.status = Session::STATUS_RUNNING
-      @session.save(state_dir: @state_dir)
       begin
+        @session.status = Session::STATUS_RUNNING
+        @session.save(state_dir: @state_dir)
         result = @engine.run_turn(@session, prompt, pending_input: pending_input_drain, **turn_args)
       rescue StandardError => e
         error = e
+        # Still running: no turn of the Engine's ended (it never began).
+        if @session.status == Session::STATUS_RUNNING
+          @session.status = Session::STATUS_IDLE
+          Log.warn(:worker, "turn_not_begun", error: e.class.name, msg: e.message)
+        end
       ensure
         refuse_queued_commands
       end
@@ -563,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.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -9,20 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: reline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: reline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rqrcode_core
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: chi is an agent harness for local and OpenAI-compatible models (llama.cpp,
   mlx, oMLX, hosted APIs). It runs sessions in a terminal REPL or in background workers
   you can attach to from the terminal and a web UI, keeps memories in plain files
@@ -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