Update MutationObserver to use document.documentElement instead of document.body

Author: robertpiosik

packages/browser/src/content-scripts/send-prompt-content-script/chatbots/ai-studio.ts

@@ -446,7 +446,7 @@ export const ai_studio: Chatbot = {
       }, 100)
     })
 
-    observer.observe(document.body, {
+    observer.observe(document.documentElement, {
       childList: true,
       subtree: true,
       characterData: true

packages/browser/src/content-scripts/send-prompt-content-script/send-prompt-content-script.ts

@@ -184,64 +184,94 @@ const initialize_chat = async (params: { message: string; chat: Chat }) => {
 }
 
 const main = async () => {
-  if (!is_cwc_hash) return
-
-  // Remove the hash from the URL to avoid reloading the content script if the page is refreshed
-  history.replaceState(
-    null,
-    '',
-    window.location.pathname + window.location.search
-  )
-
-  // Get the message using the batch ID from the hash
-  const storage_key = `chat-init:${batch_id}`
-  const storage = await browser.storage.local.get(storage_key)
-  const stored_data = storage[storage_key] as {
-    text: string
-    current_chat: Chat
-    client_id: number
-    raw_instructions?: string
-    edit_format?: string
-    mode?: 'ask' | 'edit-context' | 'code-completions' | 'no-context'
-  }
+  const session_data_key = 'cwc-session-data'
+
+  if (is_cwc_hash) {
+    // Remove the hash from the URL to avoid reloading the content script if the page is refreshed
+    history.replaceState(
+      null,
+      '',
+      window.location.pathname + window.location.search
+    )
 
-  if (!stored_data) {
-    console.error('Chat initialization data not found for batch ID:', batch_id)
-    return
-  }
+    // Get the message using the batch ID from the hash
+    const storage_key = `chat-init:${batch_id}`
+    const storage = await browser.storage.local.get(storage_key)
+    const stored_data = storage[storage_key] as {
+      text: string
+      current_chat: Chat
+      client_id: number
+      raw_instructions?: string
+      edit_format?: string
+      mode?: 'ask' | 'edit-context' | 'code-completions' | 'no-context'
+    }
 
-  // Now directly use the current_chat instead of searching for it
-  const message_text = stored_data.text
-  const current_chat = stored_data.current_chat
+    if (!stored_data) {
+      console.error(
+        'Chat initialization data not found for batch ID:',
+        batch_id
+      )
+      return
+    }
 
-  if (!current_chat) {
-    console.error('Chat configuration not found')
-    return
-  }
+    // Now directly use the current_chat instead of searching for it
+    const message_text = stored_data.text
+    const current_chat = stored_data.current_chat
 
-  if (chatbot?.wait_until_ready) {
-    await chatbot.wait_until_ready()
-  }
+    if (!current_chat) {
+      console.error('Chat configuration not found')
+      return
+    }
 
-  await initialize_chat({
-    message: message_text,
-    chat: current_chat
-  })
+    if (chatbot?.wait_until_ready) {
+      await chatbot.wait_until_ready()
+    }
 
-  // Clean up the storage entry after using it
-  await browser.storage.local.remove(storage_key)
-
-  if (
-    chatbot?.inject_apply_response_button &&
-    (!stored_data.mode ||
-      stored_data.mode == 'edit-context' ||
-      stored_data.mode == 'code-completions')
-  ) {
-    chatbot.inject_apply_response_button(
-      stored_data.client_id,
-      stored_data.raw_instructions,
-      stored_data.edit_format
-    )
+    await initialize_chat({
+      message: message_text,
+      chat: current_chat
+    })
+
+    // Clean up the storage entry after using it
+    await browser.storage.local.remove(storage_key)
+
+    if (
+      chatbot?.inject_apply_response_button &&
+      (stored_data.mode == 'edit-context' ||
+        stored_data.mode == 'code-completions')
+    ) {
+      sessionStorage.setItem(
+        session_data_key,
+        JSON.stringify({
+          client_id: stored_data.client_id,
+          raw_instructions: stored_data.raw_instructions,
+          edit_format: stored_data.edit_format
+        })
+      )
+      chatbot.inject_apply_response_button(
+        stored_data.client_id,
+        stored_data.raw_instructions,
+        stored_data.edit_format
+      )
+    } else {
+      sessionStorage.removeItem(session_data_key)
+    }
+  } else {
+    const session_data_str = sessionStorage.getItem(session_data_key)
+    if (session_data_str && chatbot) {
+      try {
+        const session_data = JSON.parse(session_data_str)
+        if (chatbot.inject_apply_response_button) {
+          chatbot.inject_apply_response_button(
+            session_data.client_id,
+            session_data.raw_instructions,
+            session_data.edit_format
+          )
+        }
+      } catch (e) {
+        console.error('Failed to parse CWC session data', e)
+      }
+    }
   }
 }
 

packages/browser/src/content-scripts/send-prompt-content-script/utils/add-apply-response-button.ts

@@ -84,7 +84,7 @@ export function observe_for_responses(params: ResponseObserverParams) {
     })
   })
 
-  observer.observe(document.body, {
+  observer.observe(document.documentElement, {
     childList: true,
     subtree: true,
     characterData: true

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

@@ -322,7 +322,11 @@ async function show_preset_quick_pick(params: {
       const item = presets.find((p) => p.name == name)
 
       if (item && !item.chatbot) {
-        return { label: name, group_name: name, description: 'Group' }
+        return {
+          label: name.replace(/\s*\(\d+\)$/, ''),
+          group_name: name,
+          description: 'Group'
+        }
       }
 
       if (item && item.chatbot) {
@@ -334,7 +338,11 @@ async function show_preset_quick_pick(params: {
           ? chatbot_models[preset.model]?.label || preset.model
           : ''
         return {
-          label: `${is_unnamed ? preset.chatbot! : preset.name!}`,
+          label: `${
+            is_unnamed
+              ? preset.chatbot!
+              : preset.name!.replace(/\s*\(\d+\)$/, '')
+          }`,
           preset_name: preset.name,
           description: is_unnamed
             ? model