samagotchi 0.121.1 → 0.122.0

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

@@ -160,9 +160,9 @@ export function createBubbles({
   // The bubble a reload draws (turn_html.js), with this page's own fields.
   // +delivery+: how it went into a running turn (next_step, cut, queue): its
   // queued badge says what it waits for.
-  function makeUserBubble(prompt, { state = null, label = null, enqueuedId = null, own = false, images = null, delivery = null, author = null } = {}) {
+  function makeUserBubble(prompt, { state = null, label = null, enqueuedId = null, own = false, images = null, delivery = null, author = null, turnId = null } = {}) {
     removeHint();
-    const div = elementOf(userBubbleTemplate({ content: prompt }, {
+    const div = elementOf(userBubbleTemplate({ content: prompt, turn_id: turnId }, {
       label, state, own, enqueuedId, delivery, author, key: normalize(prompt), thumbs: thumbsTemplate(selected(), images),
     }));
     return placeFollowing(div);
@@ -224,6 +224,7 @@ export function createBubbles({
         else liveTurn.unmatchedMerge = true;
       }
     }
+    if (started && event.type === "turn_started" && event.turn_id) started.dataset.turnId = event.turn_id;
     return started;
   }
 

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

@@ -277,6 +277,7 @@ function messageNode(message) {
   const when = fullTime(message.at);
   if (when) node.title = when;
   if (user) {
+    if (message.turn_id) node.dataset.turnId = message.turn_id;
     node.style.setProperty("--author-color", authorColor(message.author));
     // Whose it is, for an annotation's label (participant_annotate.js).
     Object.assign(node.dataset, messageAuthorData(message));
@@ -382,7 +383,7 @@ function currentTurnNodes() {
   const nodes = [];
   if (turn.prompt !== undefined || turn.automatic) {
     nodes.push(messageNode({ role: "user", content: turn.automatic ? "An automatic turn" : turn.prompt, author: turn.author,
-      author_name: turn.author_name, mine: turn.mine, automatic: turn.automatic, at: turn.at }));
+      author_name: turn.author_name, mine: turn.mine, automatic: turn.automatic, at: turn.at, turn_id: turn.turn_id }));
   }
   const reply = el("div", "p-msg reply live");
   fillLive(reply, $("liveReply"));

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

@@ -360,11 +360,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], queued_
     // The run's cut wait (TurnAccumulator, as turn_started carried it): the
     // composer's delivery line reads it.
     const cutAfter = turn.cut_after != null ? { cut_after: turn.cut_after } : {};
+    const turnId = turn.turn_id ? { turn_id: turn.turn_id } : {};
     // A participant's turn names them (TurnAccumulator keeps author, author_name).
     const author = turn.author ? { author: turn.author, ...(turn.author_name ? { author_name: turn.author_name } : {}) } : {};
     // Its wall time (TurnAccumulator keeps turn_started's at): the gap divider before it.
     const at = typeof turn.at === "string" ? { at: turn.at } : {};
-    events.push(withImages({ type: "turn_started", prompt: turn.prompt, origin: turn.origin, continue: !!turn.continue, started_at, ...at, ...cutAfter, ...author }, turn.images));
+    events.push(withImages({ type: "turn_started", prompt: turn.prompt, origin: turn.origin, continue: !!turn.continue, started_at, ...at, ...cutAfter, ...turnId, ...author }, turn.images));
     let textIteration = null; // a text bubble is open for this iteration
     const closeText = () => {
       if (textIteration !== null) events.push({ type: "generation_completed" });

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

@@ -313,7 +313,7 @@ export function userBubbleTemplate(message, { label = null, state = null, step =
   const from = author
     ? html`<span class="origin-label author-badge" title=${authorBadgeTitle(author.name)} data-unnamed=${author.unnamed ? "1" : nothing}>${authorBadgeText(author.name)}</span>`
     : label ? html`<span class="origin-label">${label}</span>` : nothing;
-  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing}>${from}<div class="user-message">${userBodyTemplate(message?.content)}${thumbs}</div>${stateBadgeTemplate(named, delivery)}</div>`;
+  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-turn-id=${message?.turn_id || nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing}>${from}<div class="user-message">${userBodyTemplate(message?.content)}${thumbs}</div>${stateBadgeTemplate(named, delivery)}</div>`;
 }
 
 // The notice of a turn that ended with no answer (the server's

data/lib/samagotchi/web/server.rb

@@ -86,9 +86,9 @@ module Samagotchi
       def self.launch(port: nil, host: nil, scope: "project", start_dir: nil, open_browser: false, markdown: false,
                       view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default,
                       editor: Config::BY_KEY["web.editor"].default, new_token: false,
-                      working_set: Config::BY_KEY["web.working_set"].default, tunnel: nil)
+                      working_set: Config::BY_KEY["web.working_set"].default, tunnel: nil, start_dir_from: :flag)
         start_given = !start_dir.to_s.strip.empty?
-        start_dir = StartDir.resolve(start_dir)
+        start_dir = StartDir.resolve(start_dir, from: start_dir_from)
         rotate_token if new_token
         public_url = public_url_setting unless tunnel
         setting = host_setting(host)

data/lib/samagotchi/web/session_access_routes.rb

@@ -449,7 +449,7 @@ module Samagotchi
       # hint}: new text for the session's --push source (chi context push;
       # the fields as a source's JSON output gives them, checked the same
       # way). 200 {status: "pushed", name, before, revision, changed}; 404
-      # not_found (no such source); 409 not_push (a command source); 400
+      # context_missing (no such source); 409 not_push (a command source); 400
       # invalid_text.
       def handle_context_push(req, id, name)
         body = body_hash(req) or return error_response(400, "invalid_json", "invalid JSON body")
@@ -462,13 +462,13 @@ module Samagotchi
         end
         pushed = session_access.context_push(context_target(id), name, fetched)
         case pushed.status
-        when :missing then error_response(404, "not_found", "no source #{name[0, 40]}")
+        when :missing then error_response(404, "context_missing", "no source #{name[0, 40]}")
         when :not_push then error_response(409, "not_push", SessionAccess::ContextPush.not_push_message(name))
         else json_response(200, { status: "pushed", name: name, before: pushed.before, revision: pushed.revision,
                                   changed: pushed.before != pushed.revision })
         end
       rescue ContextSources::Invalid
-        error_response(404, "not_found", "no source #{name[0, 40]}")
+        error_response(404, "context_missing", "no source #{name[0, 40]}")
       end
 
       # The session as chi context's Target (SessionAccess::Local's context

data/lib/samagotchi/web/session_control.rb

@@ -423,7 +423,8 @@ module Samagotchi
       # the newest chi installed (SessionManager.restart_session). 200
       # {status: "restarted", session_id, from_version, version} (version nil:
       # the new worker is still starting; its bridge_up follows); 409
-      # {error: "held" | "not_running" | "unsupported" | "failed", reason, detail} in words; 409
+      # {error: "held" | "not_running" | "unsupported" | "failed", reason, detail} in words (a stopped
+      # worker: held, reason stopped, its pid); 409
       # owned_by_tui; 404.
       def handle_restart(_req, id)
         result = @manager.restart_session(id, state_dir: @state_dir, client_id: ClientId::WEB_RESTART)
@@ -432,7 +433,8 @@ module Samagotchi
                              version: result.version })
       rescue SessionManager::RestartRefused => e
         error = %i[not_running unsupported failed].include?(e.reason) ? e.reason.to_s : "held"
-        refusal_response(409, error, e, reason: e.reason.to_s, session_id: id, version: e.version)
+        refusal_response(409, error, e, reason: e.reason.to_s, session_id: id, version: e.version, holds: e.holds,
+                                         pid: e.pid)
       rescue SessionManager::OwnedByTUI => e
         owned_by_tui(e)
       end

data/lib/samagotchi/web/start_dir.rb

@@ -9,15 +9,20 @@ module Samagotchi
     module StartDir
       class Invalid < StandardError; end
 
+      # Where +given+ came from, as its error names it.
+      SOURCES = { flag: "--start-dir", config: "web.start_dir in config.yml" }.freeze
+
       # +given+ as an absolute folder (~ expanded, a relative one against
-      # +cwd+); nil or blank: +cwd+.
+      # +cwd+, or the home folder for a config value); nil or blank: +cwd+.
+      # @param from [Symbol] :flag or :config (SOURCES)
       # @raise [Invalid] when it is no folder
-      def self.resolve(given, cwd: Dir.pwd)
+      def self.resolve(given, cwd: Dir.pwd, from: :flag)
         return File.expand_path(cwd) if given.nil? || given.to_s.strip.empty?
 
-        dir = File.expand_path(given.to_s.strip, cwd)
-        raise Invalid, "--start-dir #{given}: no such folder" unless File.exist?(dir)
-        raise Invalid, "--start-dir #{given}: not a folder" unless File.directory?(dir)
+        source = SOURCES.fetch(from)
+        dir = File.expand_path(given.to_s.strip, from == :config ? Dir.home : cwd)
+        raise Invalid, "#{source} #{given}: no such folder" unless File.exist?(dir)
+        raise Invalid, "#{source} #{given}: not a folder" unless File.directory?(dir)
 
         dir
       end

data/lib/samagotchi/worker.rb

@@ -519,11 +519,19 @@ module Samagotchi
     # it as waiting, and the next worker drops it (drop_dead_question).
     # The context poller first: a command it runs goes (its process
     # group) before the Engine does.
+    # How long the lock stays held once #teardown marks it leaving (an upper
+    # bound): the recap on leave is written by then (#left), what is left is
+    # Bridge#stop's graces and ChildRing.await_wakes.
+    TEARDOWN_LEAVE_WAIT = 10
+
     def teardown
       @config_restart_unsubscribe&.call
       @context_poller&.stop
       drop_queued_commands
       @engine&.shutdown
+      # Leaving before the Bridge closes: a client that finds its port shut
+      # from here on reads Leaving (and waits for the lock), not Live.
+      mark_leaving(wait: TEARDOWN_LEAVE_WAIT)
       @bridge&.stop
       # The process exits next: a parent wake it rang for (a crash's
       # ring comes just above) must spawn the parent's worker first.
@@ -1438,8 +1446,14 @@ module Samagotchi
     # How long the lock stays held after the Bridge: the recap on leave's
     # timeout (#left), none for a restart (#left writes none). A delete
     # writes none either, but the bound only has to be an upper one.
-    def mark_leaving
-      @owner_lock&.mark_leaving(wait: @exit_restart ? 0 : @engine.recap_timeout.to_f)
+    # Once: the teardown's (after #stop_bridge_after's) keeps the first one.
+    # @param wait [Numeric, nil] nil: as above
+    def mark_leaving(wait: nil)
+      return if @marked_leaving
+
+      @marked_leaving = true
+      wait ||= @exit_restart ? 0 : @engine.recap_timeout.to_f
+      @owner_lock&.mark_leaving(wait: wait)
     rescue StandardError => e
       Log.warn(:worker, "mark_leaving_failed", error: e.class.name, msg: e.message)
     end

data/lib/samagotchi/worker_link.rb

@@ -112,6 +112,7 @@ module Samagotchi
     module_function
 
     def not_live(session_id) = "no live worker for session #{session_id}"
+    def unanswered(session_id) = "the worker for session #{session_id} didn't answer"
 
     # @param session_dir [String]
     # @param unlink [Boolean] remove a Stale sidecar (the clients that would

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.121.1
+  version: 0.122.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -476,6 +476,7 @@ files:
 - lib/samagotchi/parent_answers_command.rb
 - lib/samagotchi/parent_report.rb
 - lib/samagotchi/participant_messages.rb
+- lib/samagotchi/participant_mode.rb
 - lib/samagotchi/participant_name.rb
 - lib/samagotchi/participants.rb
 - lib/samagotchi/participants_watch.rb
@@ -665,6 +666,8 @@ files:
 - lib/samagotchi/toolkit.rb
 - lib/samagotchi/toolkit_binding.rb
 - lib/samagotchi/toolkit_command.rb
+- lib/samagotchi/toolkit_report_command.rb
+- lib/samagotchi/toolkit_suggest.rb
 - lib/samagotchi/tools/args.rb
 - lib/samagotchi/tools/ask_user_question.rb
 - lib/samagotchi/tools/builtin_calls.rb