catpm 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ee3b0b066416fbb74d3bdecd0397443272118d67a07b339e0d61a7c2f408351
-  data.tar.gz: 5b355e9a18cde63cd975c49300f8f56efa4d8a079e855a3747de518965ff1611
+  metadata.gz: 30a794032ccb0fcb32152d5ae6c7285758260c6a80c5241c217924a887040885
+  data.tar.gz: 7691f6480aa62e4efd41d657fda9e1501a2765584a3d926a5d9ac3a8b6ac0c98
 SHA512:
-  metadata.gz: '0811e5ecba637add9c81496c180eb65fd4d8864761bb4c4d5c40b0be40ad9f3ca7e5b6e9ce120316ad2ed17f144e68b8953cf3d2ce2721f2b942a9e43aebece4'
-  data.tar.gz: 43434262c2f712032f5cf7e2205ccf2db0638d48c672e89dd2787b90258c1cd861353d21b62b504b53daa576501614e8c3aa1b6105ed6fc8e4655056120478d5
+  metadata.gz: c902a837f12312f1f856d232b056eb3669c8648f5907e5088ced55972888d64682749f937a994d79b040688d1f59d929dccd11a1d28ffdcfe4e25f2458c02f49
+  data.tar.gz: 73dd36a0cb7ea32b405388bb62f54e9f327f30155b3b30794101feb056abe70b7b747cd5dda3dc67e6669e4289392964b37ae76385e6cb680c96e5a5bb550d55

data/app/controllers/catpm/application_controller.rb

@@ -2,5 +2,13 @@
 
 module Catpm
   class ApplicationController < ActionController::Base
+    private
+
+    def remembered_range
+      if params[:range].present?
+        cookies[:catpm_range] = { value: params[:range], expires: 1.year.from_now }
+      end
+      params[:range] || cookies[:catpm_range]
+    end
   end
 end

data/app/controllers/catpm/endpoints_controller.rb

@@ -8,7 +8,7 @@ module Catpm
       @operation = params[:operation].presence || ''
 
       # Time range filter
-      @range, period, _bucket_seconds = helpers.parse_range(params[:range], extra_valid: ['all'])
+      @range, period, bucket_seconds = helpers.parse_range(remembered_range)
 
       scope = Catpm::Bucket
         .where(kind: @kind, target: @target, operation: @operation)
@@ -23,11 +23,15 @@ module Catpm
         'MAX(duration_max)',
         'MIN(duration_min)',
         'SUM(failure_count)',
-        'SUM(success_count)'
+        'SUM(success_count)',
+        'MIN(bucket_start)',
+        'MAX(bucket_start)'
       )
 
       @count, @duration_sum, @duration_max, @duration_min, @failure_count, @success_count =
-        @aggregate.map { |v| v || 0 }
+        @aggregate[0..5].map { |v| v || 0 }
+      @first_event_at = @aggregate[6]
+      @last_event_at = @aggregate[7]
 
       @avg_duration = @count > 0 ? @duration_sum / @count : 0.0
       @failure_rate = @count > 0 ? @failure_count.to_f / @count : 0.0
@@ -45,19 +49,52 @@ module Catpm
         end
       end
 
