riffer-rig 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 613c884d96e252c8793e442b39cf843d5c91438fc7d6ae6bc963536cb978de09
-  data.tar.gz: f4e2596e6c67e87f19011afa452c207f5f6e8b0394673c58e1ae22a57e2f2269
+  metadata.gz: e1743d133b2e91f50f10a376bbb8cd6f2d21f4d6c2f90600d5415d4ec9047b26
+  data.tar.gz: c8131bfda29574b5c86acb1b1ebebfe0ec1dc5cc82ff7c8c8cca5410bb7b34d0
 SHA512:
-  metadata.gz: 1d1b670b735b7d06b7b88d38c305e09018db879ca5ffe1a65a89f1424ae25b9d324b234bb3d38e89889305f85cb1f97822d2a76fba083f83e76f256cec6de331
-  data.tar.gz: 77c745faeb40661a33801885cee13d7811b05c9e557e5798a5ebb6233aef18e7c74e194f4fc9b4347cac4ff0b8182ca8c42b2e70fda71a051ee13849dbdea8f3
+  metadata.gz: 46930dae154e4a07916c0f1391e3f44419a7e385f5d31f02509a9740276ca6bfc993efb4f0e95695ad439045f69d9c3a74e344a43af7f83a75afdb6bd94f1e58
+  data.tar.gz: 18ce4fe1003d1767a234936fae81fb921c49461cefb7f6516bf051047734b68580bfc124803d353296a71daa9919f5f77805c83bc3c2599c9e17e8b2650b4b1d

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.15.0](https://github.com/bottrall/riffer-rig/compare/v0.14.0...v0.15.0) (2026-10-18)
+
+
+### Features
+
+* **terminal:** style the turn report like the status bar ([#562](https://github.com/bottrall/riffer-rig/issues/562)) ([710bd34](https://github.com/bottrall/riffer-rig/commit/710bd34b993d2743a78935ebbf3116d50cc063d7))
+
+
+### Bug Fixes
+
+* label the status-bar step counter as steps, not turns ([#560](https://github.com/bottrall/riffer-rig/issues/560)) ([80e6b2b](https://github.com/bottrall/riffer-rig/commit/80e6b2b60756ba4896878ef7df736511a3ec2ed0))
+
 ## [0.14.0](https://github.com/bottrall/riffer-rig/compare/v0.13.0...v0.14.0) (2026-10-18)
 
 

data/lib/riffer/rig/terminal/ticker.rb

@@ -83,7 +83,7 @@ class Riffer::Rig::Terminal::Ticker
     estimate = @unmetered / CHARS_PER_TOKEN
     Riffer::Rig::Terminal::StatusBar.working(
       glyph: Riffer::Rig::Terminal::Spinner.call(@tick),
-      state: stats.steps.zero? ? '' : "turn #{stats.steps}",
+      state: stats.steps.zero? ? '' : "step #{stats.steps}",
       clock: clock(stats.wall_time),
       up_tokens: usage&.input_tokens || 0,
       down_tokens: (usage&.output_tokens || 0) + estimate,

data/lib/riffer/rig/terminal/turn_report.rb

@@ -9,14 +9,21 @@ module Riffer::Rig::Terminal::TurnReport
 
   COLUMN_HEAD = /\A.*\S {2,}(?=\S)/ #: Regexp
 
+  VISIBLE = /\S/ #: Regexp
+
   # @rbs turn: Riffer::Rig::Terminal::TurnReport::_Turn
   # @rbs session: Riffer::Providers::TokenUsage?
   # @rbs theme: Riffer::Rig::Terminal::Theme
   # @rbs width: Integer?
   # @rbs return: String
   def call(turn, session, theme:, width:)
-    closing = turn.interrupted? ? INTERRUPTED : footer(turn.stats, session)
-    blocks = [*answer(turn.answer, theme: theme, width: width), theme.dim(wrap(closing, width))]
+    closing =
+      if turn.interrupted?
+        theme.dim(wrap(INTERRUPTED, width))
+      else
+        footer(turn.stats, session, theme: theme, width: width)
+      end
+    blocks = [*answer(turn.answer, theme: theme, width: width), closing]
     blocks.map { |block| "\n#{block}\n" }.join
   end
 
@@ -68,33 +75,108 @@ module Riffer::Rig::Terminal::TurnReport
 
   # @rbs stats: Riffer::Rig::Terminal::TurnBuffer::Stats
   # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs width: Integer?
   # @rbs return: String
-  def footer(stats, session)
+  def footer(stats, session, theme:, width:)
+    parts = segments(stats, session)
+    paint(wrap(parts.map(&:first).join(' · '), width), owners(parts), theme)
+  end
+
+  # @rbs stats: Riffer::Rig::Terminal::TurnBuffer::Stats
+  # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def segments(stats, session)
     usage = stats.usage
     minutes, seconds = stats.wall_time.to_i.divmod(60)
     [
-      "#{stats.steps} #{stats.steps == 1 ? 'step' : 'steps'}",
-      format('%<minutes>02d:%<seconds>02d', minutes: minutes, seconds: seconds),
-      *([*tokens(usage), *cost(usage)] if usage),
-      *(["session #{session.total_tokens} tok", *cost(session)] if session)
-    ].join(' · ')
+      ["#{stats.steps} #{stats.steps == 1 ? 'step' : 'steps'}", :dim],
+      [format('%<minutes>02d:%<seconds>02d', minutes: minutes, seconds: seconds), :dim],
+      *usage_segments(usage),
+      *session_segments(session)
+    ]
+  end
+
+  # @rbs usage: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def usage_segments(usage)
+    return [] unless usage
+
+    [*tokens(usage), *cost(usage)]
+  end
+
+  # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def session_segments(session)
+    return [] unless session
+
+    [["session #{Riffer::Rig::Terminal::Count.call(session.total_tokens)} tok", :dim], *cost(session)]
   end
 
   # @rbs usage: Riffer::Providers::TokenUsage
-  # @rbs return: Array[String]
+  # @rbs return: Array[[String, Symbol]]
   def tokens(usage)
     cache = { cache_write: usage.cache_write_tokens, cache_read: usage.cache_read_tokens }
     [
-      "↑#{usage.input_tokens}",
-      "↓#{usage.output_tokens}",
-      *cache.filter_map { |name, count| "#{name}:#{count}" if count&.positive? }
+      ["↑#{Riffer::Rig::Terminal::Count.call(usage.input_tokens)}", :dim],
+      ["↓#{Riffer::Rig::Terminal::Count.call(usage.output_tokens)}", :dim],
+      *cache.filter_map do |name, count|
+        ["#{name}:#{Riffer::Rig::Terminal::Count.call(count)}", :dim] if count&.positive?
+      end
     ]
   end
 
   # @rbs usage: Riffer::Providers::TokenUsage
-  # @rbs return: String?
+  # @rbs return: Array[[String, Symbol]]
   def cost(usage)
     amount = usage.cost
-    format('~$%.4f', amount) if amount
+    amount ? [[format('~$%.4f', amount), :cyan]] : []
+  end
+
+  # A separator's dot is dim, so a colour run carries across it into the next
+  # segment.
+  # @rbs parts: Array[[String, Symbol]]
+  # @rbs return: Array[Symbol]
+  def owners(parts)
+    parts.flat_map.with_index do |(text, role), index|
+      owned = [role] * text.scan(VISIBLE).size
+      owned << :dim unless index == parts.length - 1
+      owned
+    end
+  end
+
+  # The Wrapper moves, drops and rewrites whitespace but never a visible
+  # character, so the nth visible character of a wrapped line is the nth one
+  # the segments supplied — which is why the colours are painted after the
+  # wrap, where a span can never be cut in two.
+  # @rbs line: String
+  # @rbs owners: Array[Symbol]
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs return: String
+  def paint(line, owners, theme)
+    chars = line.chars
+    owner_at = chars.each_index.select { |index| chars.fetch(index).match?(VISIBLE) }.zip(owners).to_h
+    slots = chars.each_index.map { |index| owner_at[index] }
+    cells = nearest(slots).zip(nearest(slots.reverse).reverse).map { |left, right| left == right ? left : nil }
+    runs = cells.zip(chars).chunk_while { |(left, _), (right, _)| left == right }
+    runs.map { |run| color(run.map(&:last).join, run.fetch(0).first, theme) }.join
+  end
+
+  # @rbs slots: Array[Symbol?]
+  # @rbs return: Array[Symbol?]
+  def nearest(slots)
+    slots.each_with_object([]) { |slot, filled| filled << (slot || filled.last) }
+  end
+
+  # @rbs text: String
+  # @rbs role: Symbol?
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs return: String
+  def color(text, role, theme)
+    case role
+    when :dim then theme.dim(text)
+    when :cyan then theme.cyan(text)
+    else text
+    end
   end
 end

data/lib/riffer/rig/version.rb

@@ -2,6 +2,6 @@
 
 module Riffer
   module Rig
-    VERSION = '0.14.0'
+    VERSION = '0.15.0'
   end
 end

data/sig/generated/riffer/rig/terminal/turn_report.rbs

@@ -7,6 +7,8 @@ module Riffer::Rig::Terminal::TurnReport
 
   COLUMN_HEAD: Regexp
 
+  VISIBLE: Regexp
+
   # @rbs turn: Riffer::Rig::Terminal::TurnReport::_Turn
   # @rbs session: Riffer::Providers::TokenUsage?
   # @rbs theme: Riffer::Rig::Terminal::Theme
@@ -39,14 +41,55 @@ module Riffer::Rig::Terminal::TurnReport
 
   # @rbs stats: Riffer::Rig::Terminal::TurnBuffer::Stats
   # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs width: Integer?
   # @rbs return: String
-  def footer: (Riffer::Rig::Terminal::TurnBuffer::Stats stats, Riffer::Providers::TokenUsage? session) -> String
+  def footer: (Riffer::Rig::Terminal::TurnBuffer::Stats stats, Riffer::Providers::TokenUsage? session, theme: Riffer::Rig::Terminal::Theme, width: Integer?) -> String
+
+  # @rbs stats: Riffer::Rig::Terminal::TurnBuffer::Stats
+  # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def segments: (Riffer::Rig::Terminal::TurnBuffer::Stats stats, Riffer::Providers::TokenUsage? session) -> Array[[ String, Symbol ]]
+
+  # @rbs usage: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def usage_segments: (Riffer::Providers::TokenUsage? usage) -> Array[[ String, Symbol ]]
+
+  # @rbs session: Riffer::Providers::TokenUsage?
+  # @rbs return: Array[[String, Symbol]]
+  def session_segments: (Riffer::Providers::TokenUsage? session) -> Array[[ String, Symbol ]]
 
   # @rbs usage: Riffer::Providers::TokenUsage
-  # @rbs return: Array[String]
-  def tokens: (Riffer::Providers::TokenUsage usage) -> Array[String]
+  # @rbs return: Array[[String, Symbol]]
+  def tokens: (Riffer::Providers::TokenUsage usage) -> Array[[ String, Symbol ]]
 
   # @rbs usage: Riffer::Providers::TokenUsage
-  # @rbs return: String?
-  def cost: (Riffer::Providers::TokenUsage usage) -> String?
+  # @rbs return: Array[[String, Symbol]]
+  def cost: (Riffer::Providers::TokenUsage usage) -> Array[[ String, Symbol ]]
+
+  # A separator's dot is dim, so a colour run carries across it into the next
+  # segment.
+  # @rbs parts: Array[[String, Symbol]]
+  # @rbs return: Array[Symbol]
+  def owners: (Array[[ String, Symbol ]] parts) -> Array[Symbol]
+
+  # The Wrapper moves, drops and rewrites whitespace but never a visible
+  # character, so the nth visible character of a wrapped line is the nth one
+  # the segments supplied — which is why the colours are painted after the
+  # wrap, where a span can never be cut in two.
+  # @rbs line: String
+  # @rbs owners: Array[Symbol]
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs return: String
+  def paint: (String line, Array[Symbol] owners, Riffer::Rig::Terminal::Theme theme) -> String
+
+  # @rbs slots: Array[Symbol?]
+  # @rbs return: Array[Symbol?]
+  def nearest: (Array[Symbol?] slots) -> Array[Symbol?]
+
+  # @rbs text: String
+  # @rbs role: Symbol?
+  # @rbs theme: Riffer::Rig::Terminal::Theme
+  # @rbs return: String
+  def color: (String text, Symbol? role, Riffer::Rig::Terminal::Theme theme) -> String
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riffer-rig
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jake Bottrall