Only show browser assistant mode if remote browser enabled

Author: afshawnlotfi

src/services/browser/BrowserSession.ts

@@ -354,6 +354,7 @@ export class BrowserSession {
 		const normalizedNewUrl = url.replace(/\/$/, "")
 
 		// Check if browser assistant mode is enabled
+		const remoteBrowserEnabled = this.context.globalState.get("remoteBrowserEnabled") as string | undefined
 		const browserAssistantModeEnabled = this.context.globalState.get("browserAssistantModeEnabled") as
 			| boolean
 			| undefined
@@ -364,7 +365,7 @@ export class BrowserSession {
 		// Try to find a page with the same root domain or use the latest tab in assistant mode
 		let existingPage: Page | undefined
 
-		if (browserAssistantModeEnabled) {
+		if (browserAssistantModeEnabled && remoteBrowserEnabled) {
 			// In assistant mode, always use the latest tab (last in the array)
 			// Skip the first page which is usually the blank page
 			existingPage = pages.length >= 1 ? pages[pages.length - 1] : undefined
@@ -401,7 +402,7 @@ export class BrowserSession {
 			const currentUrl = existingPage.url().replace(/\/$/, "") // Remove trailing / if present
 
 			if (
-				browserAssistantModeEnabled ||
+				(browserAssistantModeEnabled && remoteBrowserEnabled) ||
 				(this.getRootDomain(currentUrl) === this.getRootDomain(normalizedNewUrl) &&
 					currentUrl !== normalizedNewUrl)
 			) {

webview-ui/src/components/settings/BrowserSettings.tsx

@@ -212,28 +212,27 @@ export const BrowserSettings = ({
 								<div className="text-vscode-descriptionForeground text-sm mt-1">
 									{t("settings:browser.remote.instructions")}
 								</div>
+								<div>
+									<VSCodeCheckbox
+										checked={browserAssistantModeEnabled}
+										onChange={(e: any) => {
+											setCachedStateField("browserAssistantModeEnabled", e.target.checked)
+										}}>
+										<label className="block font-medium mb-1">
+											{t("settings:browser.assistantMode.label")}
+										</label>
+									</VSCodeCheckbox>
+									<div className="text-vscode-descriptionForeground text-sm mt-1">
+										{t("settings:browser.assistantMode.description")}
+									</div>
+									{browserAssistantModeEnabled && (
+										<div className="text-vscode-descriptionForeground text-sm mt-1">
+											{t("settings:browser.assistantMode.instructions")}
+										</div>
+									)}
+								</div>
 							</>
 						)}
-
-						<div>
-							<VSCodeCheckbox
-								checked={browserAssistantModeEnabled}
-								onChange={(e: any) => {
-									setCachedStateField("browserAssistantModeEnabled", e.target.checked)
-								}}>
-								<label className="block font-medium mb-1">
-									{t("settings:browser.assistantMode.label")}
-								</label>
-							</VSCodeCheckbox>
-							<div className="text-vscode-descriptionForeground text-sm mt-1">
-								{t("settings:browser.assistantMode.description")}
-							</div>
-							{browserAssistantModeEnabled && (
-								<div className="text-vscode-descriptionForeground text-sm mt-1">
-									{t("settings:browser.assistantMode.instructions")}
-								</div>
-							)}
-						</div>
 					</div>
 				)}
 			</Section>