Add tab reuse control based on response completion state and track finished responses

Author: robertpiosik

apps/browser/src/background/message-handler.ts

@@ -15,6 +15,7 @@ interface ChatQueueItem {
 const chat_queue: ChatQueueItem[] = []
 let is_processing = false
 let last_opened_tab_id: number | undefined
+let is_finished_responding = false
 
 const CHAT_INITIALIZATION_TIMEOUT = 5000
 
@@ -102,15 +103,28 @@ const process_next_chat = async () => {
     target_url = `${current_chat_message.url}#cwc-${batch_id}`
   }
 
+  const expects_apply_response_button =
+    current_chat_message.prompt_type == 'edit-context' ||
+    current_chat_message.prompt_type == 'code-at-cursor' ||
+    current_chat_message.prompt_type == 'find-relevant-files'
+
   let tab_reused = false
-  if (last_opened_tab_id !== undefined && current_chat_message.reuse_last_tab) {
+  if (
+    last_opened_tab_id !== undefined &&
+    current_chat_message.reuse_last_tab &&
+    (!expects_apply_response_button || is_finished_responding)
+  ) {
     try {
-      await browser.tabs.get(last_opened_tab_id)
-      await browser.tabs.update(last_opened_tab_id, {
-        url: target_url,
-        active: true
-      })
-      tab_reused = true
+      const tab = await browser.tabs.get(last_opened_tab_id)
+      if (tab.active) {
+        await browser.tabs.update(last_opened_tab_id, {
+          url: target_url,
+          active: true
+        })
+        tab_reused = true
+      } else {
+        last_opened_tab_id = undefined
+      }
     } catch {
       last_opened_tab_id = undefined
     }
@@ -125,6 +139,8 @@ const process_next_chat = async () => {
     last_opened_tab_id = new_tab.id
   }
 
+  is_finished_responding = false
+
   current_queue_item.timeout_id = setTimeout(() => {
     console.warn(
       `Chat initialization timeout for ${current_chat_message.url}. Moving to next chat.`
@@ -160,7 +176,7 @@ const handle_chat_initialized = async () => {
 
 export const setup_message_listeners = () => {
   browser.runtime.onMessage.addListener(
-    (message: any, _: any, __: any): any => {
+    (message: any, sender: any, _: any): any => {
       if (is_message(message)) {
         if (message.action == 'chat-initialized') {
           handle_chat_initialized()
@@ -172,6 +188,10 @@ export const setup_message_listeners = () => {
             edit_format: message.edit_format,
             url: message.url
           } as ApplyChatResponseMessage)
+        } else if (message.action == 'finished-responding') {
+          if (sender.tab?.id && sender.tab.id == last_opened_tab_id) {
+            is_finished_responding = true
+          }
         }
       }
       return false

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

@@ -68,11 +68,21 @@ export function observe_for_responses(params: {
   footer_selector: string
   add_buttons: (footer: Element) => void
 }) {
+  let has_sent_finished_responding = true
+
   const observer = new MutationObserver(() => {
     if (params.is_generating()) {
+      has_sent_finished_responding = false
       return
     }
 
+    if (!has_sent_finished_responding) {
+      browser.runtime.sendMessage<Message>({
+        action: 'finished-responding'
+      })
+      has_sent_finished_responding = true
+    }
+
     const all_footers = document.querySelectorAll(params.footer_selector)
     if (all_footers.length == 0) {
       return

apps/browser/src/types/messages.ts

@@ -10,4 +10,11 @@ type ApplyChatResponseMessage = {
   url?: string
 }
 
-export type Message = ChatInitializedMessage | ApplyChatResponseMessage
+type FinishedRespondingMessage = {
+  action: 'finished-responding'
+}
+
+export type Message =
+  | ChatInitializedMessage
+  | ApplyChatResponseMessage
+  | FinishedRespondingMessage