+      # Chart data — request volume, errors, avg duration
+      chart_buckets = scope.order(bucket_start: :asc).to_a
+      bucket_seconds = helpers.compute_bucket_seconds(chart_buckets) if @range == 'all'
+
+      if bucket_seconds
+        slots_count = {}
+        slots_errors = {}
+        slots_dur_sum = {}
+        slots_dur_count = {}
+        chart_buckets.each do |b|
+          slot_key = (b.bucket_start.to_i / bucket_seconds) * bucket_seconds
+          slots_count[slot_key] = (slots_count[slot_key] || 0) + b.count
+          slots_errors[slot_key] = (slots_errors[slot_key] || 0) + b.failure_count
+          slots_dur_sum[slot_key] = (slots_dur_sum[slot_key] || 0) + b.duration_sum
+          slots_dur_count[slot_key] = (slots_dur_count[slot_key] || 0) + b.count
+        end
+
+        now_slot = (Time.current.to_i / bucket_seconds) * bucket_seconds
+        @chart_requests = 60.times.map { |i| slots_count[now_slot - (59 - i) * bucket_seconds] || 0 }
+        @chart_errors = 60.times.map { |i| slots_errors[now_slot - (59 - i) * bucket_seconds] || 0 }
+        @chart_durations = 60.times.map do |i|
+          key = now_slot - (59 - i) * bucket_seconds
+          c = slots_dur_count[key] || 0
+          c > 0 ? (slots_dur_sum[key] / c).round(1) : 0
+        end
+        @chart_times = 60.times.map { |i| Time.at(now_slot - (59 - i) * bucket_seconds).strftime('%H:%M') }
+      end
+
       endpoint_samples = Catpm::Sample
         .joins(:bucket)
         .where(catpm_buckets: { kind: @kind, target: @target, operation: @operation })
 
-      if @range != 'all'
-        endpoint_samples = endpoint_samples.where('catpm_samples.recorded_at >= ?', period.ago)
-      end
-
       @slow_samples = endpoint_samples.where(sample_type: 'slow').order(duration: :desc).limit(10)
       @samples = endpoint_samples.where(sample_type: 'random').order(recorded_at: :desc).limit(10)
       @error_samples = endpoint_samples.where(sample_type: 'error').order(recorded_at: :desc).limit(10)
 
       @active_error_count = Catpm::ErrorRecord.unresolved.count
     end
+
+    def destroy
+      kind = params[:kind]
+      target = params[:target]
+      operation = params[:operation].presence || ''
+
+      Catpm::Bucket.where(kind: kind, target: target, operation: operation).destroy_all
+      redirect_to catpm.status_index_path, notice: 'Endpoint deleted'
+    end
   end
 end

data/app/controllers/catpm/errors_controller.rb

@@ -36,7 +36,7 @@ module Catpm
       @contexts = @error.parsed_contexts
       @active_error_count = Catpm::ErrorRecord.unresolved.count
 
-      @range, period, bucket_seconds = helpers.parse_range(params[:range] || '24h')
+      @range, period, bucket_seconds = helpers.parse_range(remembered_range)
 
       # Samples table: 20 most recent linked by fingerprint
       @samples = Catpm::Sample.where(error_fingerprint: @error.fingerprint)
@@ -66,12 +66,36 @@ module Catpm
       end
 
       slots = {}
-      cutoff = period.ago.to_i
-      (ob[resolution] || {}).each do |ts_str, count|
-        ts = ts_str.to_i
-        next if ts < cutoff
-        slot_key = (ts / bucket_seconds) * bucket_seconds
-        slots[slot_key] = (slots[slot_key] || 0) + count
+      if @range == 'all'
+        # Collect all timestamps to compute dynamic bucket_seconds
+        all_timestamps = []
+        (ob[resolution] || {}).each do |ts_str, count|
+          ts = ts_str.to_i
+          all_timestamps << ts
+          slots[ts] = (slots[ts] || 0) + count
+        end
+        if all_timestamps.any?
+          span = all_timestamps.max - all_timestamps.min
+          span = 3600 if span < 3600
+          bucket_seconds = (span / 60.0).ceil
+        else
+          bucket_seconds = 60
+        end
+        # Re-bucket with computed bucket_seconds
+        rebucketed = {}
+        slots.each do |ts, count|
+          slot_key = (ts / bucket_seconds) * bucket_seconds
+          rebucketed[slot_key] = (rebucketed[slot_key] || 0) + count
+        end
+        slots = rebucketed
+      else
+        cutoff = period.ago.to_i
+        (ob[resolution] || {}).each do |ts_str, count|
+          ts = ts_str.to_i
+          next if ts < cutoff
+          slot_key = (ts / bucket_seconds) * bucket_seconds
+          slots[slot_key] = (slots[slot_key] || 0) + count
+        end
       end
 
       now_slot = (Time.current.to_i / bucket_seconds) * bucket_seconds

