tempest-rb 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2312e8eb343bf518ce61de53a97608a42ece28af9777501910d864e9e2f79f1f
-  data.tar.gz: 05063b25a45e82fbcb7051f93f6af1715e0c2e25f7cfeefdbf343b3d5f4877ed
+  metadata.gz: 5b619dd3e2a5448b9ed2f8c22bb286bec9fcb568f3f9d09db1a139774c226928
+  data.tar.gz: e06a2ee565a2cdf528f4c4c3f86257c55c8099e972d7ca4c239e8ae73aee605f
 SHA512:
-  metadata.gz: 8eb2f34c4c3e7dcb851976b4f7ad502edfb57784661dd06ed0792eaef9f1344ef65dee5a1b05f63c51859aa84d9412f23b5714cde1d65a08360dac549245e98f
-  data.tar.gz: 23d4f50ec5dab93b6d792009103f78a56df3fa7019bd1266866ff582a55db1e5831f72376ef2949c3bb4cf029a68c1faf1b3f68ea60cb4ea627507924ece146d
+  metadata.gz: e282a10f7bd163df16b8ee0167bf2ac1fb8796a8d9e7bc797efaf2c63bc504f78c3356582e1b4534c3f179a2e5e4dfedebc44bbbb0c5f174727125ec9a1506ea
+  data.tar.gz: e6b13a102de8bc229b4c98559a7af2766370311a811aef1c32d31a5c64e606f4bd42eccf7a70a798997ae9c87337f3176d0644a33724ba5fd59ce62d714f73a1

data/lib/tempest/jetstream/client.rb

@@ -55,7 +55,13 @@ module Tempest
       end
 
       def each_message(url)
-        Async do |task|
+        # `finished: false` makes Async::Task call `@promise.suppress_warnings!`
+        # so that connect failures (DNS errors after offline wake-from-sleep,
+        # TCP resets, TLS handshake errors) don't trigger Console.logger.warn
+        # with "Task may have ended with unhandled exception." plus a full
+        # backtrace. The exception still propagates via `.wait`; the
+        # StreamManager's reconnect loop already handles it cleanly.
+        Async(finished: false) do
           endpoint = Async::HTTP::Endpoint.parse(url)
           Async::WebSocket::Client.connect(endpoint) do |connection|
             while (message = connection.read)

data/lib/tempest/repl/formatter.rb

@@ -21,6 +21,22 @@ module Tempest
       DIM = "\e[2m".freeze
       HASHTAG_BLUE = "\e[38;5;110m".freeze
 
