Remove the ContextAtCommit prompt symbol and its associated handlers and UI components

- remove 'context at commit' feature

├── apps
│   └── editor
│       └── src
│           └── views
│               └── prompt
│                   └── backend
│                       ├── message-handlers
│                       │   └── handle-hash-sign-quick-pick
│                       │       ├── handle-hash-sign-quick-pick.ts
│                       │       └── symbols
│                       │           └── commit-symbol.ts
│                       └── utils
│                           └── symbols
│                               ├── git
│                               │   └── replace-git-symbols.ts
│                               └── replace-symbols.ts
└── packages
    ├── shared
    │   └── src
    │       └── utils
    │           └── simplify-prompt-symbols
    │               ├── simplify-prompt-symbols.spec.ts
    │               └── simplify-prompt-symbols.ts
    └── ui
        └── src
            └── components
                └── editor
                    └── prompt
                        └── prompts
                            ├── PromptField
                            │   ├── PromptField.stories.tsx
                            │   └── hooks
                            │       └── use-handlers
                            │           └── utils.ts
                            └── shared
                                └── symbols
                                    ├── get-highlighted-text.tsx
                                    ├── position-mapping.ts
                                    ├── prompt-symbols.module.scss
                                    ├── reconstruct-raw-value.ts
                                    └── use-symbol-deletion.ts

Author: robertpiosik

apps/editor/src/views/prompt/backend/message-handlers/handle-hash-sign-quick-pick/handle-hash-sign-quick-pick.ts

