samagotchi 0.58.0 → 0.59.0

data/lib/samagotchi/tools/task_wait.rb

@@ -10,6 +10,9 @@ module Samagotchi
       TAIL_LINES_DEFAULT = 10
       TAIL_LINES_MAX = 100
       POLL_INTERVAL = 0.5
+      # A handed-over execute keeps stderr in a log of its own: at most this
+      # many of its last lines follow the output tail.
+      STDERR_TAIL_LINES_MAX = 10
 
       def self.name = NAME
 
@@ -41,7 +44,7 @@ module Samagotchi
 
           if completion_pattern
             output_tail = output_tail(record, tail_lines)
-            return format_response(record, wait_result: "pattern_matched", output_tail: output_tail) if completion_pattern.match?(output_tail)
+            return format_response(record, wait_result: "pattern_matched", output_tail: output_tail, tail_lines: tail_lines) if completion_pattern.match?(output_tail)
           end
 
           return cancelled_response(task_id, tail_lines, started) if cancelled.call
@@ -55,7 +58,7 @@ module Samagotchi
         refreshed, = TaskRuntime.get_record(task_id)
         return finished_response(refreshed, tail_lines) unless refreshed.fetch("status") == "running"
 
-        format_response(refreshed, wait_result: "timeout", output_tail: output_tail(refreshed, tail_lines))
+        format_response(refreshed, wait_result: "timeout", output_tail: output_tail(refreshed, tail_lines), tail_lines: tail_lines)
       rescue StandardError => e
         "Error: #{e.message}"
       end
@@ -72,7 +75,8 @@ module Samagotchi
           "  To keep waiting: task_wait #{task_id}. If it is stuck or no longer needed: task_stop #{task_id}.",
           "waited: #{(monotonic_time - started).round}s"
         ]
-        format_response(record, wait_result: "canceled", output_tail: output_tail(record, tail_lines), extra: note)
+        format_response(record, wait_result: "canceled", output_tail: output_tail(record, tail_lines), tail_lines: tail_lines,
+                                extra: note)
       end
       private_class_method :cancelled_response
 
@@ -81,7 +85,8 @@ module Samagotchi
       def self.finished_response(record, tail_lines)
         return format_response(record) unless TaskRuntime.stopped_by_user?(record)
 
-        format_response(record, output_tail: output_tail(record, tail_lines), extra: [TaskRuntime::USER_STOP_NOTE])
+        format_response(record, output_tail: output_tail(record, tail_lines), tail_lines: tail_lines,
+                               extra: [TaskRuntime::USER_STOP_NOTE])
       end
       private_class_method :finished_response
 
@@ -90,7 +95,17 @@ module Samagotchi
       end
       private_class_method :output_tail
 
-      def self.format_response(record, wait_result: nil, output_tail: nil, extra: [])
+      # The last lines of a handed-over execute's stderr log (stderr_path),
+      # "" for a task_create task (one log) or an empty stderr.
+      def self.stderr_tail(record, tail_lines)
+        path = record["stderr_path"]
+        return "" if path.to_s.empty? || tail_lines.nil?
+
+        TaskRuntime.output_tail_lines(path, [tail_lines, STDERR_TAIL_LINES_MAX].min)
+      end
+      private_class_method :stderr_tail
+
+      def self.format_response(record, wait_result: nil, output_tail: nil, tail_lines: nil, extra: [])
         lines = [
           "task_id: #{record.fetch("id")}",
           "status: #{record.fetch("status")}",
@@ -98,12 +113,15 @@ module Samagotchi
           "stop_reason: #{record["stop_reason"]}",
           "output_path: #{record.fetch("output_path")}"
         ]
+        lines << "stderr_path: #{record["stderr_path"]}" if record["stderr_path"]
         return lines.join("\n") unless output_tail
 
         lines << "wait_result: #{wait_result}" if wait_result
         lines.concat(extra)
         lines << "output_tail:"
         lines << output_tail.rstrip unless output_tail.empty?
+        stderr_tail = stderr_tail(record, tail_lines)
+        lines.concat(["stderr_tail:", stderr_tail.rstrip]) unless stderr_tail.empty?
         lines.join("\n")
       end
       private_class_method :format_response

