samagotchi 0.95.0 → 0.97.0

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

@@ -0,0 +1,86 @@
+// The info bar's ✎ (Rename this session): a small input in its place,
+// prefilled with the session's title ("" for none). Enter sends
+// `/title TEXT` (blank: `/title --clear`) through the chips' command path
+// (composer.js run: the reply shows as a command bubble, a refusal in the
+// failed bubble, the composer untouched); leaving the field saves the same
+// way (a phone's keyboard dismissed keeps what was typed). Esc, or opening
+// another session, closes it unsent. The cards follow from the saved file
+// (the hub's scan), as for any title.
+import { normalize } from "./format.js";
+
+// As long as a title may be (TitleCommand::LIMIT).
+const TITLE_CHARS = 80;
+
+// The line the input's +text+ sends.
+export function titleLine(text) {
+  const title = normalize(text);
+  return title ? `/title ${title}` : "/title --clear";
+}
+
+// @param button the ✎ button (it hides while the input shows)
+// @param session () => the open session's id, or null
+// @param titleOf (id) => that session's title, or null
+// @param run (line) => composer.js run's promise
+export function createRename({ button, session, titleOf, run }) {
+  let input = null;
+  let openFor = null;
+
+  function close() {
+    if (!input) return;
+    const el = input;
+    input = null;
+    openFor = null;
+    el.remove();
+    button.hidden = false;
+  }
+
+  // Enter's and blur's: once (closing it blurs it again), and only to the
+  // session it was opened for.
+  function submit() {
+    if (!input) return null;
+    const id = openFor;
+    const before = normalize(input.dataset.before);
+    const text = input.value;
+    close();
+    if (!id || session() !== id || normalize(text) === before) return null;
+    return run(titleLine(text));
+  }
+
+  function open() {
+    const id = session();
+    if (input || !id) return;
+    const el = document.createElement("input");
+    el.type = "text";
+    el.className = "rename-input";
+    el.maxLength = TITLE_CHARS;
+    el.placeholder = "Session title";
+    el.setAttribute("aria-label", "Session title (Enter saves, empty clears, Esc cancels)");
+    el.value = titleOf(id) || "";
+    el.dataset.before = el.value;
+    el.addEventListener("keydown", (e) => {
+      if (e.key === "Enter") {
+        e.preventDefault();
+        submit();
+      } else if (e.key === "Escape") {
+        e.preventDefault();
+        close();
+      }
+    });
+    el.addEventListener("blur", () => submit());
+    input = el;
+    openFor = id;
+    button.hidden = true;
+    button.after(el);
+    el.focus();
+    el.select();
+  }
+
+  // The info bar redrew for +id+ (app.js updateInfoBar): an input opened
+  // for another session closes.
+  function follow(id) {
+    if (input && openFor !== id) close();
+  }
+
+  button.addEventListener("click", () => open());
+  return { open, close, follow, isOpen: () => !!input };
+}

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

@@ -118,10 +118,12 @@ export function sessionStateFrom(data) {
   return state;
 }
 
