rails_pulse 0.1.3 → 0.2.2

data/app/views/rails_pulse/requests/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/breadcrumbs' %>
+<%= render 'rails_pulse/components/page_header' %>
 
 <% unless turbo_frame_request? %>
   <div class="row">
@@ -9,61 +9,51 @@
   </div>
 <% end %>
 
-<div
-  data-controller="rails-pulse--index"
-  data-rails-pulse--index-chart-id-value="average_response_times_chart"
->
-  <%= render 'rails_pulse/components/panel', { title: 'Average Response Time', } do %>
-    <%= search_form_for @ransack_query, url: requests_path, class: "flex items-center justify-between gap mb-4" do |form| %>
-      <div class="flex items-center grow gap">
-        <%= form.select :period_start_range,
-          RailsPulse::RequestsController::TIME_RANGE_OPTIONS,
-          { selected: @selected_time_range },
-          { class: "input" }
-        %>
-        <%= form.select :avg_duration,
-          duration_options(:request),
-          { selected: @selected_response_range },
-          { class: "input" }
-        %>
-        <%= link_to "Reset", requests_path, class: "btn btn--borderless show@md" if params.has_key?(:q) %>
-        <%= form.submit "Search", class: "btn show@sm" %>
-      </div>
-    <% end %>
+<%= render 'rails_pulse/components/panel', { title: 'Requests', } do %>
+  <%= search_form_for @ransack_query, url: requests_path, class: "flex items-center justify-between gap mb-4", data: { controller: "rails-pulse--custom-range" } do |form| %>
+    <div class="flex items-center grow gap">
+      <%= time_range_selector(form,
+        time_range_options: RailsPulse::RequestsController::TIME_RANGE_OPTIONS,
+        selected_time_range: @selected_time_range,
+        mode: :recent_custom
+      ) %>
+
+      <%= form.search_field :route_path_cont,
+        placeholder: "Filter by route",
+        autocomplete: "off",
+        class: "input"
+      %>
+
+      <%= form.select :status_category_eq,
+        [
+          ["All statuses", ""],
+          ["2xx Success", "2"],
+          ["3xx Redirect", "3"],
+          ["4xx Client Error", "4"],
+          ["5xx Server Error", "5"]
+        ],
+        {},
+        { class: "input" }
+      %>
 
-    <% if @has_data %>
-      <% if @chart_data && @chart_data.values.any? { |v| v > 0 } %>
-        <div
-          class="chart-container chart-container--slim"
-          data-rails-pulse--index-target="chart"
-        >
-          <%= bar_chart(
-            @chart_data,
-            code: false,
-            id: "average_response_times_chart",
-            height: "100%",
-            options: bar_chart_options(
-              units: "ms",
-              zoom: true,
-              chart_start: 0,
-              chart_end: @chart_data.length - 1,
-              xaxis_formatter: @xaxis_formatter,
-              tooltip_formatter: @tooltip_formatter,
-              zoom_start: @zoom_start,
-              zoom_end: @zoom_end,
-              chart_data: @chart_data
-            )
-          ) %>
-        </div>
-      <% end %>
+      <%= form.select :duration_gteq,
+        duration_options(:request),
+        { selected: @selected_response_range, prompt: "Min duration" },
+        { class: "input" }
+      %>
 
-      <%= turbo_frame_tag :index_table, data: { rails_pulse__index_target: "indexTable" } do %>
-        <%= render 'rails_pulse/requests/table' %>
-      <% end %>
-    <% else %>
-      <%= render 'rails_pulse/components/empty_state',
-          title: 'No request data found for the selected filters.',
-          description: 'Try adjusting your time range or filters to see results.' %>
+      <%= link_to "Reset", requests_path, class: "btn btn--borderless show@md" if params.has_key?(:q) %>
+      <%= form.submit "Search", class: "btn show@sm" %>
+    </div>
+  <% end %>
+
+  <% if @has_data %>
+    <%= turbo_frame_tag :index_table do %>
+      <%= render 'rails_pulse/requests/table' %>
     <% end %>
