Bump version to 1.985.0 and update relevant files parser to reject responses containing code blocks

Author: robertpiosik

apps/editor/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-coder",
   "displayName": "Code Web Chat",
   "description": "Chatbot-first AI coding (CWC)",
-  "version": "1.984.0",
+  "version": "1.985.0",
   "scripts": {
     "build": "npx vsce package --no-dependencies",
     "vscode:prepublish": "rimraf out && npm run compile",

apps/editor/src/commands/apply-response-command/utils/response-parser/parsers/relevant-files-parser/relevant-files-parser.ts

@@ -5,30 +5,21 @@ type RelevantFilesItem = {
   file_paths: string[]
 }
 
-export const parse_relevant_files_from_response = (params: {
+export const parse_relevant_files = (params: {
   response: string
   workspace_files: string[]
 }): RelevantFilesItem | null => {
-  const trimmed_response = params.response.trim()
-
-  if (trimmed_response.includes('```')) {
-    const code_blocks = trimmed_response.match(/```[\s\S]*?(?:```|$)/g)
-    const has_valid_path_in_code_blocks = code_blocks?.some((block) =>
-      params.workspace_files.some((file) => block.includes(file))
-    )
-
-    if (!has_valid_path_in_code_blocks) {
-      return null
-    }
+  if (params.response.includes('```')) {
+    return null
   }
 
-  const found_paths = extract_paths_from_text(trimmed_response)
+  const found_paths = extract_paths_from_text(params.response)
 
   const valid_paths = found_paths
     .filter((path) => params.workspace_files.includes(path))
     .sort((a, b) => params.response.indexOf(a) - params.response.indexOf(b))
 
-  if (valid_paths.length === 0) {
+  if (valid_paths.length == 0) {
     return null
   }
 

apps/editor/src/commands/apply-response-command/utils/response-parser/parsers/relevant-files-parser/test/cases/code-blocks-valid/relevant-files.txt

@@ -1,52 +1,23 @@
 import * as fs from 'fs'
 import * as path from 'path'
-import { parse_relevant_files_from_response } from '../relevant-files-parser'
+import { parse_relevant_files } from '../relevant-files-parser'
 
-describe('response-parser', () => {
+describe('relevant files parser', () => {
   const load_test_case_file = (test_case: string, filename: string): string => {
     return fs.readFileSync(
       path.join(__dirname, 'cases', test_case, filename),
       'utf-8'
     )
   }
 
-  describe('parse_response relevant files', () => {
-    it('filters and sorts valid paths from text', () => {
-      const text = 'Look at src/b.ts, then src/a.ts and src/c.ts'
-      const result = parse_relevant_files_from_response({
-        response: text,
-        workspace_files: ['src/a.ts', 'src/b.ts']
-      })
-
-      expect(result).toMatchObject({
-        type: 'relevant-files',
-        file_paths: ['src/b.ts', 'src/a.ts']
-      })
-    })
-
-    it('allows code blocks if they contain valid paths', () => {
-      const test_case = 'code-blocks-valid'
-      const text = load_test_case_file(test_case, 'relevant-files.txt')
-      const result = parse_relevant_files_from_response({
-        response: text,
-        workspace_files: ['src/hello.ts', 'src/main.ts']
-      })
-
-      expect(result).toMatchObject({
-        type: 'relevant-files',
-        file_paths: ['src/hello.ts']
-      })
+  it('rejects when including code blocks', () => {
+    const test_case = 'code-blocks-invalid'
+    const text = load_test_case_file(test_case, 'relevant-files.txt')
+    const result = parse_relevant_files({
+      response: text,
+      workspace_files: ['src/hello.ts', 'src/main.ts']
     })
 
-    it('rejects responses with code blocks that do not contain valid paths', () => {
-      const test_case = 'code-blocks-invalid'
-      const text = load_test_case_file(test_case, 'relevant-files.txt')
-      const result = parse_relevant_files_from_response({
-        response: text,
-        workspace_files: ['src/hello.ts', 'src/main.ts']
-      })
-
-      expect(result).toBeNull()
-    })
+    expect(result).toBeNull()
   })
 })

apps/editor/src/commands/apply-response-command/utils/response-parser/parsers/relevant-files-parser/test/relevant-files-parser.spec.ts

@@ -2,7 +2,7 @@ import {
   extract_diffs,
   parse_code_at_cursor,
   parse_multiple_files,
-  parse_relevant_files_from_response
+  parse_relevant_files
 } from './parsers'
 
 export type FileItem = {
@@ -86,7 +86,7 @@ export const parse_response = (params: {
     params.is_single_root_folder_workspace ?? true
 
   if (params.workspace_files) {
-    const relevant_files = parse_relevant_files_from_response({
+    const relevant_files = parse_relevant_files({
       response: params.response,
       workspace_files: params.workspace_files
     })