Update UI utilities to consistently display context keywords like "Changes" and "Saved context" with a colon and space separator

Author: robertpiosik

packages/ui/src/components/editor/panel/ChatInput/utils/get-display-text.ts

@@ -21,10 +21,11 @@ export const get_display_text = (
         return match
       }
       if (changes_keyword) {
-        return 'Changes'
+        const branch_name = changes_keyword.substring('#Changes:'.length)
+        return `Changes: ${branch_name}`
       }
       if (saved_context_keyword) {
-        return `Saved context ${context_name}`
+        return `Saved context: ${context_name}`
       }
       return match
     }

packages/ui/src/components/editor/panel/ChatInput/utils/get-highlighted-text.tsx

@@ -71,7 +71,7 @@ export const get_highlighted_text = (params: {
             context_name
           )}"><span class="${styles['keyword__icon']}"></span><span class="${
             styles['keyword__text']
-          }">Saved context ${escape_html(context_name)}</span></span>`
+          }">Saved context: ${escape_html(context_name)}</span></span>`
         }
         return process_text_part_for_files(part, params.context_file_paths)
       })
@@ -103,7 +103,7 @@ export const get_highlighted_text = (params: {
           styles['keyword__icon']
         }"></span><span class="${
           styles['keyword__text']
-        }">Changes</span></span>`
+        }">Changes: ${escape_html(branch_name)}</span></span>`
       }
       const saved_context_match = part.match(
         /^#SavedContext:(WorkspaceState|JSON)\s+"([^"]+)"$/
@@ -122,7 +122,7 @@ export const get_highlighted_text = (params: {
           styles['keyword__icon']
         }"></span><span class="${
           styles['keyword__text']
-        }">Saved context ${escape_html(context_name)}</span></span>`
+        }">Saved context: ${escape_html(context_name)}</span></span>`
       }
 
       return process_text_part_for_files(part, params.context_file_paths)

packages/ui/src/components/editor/panel/ChatInput/utils/position-mapping.ts

@@ -26,13 +26,14 @@ export const map_display_pos_to_raw_pos = (
       display_match_length = filename.length
       is_replacement_match = true
     } else if (changes_keyword) {
-      display_match_length = 'Changes'.length
+      const branch_name = changes_keyword.substring('#Changes:'.length)
+      display_match_length = `Changes: ${branch_name}`.length
       is_replacement_match = true
     } else if (selection_keyword) {
       display_match_length = 'Selection'.length
       is_replacement_match = true
     } else if (saved_context_keyword) {
-      display_match_length = `Saved context ${context_name}`.length
+      display_match_length = `Saved context: ${context_name}`.length
       is_replacement_match = true
     }
 
@@ -96,13 +97,14 @@ export const map_raw_pos_to_display_pos = (
       display_match_length = filename.length
       is_replacement_match = true
     } else if (changes_keyword) {
-      display_match_length = 'Changes'.length
+      const branch_name = changes_keyword.substring('#Changes:'.length)
+      display_match_length = `Changes: ${branch_name}`.length
       is_replacement_match = true
     } else if (selection_keyword) {
       display_match_length = 'Selection'.length
       is_replacement_match = true
     } else if (saved_context_keyword) {
-      display_match_length = `Saved context ${context_name}`.length
+      display_match_length = `Saved context: ${context_name}`.length
       is_replacement_match = true
     }
 

packages/vscode/package.json

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