+  <% else %>
+    <%= render 'rails_pulse/components/empty_state',
+        title: 'No request data found for the selected filters.',
+        description: 'Try adjusting your time range or filters to see results.' %>
   <% end %>
-</div>
+<% end %>

data/app/views/rails_pulse/requests/show.html.erb

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/breadcrumbs' %>
+<%= render 'rails_pulse/components/page_header', taggable: @request %>
 
 <div class="row">
   <div class="grid-item">
@@ -8,8 +8,6 @@
         <dd><%= link_to @request.route.path_and_method, route_path(@request.route) %></dd>
         <dt>Timestamp</dt>
         <dd><%= human_readable_occurred_at(@request.occurred_at) %></dd>
-        <dt>Request UUID</dt>
-        <dd><code><%= @request.request_uuid %></code></dd>
         <dt>Duration</dt>
         <dd><%= @request.duration.round(2) %> ms</dd>
         <dt>Status</dt>

data/app/views/rails_pulse/routes/_requests_table.html.erb

@@ -0,0 +1,41 @@
+<% columns = [
+  { field: :occurred_at, label: 'Timestamp', class: 'w-auto' },
+  { field: :duration, label: 'Response Time', class: 'w-36' },
+  { field: :status, label: 'Status', class: 'w-20' },
+  { field: nil, label: 'Tags', class: 'w-32' }
+] %>
+
+<table class="table mbs-4" data-controller="rails-pulse--table-sort">
+  <%= render "rails_pulse/components/table_head", columns: columns %>
+
+  <tbody>
+    <% @table_data.each do |request| %>
+      <tr>
+        <td class="whitespace-nowrap">
+          <%= link_to human_readable_occurred_at(request.occurred_at), request_path(request), data: { turbo_frame: '_top' } %>
+        </td>
+        <td class="whitespace-nowrap">
+          <% performance_class = case request.duration
+            when 0..100 then "text-green-600"
+            when 100..300 then "text-yellow-600"
+            when 300..1000 then "text-orange-600"
+            else "text-red-600"
+            end %>
+          <span class="<%= performance_class %> font-medium">
+            <%= request.duration.round(2) %> ms
+          </span>
+        </td>
+        <td class="whitespace-nowrap">
+          <% if request.is_error? %>
+            <span class="text-red-600">Error (<%= request.status %>)</span>
+          <% else %>
+            <span class="text-green-600"><%= request.status %></span>
+          <% end %>
+        </td>
+        <td class="whitespace-nowrap"><%= display_tag_badges(request) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render "rails_pulse/components/table_pagination" %>

data/app/views/rails_pulse/routes/_table.html.erb

@@ -1,11 +1,9 @@
 <% columns = [
   { field: :route_path, label: 'Route', class: 'w-auto' },
-  { field: :avg_duration_sort, label: 'Average Response Time', class: 'w-36' },
-  { field: :max_duration_sort, label: 'Max Response Time', class: 'w-32' },
+  { field: :avg_duration_sort, label: 'Average Response Time', class: 'w-48' },
+  { field: :max_duration_sort, label: 'Max Response Time', class: 'w-44' },
   { field: :count_sort, label: 'Requests', class: 'w-24' },
-  { field: :requests_per_minute, label: 'Requests Per Minute', class: 'w-28' },
-  { field: :error_rate_percentage, label: 'Error Rate (%)', class: 'w-20' },
-  { field: :status_indicator, label: 'Status', class: 'w-16', sortable: false }
+  { field: nil, label: 'Tags', class: 'w-32' }
 ] %>
 
 <table class="table mbs-4" data-controller="rails-pulse--table-sort">