+      # Palette of ANSI 256-color codes used to colorize id vars ($AA, $LA …).
+      # Hand-picked across the hue wheel for readability on dark backgrounds,
+      # avoiding the cyan (time), green (handle), and blue-110 (hashtag)
+      # already used elsewhere. Entries stay within the 6x6x6 cube's middle
+      # bands (rgb components mostly in 3..4) so the colors read as muted
+      # rather than saturated neon — id vars sit beside the post text and
+      # shouldn't fight it for attention. Order is the hue-sorted set rotated
+      # by step 13 (coprime with 24), so consecutive palette indices land on
+      # near-opposite hues; combined with var_index this keeps adjacent vars
+      # ($AY/$AZ/$BA …) visibly distinct.
+      VAR_PALETTE = [
+        167, 115, 138, 109, 173, 67,  137, 97,
+        186, 140, 150, 139, 108, 174, 116, 175,
+        117, 180, 103, 179, 146, 143, 176, 114,
+      ].freeze
+
       HASHTAG_PATTERN = /#[[:alnum:]_]+/.freeze
       URL_PATTERN = %r{https?://[^\s]+}.freeze
       DECORATE_PATTERN = Regexp.union(URL_PATTERN, HASHTAG_PATTERN).freeze
@@ -114,7 +130,7 @@ module Tempest
         var = registry&.var_for_uri(subject_uri)
         return label unless var
 
-        bracket = Formatter.color ? "#{DIM}[#{var}]#{RESET}" : "[#{var}]"
+        bracket = Formatter.color ? "[#{colorize_var(var)}]" : "[#{var}]"
         "#{label} #{bracket}"
       end
 
@@ -133,7 +149,7 @@ module Tempest
         return body unless registry
 
         parent_var = registry.var_for_uri(reply_parent_uri)
-        marker = parent_var ? "↪#{parent_var} " : "↪ "
+        marker = parent_var ? "↪#{colorize_var(parent_var)} " : "↪ "
         "#{marker}#{body}"
       end
 
@@ -158,7 +174,7 @@ module Tempest
         urls = URI.extract(text, ["http", "https"]).uniq
         urls.each do |url|
           var = registry.assign_url(url)
-          text = text.sub(url, "#{url} (#{var})")
+          text = text.sub(url, "#{url} (#{colorize_var(var)})")
         end
         text
       end
@@ -175,7 +191,7 @@ module Tempest
         replacements = valid.map do |facet|
           var = registry.assign_url(facet.uri)
           domain = host_of(facet.uri) || facet.uri
-          [facet, "[#{domain} #{var}]"]
+          [facet, "[#{domain} #{colorize_var(var)}]"]
         end
 
         # Apply substitutions in reverse byte order so earlier ranges remain valid.
@@ -239,7 +255,27 @@ module Tempest
       end
 
       def id_label(var)
-        Formatter.color ? "#{DIM}[#{var}]#{RESET} " : "[#{var}] "
+        Formatter.color ? "[#{colorize_var(var)}] " : "[#{var}] "
+      end
+
+      # Returns a deterministic ANSI 256-color escape for the given var.
+      # Indexing by the two-letter id (var_index) avoids the byte-sum
+      # collisions that made $AZ and $BA share the same palette slot.
+      def colorize_var(var)
+        return var unless Formatter.color
+        code = VAR_PALETTE[var_index(var) % VAR_PALETTE.size]
+        "\e[38;5;#{code}m#{var}#{RESET}"
+      end
+
+      # Converts the two-letter portion of "$XY" into a base-26 index so
+      # consecutive vars always map to consecutive palette slots. Falls back
+      # to 0 for malformed vars; the palette rotation handles the rest.
+      def var_index(var)
+        pair = var.to_s.sub(/\A\$/, "")
+        return 0 if pair.length < 2
+        high = pair[0].ord - "A".ord
+        low = pair[1].ord - "A".ord
+        high * 26 + low
       end
 
       def handle_label(handle)

data/lib/tempest/repl/runner.rb

@@ -127,6 +127,7 @@ module Tempest
       private
 
       def read_line
+        @output.prepare_prompt if @output.respond_to?(:prepare_prompt)
         @input.readline(PROMPT)
       rescue Interrupt
         nil

data/lib/tempest/repl/screen.rb

@@ -14,11 +14,19 @@ module Tempest
     #   CSI row;col H     move cursor
     #   ESC 7 / ESC 8     save/restore cursor (DECSC/DECRC)
     class Screen
+      # Number of bottom rows reserved for the prompt. Reline may wrap a long
+      # input across multiple display rows; without reserving those rows below
+      # the DECSTBM region the wrap would emit \n past the bottom margin and
+      # scroll the timeline off-screen. Two rows is the common case for a
+      # single-wrap post.
+      PROMPT_ROWS = 2
+
       def initialize(io:, rows: nil, cols: nil)
         @io = io
         @rows = rows
         @cols = cols
         @enabled = false
+        @suspended = false
         @mutex = Mutex.new
         @pending_resize = nil
       end
@@ -26,12 +34,12 @@ module Tempest
       def enable
         return unless @io.respond_to?(:tty?) && @io.tty?
         rows = @rows || detect_rows
-        return unless rows && rows >= 4
+        return unless rows && rows >= PROMPT_ROWS + 3
 
         @rows = rows
         @cols ||= detect_cols
-        @io.print "\e[1;#{rows - 1}r"   # scrolling region: rows 1..rows-1
-        @io.print "\e[#{rows};1H"        # park cursor on the final row (prompt)
+        @io.print "\e[1;#{rows - PROMPT_ROWS}r" # scrolling region: rows 1..rows-PROMPT_ROWS
+        @io.print "\e[#{prompt_row};1H"          # park cursor on the first prompt row
         @io.flush if @io.respond_to?(:flush)
         @enabled = true
         install_resize_trap
@@ -59,10 +67,12 @@ module Tempest
         @io.print "\e[r"
         @io.flush if @io.respond_to?(:flush)
         @enabled = false
+        @suspended = true
       end
 
       def resume
         return if @enabled
+        @suspended = false
         enable
       end
 
@@ -70,6 +80,22 @@ module Tempest
         @enabled
       end
 
+      # Clear the rows reserved for the prompt and re-park the cursor on the
+      # first prompt row. Called by the REPL right before each readline so a
+      # previous wrapped input doesn't leave residue on the lower prompt rows.
+      def prepare_prompt
+        return unless @enabled
+        @mutex.synchronize do
+          apply_pending_resize
+          PROMPT_ROWS.times do |i|
+            @io.print "\e[#{prompt_row + i};1H"
+            @io.print "\r\e[2K"
+          end
+          @io.print "\e[#{prompt_row};1H"
+          @io.flush if @io.respond_to?(:flush)
+        end
+      end
+
       # SIGWINCH hook. Trap handlers in Ruby are restricted (can't reliably
       # acquire mutexes or drive Reline), so we only stash the new dimensions
       # here and apply them on the next mutex-protected write. If rows/cols
@@ -80,6 +106,11 @@ module Tempest
       end
 
       def puts(*lines)
+        # While `:compose` hands the terminal off to $EDITOR the Jetstream
+        # thread keeps emitting events. Swallow them rather than print over
+        # the editor's screen; the cursor is persisted, so reconnect-after-
+        # exit would replay anyway if anything important was missed.
+        return if @suspended
         @mutex.synchronize do
           apply_pending_resize
           if @enabled
@@ -125,6 +156,12 @@ module Tempest
 
       private
 
+      # The first (top) row of the prompt area. Reline draws the prompt here
+      # and may wrap downward into subsequent reserved rows.
+      def prompt_row
+        @rows - PROMPT_ROWS + 1
+      end
+
       # Caller must hold @mutex. Re-issues DECSTBM and re-parks the cursor on
       # the new prompt row when winsize actually changed; cheap no-op when it
       # didn't (some terminals send spurious WINCHes on focus changes).
@@ -142,8 +179,8 @@ module Tempest
         @cols = new_cols
         return unless @enabled
 
-        @io.print "\e[1;#{@rows - 1}r"
-        @io.print "\e[#{@rows};1H"
+        @io.print "\e[1;#{@rows - PROMPT_ROWS}r"
+        @io.print "\e[#{prompt_row};1H"
         @io.flush if @io.respond_to?(:flush)
       end
 
@@ -195,7 +232,7 @@ module Tempest
       # cleanly.
       def insert_above_prompt(line)
         chunks = wrap_to_cols(line)
-        bottom_of_region = @rows - 1
+        bottom_of_region = @rows - PROMPT_ROWS
         @io.print "\e7"                       # save cursor
         chunks.each do |chunk|
           @io.print "\e[#{bottom_of_region};1H" # move to last row of scrolling region
@@ -206,13 +243,81 @@ module Tempest
         @io.flush if @io.respond_to?(:flush)
       end
 
+      # Kitty graphics escape: `\e_G<controls>;<data>\e\\`. A single avatar
+      # may be transmitted as multiple consecutive `\e_G..\e\\` chunks (each
+      # capped at CHUNK_BYTES) when the PNG is large, but each chunk is still
+      # an atomic terminal command that must not be broken by a newline.
+      KITTY_ESCAPE = /\e_G[^\e]*?\e\\/m.freeze
+      private_constant :KITTY_ESCAPE
+
       def wrap_to_cols(line)
         return [line] unless @cols && @cols.positive?
-        return [line] if line.include?("\e_G")
-        return [line] if Reline::Unicode.calculate_width(line, true) <= @cols
+        return [line] if visible_width(line) <= @cols
+
+        # Tokenize the line into kitty-escape blocks and plain text. Plain
+        # text is split by display width; escape blocks travel intact and
+        # contribute 0 cells to the running width (their visual footprint —
+        # 2 cells per avatar in our usage — is reserved by literal spaces in
+        # the surrounding text, see Formatter#compose).
+        parts = line.split(/(#{KITTY_ESCAPE})/)
+        chunks = []
+        current = String.new
+        current_width = 0
+
+        parts.each do |part|
+          next if part.empty?
+          if part.start_with?("\e_G")
+            current << part
+            next
+          end
+
+          remaining = part
+          until remaining.empty?
+            available = @cols - current_width
+            if available <= 0
+              chunks << current
+              current = String.new
+              current_width = 0
+              available = @cols
+            end
+
+            head, tail = take_by_display_width(remaining, available)
+            if head.empty?
+              # Next grapheme is wider than the remaining cells — flush and retry.
+              chunks << current unless current.empty?
+              current = String.new
+              current_width = 0
+              next
+            end
+
+            current << head
+            current_width += Reline::Unicode.calculate_width(head, true)
+            remaining = tail
+          end
+        end
+
+        chunks << current unless current.empty?
+        chunks
+      end
+
+      # Returns [head, tail] such that head's display width is <= max_width and
+      # head + tail == str. Walks graphemes so we don't split a CJK character
+      # across chunks.
+      def take_by_display_width(str, max_width)
+        head = String.new
+        width = 0
+        str.each_grapheme_cluster do |g|
+          w = Reline::Unicode.calculate_width(g, true)
+          break if width + w > max_width
+          head << g
+          width += w
+        end
+        [head, str.byteslice(head.bytesize, str.bytesize - head.bytesize) || ""]
+      end
 
-        chunks, _ = Reline::Unicode.split_by_width(line, @cols)
-        chunks.compact.reject(&:empty?)
+      def visible_width(line)
+        stripped = line.gsub(KITTY_ESCAPE, "")
+        Reline::Unicode.calculate_width(stripped, true)
       end
 
       def rerender_prompt

data/lib/tempest/version.rb

@@ -1,3 +1,3 @@
 module Tempest
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempest-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuya Fujiwara