a11y_agent 0.0.5.pre.alpha.4 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7001f5b3ad8390654fd9e2a2255f36e3d9c78730f919696395c9397b0bf92e8
-  data.tar.gz: 1d1d506ea7dc1f9cb5532b70c2531836aadf92baca3db48aa82b5cced55b3148
+  metadata.gz: 2a7493a6bb46ce2e52d663e2b1972ac0664339be3317604fb5fb8957ff209403
+  data.tar.gz: 77ad379603264914462dcb118b1082b03a7d88bf6f346d3feac341fc15ef37b1
 SHA512:
-  metadata.gz: 29738287670b7bcc1f0e34be727fd4cd775cd810af1375398d2e38817f51f2dec2ffb99761b499d3ac48d685882508f477e98689ff7aa82764c5d908058f112b
-  data.tar.gz: acbf59aaf97914f9f432dcea8cffd99cf4dd56602cc43b8f968f1c6bbb65227dcb71ba4df3ed26f2dae6c7181993660cc9464d49a748be425a6f62f177513bf1
+  metadata.gz: 32fe6b574cc3d27f4e2d4aaa6e3ce7da83974c3a334e0df36e8458ca429bf5547c71a5169a723910bb7dfc2f74052945b9299d9189cda69a13aa92394eb5a644
+  data.tar.gz: 7fe424775861271b8bb689a0d4cd425153f8beb0933a9cdfe7cc16d6046ec619b332261742df9120019020351502216db69e29d105c921a4e1082123555a7121

data/lib/a11y_agent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module A11yAgent
-  VERSION = '0.0.5-alpha.4'
+  VERSION = '0.0.12'
 end

data/lib/agents/a11y_agent.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
+require 'axe/core'
+require 'axe/api/run'
 require 'dotenv/load'
 require 'diffy'
 require 'fileutils'
 require 'json'
 require 'open3'
 require 'rainbow/refinement'
+require 'selenium-webdriver'
 require 'sublayer'
 require 'tty-prompt'
-require_relative '../generators/fix_a11y_generator'
-require_relative '../generators/hydrate_document_generator'
+require_relative '../generators/confirmable_fix_generator'
 
 Diffy::Diff.default_format = :color
 
@@ -20,14 +22,7 @@ Diffy::Diff.default_format = :color
 # Sublayer.configuration.ai_model = "gemini-1.5-flash-latest"
 
 Sublayer.configuration.ai_provider = Sublayer::Providers::Claude
-Sublayer.configuration.ai_model = 'claude-3-haiku-20240307'
-
-CHOICES = [
-  { key: 'y', name: 'approve and continue', value: :yes },
-  { key: 'n', name: 'skip this change', value: :no },
-  { key: 'r', name: 'retry with optional instructions', value: :retry },
-  { key: 'q', name: 'quit; stop making changes', value: :quit }
-].freeze
+Sublayer.configuration.ai_model = 'claude-3-5-haiku-latest'
 
 module Sublayer
   module Agents
@@ -39,6 +34,7 @@ module Sublayer
         @issue_types = []
         @file = file
         @file_contents = File.read(@file)
+        @source_code = @file_contents
         @prompt = TTY::Prompt.new
       end
 
@@ -47,7 +43,7 @@ module Sublayer
       end
 
       check_status do
-        load_issues unless run_axe.empty?
+        load_issues
       end
 
       goal_condition do
@@ -56,104 +52,79 @@ module Sublayer
       end
 
       step do
-        @accessibility_issues.each { |issue| fix_issue_and_save(issue:) }
+        @accessibility_issues.each do |issue|
+          puts issue.description
+          fix_issue_and_save(issue:)
+        end
+
         exit 0
       end
 
       private
 
-      def run_axe(file: @file)
-        stdout, _stderr, _status = Open3.capture3("ts-node lib/bin/axe.ts #{file}")
-        JSON.parse(stdout)
-      end
-
       def load_issues
         Tempfile.create(['', File.extname(@file)]) do |tempfile|
-          tempfile.write(hydrated_file)
+          tempfile.write(@file_contents)
           tempfile.rewind
 