@@ -18,9 +16,7 @@
         <td class="whitespace-nowrap"><%= summary.avg_duration.to_i %> ms</td>
         <td class="whitespace-nowrap"><%= summary.max_duration.to_i %> ms</td>
         <td class="whitespace-nowrap"><%= number_with_delimiter summary.count %></td>
-        <td class="whitespace-nowrap"><%= summary.count < 1 ? '< 1' : (summary.count / 60.0).round(2) %></td>
-        <td class="whitespace-nowrap"><%= ((summary.error_count.to_f / summary.count) * 100).round(2) %>%</td>
-        <td class="whitespace-nowrap text-center"><%= route_status_indicator(summary.avg_duration >= 500 ? 1 : 0) %></td>
+        <td class="whitespace-nowrap"><%= display_tag_badges(summary.tags) %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/rails_pulse/routes/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/breadcrumbs' %>
+<%= render 'rails_pulse/components/page_header' %>
 
 <% unless turbo_frame_request? %>
   <div class="row">
@@ -14,14 +14,10 @@
   data-rails-pulse--index-chart-id-value="average_response_times_chart"
 >
   <%= render 'rails_pulse/components/panel', { title: 'Average Response Time', card_classes: 'b-full' } do %>
-    <%= search_form_for @ransack_query, url: routes_path, class: "flex items-center justify-between gap mb-4" do |form| %>
+    <%= search_form_for @ransack_query, url: routes_path, class: "flex items-center justify-between gap mb-4", data: { controller: "rails-pulse--custom-range" } do |form| %>
       <div class="flex items-center grow gap">
-        <%= form.search_field :route_path_cont, placeholder: "Filter by route", autocomplete: "off", class: "input", style: "max-inline-size: 250px" %>
-        <%= form.select :period_start_range,
-          RailsPulse::RoutesController::TIME_RANGE_OPTIONS,
-          { selected: @selected_time_range },
-          { class: "input" }
-        %>
+        <%= time_range_selector(form, time_range_options: RailsPulse::RoutesController::TIME_RANGE_OPTIONS, selected_time_range: @selected_time_range) %>
+        <%= form.search_field :route_path_cont, placeholder: "Filter by route", autocomplete: "off", class: "input" %>
         <%= form.select :avg_duration,
           duration_options(:route),
           { selected: @selected_response_range },

data/app/views/rails_pulse/routes/show.html.erb

@@ -1,6 +1,4 @@
-<%= render 'rails_pulse/components/breadcrumbs' %>
-
-<h1 class="text-2xl mis-2"><%= @route.path_and_method %></h1>
+<%= render 'rails_pulse/components/page_header', taggable: @route %>
 
 <% unless turbo_frame_request? %>
   <div class="row">
@@ -14,17 +12,13 @@
 <div
   class="row"
   data-controller="rails-pulse--index"
-  data-rails-pulse--index-chart-id-value="route_repsonses_chart"
+  data-rails-pulse--index-chart-id-value="route_responses_chart"
 >
   <div class="grid-item">
     <%= render 'rails_pulse/components/panel', { title: 'Route Reqeusts', } do %>
-      <%= search_form_for @ransack_query, url: route_path(@route), class: "flex items-center justify-between gap mb-4" do |form| %>
+      <%= search_form_for @ransack_query, url: route_path(@route), class: "flex items-center justify-between gap mb-4", data: { controller: "rails-pulse--custom-range" } do |form| %>
         <div class="flex items-center grow gap">
-          <%= form.select :period_start_range,
-            RailsPulse::RoutesController::TIME_RANGE_OPTIONS,
-            { selected: @selected_time_range },
-            { class: "input" }
-          %>
+          <%= time_range_selector(form, time_range_options: RailsPulse::RoutesController::TIME_RANGE_OPTIONS, selected_time_range: @selected_time_range) %>
           <%= form.select :avg_duration,
             duration_options(:route),
             { selected: @selected_response_range },
