samagotchi 0.108.0 → 0.110.0

data/lib/samagotchi/terminal_ui.rb

@@ -30,6 +30,7 @@ require_relative "terminal_ui/attached_view"
 require_relative "terminal_ui/between_turns"
 require_relative "terminal_ui/event_renderer"
 require_relative "terminal_ui/formatting"
+require_relative "terminal_ui/gap_clock"
 require_relative "terminal_ui/input_support"
 require_relative "terminal_ui/image_input"
 require_relative "terminal_ui/plain_surface"
@@ -114,7 +115,8 @@ module Samagotchi
     #   +toolkit_flags+ then)
     def initialize(prompt: nil, client: nil, host_registry: nil, profile: nil, session_id: nil, no_interrupt: false, no_default_input: false, model_name: nil, memories: [], muted_memories: [], non_interactive: false, surface: nil,
                    spinner_tick_interval: AttachedView::TICK_INTERVAL, spinner_clock: nil, scratch: false, llm_context: {}, thinking: nil,
-                   appended_prompt_files: [], toolkit: nil, toolkit_flags: [], settings: nil, parent_answers: nil)
+                   appended_prompt_files: [], toolkit: nil, toolkit_flags: [], settings: nil, parent_answers: nil,
+                   now: -> { MessageTime.now })
       @scratch        = scratch
       @parent_answers = parent_answers
       @toolkit        = toolkit
@@ -190,8 +192,12 @@ module Samagotchi
       @renderer = EventRenderer.new(@view)
       # Cards, notices and a recap announced between turns, printed by the
       # main thread at the open prompt (#poll_input_with_reminder_check).
+      # The session's last activity, for the gap dividers (+now+: the wall
+      # clock, a Time).
+      @gaps = GapClock.new(now: now)
       @between_turns = BetweenTurns.new(surface: @surface, view: @view, renderer: @renderer,
-                                        turn_running: -> { @engine.turn_running? }, quiet: @non_interactive)
+                                        turn_running: -> { @engine.turn_running? }, quiet: @non_interactive,
+                                        gaps: @gaps)
       @render_event = ->(event) { handle_stream_event(event) }
       @engine = Engine.new(
         client: client,
@@ -213,7 +219,7 @@ module Samagotchi
             # When a reminder is due, queue a synthetic turn that
             # run_assist_loop checks before read_input. The synthetic turn
             # uses an empty prompt so the agent can see
-            # [SYSTEM: REMINDERS DUE] and act on them.
+            # [SYSTEM: REMINDERS DUE <local time>] and act on them.
             @engine.note_due_reminders(due_names)
           }
         }
@@ -593,7 +599,9 @@ module Samagotchi
         messages = ContextNote.with_system_head(session.messages.dup, system_message)
         banner("Resumed session: #{session.id}")
         saved = @engine.saved_recap
-        banner(recap_block(saved[:text], turns_since: saved[:turns_since])) if saved
+        banner(recap_block(saved[:text], turns_since: saved[:turns_since], at: saved[:created_at])) if saved
+        # The first prompt after a quiet gap has its divider.
+        @gaps.seed(session.messages, fallback: saved&.dig(:created_at))
       elsif @scratch
         messages = [system_message]
         banner("Scratch session: nothing is kept, it is deleted when you leave.")
@@ -721,6 +729,8 @@ module Samagotchi
     ensure
       @active_cancel_controller = nil
       @view.finish_thinking_spinner
+      # The turn's end is the last activity.
+      @gaps.touch
     end
 
     # How the REPL leaves its session once the loop ended (#run): :scratch
@@ -909,6 +919,9 @@ module Samagotchi
 
       @turn_flow.before_prompt_turn
       persist_recent_history(input)
+      # Off a live region (no echo seam) the divider comes here; after
+      # #gap_above_echo it marks none.
+      mark_activity
       begin
         # Engine#run_turn injects due reminders as a tail message, appends
         # the prompt, and renders through @renderer via on_event.
@@ -1051,6 +1064,7 @@ module Samagotchi
         sync_continue_slot(false)
         @surface.commit(QuestionSlot.continue_summary("(dropped: a reminder ran)", paint: method(:paint)))
       end
+      mark_activity
       @surface.commit(reminder_line(names))
       hint = "#{reminder_line(names)} · Ctrl-C cancels it"
       @surface.set_slot(:hints, [color_output? ? paint(hint, 90) : hint])