data/app/controllers/catpm/events_controller.rb

@@ -5,13 +5,25 @@ module Catpm
     PER_PAGE = 25
 
     def index
-      @range, period, bucket_seconds = helpers.parse_range(params[:range])
+      @range, period, bucket_seconds = helpers.parse_range(remembered_range)
 
-      recent_buckets = Catpm::EventBucket.recent(period).to_a
+      recent_buckets = if @range == 'all'
+        Catpm::EventBucket.all.to_a
+      else
+        Catpm::EventBucket.recent(period).to_a
+      end
+
+      bucket_seconds = helpers.compute_bucket_seconds(recent_buckets) if @range == 'all'
 
       # Hero metrics
       @total_events = recent_buckets.sum(&:count)
-      period_minutes = period.to_f / 60
+      effective_period = if @range == 'all'
+        earliest = recent_buckets.min_by(&:bucket_start)&.bucket_start
+        earliest ? [Time.current - earliest, 60].max : 3600
+      else
+        period
+      end
+      period_minutes = effective_period.to_f / 60
       @events_per_min = (period_minutes > 0 ? @total_events / period_minutes : 0).round(1)
 
       # Group by name for table
@@ -59,13 +71,25 @@ module Catpm
 
     def show
       @name = params[:name]
-      @range, period, bucket_seconds = helpers.parse_range(params[:range])
+      @range, period, bucket_seconds = helpers.parse_range(remembered_range)
 
-      recent_buckets = Catpm::EventBucket.by_name(@name).recent(period).to_a
+      recent_buckets = if @range == 'all'
+        Catpm::EventBucket.by_name(@name).all.to_a
+      else
+        Catpm::EventBucket.by_name(@name).recent(period).to_a
+      end
+
+      bucket_seconds = helpers.compute_bucket_seconds(recent_buckets) if @range == 'all'
 
       # Hero metrics
       @total_count = recent_buckets.sum(&:count)
-      period_minutes = period.to_f / 60
+      effective_period = if @range == 'all'
+        earliest = recent_buckets.min_by(&:bucket_start)&.bucket_start
+        earliest ? [Time.current - earliest, 60].max : 3600
+      else
+        period
+      end
+      period_minutes = effective_period.to_f / 60
       @events_per_min = (period_minutes > 0 ? @total_count / period_minutes : 0).round(1)
       @last_seen = recent_buckets.map(&:bucket_start).max
 

data/app/controllers/catpm/status_controller.rb

@@ -6,9 +6,15 @@ module Catpm
 
     def index
       # Time range (parsed first — everything below uses this)
-      @range, period, bucket_seconds = helpers.parse_range(params[:range])
+      @range, period, bucket_seconds = helpers.parse_range(remembered_range)
 
-      recent_buckets = Catpm::Bucket.recent(period).to_a
+      recent_buckets = if @range == 'all'
+        Catpm::Bucket.all.to_a
+      else
+        Catpm::Bucket.recent(period).to_a
+      end
+
+      bucket_seconds = helpers.compute_bucket_seconds(recent_buckets) if @range == 'all'
 
       # Sparkline data
       slots = {}
@@ -31,7 +37,13 @@ module Catpm
 
       recent_count = recent_buckets.sum(&:count)
       recent_failures = recent_buckets.sum(&:failure_count)
-      period_minutes = period.to_f / 60
+      earliest_bucket = recent_buckets.min_by(&:bucket_start)&.bucket_start
+      effective_period = if @range == 'all'
+        earliest_bucket ? [Time.current - earliest_bucket, 60].max : 3600
+      else
+        earliest_bucket ? [[period, Time.current - earliest_bucket].min, 60].max : period
+      end
+      period_minutes = effective_period.to_f / 60
       @recent_avg_duration = recent_count > 0 ? (recent_buckets.sum(&:duration_sum) / recent_count).round(1) : 0.0
       @error_rate = recent_count > 0 ? (recent_failures.to_f / recent_count * 100).round(1) : 0.0
       @requests_per_min = (recent_count / period_minutes).round(1)