@@ -44,7 +38,7 @@
             <%= bar_chart(
               @chart_data,
               code: false,
-              id: "route_repsonses_chart",
+              id: "route_responses_chart",
               height: "100%",
               options: bar_chart_options(
                 units: "ms",
@@ -62,7 +56,7 @@
         <% end %>
 
         <%= turbo_frame_tag :index_table, data: { rails_pulse__index_target: "indexTable" } do %>
-          <%= render 'rails_pulse/requests/table' %>
+          <%= render 'rails_pulse/routes/requests_table' %>
         <% end %>
       <% else %>
         <%= render 'rails_pulse/components/empty_state',

data/app/views/rails_pulse/tags/_tag_manager.html.erb

@@ -0,0 +1,73 @@
+<%
+  taggable_type = taggable.class.name.demodulize.underscore
+  available_tags = RailsPulse.configuration.tags
+  current_tags = taggable.tag_list
+  available_to_add = available_tags - current_tags
+%>
+
+<div
+  id="tag_manager_<%= taggable_type %>_<%= taggable.id %>"
+  class="tag-manager"
+>
+  <div class="tag-list">
+    <% current_tags.each do |tag| %>
+      <span class="tag">
+        <%= tag %>
+        <%= button_to remove_tag_path(taggable_type, taggable.id, tag: tag),
+              method: :delete,
+              class: "tag-remove",
+              data: {
+                turbo_frame: "_top"
+              } do %>
+          <span aria-hidden="true">&times;</span>
+        <% end %>
+      </span>
+    <% end %>
+
+    <% if available_to_add.any? %>
+      <div class="tag-add-container" data-controller="rails-pulse--popover" data-rails-pulse--popover-placement-value="bottom-start">
+        <button
+          type="button"
+          id="tag_menu_button_<%= taggable_type %>_<%= taggable.id %>"
+          class="btn btn--sm tag-add-button"
+          data-rails-pulse--popover-target="button"
+          data-action="rails-pulse--popover#toggle"
+          aria-haspopup="true"
+          aria-controls="tag_menu_<%= taggable_type %>_<%= taggable.id %>"
+        >
+          + tag
+        </button>
+
+        <div
+          popover
+          class="popover"
+          style="--popover-size: 12rem;"
+          data-rails-pulse--popover-target="menu"
+        >
+          <div
+            id="tag_menu_<%= taggable_type %>_<%= taggable.id %>"
+            class="menu"
+            data-controller="rails-pulse--menu"
+            data-action="keydown.up->rails-pulse--menu#prev keydown.down->rails-pulse--menu#next"
+            role="menu"
+            aria-labelledby="tag_menu_button_<%= taggable_type %>_<%= taggable.id %>"
+          >
+            <% available_to_add.each do |tag| %>
+              <%= button_to add_tag_path(taggable_type, taggable.id, tag: tag),
+                    method: :post,
+                    class: "btn menu__item i-full",
+                    data: {
+                      turbo_frame: "_top",
+                      rails_pulse__menu_target: "item"
+                    },
+                    style: "cursor: pointer;",
+                    role: "menuitem" do %>
+                <%= tag %>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/initializers/rails_charts_csp_patch.rb

@@ -1,62 +1,54 @@
-# Monkey patch for RailsCharts CSP compliance
-# This adds nonce attributes to script tags generated by the RailsCharts gem
+# CSP patch for RailsCharts gem
+# Adds nonce attributes to script tags generated by RailsCharts for CSP compliance
 
 if defined?(RailsCharts)
   module RailsCharts
     module CspPatch
       def line_chart(data_source, options = {})
-        # Get the original chart HTML
         chart_html = super(data_source, options)
+        add_csp_nonce_to_chart(chart_html)
+      end
 
-        # Try to get CSP nonce from various sources
-        nonce = get_csp_nonce
-
-        if nonce.present? && chart_html.present?
-          # Add nonce to all script tags in the chart HTML
-          chart_html = add_nonce_to_scripts(chart_html.to_s, nonce)
-          # Ensure the HTML is marked as safe for Rails to render
-          chart_html = chart_html.html_safe if chart_html.respond_to?(:html_safe)
-        end
-
-        chart_html
+      def bar_chart(data_source, options = {})
+        chart_html = super(data_source, options)
+        add_csp_nonce_to_chart(chart_html)
       end
 
       private
 
-      def get_csp_nonce
-        # Try various methods to get the CSP nonce
-        nonce = nil
+      def add_csp_nonce_to_chart(chart_html)
+        return chart_html unless chart_html.present?
 
-        # Method 1: Check for Rails 6+ CSP nonce helper
-        if respond_to?(:content_security_policy_nonce)
-          nonce = content_security_policy_nonce
-        end
-
-        # Method 2: Check for custom csp_nonce helper
-        if nonce.blank? && respond_to?(:csp_nonce)
-          nonce = csp_nonce
-        end
+        nonce = get_csp_nonce
+        return chart_html unless nonce.present?
 
-        # Method 3: Check request environment
-        if nonce.blank? && defined?(request) && request
-          nonce = request.env["action_dispatch.content_security_policy_nonce"] ||
-                  request.env["secure_headers.content_security_policy_nonce"] ||
-                  request.env["csp_nonce"]
-        end
+        # Add nonce to script tags and mark as safe
+        modified_html = add_nonce_to_scripts(chart_html.to_s, nonce)
+        modified_html.html_safe if modified_html.respond_to?(:html_safe)
+      end
 
-        # Method 4: Check thread/request store
-        if nonce.blank?
-          nonce = Thread.current[:rails_pulse_csp_nonce] ||
-                  (defined?(RequestStore) && RequestStore.store[:rails_pulse_csp_nonce])
+      def get_csp_nonce
+        # Try common CSP nonce sources in order of preference
+        if respond_to?(:content_security_policy_nonce)
+          content_security_policy_nonce
+        elsif respond_to?(:csp_nonce)
+          csp_nonce
+        elsif defined?(request) && request
+          request.env["action_dispatch.content_security_policy_nonce"] ||
+          request.env["secure_headers.content_security_policy_nonce"] ||
+          request.env["csp_nonce"]
+        elsif respond_to?(:controller) && controller.respond_to?(:content_security_policy_nonce)
+          controller.content_security_policy_nonce
+        elsif defined?(@view_context) && @view_context.respond_to?(:content_security_policy_nonce)
+          @view_context.content_security_policy_nonce
+        else
+          Thread.current[:rails_pulse_csp_nonce] ||
+          (defined?(RequestStore) && RequestStore.store[:rails_pulse_csp_nonce])
         end
-
-        nonce.presence
       end
 
       def add_nonce_to_scripts(html, nonce)
-        # Use regex to add nonce to script tags that don't already have one
         html.gsub(/<script(?![^>]*\snonce=)([^>]*)>/i) do |match|
-          # Insert nonce attribute before the closing >
           attributes = $1
           if attributes.strip.empty?
             "<script nonce=\"#{nonce}\">"

data/config/routes.rb

@@ -11,6 +11,11 @@ RailsPulse::Engine.routes.draw do
   resources :operations, only: %i[show]
   resources :caches, only: %i[show], as: :cache
   patch "pagination/limit", to: "application#set_pagination_limit"
+  patch "settings/global_filters", to: "application#set_global_filters"
+
+  # Tag management
+  post "tags/:taggable_type/:taggable_id/add", to: "tags#create", as: :add_tag
+  delete "tags/:taggable_type/:taggable_id/remove", to: "tags#destroy", as: :remove_tag
 
   # CSP compliance testing
   get "csp_test", to: "csp_test#show", as: :csp_test

data/db/migrate/20250930105043_install_rails_pulse_tables.rb

@@ -0,0 +1,23 @@
+# Generated from Rails Pulse schema - automatically loads current schema definition
+class InstallRailsPulseTables < ActiveRecord::Migration["#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}".to_f]
+  def change
+    # Load and execute the Rails Pulse schema directly
+    # This ensures the migration is always in sync with the schema file
+    schema_file = File.join(File.dirname(__FILE__), "..", "rails_pulse_schema.rb")
+
+    if File.exist?(schema_file)
+      say "Loading Rails Pulse schema from db/rails_pulse_schema.rb"
+
+      # Load the schema file to define RailsPulse::Schema
+      load schema_file
+
+      # Execute the schema in the context of this migration
+      RailsPulse::Schema.call(connection)
+
+      say "Rails Pulse tables created successfully"
+      say "The schema file db/rails_pulse_schema.rb remains as your single source of truth"
+    else
+      raise "Rails Pulse schema file not found at db/rails_pulse_schema.rb"
+    end
+  end
+end

data/db/rails_pulse_schema.rb

@@ -4,7 +4,7 @@
 
 RailsPulse::Schema = lambda do |connection|
   # Skip if all tables already exist to prevent conflicts
-  required_tables = [:rails_pulse_routes, :rails_pulse_queries, :rails_pulse_requests, :rails_pulse_operations, :rails_pulse_summaries]
+  required_tables = [ :rails_pulse_routes, :rails_pulse_queries, :rails_pulse_requests, :rails_pulse_operations, :rails_pulse_summaries ]
 
   if ENV["CI"] == "true"
     existing_tables = required_tables.select { |table| connection.table_exists?(table) }
@@ -18,6 +18,7 @@ RailsPulse::Schema = lambda do |connection|
   connection.create_table :rails_pulse_routes do |t|
     t.string :method, null: false, comment: "HTTP method (e.g., GET, POST)"
     t.string :path, null: false, comment: "Request path (e.g., /posts/index)"
+    t.text :tags, comment: "JSON array of tags for filtering and categorization"
     t.timestamps
   end
 
@@ -34,6 +35,7 @@ RailsPulse::Schema = lambda do |connection|
     t.text :index_recommendations, comment: "JSON array of database index recommendations"
     t.text :n_plus_one_analysis, comment: "JSON object with enhanced N+1 query detection results"
     t.text :suggestions, comment: "JSON array of optimization recommendations"
+    t.text :tags, comment: "JSON array of tags for filtering and categorization"
     t.timestamps
   end
 
@@ -47,6 +49,7 @@ RailsPulse::Schema = lambda do |connection|
     t.string :request_uuid, null: false, comment: "Unique identifier for the request (e.g., UUID)"
     t.string :controller_action, comment: "Controller and action handling the request (e.g., PostsController#show)"
     t.timestamp :occurred_at, null: false, comment: "When the request started"
+    t.text :tags, comment: "JSON array of tags for filtering and categorization"
     t.timestamps
   end
 

data/lib/generators/rails_pulse/convert_to_migrations_generator.rb

@@ -13,18 +13,32 @@ module RailsPulse
 
       def check_schema_file
         unless File.exist?("db/rails_pulse_schema.rb")
-          say "No db/rails_pulse_schema.rb file found. Run 'rails generate rails_pulse:install' first.", :red
-          exit 1
+          # Only show message in non-test environments to reduce test noise
+          unless Rails.env.test?
+            say "No db/rails_pulse_schema.rb file found. Run 'rails generate rails_pulse:install' first.", :red
+            exit 1
+          else
+            return false
+          end
         end
 
         if rails_pulse_tables_exist?
-          say "Rails Pulse tables already exist. No conversion needed.", :yellow
-          say "Use 'rails generate rails_pulse:upgrade' to update existing installation.", :blue
-          exit 0
+          unless Rails.env.test?
+            say "Rails Pulse tables already exist. No conversion needed.", :yellow
+            say "Use 'rails generate rails_pulse:upgrade' to update existing installation.", :blue
+            exit 0
+          else
+            return false
+          end
         end
+
+        true
       end
 
       def create_conversion_migration
+        # Only create migration if schema file check passes
+        return unless check_schema_file
+
         say "Converting db/rails_pulse_schema.rb to migration...", :green
 
         migration_template(
@@ -34,17 +48,19 @@ module RailsPulse
       end
 
       def display_completion_message
+        # Only display completion message if migration was created
+        return unless File.exist?("db/rails_pulse_schema.rb")
+
         say <<~MESSAGE
 
           Conversion complete!
 
           Next steps:
           1. Run: rails db:migrate
-          2. Delete: db/rails_pulse_schema.rb (no longer needed)
-          3. Remove db/rails_pulse_migrate/ directory if it exists
-          4. Restart your Rails server
+          2. Restart your Rails server
 
-          Future Rails Pulse updates will come as regular migrations.
+          The schema file db/rails_pulse_schema.rb remains as your single source of truth.
+          Future Rails Pulse updates will come as regular migrations in db/migrate/
 
         MESSAGE
       end

data/lib/generators/rails_pulse/install_generator.rb

@@ -18,6 +18,29 @@ module RailsPulse
         copy_file "db/rails_pulse_schema.rb", "db/rails_pulse_schema.rb"
       end
 
+      def create_migration_directory
+        create_file "db/rails_pulse_migrate/.keep"
+      end
+
+      def copy_gem_migrations
+        gem_migrations_path = File.expand_path("../../../db/rails_pulse_migrate", __dir__)
+        destination_dir = separate_database? ? "db/rails_pulse_migrate" : "db/migrate"
+
+        if File.directory?(gem_migrations_path)
+          Dir.glob("#{gem_migrations_path}/*.rb").each do |migration_file|
+            migration_name = File.basename(migration_file)
+            destination_path = File.join(destination_dir, migration_name)
+
+            # Only copy if it doesn't already exist in the destination
+            # Use File.join with destination_root to check the actual location
+            full_destination_path = File.join(destination_root, destination_path)
+            unless File.exist?(full_destination_path)
+              copy_file migration_file, destination_path
+            end
+          end
+        end
+      end
+
       def copy_initializer
         copy_file "rails_pulse.rb", "config/initializers/rails_pulse.rb"
       end
@@ -45,10 +68,9 @@ module RailsPulse
       end
 
       def create_separate_database_setup
-        create_file "db/rails_pulse_migrate/.keep"
-
         say "Setting up separate database configuration...", :green
 
+        # Migration directory already created by create_migration_directory
         # Could add database.yml configuration here if needed
         # For now, users will configure manually
       end
@@ -80,7 +102,8 @@ module RailsPulse
           2. Run: rails db:prepare (creates database and loads schema)
           3. Restart your Rails server
 
-          Future schema changes will come as regular migrations in db/rails_pulse_migrate/
+          The schema file db/rails_pulse_schema.rb is your single source of truth.
+          Future upgrades will automatically copy new migrations to db/rails_pulse_migrate/
 
         MESSAGE
       end
@@ -92,12 +115,12 @@ module RailsPulse
 
           Next steps:
           1. Run: rails db:migrate (creates Rails Pulse tables in your main database)
-          2. Delete: db/rails_pulse_schema.rb (no longer needed)
-          3. Restart your Rails server
+          2. Restart your Rails server
 
-          Future schema changes will come as regular migrations in db/migrate/
+          The schema file db/rails_pulse_schema.rb is your single source of truth.
+          Future upgrades will automatically copy new migrations to db/migrate/
 
-          Note: The installation migration was created from db/rails_pulse_schema.rb
+          Note: The installation migration loads from db/rails_pulse_schema.rb
           and includes all current Rails Pulse tables and columns.
 
         MESSAGE