@@ -1147,13 +1161,34 @@ module Samagotchi
     # a question's ? prompt. +prefill+ is typed in first.
     def read_repl_line(prompt, prefill)
       queue_input_prefill(prefill) if prefill
-      return read_prompt_line(prompt) if prompt == paint("> ", 92)
+      return RelineSeam.echo_above(method(:gap_above_echo)) { read_prompt_line(prompt) } if prompt == paint("> ", 92)
 
       read = -> { with_next_input_prefill { Reline.readline(prompt, true) }&.strip }
       # A question's answer leaves only its summary line.
       prompt == paint(QUESTION_PROMPT, 33) ? RelineSeam.without_echo(&read) : read.call
     end
 
+    # Activity starts now: a gap's divider first when one passed since the
+    # last (none while a turn runs: a steer is no gap; none in a
+    # --non-interactive run, whose stdout is the answer's alone).
+    def mark_activity
+      line = @gaps.divider(quiet: @non_interactive || @engine.turn_running?)
+      @surface.commit(gap_divider(line)) if line
+    end
+
+    # The divider above a typed line's echo (RelineSeam.echo_above, on the
+    # reader thread): a prompt typed at the idle prompt after a quiet gap.
+    # It marks the activity, so #run_input_line marks none.
+    def gap_above_echo(text)
+      return nil if @engine.turn_running? || @turn_flow.awaiting_continue?
+
+      route = ComposerRoute.call(text.to_s.strip, running: false, registry: command_registry)
+      return nil unless %i[prompt deliver].include?(route.kind)
+
+      line = @gaps.divider
+      line && gap_divider(line)
+    end
+
     # Lines come from a pipe or a file (`chi -p X </dev/null`, `echo … | chi`),
     # not a terminal: no prompt is restored for a retry.
     def piped_input? = !$stdin.tty?

data/lib/samagotchi/tool_activity.rb

@@ -43,6 +43,17 @@ module Samagotchi
     # Without a "[tool]" lead (an older or hand-made output) it stays as it is.
     def saved_result_text(output) = output.to_s.sub(SAVED_LEAD, "")
 
+    # A call the guardrails denied, as its saved text reads after the
+    # "[tool]" lead (ToolRunner#denied, Guardrails::Verdict#deny_text): a
+    # rule's or hook's deny, a legacy hook veto, or the user declining (or
+    # cancelling) the approval.
+    GUARDRAIL_DENIED = /\AError: (?:(?:denied|blocked) by guardrail\b|The (?:user declined this call|approval was cancelled)\b.*? It needed approval \()/m
+
+    # Whether a saved result text (#saved_result_text) is a guardrail's
+    # deny: "blocked" as live (its activity's status), not "error", for a
+    # call with no saved tool record.
+    def guardrail_denied?(text) = text.to_s.scrub.match?(GUARDRAIL_DENIED)
+
     # @param registry [Tools::Registry, nil] the session's tools
     # @param cwd [String, nil] what a file tool's title is relative to (the
     #   worker runs in its session's working directory)

data/lib/samagotchi/turn_checkpoint.rb

@@ -7,6 +7,7 @@ require_relative "atomic_file"
 require_relative "interrupted_turn"
 require_relative "last_turn"
 require_relative "log"
+require_relative "message_time"
 require_relative "session"
 require_relative "session_inbox"
 require_relative "steer"
@@ -181,7 +182,9 @@ module Samagotchi
       @written_at = nil
       @started_at = Time.now.iso8601(3)
       messages = Array(@session.messages).dup
-      messages << { role: "user", content: prompt, **author } unless prompt.to_s.empty?
+      # Stamped by the wall clock here, a moment before the turn's own
+      # stamp (Engine's Turn#wall), which the turn's first boundary saves.
+      messages << { role: "user", content: prompt, **author, MessageTime::KEY => MessageTime.iso(MessageTime.now) } unless prompt.to_s.empty?
       @session.turn_checkpoint = { messages: messages, marker: InterruptedTurn.new(started_at: @started_at, at: @started_at, iteration: 0,
                                                                                    enqueued_id: @enqueued_id) }
     end
@@ -202,6 +205,8 @@ module Samagotchi
       return false unless conversation
 
       @boundaries += 1
+      # The merge's stamps are this copy's own; Steer.inject! stamps the
+      # live merge a moment later.
       merged = merging.empty? ? [] : Steer.merge(merging).messages
       # One level deep: the loop may edit an entry in place later (a
       # forget stub) while a save on another thread serializes this one.

data/lib/samagotchi/version.rb

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