Remove unnecessary comments and optimize file sorting logic for context collection

Author: robertpiosik

packages/vscode/src/context/context-initialization.ts

@@ -462,7 +462,7 @@ export const context_initialization = async (
       tab_change_timeout = setTimeout(() => {
         update_view_badges()
         tab_change_timeout = null
-      }, 100) // 100ms debounce
+      }, 100)
     })
   )
 

packages/vscode/src/context/providers/open-editors/open-editors-provider.ts

@@ -183,7 +183,7 @@ export class OpenEditorsProvider
 
     const token_count = element.tokenCount
 
-    let final_description = element.description || '' // relative path
+    let final_description = element.description || ''
 
     const prefix_parts: string[] = []
     if (token_count !== undefined) {
@@ -297,7 +297,7 @@ export class OpenEditorsProvider
         false,
         true,
         token_count,
-        undefined, // selectedTokenCount is undefined for open editor files
+        undefined,
         description,
         false,
         range

packages/vscode/src/context/providers/workspace/workspace-provider.ts

@@ -992,7 +992,7 @@ export class WorkspaceProvider
     } else {
       this._checked_timestamps.delete(key)
     }
-    this._token_calculator.invalidate_directory_selected_count(key) // Invalidate self
+    this._token_calculator.invalidate_directory_selected_count(key)
 
     if (item.isDirectory) {
       await this._update_directory_check_state(key, state, false)
@@ -1001,7 +1001,7 @@ export class WorkspaceProvider
     let dir_path = path.dirname(key)
     const workspace_root = this.get_workspace_root_for_file(key)
     while (workspace_root && dir_path.startsWith(workspace_root)) {
-      this._token_calculator.invalidate_directory_selected_count(dir_path) // Invalidate parents
+      this._token_calculator.invalidate_directory_selected_count(dir_path)
       await this._update_parent_state(dir_path)
       dir_path = path.dirname(dir_path)
     }
@@ -1011,7 +1011,7 @@ export class WorkspaceProvider
   }
 
   private async _update_parent_state(dir_path: string): Promise<void> {
-    this._token_calculator.invalidate_directory_selected_count(dir_path) // Invalidate selected count for this dir
+    this._token_calculator.invalidate_directory_selected_count(dir_path)
     try {
       const workspace_root = this.get_workspace_root_for_file(dir_path)
       if (!workspace_root) return
@@ -1299,7 +1299,7 @@ export class WorkspaceProvider
     const gitignore_files = await vscode.workspace.findFiles(
       '**/{.gitignore,.cursorignore,.codeiumignore}'
     )
-    this._combined_gitignore = ignore() // Reset
+    this._combined_gitignore = ignore()
 
     for (const file_uri of gitignore_files) {
       const gitignore_path = file_uri.fsPath

packages/vscode/src/context/shared-file-state.ts

@@ -176,7 +176,6 @@ export class SharedFileState {
     return false
   }
 
-  // Get all currently open editor URIs
   private get_open_editor_uris(): vscode.Uri[] {
     const open_uris: vscode.Uri[] = []
     vscode.window.tabGroups.all.forEach((group) => {
@@ -189,7 +188,6 @@ export class SharedFileState {
     return open_uris
   }
 
-  // Update a file check state in open editors
   private async update_file_in_open_editors(
     file_path: string,
     checked: boolean

packages/vscode/src/utils/files-collector.ts

@@ -131,7 +131,6 @@ export class FilesCollector {
     now: number,
     three_hours: number
   ): string[] {
-    // Categorize files into two groups
     const recently_modified: Array<{ path: string; mtime: number }> = []
     const older_files: Array<{ path: string; timestamp: number }> = []
 
@@ -146,10 +145,8 @@ export class FilesCollector {
           this.workspace_provider.get_selection_timestamp(file_path) ?? now
 
         if (now - mtime < three_hours) {
-          // Modified within last 3 hours
           recently_modified.push({ path: file_path, mtime })
         } else {
-          // Modified earlier than 3 hours
           older_files.push({ path: file_path, timestamp: selection_timestamp })
         }
       } catch (error) {
@@ -158,19 +155,20 @@ export class FilesCollector {
     }
 
     // Sort older files by selection timestamp (ascending), with natural sort as tiebreaker
+    // Files selected within 20 seconds of each other are grouped and sorted naturally
     older_files.sort((a, b) => {
-      const timestamp_diff = a.timestamp - b.timestamp
-      if (timestamp_diff != 0) {
-        return timestamp_diff
+      const timestamp_bucket_a = Math.floor(a.timestamp / 20)
+      const timestamp_bucket_b = Math.floor(b.timestamp / 20)
+      const bucket_diff = timestamp_bucket_a - timestamp_bucket_b
+      if (bucket_diff != 0) {
+        return bucket_diff
       }
-      // If timestamps are the same, use natural sort on paths
+      // If timestamps are within the same 20-second bucket, use natural sort on paths
       return natural_sort(a.path, b.path)
     })
 
-    // Sort recently modified files by modification time (ascending - oldest to newest)
     recently_modified.sort((a, b) => a.mtime - b.mtime)
 
-    // Combine: older files first, then recently modified
     return [
       ...older_files.map((f) => f.path),
       ...recently_modified.map((f) => f.path)