samagotchi 0.41.0 → 0.43.0

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

@@ -11,7 +11,7 @@
 // removed at the end: the answer bubble takes its place.
 import { leavesBlock } from "./card.js";
 import { copySourceAttr } from "./copy.js";
-import { escapeHtml, messageBodyHtml, noteHtml, normalize, sourceLabel, steerRowHtml } from "./format.js";
+import { escapeHtml, failedTurnText, messageBodyHtml, noteHtml, normalize, sourceLabel, steerRowHtml } from "./format.js";
 import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
 import { hookNoticeLabel } from "./turn_events.js";
@@ -701,6 +701,17 @@ function setLabel(summary, gen) {
   summary.innerHTML = html;
 }
 
+// A re-rendered failed turn's line (a .bubble.cancel, as live's
+// addEndBubble), in turn_failed's words (failedTurnText) from what the turn
+// record kept of it (SessionMetrics' failure: summary, message,
+// error_class, kept_steps); "" for any other record, or a failed one saved
+// before records kept that.
+function failedLineHtml(record) {
+  const failure = record?.status === "failed" ? record.failure : null;
+  if (!failure || typeof failure !== "object") return "";
+  return `<div class="bubble cancel">${escapeHtml(failedTurnText(failure))}</div>`;
+}
+
 // A reloaded history in the turn view (renderHistory's object path): per
 // turn the prompt, a collapsed block of its steps when it had any (texts,
 // and with the server's parts the thinking, params and output, from the
@@ -789,8 +800,10 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     // timing after its prompt and steps, where the live view leaves it.
     else if (group.answer === null) parts.push(timingHtml(group));
     else parts.push(answerHtml(items[group.answer], timingHtml(group)));
-    // A canceled turn ends with its cancel line, as the live view left it.
+    // A canceled turn ends with its cancel line, a failed one whose steps
+    // stayed with its failure line, as the live view left them.
     parts.push(cancelLineHtml(group.record, escapeHtml));
+    parts.push(failedLineHtml(group.record));
     return parts.join("");
   }).join("");
 }

data/lib/samagotchi/web/session_summary.rb

@@ -47,6 +47,8 @@ module Samagotchi
           # The session's --memory and --mute lists (info-bar tooltip).
           preloaded_memory_names: Array(session.preloaded_memory_names),
           muted_memory_names: Array(session.muted_memory_names),
+          # The model notes its prompt carried (the info bar's notes chip).
+          prompt_notes: Array(session.prompt_notes).map(&:to_h),
           # The session that delegated this one (the `delegate` tool), else nil.
           parent_id: session.parent_id,
           # Started by the delegate tool (Session#delegate?); a fork has a

data/lib/samagotchi/worker.rb

@@ -507,6 +507,7 @@ module Samagotchi
       @wakes.hand_over(reports)
       Log.info(:worker, "delegate_wake_turn", reports: reports.size, in_a_row: @wakes.count!)
       @turn_flow.before_prompt_turn
+      restores = @turn_flow.restores
       run_engine_turn(nil, continue: true, origin: reports.first.origin, max_iterations: IterationLimit.for) do |result, error|
         if error
           # Rolled back, the rings stay (settle_child_reports): the user's
@@ -519,6 +520,11 @@ module Samagotchi
           @wakes.pause!
         else
           @continue_offer.after_turn(result)
+          # Stopped before it got anywhere (a Stop or a before_turn hook's
+          # cancel before the model call) and restored: its rings stay, and
+          # wait for the user's next message as after a failure, rather
+          # than waking again at once.
+          @wakes.pause! if result.canceled? && @turn_flow.restores != restores
         end
       end
       true
@@ -656,6 +662,7 @@ module Samagotchi
       # a fresh worker's first), so the list is this turn's from the start.
       @merged_this_turn = []
       @reporting_turn = reports_to_parent?(turn_args[:origin])
+      restores = @turn_flow.restores
       begin
         @session.status = Session::STATUS_RUNNING
         @session.save(state_dir: @state_dir)
@@ -682,15 +689,20 @@ module Samagotchi
         SessionInbox.write_output(@session_dir, response)
       end
       save_or_log(:turn) { save_session }
-      # A failed turn whose work stayed (TurnFlow#prompt_turn_failed) read
-      # the reports it merged, as a turn that ended does.
-      settle_child_reports(rolled_back: error && !LLM::FailedTurn.kept_steps(error))
+      # The reports the turn merged were read unless its end took the turn
+      # back out of the conversation (TurnFlow restored a checkpoint: a
+      # failed prompt or wake turn that got nowhere, a canceled continue
+      # turn). A failed turn whose work stayed, and a reminder or continue
+      # turn that failed (kept with its failed note), read them.
+      settle_child_reports(rolled_back: @turn_flow.restores != restores)
       ring_parent_after_turn
     end
 
     # The delegate reports this turn took: a kept turn moves the cursors on
     # and deletes their rings; a rolled-back one leaves the rings for the
-    # next turn.
+    # next turn. Once either way: the model reads a report in the
+    # conversation, or the next turn brings it (unless a later !rollback
+    # erases a kept turn, which drops what it read).
     def settle_child_reports(rolled_back:)
       rolled_back ? @child_reports.release : @child_reports.commit
     end

data/lib/samagotchi/worker_wakes.rb

@@ -73,7 +73,8 @@ module Samagotchi
     # A wake turn starts. @return [Integer] the wake turns in a row now
     def count! = @in_a_row += 1
 
-    # A wake turn failed: none starts again until a human's input.
+    # A wake turn failed (or was stopped before it got anywhere): none
+    # starts again until a human's input.
     def pause!
       @paused = true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -373,6 +373,7 @@ files:
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_history.rb
 - lib/samagotchi/prompt_literal_guard.rb
+- lib/samagotchi/prompt_note.rb
 - lib/samagotchi/prompt_warmup.rb
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/recap_setup.rb