data/lib/samagotchi/utf8_default.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  # chi's files (memories, AGENT.md, sessions, config.yml) are UTF-8,
+  # chi's files (memories, AGENTS.md, sessions, config.yml) are UTF-8,
   # whatever the locale. Under LC_ALL=C (or with no locale at all: an app
   # started from Finder or launchd, `env -i`) Ruby reads files as US-ASCII,
   # and a UTF-8 memory index then breaks the system prompt

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.58.0"
+  VERSION = "0.59.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

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

@@ -67,8 +67,10 @@ export function readLinesHtml(row) {
   const first = numbered[0].line;
   const last = numbered.at(-1).line;
   const label = first === last ? `line ${first}` : `lines ${first}–${last}`;
+  // A blank line of the file holds no text, only a <br>: an empty block
+  // drops out of a copied selection, a space would be copied as one.
   const spans = lines.map(({ text, line }) => line === null
     ? `<span class="read-line read-meta">${escapeHtml(text)}</span>`
-    : `<span class="read-line" data-line="${line}">${escapeHtml(text) || " "}</span>`).join("");
+    : `<span class="read-line" data-line="${line}">${escapeHtml(text) || "<br>"}</span>`).join("");
   return `<details class="activity-read"><summary>${label}</summary><pre class="read-lines"><code>${spans}</code></pre></details>`;
 }

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

@@ -22,10 +22,30 @@ export function stopTarget(row, features) {
 // A task_wait row's title without its wait ("npm test · up to 600s").
 const WAIT_SUFFIX = / · up to \d+s$/;
 
-// The command a task_create of this turn started +taskId+ with (its row's
-// view), else a task_wait row's title for it (the server titles one by its
-// task's command, also for a task from an earlier turn: ToolActivity.
-// task_title), or null.
+// The first line of an execute that was still running at its limit and
+// went on as a task (Tools::Execute::HANDED_OVER), then its task_id line.
+// Anchored at the start, an optional "ran as: …" line and "[execute]" lead
+// before it: a "task_id:" line anywhere else is the command's own output.
+// The twin of TaskRuntime.handed_over_id.
+const HANDED_OVER = /^(?:ran as: [^\n]*\n)?(?:\[execute\]\n)?Still running at the \d+s limit:[^\n]*\ntask_id: (\S+)/;
+
+// The task id an execute row's output hands over, else null.
+export function handedOverId(output) {
+  return HANDED_OVER.exec(output || "")?.[1] || null;
+}
+
+// The task id a row of this turn started: a task_create's, or an execute's
+// hand-over (handedOverId); else null.
+function startedId(row) {
+  if (row.tool === "execute") return handedOverId(row.output);
+  if (row.tool !== "task_create") return null;
+  return /(?:^|\n)task_id: (\S+)/.exec(row.output || "")?.[1] || null;
+}
+
+// The command a task_create or a handed-over execute of this turn started
+// +taskId+ with (its row's view), else a task_wait row's title for it (the
+// server titles one by its task's command, also for a task from an earlier
+// turn: ToolActivity.task_title), or null.
 export function taskCommand(gens, taskId) {
   let titled = null;
   for (const gen of gens || []) {
@@ -33,9 +53,7 @@ export function taskCommand(gens, taskId) {
       if (row.tool === "task_wait" && row.view?.task_id === taskId && row.title) {
         titled ||= row.title.replace(WAIT_SUFFIX, "");
       }
-      if (row.tool !== "task_create") continue;
-      const id = /(?:^|\n)task_id: (\S+)/.exec(row.output || "")?.[1];
-      if (id === taskId) return row.view?.command || null;
+      if (startedId(row) === taskId) return row.view?.command || null;
     }
   }
   return titled;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -430,6 +430,7 @@ files:
 - lib/samagotchi/setting_explained.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
+- lib/samagotchi/steer_cut_after.rb
 - lib/samagotchi/system_prompt.rb
 - lib/samagotchi/terminal_ui.rb
 - lib/samagotchi/terminal_ui/attach_launcher.rb