Skip to content

feat(extension): add focusTab option to prevent focus stealing on connect #1471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
himself65 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(extension): add focusTab option to prevent focus stealing on connect #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/extension/src/background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type PageMessage = {
tabId?: number;
windowId?: number;
mcpRelayUrl: string;
focusTab?: boolean;
} | {
type: 'getConnectionStatus';
} | {
Expand Down Expand Up @@ -61,7 +62,7 @@ class TabShareExtension {
case 'connectToTab':
const tabId = message.tabId || sender.tab?.id!;
const windowId = message.windowId || sender.tab?.windowId!;
this._connectTab(sender.tab!.id!, tabId, windowId, message.mcpRelayUrl!).then(
this._connectTab(sender.tab!.id!, tabId, windowId, message.mcpRelayUrl!, message.focusTab).then(
() => sendResponse({ success: true }),
(error: any) => sendResponse({ success: false, error: error.message }));
return true; // Return true to indicate that the response will be sent asynchronously
Expand Down Expand Up @@ -104,7 +105,7 @@ class TabShareExtension {
}
}

private async _connectTab(selectorTabId: number, tabId: number, windowId: number, mcpRelayUrl: string): Promise<void> {
private async _connectTab(selectorTabId: number, tabId: number, windowId: number, mcpRelayUrl: string, focusTab?: boolean): Promise<void> {
try {
debugLog(`Connecting tab ${tabId} to relay at ${mcpRelayUrl}`);
try {
Expand All @@ -126,11 +127,13 @@ class TabShareExtension {
void this._setConnectedTabId(null);
};

await Promise.all([
this._setConnectedTabId(tabId),
chrome.tabs.update(tabId, { active: true }),
chrome.windows.update(windowId, { focused: true }),
]);
await this._setConnectedTabId(tabId);
if (focusTab !== false) {
await Promise.all([
chrome.tabs.update(tabId, { active: true }),
chrome.windows.update(windowId, { focused: true }),
]);
}
debugLog(`Connected to MCP bridge`);
} catch (error: any) {
await this._setConnectedTabId(null);
Expand Down
7 changes: 6 additions & 1 deletion packages/extension/src/ui/connect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const ConnectApp: React.FC = () => {
const [clientInfo, setClientInfo] = useState('unknown');
const [mcpRelayUrl, setMcpRelayUrl] = useState('');
const [newTab, setNewTab] = useState<boolean>(false);
const [focusTab, setFocusTab] = useState<boolean>(true);

useEffect(() => {
const runAsync = async () => {
Expand Down Expand Up @@ -103,6 +104,9 @@ const ConnectApp: React.FC = () => {

await connectToMCPRelay(relayUrl);

if (params.get('focusTab') === 'false')
setFocusTab(false);

// If this is a browser_navigate command, hide the tab list and show simple allow/reject
if (params.get('newTab') === 'true') {
setNewTab(true);
Expand Down Expand Up @@ -144,6 +148,7 @@ const ConnectApp: React.FC = () => {
mcpRelayUrl,
tabId: tab?.id,
windowId: tab?.windowId,
focusTab,
});

if (response?.success) {
Expand All @@ -160,7 +165,7 @@ const ConnectApp: React.FC = () => {
message: `MCP client "${clientInfo}" failed to connect: ${e}`
});
}
}, [clientInfo, mcpRelayUrl]);
}, [clientInfo, mcpRelayUrl, focusTab]);

useEffect(() => {
const listener = (message: any) => {
Expand Down