From 5c1e7b521eca6108cee7e45a01e6db768fcfe812 Mon Sep 17 00:00:00 2001
From: hongzio <11085613+hongzio@users.noreply.github.com>
Date: Tue, 22 Apr 2025 03:23:24 +0900
Subject: [PATCH 1/2] Fix: focusInput open roo code panel (#2626)

* Fix: `roo-cline.focusInput` open roo code panel
---
 src/activate/registerCommands.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts
index 486566357b..06da14a428 100644
--- a/src/activate/registerCommands.ts
+++ b/src/activate/registerCommands.ts
@@ -114,8 +114,16 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 			const { promptForCustomStoragePath } = await import("../shared/storagePathManager")
 			await promptForCustomStoragePath()
 		},
-		"roo-cline.focusInput": () => {
-			provider.postMessageToWebview({ type: "action", action: "focusInput" })
+		"roo-cline.focusInput": async () => {
+			const panel = getPanel()
+			if (!panel) {
+				await vscode.commands.executeCommand("workbench.view.extension.roo-cline-ActivityBar")
+			} else if (panel === tabPanel) {
+				panel.reveal(vscode.ViewColumn.Active, false)
+			} else if (panel === sidebarPanel) {
+				await vscode.commands.executeCommand(`${ClineProvider.sideBarId}.focus`)
+				provider.postMessageToWebview({ type: "action", action: "focusInput" })
+			}
 		},
 		"roo.acceptInput": () => {
 			const visibleProvider = getVisibleProviderOrLog(outputChannel)

From 440d2f2417eeb5004dd9a119329dccaa897f83dc Mon Sep 17 00:00:00 2001
From: hongzio <11085613+hongzio@users.noreply.github.com>
Date: Tue, 22 Apr 2025 12:41:19 +0900
Subject: [PATCH 2/2] fixup! Fix: focusInput open roo code panel (#2626)

---
 src/activate/registerCommands.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts
index 06da14a428..1883083b6e 100644
--- a/src/activate/registerCommands.ts
+++ b/src/activate/registerCommands.ts
@@ -115,14 +115,18 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 			await promptForCustomStoragePath()
 		},
 		"roo-cline.focusInput": async () => {
-			const panel = getPanel()
-			if (!panel) {
-				await vscode.commands.executeCommand("workbench.view.extension.roo-cline-ActivityBar")
-			} else if (panel === tabPanel) {
-				panel.reveal(vscode.ViewColumn.Active, false)
-			} else if (panel === sidebarPanel) {
-				await vscode.commands.executeCommand(`${ClineProvider.sideBarId}.focus`)
-				provider.postMessageToWebview({ type: "action", action: "focusInput" })
+			try {
+				const panel = getPanel()
+				if (!panel) {
+					await vscode.commands.executeCommand("workbench.view.extension.roo-cline-ActivityBar")
+				} else if (panel === tabPanel) {
+					panel.reveal(vscode.ViewColumn.Active, false)
+				} else if (panel === sidebarPanel) {
+					await vscode.commands.executeCommand(`${ClineProvider.sideBarId}.focus`)
+					provider.postMessageToWebview({ type: "action", action: "focusInput" })
+				}
+			} catch (error) {
+				outputChannel.appendLine(`Error focusing input: ${error}`)
 			}
 		},
 		"roo.acceptInput": () => {