samagotchi 0.112.0 → 0.114.0

data/lib/samagotchi/web/server.rb

@@ -130,7 +130,9 @@ module Samagotchi
                       annotate_presets: annotate_presets, editor: editor, lan: lan, working_set: working_set,
                       public_url: public_url }
           started = if plan
-                      with_tunnel(provider, plan) { start(**options, public_notes: provider.start_lines(plan)) }
+                      with_tunnel(provider, plan) do |up|
+                        start(**options, public_notes: provider.start_lines(plan), on_bound: up)
+                      end
                     else
                       start(**options)
                     end
@@ -147,25 +149,43 @@ module Samagotchi
       end
 
       # The tunnel on while the block runs (the server), off after it
-      # whatever ends it (Ctrl-C, SIGTERM, SIGHUP, a port taken), and only
-      # once #up succeeded: a refusal before it, or a failed #up, turns off
-      # nothing (a live tunnel of another chi web stays).
+      # whatever ends it (Ctrl-C, SIGTERM, SIGHUP), once #up may have taken
+      # effect: a refusal before it turns off nothing (a live tunnel of
+      # another chi web stays). The block gets #up to call once the port is
+      # bound (start's on_bound), so Serve never forwards the tailnet to a
+      # listener that took the port first. A signal during #up waits for it
+      # (its command runs in its own process group, and Serve keeps what it
+      # set even if chi stopped waiting), so it can't land between the serve
+      # going on and the teardown being due; #up is bounded by its timeout.
       def self.with_tunnel(provider, plan)
-        provider.up(plan)
-        upped = true
-        yield
+        attempted = false
+        yield(lambda do
+          Thread.handle_interrupt(SignalException => :never) do
+            attempted = true
+            provider.up(plan)
+          end
+        end)
       ensure
-        tunnel_down(provider, plan) if upped
+        tunnel_down(provider, plan) if attempted
       end
 
       # The tunnel's teardown, before any line (a hung-up terminal can't
       # write): a failure is one warning line, never a crash or another exit
-      # status, and a second Ctrl-C during it only cuts it short.
+      # status. A second Ctrl-C (SIGTERM, SIGHUP) during it waits for it
+      # (bounded by its commands' timeouts) and is then dropped: the run
+      # already ends the way the first signal ends it.
       def self.tunnel_down(provider, plan)
-        line = begin
-          provider.down_line(plan, provider.down(plan))
-        rescue Tunnel::Refused, SignalException => e
-          provider.down_warning(plan, e)
+        line = nil
+        begin
+          Thread.handle_interrupt(SignalException => :never) do
+            line = begin
+              provider.down_line(plan, provider.down(plan))
+            rescue Tunnel::Refused => e
+              provider.down_warning(plan, e)
+            end
+          end
+        rescue SignalException
+          nil
         end
         say(line) if line
       end
@@ -187,11 +207,14 @@ module Samagotchi
       #   (web.public_url, or --tunnel's): every request needs the access token
       # @param public_notes [Array<String>] lines after the proxied link's
       #   (the tunnel's)
+      # @param on_bound [#call, nil] run once the port is bound, before any
+      #   line (the tunnel's #up); what it raises ends the run
       # @return [Boolean] false when the port was taken (said so on stderr)
       def self.start(port: nil, host: nil, url: nil, open_browser: false, state_dir: nil, manager: nil, markdown: false,
                      view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default, hub: nil, lan: nil,
                      editor: Config::BY_KEY["web.editor"].default, token_path: Token.path,
-                     working_set: Config::BY_KEY["web.working_set"].default, public_url: nil, public_notes: [])
+                     working_set: Config::BY_KEY["web.working_set"].default, public_url: nil, public_notes: [],
+                     on_bound: nil)
         config_restart_unsubscribe = ConfigFile.watch_restart_settings!(process: :web) do |message|
           Samagotchi::Log.warn(:config, "restart_required", echo: "Warning: config: #{message}")
         end
@@ -227,7 +250,11 @@ module Samagotchi
         # Said once the port is bound: a second chi web racing for it gets
         # the in-use line instead.
         running_path = Running.path(state_dir: state_dir)
+        webrick = nil
+        callback_unfinished = false
         started = lambda do
+          callback_unfinished = true
+          on_bound&.call
           record_running(running_path, port, public_url)
           puts "Chi Web on #{url} (public: #{File.expand_path("public", __dir__)})"
           puts lan_lines(ip: lan.ip, port: port, token: Token.read(token_path), others: lan.others, public: lan.public) if lan
