samagotchi 0.58.0 → 0.60.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/turn_flow.rb

@@ -42,8 +42,9 @@ module Samagotchi
       [:invalid, nil]
     end
 
-    # @return [Hash, nil] the pending continue offer: {context:, no_interrupt:}
-    #   (context summarizes the interrupted turn for a "no, <reason>")
+    # @return [Hash, nil] the pending continue offer: {context:, no_interrupt:,
+    #   run_start:, model:} (context summarizes the interrupted turn for a
+    #   "no, <reason>"; run_start and model are #resume_from's)
     attr_reader :offer
 
     # How many times the conversation went back to a checkpoint (a failed
@@ -94,7 +95,11 @@ module Samagotchi
       end
 
       if result.resumable?
-        @offer = { context: interrupted_turn_context(result), no_interrupt: no_interrupt }
+        # A Continue that ran out again goes on from the run the chain
+        # started; any other turn's offer (a prompt's, a wake's) from its own.
+        run_start = (continue && resume_from) || result.run_start
+        @offer = { context: interrupted_turn_context(result), no_interrupt: no_interrupt, run_start: run_start,
+                   model: @engine.effective_model_name }
         :continue_offered
       else
         @offer = nil
@@ -143,6 +148,20 @@ module Samagotchi
       :restored
     end
 
