Single violation

Author: Colin McNeil

functions/tree_sitter/Dockerfile

@@ -15,4 +15,4 @@ FROM node:alpine3.20
 COPY main.js /main.js
 COPY --from=build /tree-sitter/node_modules /node_modules
 
-ENTRYPOINT [ "node", "main.js" ] 
+ENTRYPOINT [ "node", "/main.js" ] 

prompts/eslint/scripts/lint.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+
 PROJECT_DIR="/project"
 
 THREAD_DIR="/thread"
@@ -9,6 +10,8 @@ ARGS="$1"
 
 # args[eslint_args] args [eslint_version]
 
+set -f
+# Without pathname expansion
 ESLINT_ARGS=$(echo $ARGS | jq -r '.args')
 
 ESLINT_VERSION=$(echo $ARGS | jq -r '.version')
@@ -33,3 +36,10 @@ echo "Running npx with args: $ARGS"
 ESLINT_JSON=$(npx --no-install $ARGS )
 
 echo $ESLINT_JSON | /remap_lint.sh "$OUTPUT_LEVEL"
+echo $ESLINT_JSON > $THREAD_DIR/eslint.json
+
+# If --fix is in args, copy the files back to the project directory
+if [[ $ESLINT_ARGS == *"--fix"* ]]; then
+    cp -r $TEMP_DIR/. $PROJECT_DIR
+fi
+

prompts/eslint/scripts/remap_lint.sh

@@ -23,6 +23,8 @@ AFFECTED_FILE_COUNT=$(echo $INPUT | jq -r 'length')
 # Iterate over file paths
 for index in "${!FILE_PATHS[@]}"; do
     file_path=${FILE_PATHS[$index]}
+    # Strip $TEMP_DIR from the path
+    file_path=$(echo $file_path | sed "s/\/eslint-temp\///g")
     # Get the messages for the file path
     messages=${ALL_MESSAGES[$index]}
 

prompts/eslint_fix/010_system_prompt.md

@@ -1,3 +1,13 @@
-You are an AI assistant who specializes in resolving lint violations in projects.
+You are an AI assistant who specializes in resolving lint violations in projects. Use the tools available to quickly take action and be very brief.
+
+1. Run lint.
+2. Evaluate total violations.
+  <10 violations: Parse output with complaints output.
+  10+ violations: Parse output with condensed output.
+3. Fix the violations using the following steps:
+
+## Condensed:
+
+For each file:
 
 {>fixing}

prompts/eslint_fix/020_user_prompt.md

@@ -1,5 +1 @@
-1. Run ESLint in the project 
-2. Evaluate total violations.
-  <10 violations: Parse eslint with complaints output.
-  10+ violations: Parse eslint with condensed output.
-3. Fix the violations.
+Fix any lint violations you can using the tools provided.

prompts/eslint_fix/README.md

@@ -1,38 +1,30 @@
 ---
 functions:
-  - name: eslint
+  - name: run_lint
     type: prompt
     ref: github:docker/labs-ai-tools-for-devs?ref=main&path=prompts/eslint
-  - name: write_files
-    description: Write a set of files to my project
+  - name: parse_lint_results
+    description: Loads lint violations grouped by type.
     parameters:
       type: object
       properties:
-        files:
-          type: array
-          items:
-            type: object
-            properties:
-              path:
-                type: string
-                description: the relative path to the file that the script should run in
-        script:
+        outputLevel:
           type: string
-          description: The script to run in the files.
+          description: Supports `condensed` or `complaints`
     container:
-      image: vonwig/apply_script:latest
-  - name: read_eslint
-    description: Loads ESLint violations
+      image: vonwig/read_eslint
+  - name: violations_for_file
+    description: Loads lint violations for a file.
     parameters:
       type: object
       properties:
-        output_level:
+        path:
           type: string
-          description: "`condensed` or `complaints`"
+          description: Path to read violations for. Useful for getting line numbers. Always uses full `json` output level for most context. 
     container:
       image: vonwig/read_eslint
-  - name: tree_sitter
-    description: Gets the surrounding code block for a given line in a file
+  - name: run_tree_sitter
+    description: Gets context from source code for a given line.
     parameters:
       type: object
       properties:
@@ -42,6 +34,9 @@ functions:
         line:
           type: number
           description: The affected line to load context from
+      required:
+        - path
+        - line
     container:
       image: vonwig/tree_sitter
 ---

prompts/eslint_fix/entrypoint.sh

@@ -13,6 +13,20 @@ fi
 # Get eslint.json
 ESLINT_JSON=$(cat $THREAD_DIR/eslint.json)
 
+# Replace all eslint-temp with empty string
+ESLINT_JSON=$(echo $ESLINT_JSON | sed 's/\/eslint-temp\///g')
+
 OUTPUT_LEVEL=$(echo $ARGS_JSON | jq -r '.outputLevel')
+FILEPATH=$(echo $ARGS_JSON | jq -r '.path')
+# If path is not null
+if [ "$FILEPATH" != "null" ]; then
+    echo "Getting eslint.json for path: $FILEPATH"
+    ESLINT_JSON_FOR_PATH=$(echo $ESLINT_JSON | jq -r --arg path "$FILEPATH" '.[] | select(.filePath == $path)')
+    echo "ESLint violations for $FILEPATH:"
+    # Strip source key if it exists
+    ESLINT_JSON_FOR_PATH=$(echo $ESLINT_JSON_FOR_PATH | jq -r 'del(.source)')
+    echo $ESLINT_JSON_FOR_PATH
+    exit 0
+fi
 
 echo $ESLINT_JSON | /remap_lint.sh "$OUTPUT_LEVEL"

prompts/eslint_fix/fixing.md

@@ -1,7 +1,16 @@
-To fix a violation:
-1. Take filepath of violation
-2. Use tree_sitter with the filepath and line number to get the code to correct
-3. Make the correction
+1. **Get the line**: Use read_eslint with the `path` arg to get all of the violations for a file.
+2. **Get the code**: Use tree_sitter with the path and line to read the surrounding code if necessary. Repeat for all violations in the file.
+3. **Make the correction** Respond in the following format:
+
+```json
+{
+    "start": [1, 4],
+    "end": [2, 4],
+    "edit": "Lorem ipsum"
+}
+```
+
+Once you have fixed one file, move on to the next.
 
 You are able to fix the following violations:
 

prompts/eslint_fix/scripts/remap_lint.sh

@@ -21,6 +21,8 @@ IFS=$'\n' ALL_MESSAGES=($ALL_MESSAGES)
 # Iterate over file paths
 for index in "${!FILE_PATHS[@]}"; do
     file_path=${FILE_PATHS[$index]}
+    # Strip /eslint-temp
+    file_path=$(echo $file_path | sed 's/\/eslint-temp\///g')
     # Get the messages for the file path
     messages=${ALL_MESSAGES[$index]}