-// The info bar's title: the first user message when the payload has
-// messages, else the card's preview, else the first prompt of its history.
+// The info bar's title: the session's own title (/title), else the first
+// user message when the payload has messages, else the card's preview, else
+// the first prompt of its history.
 function sessionFirstPreview(data) {
   const s = data.session;
+  if (s.title) return firstPreview(s.title);
   let preview = s.first_preview || previewForCard(s);
   if (data.messages && data.messages.length) {
     const first = data.messages.find((m) => m.role === "user");

data/lib/samagotchi/web/session_summary.rb

@@ -67,6 +67,9 @@ module Samagotchi
           # chain), else nil: the lists draw chains from it.
           continues: session.continues,
           first_preview: first_preview_for(session),
+          # The session's own name (/title), else nil: the pages show it in
+          # place of the first message.
+          title: session.title,
           owner: owner&.kind,
           # The saved recap's first sentence, for the session card.
           recap: RecapStore.preview(session_dir),

data/lib/samagotchi/worker.rb

@@ -237,6 +237,7 @@ module Samagotchi
       @config_restart_unsubscribe = ConfigFile.watch_restart_settings!(process: :worker) do |message|
         @engine.announce(type: :hook_notice, hook: "config", text: message, level: :warn, between_turns: true)
       end
+      prune_tombstones
       settle_interrupted_turn
       # Before the Bridge serves anything: a UI joining a resumed worker's
       # stream gets the session's history and status in its snapshot, not
@@ -491,6 +492,15 @@ module Samagotchi
       save_or_log(:interrupted_turn) { save_session }
     end
 
+    # The per-input tombstones (removed, settled) older than
+    # SessionInbox::TOMBSTONE_MAX_AGE, once per worker start: they only go
+    # with the session dir otherwise.
+    def prune_tombstones
+      removed = SessionInbox.prune_removed(@session_dir)
+      settled = TurnCheckpoint.prune_settled(@session_dir)
+      Log.info(:worker, "tombstones_pruned", removed: removed, settled: settled) if (removed + settled).positive?
+    end
+
     # A saved parent_answers that isn't a level reads as hard on every
     # answer without a word; said once here, as the session loads.
     def announce_session_warnings
@@ -933,8 +943,11 @@ module Samagotchi
     # finishes) comes after its command_queued. The cards it shows go out at
     # once (btw's "thinking…" card), after its command_queued, which the
     # UIs draw its line at (Engine#running_anytime). Its handler reads
-    # copies (ctx.messages) and shows things through ctx only; nothing is
-    # saved.
+    # copies (ctx.messages) and shows things through ctx only. One saves:
+    # /title, a field no turn writes, through Session#save, which takes the
+    # session's lock and writes a running turn's checkpoint (as
+    # WorkerSignals' save off the turn thread does), so the turn's own saves
+    # keep it.
     def start_anytime_command(command)
       @engine.spawn_anytime do
         result = command_result(command) { @engine.running_anytime { @commands.run(command.line, confirm: confirm?(command)) } }
@@ -955,6 +968,8 @@ module Samagotchi
       event = { type: :command_ran, **command.event_fields, status: status, output: text[0, COMMAND_OUTPUT_LIMIT],
                 changed: changed.map(&:to_s), model_name: @engine.effective_model_name }
       event[:anytime] = true if anytime
+      # The session's title after /title (nil: cleared), for the TUIs' row.
+      event[:title] = @engine.session&.title if changed.include?(:title)
       # Its line was shown at its command_queued (waits: turn_end).
       event[:queued] = true if command.waits_for_turn_end?
       # The chips the command moved (SessionSetting#changed_by): what the next
@@ -1256,12 +1271,14 @@ module Samagotchi
       # The Bridge serves before the idle-exit policy exists.
       return WorkerIdleExit::Hold.new(reason: :starting) unless @idle_exit
 
-      hold = restart ? @idle_exit.hold_for_restart : @idle_exit.hold_for_request(requester: client_id)
-      if hold == :background_tasks && !restart
-        # /exit names the tasks it waits for (D3).
-        return WorkerIdleExit::Hold.new(reason: hold, tasks: @task_wakes.watch.running, hint: TASK_STOP_HINT)
+      if restart
+        hold = @idle_exit.hold_for_restart
+        return WorkerIdleExit::Hold.new(reason: hold) if hold
+      else
+        # /exit names the tasks it waits for (D3), from the one look that found them.
+        hold = @idle_exit.request_hold(requester: client_id, hint: TASK_STOP_HINT)
+        return hold if hold
       end
-      return WorkerIdleExit::Hold.new(reason: hold) if hold
 
       @exit_requested = true
       @exit_requested_by = client_id

data/lib/samagotchi/worker_idle_exit.rb

@@ -94,15 +94,23 @@ module Samagotchi
     #   still be open, untagged)
     # @return [Symbol, nil] :turn_running, :input_queued, :continue_offered,
     #   :client_connected, :reminders or :background_tasks
-    def hold_for_request(requester:, streams: true)
-      return :turn_running if @engine.turn_running?
-      return :input_queued if @input_pending.call
-      return :continue_offered if @awaiting_continue.call
-      return :client_connected if streams && @bridge && @bridge.open_streams_except(requester).positive?
-      return :reminders if @engine.reminder_store&.any?
-      return :background_tasks if @watched_running.call.any?
+    def hold_for_request(requester:, streams: true) = request_hold(requester: requester, streams: streams)&.reason
 
-      nil
+    # #hold_for_request as a Hold: for :background_tasks, the watched tasks
+    # still running, read once (TaskWatch#running looks at each task's
+    # process), with +hint+.
+    # @return [Hold, nil]
+    def request_hold(requester:, streams: true, hint: nil)
+      reason = if @engine.turn_running? then :turn_running
+               elsif @input_pending.call then :input_queued
+               elsif @awaiting_continue.call then :continue_offered
+               elsif streams && @bridge && @bridge.open_streams_except(requester).positive? then :client_connected
+               elsif @engine.reminder_store&.any? then :reminders
+               end
+      return Hold.new(reason: reason) if reason
+
+      running = @watched_running.call
+      running.any? ? Hold.new(reason: :background_tasks, tasks: running, hint: hint) : nil
     end
 
     # What keeps the worker from restarting now (a client asked: POST /exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.95.0
+  version: 0.97.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -437,6 +437,7 @@ files:
 - lib/samagotchi/memory_bundle/system_bundle.rb
 - lib/samagotchi/memory_bundle/trash.rb
 - lib/samagotchi/memory_bundle/uninstaller.rb
+- lib/samagotchi/memory_command.rb
 - lib/samagotchi/memory_paths.rb
 - lib/samagotchi/message_parts.rb
 - lib/samagotchi/model_catalog.rb
@@ -582,6 +583,7 @@ files:
 - lib/samagotchi/thinking_tails.rb
 - lib/samagotchi/thinking_ticker.rb
 - lib/samagotchi/thought_stream_splitter.rb
+- lib/samagotchi/title_command.rb
 - lib/samagotchi/token_usage.rb
 - lib/samagotchi/tool_activity.rb
 - lib/samagotchi/tool_call_parser.rb
@@ -717,6 +719,7 @@ files:
 - lib/samagotchi/web/public/send_turn.js
 - lib/samagotchi/web/public/sentences.js
 - lib/samagotchi/web/public/session_actions.js
+- lib/samagotchi/web/public/session_rename.js
 - lib/samagotchi/web/public/session_state.js
 - lib/samagotchi/web/public/session_title.js
 - lib/samagotchi/web/public/sessions_list.js