@@ -13,7 +13,6 @@ import {
 const selection_label = '$(list-flat) Selection'
 const changes_label = '$(git-pull-request-draft) Changes'
 const commit_label = '$(git-commit) Commit'
-const context_at_commit_label = '$(history) Context at commit'
 const saved_context_label = '$(checklist) Saved context'
 const skill_label = '$(thinking) Skill'
 
@@ -35,10 +34,6 @@ const hash_sign_quick_pick = async (params: {
       label: commit_label,
       description: 'Diff from a specific commit'
     },
-    {
-      label: context_at_commit_label,
-      description: 'Older versions of the currently selected files'
-    },
     {
       label: saved_context_label,
       description: 'Files from the workspace'
@@ -56,11 +51,7 @@ const hash_sign_quick_pick = async (params: {
   ]
 
   if (params.is_find_relevant_files) {
-    items = items.filter(
-      (item) =>
-        item.label !== context_at_commit_label &&
-        item.label !== saved_context_label
-    )
+    items = items.filter((item) => item.label !== saved_context_label)
   }
 
   const last_selected_symbol =
@@ -135,12 +126,6 @@ const hash_sign_quick_pick = async (params: {
       case commit_label:
         result = await handle_commit_item(params.extension_context, 'Commit')
         break
-      case context_at_commit_label:
-        result = await handle_commit_item(
-          params.extension_context,
-          'ContextAtCommit'
-        )
-        break
       case saved_context_label:
         result = await handle_saved_context_item(params.extension_context)
         break

apps/editor/src/views/prompt/backend/message-handlers/handle-hash-sign-quick-pick/symbols/commit-symbol.ts

@@ -6,7 +6,7 @@ import { GIT_LOG_SINCE_DURATION } from '@/constants/values'
 
 export const handle_commit_item = async (
   extension_context: vscode.ExtensionContext,
-  symbol: 'Commit' | 'ContextAtCommit'
+  symbol: 'Commit'
 ): Promise<string | 'continue' | undefined> => {
   try {
     const workspace_folders = vscode.workspace.workspaceFolders

apps/editor/src/views/prompt/backend/utils/symbols/git/replace-git-symbols.ts

@@ -482,127 +482,3 @@ export const replace_commit_symbol = async (params: {
   }
   return { instruction: result_instruction, commit_definitions }
 }
-
-const build_context_at_commit_xml = (
-  files_content: { path: string; content: string }[]
-): string => {
-  if (files_content.length == 0) {
-    return '<archive/>'
-  }
-
-  let files_xml = ''
-  for (const file of files_content) {
-    files_xml += `<file path="${file.path.replace(/\\/g, '/')}">\n<![CDATA[\n${
-      file.content
-    }\n]]>\n</file>\n`
-  }
-
-  return `\n<archive>\n${files_xml}</archive>\n`
-}
-
-export const replace_context_at_commit_symbol = async (params: {
-  instruction: string
-  workspace_provider: WorkspaceProvider
-}): Promise<string> => {
-  const regex =
-    /#ContextAtCommit\(([^:]+):([a-fA-F0-9]+)\s*(?:"((?:[^"\\]|\\.)*)")?\)/g
-
-  let result_instruction = params.instruction
-  const matches = [...result_instruction.matchAll(regex)]
-
-  const workspace_folders = vscode.workspace.workspaceFolders
-  if (!workspace_folders) {
-    return result_instruction.replace(regex, '')
-  }
-
-  for (const match of matches) {
-    const full_match = match[0]
-    const folder_name = match[1]
-    const commit_hash = match[2]
-
-    const target_folder = workspace_folders.find(
-      (folder) => folder.name == folder_name
-    )
-
-    if (!target_folder) {
-      vscode.window.showErrorMessage(
-        dictionary.error_message.WORKSPACE_FOLDER_NOT_FOUND(folder_name)
-      )
-      result_instruction = result_instruction.replace(full_match, '')
-      continue
-    }
-
-    const checked_files = params.workspace_provider.get_checked_files()
-    const files_in_repo = checked_files.filter((file) =>
-      file.startsWith(target_folder.uri.fsPath)
-    )
-
-    if (files_in_repo.length == 0) {
-      vscode.window.showInformationMessage(
-        dictionary.information_message.NO_CHECKED_FILES_IN_REPO_FOR_COMMIT(
-          folder_name,
-          commit_hash.substring(0, 7)
-        )
-      )
-    }
-
-    const files_content: { path: string; content: string }[] = []
-
-    for (const file_path of files_in_repo) {
-      const relative_path = path.relative(target_folder.uri.fsPath, file_path)
-
-      let content_at_commit: string | null = null
-      try {
-        content_at_commit = execSync(
-          `git show ${commit_hash}:"./${relative_path.replace(/\\/g, '/')}"`,
-          {
-            cwd: target_folder.uri.fsPath,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'ignore'] // ignore stderr
-          }
-        )
-      } catch (error) {
-        // File might not have existed at that commit
-      }
-
-      let current_content: string | null = null
-      try {
-        current_content = fs.readFileSync(file_path, 'utf-8')
-      } catch (error) {
-        // File might not exist in workspace (e.g., deleted)
-      }
-
-      if (content_at_commit === current_content) {
-        continue // File is unchanged, ignore it
-      }
-
-      if (content_at_commit !== null) {
-        // If we are here, file has changed (modified, new, or deleted)
-        // Add its historical content to the archive.
-        const display_path =
-          params.workspace_provider.get_workspace_roots().length > 1
-            ? `${folder_name}/${relative_path.replace(/\\/g, '/')}`
-            : relative_path.replace(/\\/g, '/')
-
-        files_content.push({ path: display_path, content: content_at_commit })
-      }
-    }
-
-    if (files_in_repo.length > 0 && files_content.length == 0) {
-      vscode.window.showInformationMessage(
-        dictionary.information_message.ALL_CHECKED_FILES_UNCAHNGED_SINCE_COMMIT(
-          folder_name,
-          commit_hash.substring(0, 7)
-        )
-      )
-    }
-
-    const replacement_text = build_context_at_commit_xml(files_content)
-    result_instruction = result_instruction.replace(
-      full_match,
-      replacement_text
-    )
-  }
-
-  return result_instruction
-}

apps/editor/src/views/prompt/backend/utils/symbols/replace-symbols.ts

@@ -2,8 +2,7 @@ import * as vscode from 'vscode'
 import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
 import {
   replace_changes_symbol,
-  replace_commit_symbol,
-  replace_context_at_commit_symbol
+  replace_commit_symbol
 } from './git/replace-git-symbols'
 import { replace_saved_context_symbol } from './saved-context/replace-saved-context-symbol'
 import { replace_selection_symbol } from './selection/replace-selection-symbol'
@@ -46,13 +45,6 @@ export const replace_symbols = async (
     skill_definitions += result.commit_definitions
   }
 
-  if (processed_instructions.includes('#ContextAtCommit(')) {
-    processed_instructions = await replace_context_at_commit_symbol({
-      instruction: processed_instructions,
-      workspace_provider: params.workspace_provider
-    })
-  }
-
   if (processed_instructions.includes('#SavedContext(')) {
     const result = await replace_saved_context_symbol({
       instruction: processed_instructions,

packages/shared/src/utils/simplify-prompt-symbols/simplify-prompt-symbols.spec.ts

@@ -44,13 +44,6 @@ describe('simplify_prompt_symbols', () => {
     expect(simplify_prompt_symbols({ prompt })).toBe('Check [Commit]')
   })
 
-  it('should replace #ContextAtCommit', () => {
-    const prompt = 'Check #ContextAtCommit(repo:hash "message")'
-    expect(simplify_prompt_symbols({ prompt })).toBe(
-      'Check [Context at commit]'
-    )
-  })
-
   it('should replace #Skill', () => {
     const prompt = 'Run #Skill(agent:repo:skill)'
     expect(simplify_prompt_symbols({ prompt })).toBe('Run [Skill]')

packages/shared/src/utils/simplify-prompt-symbols/simplify-prompt-symbols.ts

@@ -17,10 +17,6 @@ export const simplify_prompt_symbols = (params: { prompt: string }): string => {
     /#Commit\([^:]+:[^\s"]+ "(?:\\.|[^"\\])*"\)/g,
     '[Commit]'
   )
-  simplified = simplified.replace(
-    /#ContextAtCommit\([^:]+:[^\s"]+ "(?:\\.|[^"\\])*"\)/g,
-    '[Context at commit]'
-  )
   simplified = simplified.replace(/#Skill\([^)]+\)/g, '[Skill]')
   simplified = simplified.replace(/#Image\([a-fA-F0-9]+\)/g, '[Image]')
   simplified = simplified.replace(

packages/ui/src/components/editor/prompt/prompts/PromptField/PromptField.stories.tsx

@@ -472,72 +472,6 @@ export const WithCommitWithQuotes = () => (
     }}
   />
 )
-export const WithContextAtCommit = () => (
-  <PromptField
-    value='Ask about #ContextAtCommit(my-repo:a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0 "Initial commit")'
-    chat_history={[]}
-    on_change={(value) => console.log('Changed:', value)}
-    on_submit={() => console.log('Submitted')}
-    on_copy={() => console.log('Copied')}
-    is_connected={true}
-    prompt_type="edit-files"
-    current_selection={null}
-    currently_open_file_path="/path/to/file"
-    on_caret_position_change={(pos) => console.log('Caret position:', pos)}
-    on_at_sign_click={() => console.log('@ clicked')}
-    on_hash_sign_click={() => console.log('# clicked')}
-    is_web_mode={false}
-    on_submit_with_control={() => console.log('Submitted with control')}
-    selected_files={[]}
-    invocation_count={1}
-    on_invocation_count_change={(count) =>
-      console.log('Invocation count changed:', count)
-    }
-    on_go_to_file={(path) => console.log('Go to file:', path)}
-    on_slash_click={() => {}}
-    on_pasted_lines_click={(path, start, end) =>
-      console.log('Pasted lines clicked:', path, start, end)
-    }
-    on_open_url={(url) => console.log('Open URL:', url)}
-    on_open_website={(url) => console.log('Open website:', url)}
-    on_paste_image={(content) => console.log('Paste image:', content)}
-    on_paste_long_text={(content) => console.log('Paste long text:', content)}
-    on_open_image={(hash) => console.log('Open image:', hash)}
-    on_open_pasted_text={(hash) => console.log('Open pasted text:', hash)}
-    on_paste_url={(url) => console.log('Paste URL:', url)}
-    is_recording={false}
-    on_recording_started={() => console.log('Recording started')}
-    on_recording_finished={() => console.log('Recording finished')}
-    tabs_count={1}
-    active_tab_index={0}
-    on_tab_change={() => {}}
-    on_new_tab={() => {}}
-    on_tab_delete={() => {}}
-    translations={{
-      invocation_count: 'Invocation count',
-      voice_input: 'Voice input',
-      exit_voice_input: 'Exit voice input',
-      reference_file: 'Reference file',
-      insert_symbol: 'Insert symbol',
-      prompt_templates: 'Prompt templates',
-      edit_format: 'Edit format',
-      edit_format_whole: 'Whole-File Overwrite',
-      edit_format_search_replace: 'Search & Replace',
-      edit_format_diff: 'Unified Diff',
-      edit_format_truncated: 'Ellipsis truncations',
-      placeholder_code_history: 'Optional instructions (⇅ for history)',
-      placeholder_code: 'Optional instructions',
-      placeholder_history: 'Type instructions (⇅ for history)',
-      placeholder_default: 'Type instructions',
-      send_with: 'Send with',
-      send_with_ellipsis: 'Send with...',
-      copy_prompt: 'Copy prompt',
-      more_actions: 'More actions',
-      send: 'Send'
-    }}
-  />
-)
-
 export const WithEditFormatSelector = () => {
   const [edit_format, set_edit_format] = useState<EditFormat>('diff')
   const [invocation_count, set_invocation_count] = useState(1)

packages/ui/src/components/editor/prompt/prompts/PromptField/hooks/use-handlers/utils.ts

@@ -10,7 +10,7 @@ export const get_symbol_ranges = (params: {
 }): { start: number; end: number }[] => {
   const ranges: { start: number; end: number }[] = []
   const regex =
-    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "(?:\\.|[^"\\])*"\))|(#(?:Commit|ContextAtCommit)\([^:]+:[^\s"]+ "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>[\s\S]*?<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
+    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "(?:\\.|[^"\\])*"\))|(#Commit\([^:]+:[^\s"]+ "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>[\s\S]*?<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
 
   let match
   while ((match = regex.exec(params.text)) !== null) {

packages/ui/src/components/editor/prompt/prompts/shared/symbols/get-highlighted-text.tsx

@@ -58,8 +58,7 @@ export const get_highlighted_text = (params: {
   const saved_context_regex_part =
     '#SavedContext\\((?:WorkspaceState|JSON) "(?:\\\\.|[^"\\\\])*"\\)'
 
-  const commit_regex_part =
-    '#(?:Commit|ContextAtCommit)\\([^:]+:[^\\s"]+ "(?:\\\\.|[^"\\\\])*"\\)'
+  const commit_regex_part = '#Commit\\([^:]+:[^\\s"]+ "(?:\\\\.|[^"\\\\])*"\\)'
 
   const fragment_regex_part =
     '<fragment path="[^"]+"(?: [^>]+)?>[\\s\\S]*?<\\/fragment>'
@@ -178,13 +177,13 @@ export const get_highlighted_text = (params: {
         )}"</span></span>`
       }
       const commit_match = part.match(
-        /^#(Commit|ContextAtCommit)\(([^:]+):([^\s"]+) "((?:\\.|[^"\\])*)"\)$/
+        /^#Commit\(([^:]+):([^\s"]+) "((?:\\.|[^"\\])*)"\)$/
       )
       if (part && commit_match) {
-        const symbol = commit_match[1]
-        const repo_name = commit_match[2]
-        const commit_hash = commit_match[3]
-        const commit_message = commit_match[4].replace(/\\"/g, '"')
+        const symbol = 'Commit'
+        const repo_name = commit_match[1]
+        const commit_hash = commit_match[2]
+        const commit_message = commit_match[3].replace(/\\"/g, '"')
         const short_hash = commit_hash.substring(0, 7)
         return `<span class="${cn(
           styles['symbol'],

packages/ui/src/components/editor/prompt/prompts/shared/symbols/position-mapping.ts

@@ -8,7 +8,7 @@ export const map_display_pos_to_raw_pos = (params: {
   let last_raw_index = 0
 
   const regex =
-    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "((?:\\.|[^"\\])*)"\))|(#(?:Commit|ContextAtCommit)\([^:]+:([^\s"]+) "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>([\s\S]*?)<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
+    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "((?:\\.|[^"\\])*)"\))|(#Commit\([^:]+:([^\s"]+) "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>([\s\S]*?)<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
   let match
 
   while ((match = regex.exec(params.raw_text)) !== null) {
@@ -143,7 +143,7 @@ export const map_raw_pos_to_display_pos = (params: {
   let last_raw_index = 0
 
   const regex =
-    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "((?:\\.|[^"\\])*)"\))|(#(?:Commit|ContextAtCommit)\([^:]+:([^\s"]+) "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>([\s\S]*?)<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
+    /`([^`]+)`|(#Changes\([^)]+\))|(#Selection)|(#SavedContext\((?:WorkspaceState|JSON) "((?:\\.|[^"\\])*)"\))|(#Commit\([^:]+:([^\s"]+) "(?:\\.|[^"\\])*"\))|(<fragment path="[^"]+"(?: [^>]+)?>([\s\S]*?)<\/fragment>)|(#Skill\([^)]+\))|(#Image\([a-fA-F0-9]+\))|(#PastedText\([a-fA-F0-9]+:\d+\))|(#Website\([^)]+\))/g
   let match
 
   while ((match = regex.exec(params.raw_text)) !== null) {