+    # Where a Continue of the pending offer resumes: the run its turn (or
+    # the first turn of a chain of Continues) started (ModelResult#run_start),
+    # so the Continue keeps that run's reasoning (Engine#run_turn
+    # resume_from:). nil with no offer, and after a model change while the
+    # offer stands: another model's reasoning isn't replayed, the Continue
+    # starts cold. A cancelled or failed Continue keeps the offer, and so
+    # this; every way the offer goes takes it along.
+    # @return [Integer, nil]
+    def resume_from
+      return nil unless @offer && @offer[:model] == @engine.effective_model_name
+
+      @offer[:run_start]
+    end
+
     # Answer the offer with no (Stop): the interrupted turn stays, as
     # after a Ctrl-C or a new prompt (!rollback still erases it), and the
     # model reads that it wasn't continued: a note, or the user's reason

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.60.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/web/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><linearGradient id="g" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#7aa5ff"/><stop offset="1" stop-color="#8957e5"/></linearGradient></defs><rect x="1" y="1" width="30" height="30" rx="7.5" fill="url(#g)"/><g fill="none" stroke="#fff" stroke-width="3.2" stroke-linecap="round" stroke-linejoin="round"><path d="M7.8 9.6c2.3-1.3 4-.7 5.2 1.4l6 10.1c1.2 2.1 2.9 2.7 5.2 1.4"/><path d="M22.6 9.2 9.4 22.8"/></g></svg>

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

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Chi</title>
+<link rel="icon" href="/assets/favicon.svg" type="image/svg+xml">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <style>
 :root{color-scheme:dark;--bg:#0b0d11;--bg-panel:#151821;--bg-inset:#0f1115;--bg-raised:#22262f;--bg-hover:#1b1f27;--border:#1f232b;--border-strong:#2d333f;--text:#e6e8eb;--text-bright:#f0f3f6;--text-2:#c9d1d9;--text-3:#9aa4b2;--text-muted:#8b949e;--text-faint:#6e7681;--accent:#7aa5ff;--accent-strong:#1f6feb;--accent-bg:#1b2336;--accent-ring:rgba(122,165,255,.18);--primary:#2a68d1;--ok:#3fb950;--ok-text:#7ee787;--ok-bg:#1a2e1a;--warn:#d29922;--warn-text:#e3b341;--warn-bright:#f2cc60;--warn-bg:#2b2108;--warn-border:#6b5416;--danger:#f85149;--danger-bg:#da3633;--danger-text:#ff7b72;--danger-bg-dim:#3d1f1f;--think:#8957e5;--think-text:#d2a8ff;--accent-border:#223150;--pick-border:#79c0ff;--accent-tint:color-mix(in srgb,var(--accent) 7%,transparent);--narr:color-mix(in srgb,var(--accent) 38%,var(--text-muted));

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/refs.js

@@ -6,6 +6,11 @@
 // an answer or a step's text (ref_scan.js; a link whose text is one too).
 // The DOM carries data-ref-kind and the target's attributes, never what a
 // click does: those are the ref's targets, kept per kind in REF_ACTIONS.
+// A plugin's ref (the server's Ref: {kind, target, label?, actions}) is
+// bound to its element by bindRef: its label and its URL actions live in a
+// WeakMap off the DOM, and refTarget reads them first. Its actions join the
+// kind's own (the `actions` entry); a kind the page has no table for runs
+// only those.
 // A plain click runs the first one available (the main target); a ref
 // with more shows a ▾ on hover that opens a menu of all of them
 // (ref_menu.js), and a tap opens it. A ref with a target is a tab stop
@@ -26,6 +31,55 @@ export function refAttrs(ref) {
   return ` data-ref-kind="${escapeHtml(ref.kind)}"${attr("path", ref.path)}${attr("line", ref.line)}${attr("end-line", ref.end_line)}`;
 }
 
+// A kind, as the server's Ref allows it (Ref::KIND).
+const KIND = /^[a-z][a-z0-9_-]{0,31}$/;
+
+// A plugin's ref data per element (bindRef): {kind, target, label,
+// actions}. A WeakMap, so a redrawn element takes its data with it.
+const REF_DATA = new WeakMap();
+
+// +url+ as the page opens it when it is an http(s) one, else null. The
+// server checks it too (Ref, RefAction); the page never opens another
+// scheme a plugin gave (javascript:, data:, an editor's).
+export function httpUrl(url) {
+  if (typeof url !== "string") return null;
+  try {
+    const parsed = new URL(url.trim());
+    return parsed.protocol === "http:" || parsed.protocol === "https:" ? parsed.href : null;
+  } catch {
+    return null;
+  }
+}
+
+// Makes +el+ the ref +ref+ (the server's Ref#to_h): the ref class and the
+// data attributes every ref carries (a file's path and lines, as refAttrs),
+// its label and its actions in the WeakMap. An action without an id, a
+// label or an http(s) URL is dropped; a kind the server's Ref refuses binds
+// nothing. A rebind replaces the target attributes. +el+, or null without one.
+export function bindRef(el, ref) {
+  if (!el) return null;
+  if (typeof ref?.kind !== "string" || !KIND.test(ref.kind)) return el;
+  const target = ref.target || {};
+  el.classList.add("ref");
+  el.dataset.refKind = ref.kind;
+  for (const [name, value] of [["refPath", target.path], ["refLine", target.line], ["refEndLine", target.end_line]]) {
+    if (value) el.dataset[name] = String(value);
+    else delete el.dataset[name];
+  }
+  const actions = (Array.isArray(ref.actions) ? ref.actions : []).flatMap((action) => {
+    const url = httpUrl(action?.url);
+    return url && action.id && action.label ? [{ id: String(action.id), label: String(action.label), url }] : [];
+  });
+  REF_DATA.set(el, { kind: ref.kind, target, label: ref.label || null, actions });
+  return el;
+}
+
+// The same URL either way (a link's href against an action's URL).
+function sameUrl(a, b) {
+  const url = httpUrl(a);
+  return !!url && url === httpUrl(b);
+}
+
 // The URL +template+ ({path}, {line}; web.editor) opens +path+ at +line+
 // (1 when none) with: each path segment encoded, the slashes kept. "" with
 // no template or path.
@@ -41,16 +95,38 @@ export function editorUrl(template, path, line) {
 // editorUrl}, the server's capabilities.editor and editor_url) and
 // +target+ (refTarget's). A secondary one (copy) joins a ref that has
 // another, never alone. A line (a diff or read line) has its click only.
+// A link whose text is the ref (github-pr's PR diff): its href stays the
+// plain click's, which the browser follows. Its label is the ref's action
+// with the same URL (the menu shows them once), else the old guess from
+// the URL (an old session's link has no ref data).
+const LINK = Object.freeze({
+  id: "link",
+  label: (target) => target.actions?.find((action) => sameUrl(action.url, target.href))?.label ||
+    (/\/pull\/\d+\/files\b/.test(target.href) ? "PR diff" : "Open link"),
+  available: (_viewer, target) => !!target.href,
+  run: (target, _viewer, env) => env.openLink(target.href),
+});
+
+// The ref's own actions (a plugin's, bindRef), one target each, for every
+// viewer (a URL opens on a phone too): a new tab with no opener and no
+// referrer. One with the link's URL, or an earlier one's, isn't repeated.
+// Not on a diff or read line (its click only), which shares its title's data.
+const URL_ACTIONS = Object.freeze({
+  id: "actions",
+  expand: (target) => (target.actions || [])
+    .filter((action, at, all) => !sameUrl(action.url, target.href) && all.findIndex((other) => sameUrl(other.url, action.url)) === at)
+    .map((action) => Object.freeze({
+      id: `url:${action.id}`,
+      label: () => action.label,
+      available: (_viewer, target) => !target.isLine,
+      run: (_target, _viewer, env) => env.openLink(action.url),
+      hint: () => action.url,
+    })),
+});
+
 export const REF_ACTIONS = Object.freeze({
   file: Object.freeze([
-    // A link whose text is the ref (github-pr's PR diff): its href stays
-    // the plain click's, which the browser follows.
-    Object.freeze({
-      id: "link",
-      label: (target) => (/\/pull\/\d+\/files\b/.test(target.href) ? "PR diff" : "Open link"),
-      available: (_viewer, target) => !!target.href,
-      run: (target, _viewer, env) => env.openLink(target.href),
-    }),
+    LINK,
     Object.freeze({
       id: "editor",
       label: () => "Open in editor",
@@ -63,6 +139,7 @@ export const REF_ACTIONS = Object.freeze({
       // The hover hint: it opens the file as it is now.
       hint: (target) => `Open the current file in your editor${target.line ? ` at line ${target.line}` : ""}`,
     }),
+    URL_ACTIONS,
     // The row that touched the file, in the turn: not for a row's own
     // title or lines (they are in the turn already).
     Object.freeze({
@@ -80,13 +157,18 @@ export const REF_ACTIONS = Object.freeze({
       run: (target, _viewer, env) => env.copy(target.path),
     }),
   ]),
+  // Any other kind (a plugin's issue, commit, …): its link, then its actions.
+  "*": Object.freeze([LINK, URL_ACTIONS]),
 });
 
 // The targets +viewer+ has for +target+ (refTarget's), in order; none
 // when only a secondary one is.
 export function refActions(target, viewer, actions = REF_ACTIONS) {
   if (!target) return [];
-  const found = (actions[target.kind] || []).filter((action) => action.available(viewer, target));
+  // Own keys only: a kind named like an Object property ("constructor") is
+  // any other kind.
+  const table = (Object.hasOwn(actions, target.kind) ? actions[target.kind] : actions["*"]) || [];
+  const found = table.flatMap((action) => (action.expand ? action.expand(target) : [action])).filter((action) => action.available(viewer, target));
   return found.some((action) => !action.secondary) ? found : [];
 }
 
@@ -97,8 +179,9 @@ const OWNERS = ".activity-row, .bubble.approval";
 // A line of the owner's file: a diff line, or a read row's numbered line.
 const LINES = ".diff-line[data-line], .read-line[data-line]";
 
-// What a click on +el+ points at: {kind, path, line, owner, el, isLine,
-// href} or null. A row title (or an approval card's path) opens its file
+// What a click on +el+ points at: {kind, path, id, label, actions, line,
+// owner, el, isLine, href} or null (+id+, +label+ and +actions+ a plugin's
+// ref's, bindRef: the WeakMap is read first). A row title (or an approval card's path) opens its file
 // at the lines the call named (an edit without any at its first changed
 // line); a diff line (or a hunk header) or a read row's numbered line, in
 // a row or a card with a ref, opens that file at that line. +el+ is the
@@ -109,7 +192,8 @@ export function refTarget(el) {
   if (title) {
     const owner = title.closest(OWNERS);
     const href = title.matches("a[href]") ? title.getAttribute("href") : null;
-    return { ...targetOf(title), line: Number(title.dataset.refLine) || firstChange(owner), owner: owner || title, el: title, isLine: false, href };
+    const own = targetOf(title);
+    return { ...own, line: own.line || firstChange(owner), owner: owner || title, el: title, isLine: false, href };
   }
   const diffLine = el?.closest?.(LINES);
   const owner = diffLine?.closest(OWNERS);
@@ -119,7 +203,13 @@ export function refTarget(el) {
 }
 
 function targetOf(el) {
-  return { kind: el.dataset.refKind, path: el.dataset.refPath || "" };
+  const data = REF_DATA.get(el);
+  if (!data) return { kind: el.dataset.refKind, path: el.dataset.refPath || "", line: Number(el.dataset.refLine) || null, id: null, label: null, actions: [] };
+  // Bound data is the whole ref: no fallback to the attributes.
+  const { target } = data;
+  return {
+    kind: data.kind, path: target.path || "", line: Number(target.line) || null, id: target.id ?? null, label: data.label, actions: data.actions,
+  };
 }
 
 // An edit/write without a line range opens at its first changed line (its
@@ -235,9 +325,11 @@ function defaultOpen(url) {
   else window.location.href = url;
 }
 
-// A link ref's href from the menu: a new tab, as the answer's links open.
+// A link ref's href or a ref's URL action: a new tab, as the answer's
+// links open, with no opener and no referrer (the page's LAN URL and
+// session id stay here).
 function defaultOpenLink(href) {
-  window.open(href, "_blank", "noopener");
+  window.open(href, "_blank", "noopener,noreferrer");
 }
 
 // One delegated listener set on +root+ for every ref on the page.

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;

data/lib/samagotchi/worker.rb

@@ -367,6 +367,7 @@ module Samagotchi
         # (re)spawn.
         memories: @session.preloaded_memory_names,
         muted_memories: @session.muted_memory_names,
+        appended_prompt_files: @session.appended_prompt_files,
         reminders: {
           callback: lambda { |due_names|
             # A reminder is due: the loop runs a reminder turn for it once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -178,6 +178,8 @@ files:
 - lib/samagotchi/broadcast_command.rb
 - lib/samagotchi/bundle_command.rb
 - lib/samagotchi/bundle_needs.rb
+- lib/samagotchi/bundles/agents-md/manifest.yml
+- lib/samagotchi/bundles/agents-md/plugin.rb
 - lib/samagotchi/bundles/btw/manifest.yml
 - lib/samagotchi/bundles/btw/plugin.rb
 - lib/samagotchi/bundles/check-in/manifest.yml
@@ -392,6 +394,7 @@ files:
 - lib/samagotchi/process_group.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
+- lib/samagotchi/prompt_files.rb
 - lib/samagotchi/prompt_history.rb
 - lib/samagotchi/prompt_literal_guard.rb
 - lib/samagotchi/prompt_note.rb
@@ -403,6 +406,7 @@ files:
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/redacted_inspect.rb
+- lib/samagotchi/ref.rb
 - lib/samagotchi/relay.rb
 - lib/samagotchi/relay_desk.rb
 - lib/samagotchi/relay_verifier.rb
@@ -430,6 +434,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
@@ -541,6 +546,7 @@ files:
 - lib/samagotchi/web/public/data.js
 - lib/samagotchi/web/public/diff_view.js
 - lib/samagotchi/web/public/families_view.js
+- lib/samagotchi/web/public/favicon.svg
 - lib/samagotchi/web/public/format.js
 - lib/samagotchi/web/public/hold.js
 - lib/samagotchi/web/public/images.js