data/app/controllers/catpm/system_controller.rb

@@ -7,9 +7,6 @@ module Catpm
       @buffer_size = Catpm.buffer&.size || 0
       @buffer_bytes = Catpm.buffer&.current_bytes || 0
       @config = Catpm.config
-      @bucket_count = Catpm::Bucket.count
-      @sample_count = Catpm::Sample.count
-      @error_count = Catpm::ErrorRecord.count
       @oldest_bucket = Catpm::Bucket.minimum(:bucket_start)
       @active_error_count = Catpm::ErrorRecord.unresolved.count
     end

data/app/helpers/catpm/application_helper.rb

@@ -116,10 +116,14 @@ module Catpm
       circles = parsed.map.with_index do |(x, y, val), i|
         label = labels ? labels[i] : val.is_a?(Float) ? ('%.1f' % val) : val
         time_attr = time_labels ? %( data-time="#{time_labels[i]}") : ''
-        %(<circle cx="#{x}" cy="#{y}" r="6" fill="transparent" data-value="#{label}"#{time_attr} class="sparkline-dot"/>)
+        %(<circle cx="#{x}" cy="#{y}" r="0" data-value="#{label}"#{time_attr} class="sparkline-dot"/>)
       end.join
 
-      %(<svg width="#{width}" height="#{height}" viewBox="0 0 #{width} #{height}" xmlns="http://www.w3.org/2000/svg" style="display:block;position:relative">#{fill_el}<polyline points="#{coords_str.join(" ")}" fill="none" stroke="#{color}" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round"/>#{circles}</svg>).html_safe
+      capture = %(<rect width="#{width}" height="#{height}" fill="transparent"/>)
+      highlight = %(<circle cx="0" cy="0" r="3" fill="#{color}" class="sparkline-highlight" style="display:none"/>)
+      vline = %(<line x1="0" y1="0" x2="0" y2="#{height}" stroke="#{color}" stroke-width="0.5" opacity="0.4" class="sparkline-vline" style="display:none"/>)
+
+      %(<svg class="sparkline-chart" width="#{width}" height="#{height}" viewBox="0 0 #{width} #{height}" xmlns="http://www.w3.org/2000/svg" style="display:block">#{capture}#{fill_el}<polyline points="#{coords_str.join(" ")}" fill="none" stroke="#{color}" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round"/>#{circles}#{vline}#{highlight}</svg>).html_safe
     end
 
     def bar_chart_svg(data_points, width: 600, height: 200, color: 'var(--accent)', time_labels: nil)
@@ -207,16 +211,16 @@ module Catpm
       %(<span class="status-dot"><span class="dot" style="background:#{color}"></span> #{label}</span>).html_safe
     end
 
-    def parse_range(range_str, extra_valid: [])
-      valid = RANGE_KEYS + extra_valid
-      key = valid.include?(range_str) ? range_str : '1h'
-      return [key, nil, nil] if extra_valid.include?(key) && !RANGES.key?(key)
+    def parse_range(range_str)
+      key = (RANGE_KEYS + ['all']).include?(range_str) ? range_str : 'all'
+      return [key, nil, nil] if key == 'all'
       period, bucket_seconds = RANGES[key]
       [key, period, bucket_seconds]
     end
 
     def range_label(range)
       case range
+      when 'all' then 'All time'
       when '6h'  then 'Last 6 hours'
       when '24h' then 'Last 24 hours'
       when '1w'  then 'Last week'
@@ -227,6 +231,14 @@ module Catpm
       end
     end
 
+    def compute_bucket_seconds(buckets)
+      return 60 if buckets.empty?
+      times = buckets.map { |b| b.bucket_start.to_i }
+      span = times.max - times.min
+      span = 3600 if span < 3600
+      (span / 60.0).ceil
+    end
+
     def pagination_nav(current_page, total_count, per_page, extra_params: {})
       total_pages = (total_count.to_f / per_page).ceil
       return '' if total_pages <= 1
@@ -236,7 +248,7 @@ module Catpm
       prev_url = '?' + prev_params.compact.map { |k, v| "#{k}=#{v}" }.join('&')
       next_url = '?' + next_params.compact.map { |k, v| "#{k}=#{v}" }.join('&')
 
-      html = '<div class="pagination">'
+      html = +'<div class="pagination">'
       if current_page > 1
         html << %(<a href="#{prev_url}" class="btn">← Previous</a>)
       else

data/app/views/catpm/endpoints/show.html.erb

@@ -8,15 +8,20 @@
 
 <%= render "catpm/shared/page_nav", active: "performance" %>
 
-<div class="breadcrumbs">
-  <a href="<%= catpm.status_index_path %>">Performance</a>
-  <span class="sep">/</span>
-  <span><%= @target %></span>
+<div class="breadcrumbs" style="display:flex; align-items:center; justify-content:space-between">
+  <div>
+    <a href="<%= catpm.status_index_path %>">Performance</a>
+    <span class="sep">/</span>
+    <span><%= @target %></span>
+  </div>
+  <%= button_to "Delete Endpoint", catpm.endpoint_path(kind: @kind, target: @target, operation: @operation),
+      method: :delete, class: "btn btn-danger",
+      data: { confirm: "Delete this endpoint and all its data? This cannot be undone." } %>
 </div>
 
 <% ep_params = { kind: @kind, target: @target, operation: @operation } %>
 <div class="time-range">
-  <% (Catpm::ApplicationHelper::RANGE_KEYS + ["all"]).each do |r| %>
+  <% (["all"] + Catpm::ApplicationHelper::RANGE_KEYS).each do |r| %>
     <a href="<%= catpm.endpoint_path(ep_params.merge(range: r)) %>" class="<%= 'active' if @range == r %>"><%= r == "all" ? "All" : r %></a>
   <% end %>
 </div>
@@ -27,12 +32,12 @@
     <div class="value"><%= @count %></div>
   </div>
   <div class="card">
-    <div class="label">Avg Duration</div>
-    <div class="value"><%= format_duration(@avg_duration) %></div>
+    <div class="label">First Event</div>
+    <div class="value"><%= @first_event_at ? time_with_tooltip(@first_event_at) : "—" %></div>
   </div>
   <div class="card">
-    <div class="label">p95</div>
-    <div class="value"><%= @tdigest ? format_duration(@tdigest.percentile(0.95)) : "—" %></div>
+    <div class="label">Last Event</div>
+    <div class="value"><%= @last_event_at ? time_with_tooltip(@last_event_at) : "—" %></div>
   </div>
   <div class="card">
     <div class="label">Max</div>
@@ -101,19 +106,36 @@
     </div>
   </div>
 
-  <div class="grid">
-    <% type_data.each do |d| %>
-      <div class="card">
-        <div class="label">Avg <%= d[:label] %></div>
-        <div class="value"><%= "%.0f" % d[:avg_count] %></div>
-        <div class="detail"><%= format_duration(d[:avg_dur]) %> avg</div>
+<% end %>
+
+<% has_requests = @chart_requests&.any? { |v| v > 0 } %>
+<% has_errors = @chart_errors&.any? { |v| v > 0 } %>
+<% has_durations = @chart_durations&.any? { |v| v > 0 } %>
+<% if has_requests || has_errors || has_durations %>
+  <div class="charts-row">
+    <% if has_requests %>
+      <div class="chart-card">
+        <div class="label">Request Volume</div>
+        <div class="value"><%= @chart_requests.sum %></div>
+        <div class="detail"><%= range_label(@range) %></div>
+        <div class="sparkline"><%= sparkline_svg(@chart_requests, width: 500, height: 64, color: "var(--accent)", fill: true, time_labels: @chart_times) %></div>
       </div>
     <% end %>
-    <% if avg_other > 0 %>
-      <div class="card">
-        <div class="label">Avg Other</div>
-        <div class="value"><%= format_duration(avg_other) %></div>
-        <div class="detail">App code, middleware, etc.</div>
+    <% if has_errors %>
+      <div class="chart-card">
+        <div class="label">Error Volume</div>
+        <div class="value"><%= @chart_errors.sum %></div>
+        <div class="detail"><%= range_label(@range) %></div>
+        <div class="sparkline"><%= sparkline_svg(@chart_errors, width: 500, height: 64, color: "var(--red)", fill: true, time_labels: @chart_times) %></div>
+      </div>
+    <% end %>
+    <% if has_durations %>
+      <div class="chart-card">
+        <div class="label">Avg Duration</div>
+        <% nonzero = @chart_durations.select { |v| v > 0 } %>
+        <div class="value"><%= nonzero.any? ? format_duration(nonzero.sum / nonzero.size) : "—" %></div>
+        <div class="detail"><%= range_label(@range) %></div>
+        <div class="sparkline"><%= sparkline_svg(@chart_durations, width: 500, height: 64, color: "var(--accent)", fill: true, labels: @chart_durations.map { |d| format_duration(d) }, time_labels: @chart_times) %></div>
       </div>
     <% end %>
   </div>

data/app/views/catpm/errors/show.html.erb

@@ -50,16 +50,21 @@
 
 <%# ─── Error Frequency Chart ─── %>
 <div class="time-range">
-  <% Catpm::ApplicationHelper::RANGE_KEYS.each do |r| %>
-    <a href="<%= catpm.error_path(@error, range: r) %>" class="<%= 'active' if @range == r %>"><%= r %></a>
+  <% (["all"] + Catpm::ApplicationHelper::RANGE_KEYS).each do |r| %>
+    <a href="<%= catpm.error_path(@error, range: r) %>" class="<%= 'active' if @range == r %>"><%= r == "all" ? "All" : r %></a>
   <% end %>
 </div>
 
-<h2>Error Frequency</h2>
-<%= section_description("Occurrences per time slot over the selected range.") %>
-<div style="border:1px solid var(--border); border-radius:var(--radius); padding:16px; margin-bottom:24px; position:relative">
-  <%= bar_chart_svg(@chart_data, width: 600, height: 180, color: "var(--red, #e5534b)", time_labels: @chart_times) %>
-</div>
+<% if @chart_data&.any? { |v| v > 0 } %>
+  <div class="charts-row">
+    <div class="chart-card">
+      <div class="label">Error Frequency</div>
+      <div class="value"><%= @chart_data.sum %></div>
+      <div class="detail">occurrences &middot; <%= range_label(@range) %></div>
+      <div class="sparkline"><%= sparkline_svg(@chart_data, width: 500, height: 64, color: "var(--red)", fill: true, time_labels: @chart_times) %></div>
+    </div>
+  </div>
+<% end %>
 
 <%# ─── Backtrace ─── %>
 <% first_bt = @contexts.first && (@contexts.first["backtrace"] || @contexts.first[:backtrace] || []) %>

data/app/views/catpm/events/index.html.erb

@@ -5,8 +5,8 @@
 
 <%# ─── Time Range ─── %>
 <div class="time-range">
-  <% Catpm::ApplicationHelper::RANGE_KEYS.each do |r| %>
-    <a href="<%= catpm.events_path(range: r) %>" class="<%= 'active' if @range == r %>"><%= r %></a>
+  <% (["all"] + Catpm::ApplicationHelper::RANGE_KEYS).each do |r| %>
+    <a href="<%= catpm.events_path(range: r) %>" class="<%= 'active' if @range == r %>"><%= r == "all" ? "All" : r %></a>
   <% end %>
   <span style="margin-left:auto; font-size:12px; color:var(--text-2)">
     Updated <%= Time.current.strftime("%H:%M:%S") %>

data/app/views/catpm/events/show.html.erb

@@ -11,8 +11,8 @@
 
 <%# ─── Time Range ─── %>
 <div class="time-range">
-  <% Catpm::ApplicationHelper::RANGE_KEYS.each do |r| %>
-    <a href="<%= catpm.event_path(name: @name, range: r) %>" class="<%= 'active' if @range == r %>"><%= r %></a>
+  <% (["all"] + Catpm::ApplicationHelper::RANGE_KEYS).each do |r| %>
+    <a href="<%= catpm.event_path(name: @name, range: r) %>" class="<%= 'active' if @range == r %>"><%= r == "all" ? "All" : r %></a>
   <% end %>
 </div>
 
@@ -34,12 +34,16 @@
   </div>
 </div>
 
-<%# ─── Bar Chart ─── %>
-<h2>Event Volume</h2>
-<%= section_description("Events per time slot over the selected range.") %>
-<div style="border:1px solid var(--border); border-radius:var(--radius); padding:16px; margin-bottom:24px; position:relative">
-  <%= bar_chart_svg(@chart_data, width: 600, height: 180, color: "var(--accent)", time_labels: @chart_times) %>
-</div>
+<% if @chart_data&.any? { |v| v > 0 } %>
+  <div class="charts-row">
+    <div class="chart-card">
+      <div class="label">Event Volume</div>
+      <div class="value"><%= @chart_data.sum %></div>
+      <div class="detail"><%= range_label(@range) %></div>
+      <div class="sparkline"><%= sparkline_svg(@chart_data, width: 500, height: 64, color: "var(--accent)", fill: true, time_labels: @chart_times) %></div>
+    </div>
+  </div>
+<% end %>
 
 <%# ─── Recent Samples ─── %>
 <h2>Recent Samples</h2>

data/app/views/catpm/samples/show.html.erb

@@ -34,48 +34,34 @@
   <% end %>
 </div>
 
-<%# ─── Request Context + Full JSON side by side ─── %>
+<%# ─── Request Context ─── %>
 <%
-  ctx_display = @context.except("segments", :segments, "segment_summary", :segment_summary, "segments_capped", :segments_capped, "backtrace", :backtrace)
+  ctx_display = @context.except("segments", :segments, "segment_summary", :segment_summary, "segments_capped", :segments_capped, "backtrace", :backtrace, "method", :method, "path", :path, "status", :status)
   ctx_flat = ctx_display.select { |_, v| !v.is_a?(Hash) && !v.is_a?(Array) }
   ctx_nested = ctx_display.select { |_, v| v.is_a?(Hash) || v.is_a?(Array) }
 %>
 
-<div class="sample-layout">
-  <% if ctx_display.any? %>
-    <div class="sample-sidebar">
-      <h2 style="margin-top:0">Request Context</h2>
-      <% if ctx_flat.any? %>
-        <div class="context-grid" style="margin-bottom:12px">
-          <% ctx_flat.each do |k, v| %>
-            <div class="ctx-key"><%= k %></div>
-            <div class="ctx-val"><%= v.to_s.truncate(200) %></div>
-          <% end %>
-        </div>
-      <% end %>
-      <% if ctx_nested.any? %>
-        <% ctx_nested.each do |k, v| %>
-          <details class="collapsible" open>
-            <summary><%= k %></summary>
-            <div class="details-body">
-              <pre class="mono" style="color:var(--text-1); white-space:pre-wrap; font-size:12px"><%= JSON.pretty_generate(v) rescue v.inspect %></pre>
-            </div>
-          </details>
-        <% end %>
+<% if ctx_display.any? %>
+  <h2>Request Context</h2>
+  <% if ctx_flat.any? %>
+    <div class="context-grid" style="margin-bottom:12px">
+      <% ctx_flat.each do |k, v| %>
+        <div class="ctx-key"><%= k %></div>
+        <div class="ctx-val"><%= v.to_s.truncate(200) %></div>
       <% end %>
     </div>
   <% end %>
-
-  <div class="sample-main">
-    <%# ─── Full JSON ─── %>
-    <details class="collapsible" open>
-      <summary>Full JSON</summary>
-      <div class="details-body">
-        <pre class="mono" style="color:var(--text-1); white-space:pre-wrap; font-size:12px; word-break:break-all"><%= JSON.pretty_generate(@context.except("segments", :segments)) rescue @context.inspect %></pre>
-      </div>
-    </details>
-  </div>
-</div>
+  <% if ctx_nested.any? %>
+    <% ctx_nested.each do |k, v| %>
+      <details class="collapsible" open>
+        <summary><%= k %></summary>
+        <div class="details-body">
+          <pre class="mono" style="color:var(--text-1); white-space:pre-wrap; font-size:12px"><%= JSON.pretty_generate(v) rescue v.inspect %></pre>
+        </div>
+      </details>
+    <% end %>
+  <% end %>
+<% end %>
 
 <%# ─── Time Breakdown (full width, above waterfall) ─── %>
 <% if @summary.any? %>

data/app/views/catpm/shared/_page_nav.html.erb

@@ -1,6 +1,8 @@
 <div class="page-nav">
   <a href="<%= catpm.status_index_path %>"<%= ' class="active"'.html_safe if active == "performance" %>>Performance</a>
-  <a href="<%= catpm.events_path %>"<%= ' class="active"'.html_safe if active == "events" %>>Events</a>
+  <% if Catpm.config.events_enabled || Catpm::EventBucket.exists? %>
+    <a href="<%= catpm.events_path %>"<%= ' class="active"'.html_safe if active == "events" %>>Events</a>
+  <% end %>
   <a href="<%= catpm.errors_path %>"<%= ' class="active"'.html_safe if active == "errors" %>>Errors<% if @active_error_count.to_i > 0 %><span class="nav-count alert"><%= @active_error_count %></span><% end %></a>
   <a href="<%= catpm.system_index_path %>"<%= ' class="active"'.html_safe if active == "system" %>>System</a>
 </div>

data/app/views/catpm/status/index.html.erb

@@ -5,8 +5,8 @@
 
 <%# ─── Time Range ─── %>
 <div class="time-range">
-  <% Catpm::ApplicationHelper::RANGE_KEYS.each do |r| %>
-    <a href="<%= catpm.status_index_path(range: r) %>" class="<%= 'active' if @range == r %>"><%= r %></a>
+  <% (["all"] + Catpm::ApplicationHelper::RANGE_KEYS).each do |r| %>
+    <a href="<%= catpm.status_index_path(range: r) %>" class="<%= 'active' if @range == r %>"><%= r == "all" ? "All" : r %></a>
   <% end %>
   <span style="margin-left:auto; font-size:12px; color:var(--text-2)">
     Updated <%= Time.current.strftime("%H:%M:%S") %> ·

data/app/views/catpm/system/index.html.erb

@@ -38,8 +38,8 @@
   <div class="pipeline-node">
     <div class="node-icon"><svg width="28" height="28" viewBox="0 0 28 28" fill="none" stroke="var(--text-2)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><ellipse cx="14" cy="8" rx="8" ry="4"/><path d="M6 8v12c0 2.2 3.58 4 8 4s8-1.8 8-4V8"/><path d="M6 14c0 2.2 3.58 4 8 4s8-1.8 8-4"/></svg></div>
     <div class="node-label">Database</div>
-    <div class="node-value"><%= @bucket_count %> <span style="font-size:12px;font-weight:400;color:var(--text-2)">buckets</span></div>
-    <div class="node-detail">Aggregated stats are stored as time buckets, plus <%= @sample_count %> detailed samples and <%= @error_count %> error fingerprints.<br><%= @oldest_bucket ? "Data since #{@oldest_bucket.strftime('%b %-d')}, retained #{@config.retention_period ? "#{(@config.retention_period / 1.day).to_i} days" : "forever"}." : "No data yet." %></div>
+    <div class="node-value" style="font-size:14px">Storage</div>
+    <div class="node-detail">Aggregated stats are stored as time buckets, with detailed samples and error fingerprints.<br><%= @oldest_bucket ? "Data since #{@oldest_bucket.strftime('%b %-d')}, retained #{@config.retention_period ? "#{(@config.retention_period / 1.day).to_i} days" : "forever"}." : "No data yet." %></div>
   </div>
 </div>