rails-hyperdrive 0.3.0 → 0.5.0

data/lib/rails/hyperdrive/stack_profile.rb

@@ -5,15 +5,7 @@ require "digest"
 module Rails
   module Hyperdrive
     class StackProfile
-      CATEGORIES_PATH = File.expand_path("data/gem_categories.yml", __dir__)
-
       class << self
-        def categories
-          @categories ||= YAML.load_file(CATEGORIES_PATH).each_with_object({}) do |(cat, gems), acc|
-            gems.each { |g| acc[g] = cat.to_sym }
-          end
-        end
-
         def current
           @current ||= from_lockfile(default_lockfile_path)
         end
@@ -54,16 +46,11 @@ module Rails
         specs    = parser.specs.each_with_object({}) { |s, h| h[s.name] = s.version.to_s }
 
         @data = {
-          rails:      rails_info(specs),
-          ruby:       ruby_info(parser),
-          database:   database_info(specs),
-          test:       bucket(specs, :test),
-          jobs:       bucket(specs, :jobs),
-          frontend:   frontend_info(specs),
-          auth:       bucket(specs, :auth),
-          authz:      bucket(specs, :authz),
-          db_gems:    bucket(specs, :db),
-          gem_skills: gem_skills_info
+          rails:               rails_info(specs),
+          ruby:                ruby_info(parser),
+          database:            database_info(specs),
+          direct_dependencies: direct_dependencies(parser, specs),
+          gem_skills:          gem_skills_info
         }
         self
       end
@@ -77,8 +64,7 @@ module Rails
       def empty_profile
         {
           rails: {}, ruby: {}, database: {},
-          test: [], jobs: [], frontend: [],
-          auth: [], authz: [], db_gems: [], gem_skills: []
+          direct_dependencies: [], gem_skills: []
         }
       end
 
@@ -132,33 +118,20 @@ module Rails
         ::Rails.root.join("config", "database.yml").to_s
       end
 
-      def bucket(specs, category)
-        gem_names = self.class.categories.select { |_, c| c == category }.keys
-        gem_names.filter_map do |name|
-          version = specs[name]
-          next unless version
-          { key: name.to_sym, version: version }
+      # Presence in the resolved specs does not mean the app chose a gem —
+      # minitest resolves under every Rails app. Transitive gems stay out.
+      def direct_dependencies(parser, specs)
+        parser.dependencies.keys.sort.map do |name|
+          { name: name, version: specs[name] }
         end
       end
 
-      # Frontend gets a special shape because Hotwire is actually two gems.
-      def frontend_info(specs)
-        bucket(specs, :frontend).map do |entry|
-          if entry[:key] == :"turbo-rails" || entry[:key] == :"stimulus-rails"
-            turbo = specs["turbo-rails"]
-            stim  = specs["stimulus-rails"]
-            { key: :hotwire, versions: { turbo: turbo, stimulus: stim }.compact }
-          else
-            entry
-          end
-        end.uniq
-      end
-
       # Loaded lazily and rescued broadly so StackProfile stays usable where
       # Bundler is absent or refuses to resolve.
       def gem_skills_info
         require "rails/hyperdrive/bundler_artifact_discovery"