-          @accessibility_issues = run_axe(file: tempfile.path).map do |issue|
-            %w[id impact tags helpUrl].each { |key| issue.delete(key) }
-            issue
+          command = %(yarn --silent biome lint --reporter=json --only=a11y #{tempfile.path})
+          stdout, _stderr, _status = Open3.capture3(command, stdin_data: @file_contents)
+
+          @accessibility_issues = JSON.parse(stdout).fetch('diagnostics').map do |d|
+            OpenStruct.new(
+              description: d.fetch('description'),
+              location: d.fetch('location').fetch('span'),
+              snippet: d.fetch('location').fetch('sourceCode')[d.fetch('location').fetch('span')[0]..d.fetch('location').fetch('span')[1] - 1],
+              advice: d.fetch('advices').fetch('advices').map do |a|
+                a.fetch('log')[1][0].fetch('content') unless a.fetch('log', nil).nil?
+              end
+            )
           end
         end
 
         puts "🚨 Found #{@accessibility_issues.length} accessibility issues" unless @accessibility_issues.empty?
       end
 
-      def hydrated_file
-        puts "Loading fake data into #{@file}"
-        hydrated = HydrateDocumentGenerator.new(contents: @file_contents, extension: File.extname(@file)).generate
-        hydrated << "\n" until hydrated.end_with?("\n")
-
-        print_diff(contents: @file_contents, fixed: hydrated, message: '📊 Changes made:')
-        hydration_approved = @prompt.yes? 'Continue with updates?'
-        hydrated = @file_contents unless hydration_approved
-        hydrated
-      end
-
       def fix_issue_and_save(issue:)
-        updated_contents = File.read(@file)
-
-        issue['nodes'].each do |node|
-          user_input = nil
-          fixed = nil
-          additional_prompt = nil
-          summary = node['failureSummary']
-          node_issue = [summary, issue['help'], node['html']].join("\n\n")
-
-          puts "🔍 #{issue['help']}"
-          attempt = @prompt.yes? "Attempt to fix these issues in #{@file}?"
-          next unless attempt
-
-          until %i[yes no].include?(user_input)
-            puts '🔧 Attempting a fix...'
-            result = FixA11yGenerator.new(contents: updated_contents, issue: node_issue, extension: File.extname(@file),
-                                          additional_prompt:).generate
-            result << "\n" unless result.end_with?("\n")
-
-            print_chunks(contents: updated_contents, fixed: result)
-
-            user_input = @prompt.expand('Approve changes?', CHOICES)
-
-            case user_input
-            when :yes
-              fixed = result
-            when :no
-              fixed = updated_contents
-            when :retry
-              additional_prompt = @prompt.ask('Additional instructions:')
-              fixed = nil
-            when :quit
-              puts 'Quitting...'
-              exit 0
-            end
+        additional_instructions = nil
+        input = nil
+
+        until %i[fix skip].include?(input)
+          exit 0 if input == :exit
+          puts additional_instructions if additional_instructions
+          
+          result = ConfirmableFixGenerator.new(lint_failure: issue, source_code: @source_code, additional_instructions:).generate
+          fixed = result.fixed + "\n"
+          puts Diffy::Diff.new(@source_code, fixed, context: 2).to_s(:color)
+
+          input = @prompt.expand('Apply the fix?', [
+                                  { key: 'y', name: 'Apply the fix', value: :fix },
+                                  { key: 'n', name: 'Skip the fix', value: :skip },
+                                  { key: 'e', name: 'Explain why', value: :explain },
+                                  { key: 'r', name: 'Retry with optional instructions', value: :retry },
+                                  { key: 'q', name: 'Exit', value: :exit }
+                                ])
+
+          if input == :retry
+            additional_instructions = @prompt.ask('Provide additional instructions:')
+            next
+          elsif input == :explain
+            puts
+            puts 'Explanation'.bright
+            puts result.description
+            puts
+
+            continue = @prompt.yes? 'Continue with the fix?'
+            next unless continue
+            input = :fix
           end
-
-          puts '📝 Saving changes...'
-          File.write(@file, fixed) if fixed
         end
-      end
 
-      def print_diff(contents:, fixed:, message: '')
-        puts message
-        puts Diffy::Diff.new(contents, fixed)
-      end
 
-      def print_chunks(contents:, fixed:)
-        Diffy::Diff.new(contents, fixed).each_chunk do |chunk|
-          case chunk
-          when /^\+/
-            print chunk.to_s.green
-          when /^-/
-            print chunk.to_s.red
-          else
-            lines = chunk.to_s.split("\n")
-            puts lines[0..2].join("\n")
-            puts '...'
-            puts lines[-3..].join("\n") if lines.length > 5
-          end
-        end
+        return unless input == :fix
+        puts '📝 Saving changes...'
+        File.write(@file, fixed)
+        @source_code = fixed
       end
     end
   end

data/lib/generators/confirmable_fix_generator.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'dotenv/load'
+require 'sublayer'
+
+class ConfirmableFixGenerator < Sublayer::Generators::Base
+  llm_output_adapter type: :named_strings,
+                     name: 'lint_fix',
+                     description: 'A fix for lint failures',
+                     item_name: 'lint_fix',
+                     attributes: [
+                       {
+                         name: 'description',
+                         description: 'A brief description of the fix and why it is important'
+                       },
+                       {
+                         name: 'impact',
+                         description: 'A brief explanation of how the fix impacts assistive technologies'
+                       },
+                       {
+                         name: 'fixed',
+                         description: 'The complete source code with the fix applied'
+                       }
+                     ]
+
+  def initialize(lint_failure:, source_code:, additional_instructions: nil)
+    super()
+    @source_code = source_code
+    @additional_instructions = additional_instructions
+    @failure_line = %(#{lint_failure.description} at span #{lint_failure.location[0]}:#{lint_failure.location[1]})
+  end
+
+  def prompt
+    <<-PROMPT
+    You are an expert at remediating lint errors in source code.
+    Generate a fix for the following lint failure in the provided source code.
+    Only fix one specified lint failure at a time, at the given position.
+
+    Source code:
+    #{@source_code}
+
+    Lint failure:
+    #{@failure_line}
+
+    Additional instructions (if any):
+    #{@additional_instructions}
+
+    For the fix provide:
+    - description: A brief description of the change and why it is important.
+    - fixed: the fixed source code with the issue resolved.
+    - impact: A description of how the fix impacts assistive technologies.
+
+    Provide your response is an object containing the above attributes.
+    PROMPT
+  end
+end

data/lib/tasks/release.rake

@@ -54,8 +54,8 @@ namespace :release do
           # Extract all files to libexec, which is a common Homebrew practice for third-party tools
           libexec.install Dir["*"]
 
-          system "bundle", "install", "--without", "development"
-          system "gem", "build", "#{spec.name}.gemspec"
+          system "bundle", "install", "--gemfile", libexec/"Gemfile"
+          system "gem", "build", libexec/"#{spec.name}.gemspec"
           system "gem", "install", "--ignore-dependencies", "#{spec.name}-#{version}.gem"
 
           bin.install libexec/"exe/#{spec.name}"
@@ -64,7 +64,7 @@ namespace :release do
 
         test do
           # Simple test to check the version or a help command
-          system "\#{bin}/a11y_agent", "--help"
+          system "\#{bin}/#{spec.name}", "--help"
         end
       end
     RUBY

data/package.json

@@ -1,16 +1,16 @@
 {
-  "devDependencies": {
-    "@types/jsdom": "^21.1.7",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
-    "globals": "^15.8.0",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^7.17.0"
-  },
+  "name": "a11y-agent",
+  "version": "0.0.0",
+  "main": "index.js",
+  "repository": "git@github.com:AccessLint/a11y-agent.git",
+  "author": "Cameron Cundiff <github@ckundo.com>",
+  "license": "AGPL-3.0",
+  "private": true,
   "dependencies": {
-    "axe-core": "^4.10.0",
-    "canvas": "^2.11.2",
-    "jsdom": "^24.1.1"
+    "@biomejs/biome": "1.9.4",
+    "eslint-plugin-vuejs-accessibility": "^2.4.1"
+  },
+  "devDependencies": {
+    "globals": "^15.9.0"
   }
 }