@@ -244,12 +271,14 @@ module Samagotchi
               open_url(open_target)
             end
           end
+          callback_unfinished = false
         end
 
         # The event loops (GET /api/events) end once WEBrick leaves
         # :Running: it joins every request thread before run returns.
         Rackup::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: Log.new($stderr, WEBrick::Log::WARN),
                                           StartCallback: started) do |server|
+          webrick = server
           app.server_running = -> { server.status == :Running }
           listen_lan(server, lan, port) if lan
         end
@@ -261,6 +290,9 @@ module Samagotchi
         warn "Error: can't listen on #{lan.ip}:#{port} (#{e.message}); did the address change? Run chi web again"
         false
       ensure
+        # A start callback that raised (on_bound's refusal, a Ctrl-C) leaves
+        # WEBrick :Running with its sockets open.
+        webrick&.listeners&.each { |socket| socket.close unless socket.closed? } if callback_unfinished
         Running.clear(path: running_path) if running_path
         config_restart_unsubscribe&.call
         notifier&.stop

data/lib/samagotchi/web/session_show.rb

@@ -81,6 +81,7 @@ module Samagotchi
           # names its plugins' too.
           commands: turn_snapshot&.fetch("commands", nil) || SessionCommands.builtin_registry.listing,
           markdown_warning: @markdown_renderer.warning,
+          markdown_tip: @markdown_renderer.tip,
           **viewer_capabilities(req),
           pending_question: pending,
           last_event_seq: last_event_seq,
@@ -208,6 +209,7 @@ module Samagotchi
           session: session_json,
           messages: messages,
           markdown_warning: @markdown_renderer.warning,
+          markdown_tip: @markdown_renderer.tip,
           **viewer_capabilities(req),
           timing: timing
         })

data/lib/samagotchi/web/session_summary.rb

@@ -40,6 +40,7 @@ module Samagotchi
         up = bridge_up?(session_dir, owner)
         sidecar = up ? WorkerSidecar.read(session_dir) : nil
         saved = SessionMetrics.saved_summary(session_dir, budget_tokens: budget_resolver(session, registry))
+        recap_card = RecapStore.card(session_dir)
         {
           id: session.id,
           status: status,
@@ -74,8 +75,12 @@ module Samagotchi
           # 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),
+          # The saved recap's first sentence, for the session card, and the
+          # auto title its reply led with (RecapTitle), else nil: an untitled
+          # session's name on the pages and its pushes (never in a model
+          # request).
+          recap: recap_card.preview,
+          auto_title: recap_card.title,
           # How full the context was after the last turn (%), or nil, and
           # the session's token sums and cost (the card's ctx tooltip), from
           # one read of analytics.json.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.112.0
+  version: 0.114.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -503,6 +503,7 @@ files:
 - lib/samagotchi/prompt_note.rb
 - lib/samagotchi/prompt_warmup.rb
 - lib/samagotchi/proxy_trace.rb
+- lib/samagotchi/push_command.rb
 - lib/samagotchi/question_answer.rb
 - lib/samagotchi/question_asked.rb
 - lib/samagotchi/question_desk.rb
@@ -512,6 +513,7 @@ files:
 - lib/samagotchi/recap_command.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
+- lib/samagotchi/recap_title.rb
 - lib/samagotchi/redacted_inspect.rb
 - lib/samagotchi/ref.rb
 - lib/samagotchi/relay.rb
@@ -767,6 +769,7 @@ files:
 - lib/samagotchi/web/public/llm_context_chip.js
 - lib/samagotchi/web/public/manifest.webmanifest
 - lib/samagotchi/web/public/markdown_place.js
+- lib/samagotchi/web/public/markdown_tip.js
 - lib/samagotchi/web/public/model_pick.js
 - lib/samagotchi/web/public/model_picker.js
 - lib/samagotchi/web/public/notice_links.js
@@ -780,6 +783,7 @@ files:
 - lib/samagotchi/web/public/plain_line.js
 - lib/samagotchi/web/public/prompt_history.js
 - lib/samagotchi/web/public/push.js
+- lib/samagotchi/web/public/push_devices.js
 - lib/samagotchi/web/public/question_card.js
 - lib/samagotchi/web/public/question_cards.js
 - lib/samagotchi/web/public/read_view.js