From d92420eee4ac7e4d8358e4aca3ffdb2e50727fcd Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Sat, 15 Nov 2025 13:45:42 +0100
Subject: [PATCH] adding _onTabDetachedCallback to extension

---
 extension-playwright/src/background.ts      | 30 ++++++++++++++-------
 extension-playwright/src/relayConnection.ts | 27 ++++++++++++-------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/extension-playwright/src/background.ts b/extension-playwright/src/background.ts
index cf7fb5a..feea925 100644
--- a/extension-playwright/src/background.ts
+++ b/extension-playwright/src/background.ts
@@ -116,18 +116,28 @@ class SimplifiedExtension {
         });
 
         debugLog('WebSocket connected successfully, creating RelayConnection instance');
-        this._connection = new RelayConnection(socket);
-        this._connection.onclose = () => {
-          debugLog('=== Relay connection onclose callback triggered ===');
-          debugLog('Connected tabs before clearing:', Array.from(this._connectedTabs.keys()));
-          this._connection = undefined;
-          for (const tabId of this._connectedTabs.keys()) {
-            debugLog('Updating icon to disconnected for tab:', tabId);
+        this._connection = new RelayConnection({
+          ws: socket,
+          onClose: () => {
+            debugLog('=== Relay connection onClose callback triggered ===');
+            debugLog('Connected tabs before clearing:', Array.from(this._connectedTabs.keys()));
+            this._connection = undefined;
+            for (const tabId of this._connectedTabs.keys()) {
+              debugLog('Updating icon to disconnected for tab:', tabId);
+              void this._updateIcon(tabId, 'disconnected');
+            }
+            this._connectedTabs.clear();
+            debugLog('All tabs cleared');
+          },
+          onTabDetached: (tabId) => {
+            debugLog('=== Manual tab detachment detected for tab:', tabId, '===');
+            debugLog('User closed debugger via Chrome automation bar');
+            this._connectedTabs.delete(tabId);
+            debugLog('Removed tab from _connectedTabs map');
             void this._updateIcon(tabId, 'disconnected');
+            debugLog('Updated icon to disconnected state');
           }
-          this._connectedTabs.clear();
-          debugLog('All tabs cleared');
-        };
+        });
       } else {
         debugLog('Reusing existing connection');
       }
diff --git a/extension-playwright/src/relayConnection.ts b/extension-playwright/src/relayConnection.ts
index d3c2afb..dc6f55e 100644
--- a/extension-playwright/src/relayConnection.ts
+++ b/extension-playwright/src/relayConnection.ts
@@ -42,11 +42,17 @@ export class RelayConnection {
   private _nextSessionId: number = 1;
   private _ws: WebSocket;
   private _closed = false;
+  private _onCloseCallback?: () => void;
+  private _onTabDetachedCallback?: (tabId: number) => void;
 
-  onclose?: () => void;
-
-  constructor(ws: WebSocket) {
+  constructor({ ws, onClose, onTabDetached }: {
+    ws: WebSocket;
+    onClose?: () => void;
+    onTabDetached?: (tabId: number) => void;
+  }) {
     this._ws = ws;
+    this._onCloseCallback = onClose;
+    this._onTabDetachedCallback = onTabDetached;
     this._ws.onmessage = async (event: MessageEvent) => {
       let message: ExtensionCommandMessage;
       try {
@@ -164,6 +170,9 @@ export class RelayConnection {
       }
     });
 
+    this._attachedTabs.delete(tabId);
+    debugLog('Removed tab from _attachedTabs map. Remaining tabs:', this._attachedTabs.size);
+    
     chrome.debugger.detach(tab.debuggee)
       .then(() => {
         debugLog('Successfully detached debugger from tab:', tabId);
@@ -171,9 +180,6 @@ export class RelayConnection {
       .catch((err) => {
         debugLog('Error detaching debugger from tab:', tabId, err.message);
       });
-    
-    this._attachedTabs.delete(tabId);
-    debugLog('Removed tab from _attachedTabs map. Remaining tabs:', this._attachedTabs.size);
   }
 
   close(message: string): void {
@@ -211,8 +217,8 @@ export class RelayConnection {
     this._attachedTabs.clear();
     debugLog('All tabs cleared from map. Chrome automation bar should disappear in a few seconds.');
 
-    debugLog('Connection closed, calling onclose callback');
-    this.onclose?.();
+    debugLog('Connection closed, calling onClose callback');
+    this._onCloseCallback?.();
   }
 
   private _onDebuggerEvent = (source: chrome.debugger.DebuggerSession, method: string, params: any): void => {
@@ -256,7 +262,10 @@ export class RelayConnection {
       return;
     }
 
-    debugLog(`Debugger detached from tab ${tabId}: ${reason}`);
+    debugLog(`Manual debugger detachment detected for tab ${tabId}: ${reason}`);
+    debugLog('User closed debugger via Chrome automation bar, calling onTabDetached callback');
+    this._onTabDetachedCallback?.(tabId);
+    
     this.detachTab(tabId);
   };