-        ::Rails::Hyperdrive::BundlerArtifactDiscovery.discover.select(&:skill?).map do |skill|
+        discovered = ::Rails::Hyperdrive::BundlerArtifactDiscovery.discover(enabled_gems: enabled_gems)
+        discovered.select(&:skill?).map do |skill|
           {
             name: skill.name,
             gem: skill.target_gem,
@@ -171,6 +144,24 @@ module Rails
       rescue StandardError
         []
       end
+
+      def enabled_gems
+        require "rails/hyperdrive/install_layout"
+        require "rails/hyperdrive/lock_file"
+        root =
+          if @app_root
+            @app_root.to_s
+          elsif defined?(::Rails) && ::Rails.respond_to?(:root) && ::Rails.root
+            ::Rails.root.to_s
+          end
+        return [] unless root
+
+        ::Rails::Hyperdrive::LockFile.load(
+          File.join(root, ::Rails::Hyperdrive::InstallLayout::LOCK_PATH)
+        ).enabled_gems
+      rescue StandardError
+        []
+      end
     end
   end
 end

data/lib/rails/hyperdrive/three_way_merge.rb

@@ -0,0 +1,47 @@
+require "open3"
+require "tmpdir"
+
+module Rails
+  module Hyperdrive
+    # Tempfiles live in the system tmpdir, never in the app, so a dry run
+    # stays write-free. Fail-open: a missing or erroring git reads as
+    # :unavailable, never an exception.
+    module ThreeWayMerge
+      Outcome = Struct.new(:status, :body, keyword_init: true) do
+        def clean?
+          status == :clean
+        end
+      end
+
+      module_function
+
+      def merge(ours:, base:, theirs:)
+        return Outcome.new(status: :unavailable) if [ours, base, theirs].any? { |b| binary?(b) }
+
+        Dir.mktmpdir("hyperdrive-merge") do |dir|
+          paths = { "ours" => ours, "base" => base, "theirs" => theirs }.map do |name, content|
+            File.join(dir, name).tap { |p| File.binwrite(p, content) }
+          end
+
+          out, _err, status = Open3.capture3("git", "merge-file", "-p", *paths)
+          if status.success?
+            Outcome.new(status: :clean, body: out)
+          elsif status.exited? && status.exitstatus.between?(1, 127)
+            # git merge-file exits with the conflict count.
+            Outcome.new(status: :conflicted)
+          else
+            Outcome.new(status: :unavailable)
+          end
+        end
+      rescue SystemCallError, IOError
+        Outcome.new(status: :unavailable)
+      end
+
+      def binary?(content)
+        s = content.to_s
+        return true if s.include?("\0".b)
+        !s.dup.force_encoding(Encoding::UTF_8).valid_encoding?
+      end
+    end
+  end
+end

data/lib/rails/hyperdrive/tools/describe_app.rb

@@ -6,7 +6,7 @@ module Rails
     module Tools
       class DescribeApp < Base
         tool_name "describe_app"
-        description "Snapshot of Rails/Ruby/DB versions plus the full StackProfile (test, jobs, frontend, auth, authz, db_gems, gem_skills)."
+        description "Snapshot of Rails/Ruby/DB versions plus the app's direct gem dependencies and installed gem skills."
 
         input_schema(properties: {})
 

data/lib/rails/hyperdrive/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Hyperdrive
-    VERSION = "0.3.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/tasks/hyperdrive.rake

@@ -6,7 +6,7 @@ namespace :hyperdrive do
     Rails::Generators::Hyperdrive::InstallGenerator.start(ARGV.drop(1))
   end
 
-  desc "Sync Rails Hyperdrive content (skills, guidelines, index.md, lockfile); locally-edited files are preserved — pass --overwrite to restore gem-shipped content"
+  desc "Sync Rails Hyperdrive content (skills, guidelines, index.md, lockfile); locally-edited files are preserved — pass --merge (three-way merge), --sidecar (deliver upstream to <file>.new), or --overwrite (restore gem-shipped content)"
   task :sync do
     require "rails/generators"
     require "generators/hyperdrive/sync/sync_generator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Bakaface
@@ -96,17 +96,18 @@ files:
 - lib/generators/hyperdrive/sync_runner.rb
 - lib/rails-hyperdrive.rb
 - lib/rails/hyperdrive.rb
+- lib/rails/hyperdrive/ancestor_locator.rb
 - lib/rails/hyperdrive/artifact_status.rb
-- lib/rails/hyperdrive/audit_header.rb
 - lib/rails/hyperdrive/auto_install.rb
 - lib/rails/hyperdrive/bundler_artifact_discovery.rb
+- lib/rails/hyperdrive/canonical_skill_render.rb
 - lib/rails/hyperdrive/claude_md_import.rb
 - lib/rails/hyperdrive/companion_discovery.rb
 - lib/rails/hyperdrive/console_executor.rb
-- lib/rails/hyperdrive/data/gem_categories.yml
 - lib/rails/hyperdrive/drift_verdict.rb
 - lib/rails/hyperdrive/eager_footprint.rb
 - lib/rails/hyperdrive/engine.rb
+- lib/rails/hyperdrive/gem_manifest.rb
 - lib/rails/hyperdrive/index_document.rb
 - lib/rails/hyperdrive/install_layout.rb
 - lib/rails/hyperdrive/install_pipeline.rb
@@ -117,9 +118,11 @@ files:
 - lib/rails/hyperdrive/resources/skill.rb
 - lib/rails/hyperdrive/resources/stack_profile.rb
 - lib/rails/hyperdrive/safety/rack_middleware.rb
+- lib/rails/hyperdrive/skill_tasks.rb
 - lib/rails/hyperdrive/skill_template.rb
 - lib/rails/hyperdrive/sql_safety.rb
 - lib/rails/hyperdrive/stack_profile.rb
+- lib/rails/hyperdrive/three_way_merge.rb
 - lib/rails/hyperdrive/tools/base.rb
 - lib/rails/hyperdrive/tools/describe_app.rb
 - lib/rails/hyperdrive/tools/list_models.rb

data/lib/rails/hyperdrive/audit_header.rb

@@ -1,83 +0,0 @@
-require "time"
-
-module Rails
-  module Hyperdrive
-    module AuditHeader
-      YAML_LINE = /\A#\s*hyperdrive:/.freeze
-      HTML_LINE = /\A<!--\s*hyperdrive:.*-->\s*\z/.freeze
-
-      module_function
-
-      def fields(source_gem:, version:, sha256:, installed_at: Time.now.utc)
-        [
-          "source=#{source_gem}@#{version}",
-          "sha256=#{sha256}",
-          "installed_at=#{installed_at.iso8601}"
-        ]
-      end
-
-      def build(source_gem:, version:, sha256:, installed_at: Time.now.utc)
-        fields(source_gem: source_gem, version: version, sha256: sha256, installed_at: installed_at)
-          .map { |f| "# hyperdrive: #{f}" }
-          .join("\n")
-      end
-
-      def build_html(source_gem:, version:, sha256:, installed_at: Time.now.utc)
-        fields(source_gem: source_gem, version: version, sha256: sha256, installed_at: installed_at)
-          .map { |f| "<!-- hyperdrive: #{f} -->" }
-          .join("\n")
-      end
-
-      def inject_into_frontmatter(body, header_block)
-        lines = body.lines
-        unless lines.first&.strip == "---"
-          return "---\n#{header_block}\n---\n\n#{body}"
-        end
-
-        closing_index = lines[1..].index { |l| l.strip == "---" }
-        return body unless closing_index
-
-        absolute_closing = closing_index + 1
-        lines.insert(absolute_closing, header_block + "\n")
-        lines.join
-      end
-
-      def prepend_html(body, header_block)
-        "#{header_block}\n\n#{body}"
-      end
-
-      # Strips only the contiguous injected block, never stray "# hyperdrive:"
-      # or "<!-- -->" lines elsewhere in the body.
-      def strip(body)
-        lines = body.lines
-        if lines.first&.strip == "---"
-          strip_yaml(lines)
-        else
-          strip_html(lines)
-        end
-      end
-
-      def strip_yaml(lines)
-        closing_index = lines[1..].index { |l| l.strip == "---" }
-        return lines.join unless closing_index
-
-        absolute_closing = closing_index + 1
-        first = (1...absolute_closing).find { |i| lines[i] =~ YAML_LINE }
-        return lines.join unless first
-
-        last = first
-        last += 1 while last < absolute_closing && lines[last] =~ YAML_LINE
-        (lines[0...first] + lines[last..]).join
-      end
-
-      def strip_html(lines)
-        return lines.join unless lines.first =~ HTML_LINE
-
-        i = 0
-        i += 1 while lines[i] =~ HTML_LINE
-        i += 1 if lines[i] && lines[i].strip.empty?
-        lines[i..].join
-      end
-    end
-  end
-end

data/lib/rails/hyperdrive/data/gem_categories.yml

@@ -1,52 +0,0 @@
-# Category assignment is reporting metadata only; nothing here is executed.
-
-test:
-  - rspec
-  - rspec-rails
-  - minitest
-  - minitest-rails
-  - test-unit
-  - capybara
-  - cucumber
-  - cucumber-rails
-
-jobs:
-  - sidekiq
-  - resque
-  - delayed_job
-  - good_job
-  - solid_queue
-  - sucker_punch
-  - shoryuken
-  - que
-
-auth:
-  - devise
-  - clearance
-  - sorcery
-  - authlogic
-  - rodauth
-  - rodauth-rails
-
-authz:
-  - pundit
-  - cancancan
-  - action_policy
-
-frontend:
-  - turbo-rails
-  - stimulus-rails
-  - importmap-rails
-  - jsbundling-rails
-  - cssbundling-rails
-  - view_component
-  - phlex
-  - phlex-rails
-  - hotwire-rails
-
-db:
-  - pg
-  - mysql2
-  - sqlite3
-  - trilogy
-  - sequel