Merge branch 'dev'

Author: robertpiosik

packages/shared/src/types/file-in-preview.ts

@@ -1,4 +1,5 @@
 export type FileInPreview = {
+  type: 'file'
   file_path: string
   is_checked: boolean
   workspace_name?: string

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.stories.tsx

@@ -8,16 +8,19 @@ export default {
 
 const base_files = [
   {
+    type: 'file',
     file_path: 'src/components/Button/Button.tsx',
     lines_added: 10,
     lines_removed: 2
   },
   {
+    type: 'file',
     file_path: 'src/components/Input/Input.module.scss',
     lines_added: 5,
     lines_removed: 5
   },
   {
+    type: 'file',
     file_path: 'src/utils/helpers.ts',
     lines_added: 20,
     lines_removed: 0
@@ -26,25 +29,29 @@ const base_files = [
 
 const files_using_fallbacks = [
   {
+    type: 'file',
     file_path: 'src/new-feature.ts',
     is_new: true,
     lines_added: 50,
     lines_removed: 0
   },
   {
+    type: 'file',
     file_path: 'src/old-component.tsx',
     is_deleted: true,
     lines_added: 0,
     lines_removed: 100
   },
   {
+    type: 'file',
     file_path: 'src/complex-logic.js',
     is_fallback: true,
     diff_fallback_method: 'recount',
     lines_added: 15,
     lines_removed: 12
   },
   {
+    type: 'file',
     file_path: 'src/aggressive-fallback.css',
     is_fallback: true,
     diff_fallback_method: 'search_and_replace',
@@ -62,7 +69,7 @@ const log_action =
 const InteractiveResponsePreview = (props: any) => {
   const [items, set_items] = useState(
     props.items.map((f: any) =>
-      'file_path' in f ? { ...f, is_checked: true } : f
+      f.type == 'file' ? { ...f, is_checked: true } : f
     )
   )
 
@@ -77,9 +84,9 @@ const InteractiveResponsePreview = (props: any) => {
   }) => {
     set_items(
       items.map((f: any) =>
-        'file_path' in f &&
-        f.file_path === file_path &&
-        f.workspace_name === workspace_name
+        f.type == 'file' &&
+        f.file_path == file_path &&
+        f.workspace_name == workspace_name
           ? { ...f, is_checked }
           : f
       )

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.tsx

@@ -68,7 +68,7 @@ export const ResponsePreview: FC<Props> = (props) => {
   }
 
   const files_in_preview = props.items.filter(
-    (i) => 'file_path' in i
+    (i) => i.type == 'file'
   ) as FileInPreview[]
   const fallback_count = files_in_preview.filter((f) => f.is_fallback).length
 
@@ -118,7 +118,7 @@ export const ResponsePreview: FC<Props> = (props) => {
         )}
         <div className={styles.list}>
           {props.items.map((item, index) => {
-            if ('file_path' in item) {
+            if (item.type === 'file') {
               const file = item
               const last_slash_index = file.file_path.lastIndexOf('/')
               const file_name = file.file_path.substring(last_slash_index + 1)

packages/ui/src/components/editor/panel/ResponsePreviewFooter/ResponsePreviewFooter.tsx

@@ -2,23 +2,23 @@ import { Button } from '../Button'
 import styles from './ResponsePreviewFooter.module.scss'
 
 type Props = {
-  on_discard: () => void
-  on_approve: () => void
-  is_approve_disabled: boolean
+  on_reject: () => void
+  on_accept: () => void
+  is_accept_disabled: boolean
 }
 
 export const ResponsePreviewFooter: React.FC<Props> = ({
-  on_discard,
-  on_approve,
-  is_approve_disabled
+  on_reject,
+  on_accept,
+  is_accept_disabled
 }) => {
   return (
     <div className={styles.container}>
-      <Button on_click={on_discard} is_secondary>
-        Discard
+      <Button on_click={on_reject} is_secondary>
+        Reject
       </Button>
-      <Button on_click={on_approve} disabled={is_approve_disabled}>
-        Approve
+      <Button on_click={on_accept} disabled={is_accept_disabled}>
+        Accept
       </Button>
     </div>
   )

packages/vscode/package.json

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

packages/vscode/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -154,6 +154,7 @@ export const apply_chat_response_command = (
                 !state.is_new && current_content === '' && state.content !== ''
 
               files_for_history.push({
+                type: 'file',
                 file_path: state.file_path,
                 workspace_name: state.workspace_name,
                 is_new: state.is_new,

packages/vscode/src/commands/apply-chat-response-command/handlers/fast-replace-handler.ts

@@ -4,19 +4,19 @@ import * as fs from 'fs'
 import { Logger } from '@shared/utils/logger'
 import { dictionary } from '@shared/constants/dictionary'
 import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
-import { ClipboardFile } from '../utils/clipboard-parser'
+import { FileItem } from '../utils/clipboard-parser'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
 
 export const handle_fast_replace = async (
-  files: ClipboardFile[]
+  files: FileItem[]
 ): Promise<{ success: boolean; original_states?: OriginalFileState[] }> => {
   Logger.info({
     function_name: 'handle_fast_replace',
     message: 'start',
     data: { file_count: files.length }
   })
   try {
-    const safe_files: ClipboardFile[] = []
+    const safe_files: FileItem[] = []
     const unsafe_files: string[] = []
 
     if (

packages/vscode/src/commands/apply-chat-response-command/handlers/intelligent-update-handler.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import axios from 'axios'
 import * as path from 'path'
 import * as fs from 'fs'
-import { ClipboardFile } from '../utils/clipboard-parser'
+import { FileItem } from '../utils/clipboard-parser'
 import { sanitize_file_name, create_safe_path } from '@/utils/path-sanitizer'
 import { Logger } from '@shared/utils/logger'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
@@ -53,10 +53,10 @@ export const handle_intelligent_update = async (params: {
   })
 
   const raw_files = raw_items.filter(
-    (item): item is ClipboardFile => 'file_path' in item
+    (item): item is FileItem => item.type == 'file'
   )
 
-  const files: ClipboardFile[] = []
+  const files: FileItem[] = []
   const skipped_files: string[] = []
 
   for (const file of raw_files) {
@@ -120,8 +120,8 @@ export const handle_intelligent_update = async (params: {
     return null
   }
 
-  const new_files: ClipboardFile[] = []
-  const existing_files: ClipboardFile[] = []
+  const new_files: FileItem[] = []
+  const existing_files: FileItem[] = []
 
   for (const file of files) {
     let file_exists = false

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.ts

@@ -1,20 +1,6 @@
 import { extract_diffs } from './extract-diff-patches'
 import { parse_code_completion, parse_multiple_files } from './parsers'
 
-export interface ClipboardFile {
-  file_path: string
-  content: string
-  workspace_name?: string
-}
-
-export interface ClipboardCodeCompletion {
-  file_path: string
-  content: string
-  line: number
-  character: number
-  workspace_name?: string
-}
-
 export interface FileItem {
   type: 'file'
   file_path: string
@@ -98,7 +84,7 @@ export const parse_response = (params: {
     is_single_root_folder_workspace
   })
   if (code_completion) {
-    return [{ type: 'completion', ...code_completion }]
+    return [code_completion]
   }
 
   const processed_response = params.response.replace(/``````/g, '```\n```')
@@ -129,10 +115,5 @@ export const parse_response = (params: {
     is_single_root_folder_workspace
   })
 
-  return items.map((item) => {
-    if ('file_path' in item) {
-      return { type: 'file', ...item }
-    }
-    return item
-  })
+  return items
 }

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-completion-parser.ts

@@ -1,8 +1,5 @@
 import { cleanup_api_response } from '@/utils/cleanup-api-response'
-import {
-  ClipboardCodeCompletion,
-  extract_workspace_and_path
-} from '../clipboard-parser'
+import { CompletionItem, extract_workspace_and_path } from '../clipboard-parser'
 
 const extract_path_and_position = (
   line: string
@@ -31,7 +28,7 @@ const extract_path_and_position = (
 export const parse_code_completion = (params: {
   response: string
   is_single_root_folder_workspace: boolean
-}): ClipboardCodeCompletion | null => {
+}): CompletionItem | null => {
   const lines = params.response.split('\n')
   let in_code_block = false
   let first_line_of_block: string | null = null
@@ -50,6 +47,7 @@ export const parse_code_completion = (params: {
                   params.is_single_root_folder_workspace
               })
             return {
+              type: 'completion',
               file_path: relative_path,
               content: cleanup_api_response({
                 content: content_lines.join('\n')