Update WebsitesProvider import paths and refactor preset/group selection state management

Author: robertpiosik

packages/vscode/src/commands/checkpoints-command/actions/create-checkpoint.ts

@@ -21,7 +21,7 @@ import * as path from 'path'
 import { Logger } from '@shared/utils/logger'
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { dictionary } from '@shared/constants/dictionary'
-import { WebsitesProvider } from '@/context/providers/websites-provider'
+import { WebsitesProvider } from '@/context/providers/websites/websites-provider'
 import { response_preview_promise_resolve } from '../../apply-chat-response-command/utils/preview'
 import { remove_old_checkpoints } from './get-checkpoints'
 

packages/vscode/src/commands/checkpoints-command/actions/create-temporary-checkpoint.ts

@@ -9,7 +9,7 @@ import {
 } from '../utils/git-utils'
 import * as path from 'path'
 import { Logger } from '@shared/utils/logger'
-import { WebsitesProvider } from '@/context/providers/websites-provider'
+import { WebsitesProvider } from '@/context/providers/websites/websites-provider'
 
 export const create_temporary_checkpoint = async (
   workspace_provider: WorkspaceProvider,

packages/vscode/src/commands/checkpoints-command/actions/restore-checkpoint.ts

@@ -21,7 +21,7 @@ import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { response_preview_promise_resolve } from '../../apply-chat-response-command/utils/preview'
 import { ongoing_review_cleanup_promise } from '../../apply-chat-response-command/utils/preview-handler'
 import { dictionary } from '@shared/constants/dictionary'
-import { WebsitesProvider } from '@/context/providers/websites-provider'
+import { WebsitesProvider } from '@/context/providers/websites/websites-provider'
 import { get_git_info } from '../utils/git-utils'
 
 export const restore_checkpoint = async (params: {

packages/vscode/src/commands/checkpoints-command/checkpoints-command.ts

@@ -19,7 +19,7 @@ import {
 } from './actions'
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { get_checkpoint_path } from './utils'
-import { WebsitesProvider } from '@/context/providers/websites-provider'
+import { WebsitesProvider } from '@/context/providers/websites/websites-provider'
 import { dictionary } from '@shared/constants/dictionary'
 
 dayjs.extend(relativeTime)

packages/vscode/src/commands/duplicate-workspace-command.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import { WorkspaceProvider } from '../context/providers/workspace/workspace-provider'
-import { WebsitesProvider } from '../context/providers/websites-provider'
+import { WebsitesProvider } from '../context/providers/websites/websites-provider'
 import {
   API_EDIT_FORMAT_STATE_KEY,
   CHAT_EDIT_FORMAT_STATE_KEY,

packages/vscode/src/constants/state-keys.ts

@@ -67,10 +67,6 @@ export const get_configurations_collapsed_state_key = (
   api_prompt_type: string
 ) => `configurations-collapsed-${api_prompt_type}`
 
-export const get_last_selected_preset_or_group_key = (
-  web_prompt_type: string
-) => `last-selected-preset-or-group-${web_prompt_type}`
-
 export const get_recently_used_presets_or_groups_key = (
   web_prompt_type: string
 ) => `recently-used-presets-or-groups-${web_prompt_type}`

packages/vscode/src/services/websocket-manager.ts

@@ -9,7 +9,7 @@ import {
 } from '@shared/types/websocket-message'
 import { CHATBOTS } from '@shared/constants/chatbots'
 import { DEFAULT_PORT, SECURITY_TOKENS } from '@shared/constants/websocket'
-import { WebsitesProvider } from '../context/providers/websites-provider'
+import { WebsitesProvider } from '../context/providers/websites/websites-provider'
 import { dictionary } from '@shared/constants/dictionary'
 import { Logger } from '@shared/utils/logger'
 import { Preset } from '@shared/types/preset'

packages/vscode/src/views/panel/backend/message-handlers/handle-send-prompt.ts

@@ -10,10 +10,7 @@ import {
   replace_commit_symbol
 } from '@/views/panel/backend/utils/replace-git-symbols'
 import { code_completion_instructions_for_panel } from '@/constants/instructions'
-import {
-  get_last_selected_preset_or_group_key,
-  get_recently_used_presets_or_groups_key
-} from '@/constants/state-keys'
+import { get_recently_used_presets_or_groups_key } from '@/constants/state-keys'
 import { ConfigPresetFormat } from '../utils/preset-format-converters'
 import { MODE } from '@/views/panel/types/main-view-mode'
 import { WebPromptType } from '@shared/types/prompt-types'
@@ -81,25 +78,11 @@ export const handle_send_prompt = async (params: {
   const resolved_preset_names = resolution.preset_names
 
   if (params.preset_name !== undefined || params.group_name) {
-    const name_to_save = params.preset_name ?? params.group_name!
     update_last_used_preset_or_group({
       panel_provider: params.panel_provider,
       preset_name: params.preset_name,
       group_name: params.group_name
     })
-    const recents_key = get_recently_used_presets_or_groups_key(
-      params.panel_provider.web_prompt_type
-    )
-    const recents =
-      params.panel_provider.context.globalState.get<string[]>(
-        recents_key,
-        []
-      ) ?? []
-    const new_recents = [
-      name_to_save,
-      ...recents.filter((r) => r != name_to_save)
-    ].slice(0, 10)
-    params.panel_provider.context.globalState.update(recents_key, new_recents)
   }
 
   await vscode.workspace.saveAll()
@@ -337,10 +320,7 @@ async function show_preset_quick_pick(params: {
   quick_pick.title = 'Recently Used Presets and Groups'
   quick_pick.matchOnDescription = true
 
-  const last_selected_key = get_last_selected_preset_or_group_key(mode)
-  const last_selected_name =
-    context.workspaceState.get<string>(last_selected_key) ??
-    context.globalState.get<string>(last_selected_key)
+  const last_selected_name = recent_names[0]
 
   let last_selected_preset_name: string | undefined
   if (last_selected_name) {
@@ -473,8 +453,9 @@ async function resolve_presets(params: {
   show_quick_pick?: boolean
   context: vscode.ExtensionContext
 }): Promise<{ preset_names: string[] }> {
-  const last_selected_preset_or_group_key =
-    get_last_selected_preset_or_group_key(params.panel_provider.web_prompt_type)
+  const recents_key = get_recently_used_presets_or_groups_key(
+    params.panel_provider.web_prompt_type
+  )
   const config = vscode.workspace.getConfiguration('codeWebChat')
   const presets_config_key = params.panel_provider.get_presets_config_key()
   const all_presets = config.get<ConfigPresetFormat[]>(presets_config_key, [])
@@ -604,12 +585,8 @@ async function resolve_presets(params: {
     params.group_name === undefined
   ) {
     // Try to use last selection if "Send" button is clicked without specific preset/group
-    const last_selected_name =
-      params.context.workspaceState.get<string>(
-        last_selected_preset_or_group_key
-      ) ??
-      params.context.globalState.get<string>(last_selected_preset_or_group_key)
-
+    const recents = params.context.globalState.get<string[]>(recents_key, [])
+    const last_selected_name = recents[0]
     if (last_selected_name) {
       const item = all_presets.find((p) => p.name === last_selected_name)
       if (item) {

packages/vscode/src/views/panel/backend/message-handlers/update-last-used-preset-or-group.ts

@@ -1,32 +1,34 @@
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
-import { get_last_selected_preset_or_group_key } from '@/constants/state-keys'
+import { get_recently_used_presets_or_groups_key } from '@/constants/state-keys'
 
 export const update_last_used_preset_or_group = (params: {
   panel_provider: PanelProvider
   preset_name?: string
   group_name?: string
 }) => {
-  if (params.preset_name !== undefined) {
-    const key = get_last_selected_preset_or_group_key(
-      params.panel_provider.web_prompt_type
-    )
-    params.panel_provider.context.workspaceState.update(key, params.preset_name)
-    params.panel_provider.context.globalState.update(key, params.preset_name)
-    params.panel_provider.send_message({
-      command: 'SELECTED_PRESET_OR_GROUP_CHANGED',
-      mode: params.panel_provider.web_prompt_type,
-      name: params.preset_name
-    })
-  } else if (params.group_name) {
-    const key = get_last_selected_preset_or_group_key(
+  const name_to_save = params.preset_name ?? params.group_name
+
+  if (name_to_save) {
+    const recents_key = get_recently_used_presets_or_groups_key(
       params.panel_provider.web_prompt_type
     )
-    params.panel_provider.context.workspaceState.update(key, params.group_name)
-    params.panel_provider.context.globalState.update(key, params.group_name)
+    const recents =
+      params.panel_provider.context.globalState.get<string[]>(
+        recents_key,
+        []
+      ) ?? []
+
+    const new_recents = [
+      name_to_save,
+      ...recents.filter((r) => r != name_to_save)
+    ].slice(0, 10)
+
+    params.panel_provider.context.globalState.update(recents_key, new_recents)
+
     params.panel_provider.send_message({
       command: 'SELECTED_PRESET_OR_GROUP_CHANGED',
       mode: params.panel_provider.web_prompt_type,
-      name: params.group_name
+      name: name_to_save
     })
   }
 }

packages/vscode/src/views/panel/backend/panel-provider.ts

@@ -80,12 +80,12 @@ import {
   INSTRUCTIONS_EDIT_CONTEXT_STATE_KEY,
   INSTRUCTIONS_NO_CONTEXT_STATE_KEY,
   get_configurations_collapsed_state_key,
-  get_last_selected_preset_or_group_key,
   LAST_APPLIED_CHANGES_STATE_KEY,
   LAST_SELECTED_CODE_COMPLETION_CONFIG_ID_STATE_KEY,
   LAST_SELECTED_EDIT_CONTEXT_CONFIG_ID_STATE_KEY,
   get_presets_collapsed_state_key,
-  WEB_MODE_STATE_KEY
+  WEB_MODE_STATE_KEY,
+  get_recently_used_presets_or_groups_key
 } from '@/constants/state-keys'
 import {
   config_preset_to_ui_format,
@@ -776,10 +776,9 @@ export class PanelProvider implements vscode.WebviewViewProvider {
         web_modes.map((mode) => {
           const presets_for_mode = all_presets[mode]
           let selected_name: string | undefined = undefined
-          const key = get_last_selected_preset_or_group_key(mode)
-          const last_selected =
-            this.context.workspaceState.get<string>(key) ??
-            this.context.globalState.get<string>(key)
+          const key = get_recently_used_presets_or_groups_key(mode)
+          const recents = this.context.globalState.get<string[]>(key, [])
+          const last_selected = recents[0]
           if (last_selected) {
             if (last_selected === 'Ungrouped') {
               const first_group_index = presets_for_mode.findIndex(