From 7d2411e72fe32e76e9d845830520f64d5f8ee6dc Mon Sep 17 00:00:00 2001
From: yiliang114 <1204183885@qq.com>
Date: Thu, 20 Nov 2025 23:41:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(vscode-ide-companion):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20Qwen=20Code=20=E8=81=8A=E5=A4=A9=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 createPanel 方法返回值类型，使其支持异步操作
- 实现聚焦当前激活编辑器的功能
- 优化多窗口创建逻辑，允许在已有 Qwen Code 窗口旁边创建新窗口
- 移除自动锁定编辑器组的功能，以支持多个 Qwen Code 标签页
- 在 UI 中添加聚焦当前文件的按钮
---
 .../src/WebViewProvider.ts                    |   2 +-
 .../vscode-ide-companion/src/webview/App.tsx  |  29 ++++-
 .../src/webview/MessageHandler.ts             |  12 ++
 .../src/webview/PanelManager.ts               | 121 ++++++++++++++----
 4 files changed, 131 insertions(+), 33 deletions(-)

diff --git a/packages/vscode-ide-companion/src/WebViewProvider.ts b/packages/vscode-ide-companion/src/WebViewProvider.ts
index b73b3f73..c8018208 100644
--- a/packages/vscode-ide-companion/src/WebViewProvider.ts
+++ b/packages/vscode-ide-companion/src/WebViewProvider.ts
@@ -117,7 +117,7 @@ export class WebViewProvider {
     }
 
     // Create new panel
-    const isNewPanel = this.panelManager.createPanel();
+    const isNewPanel = await this.panelManager.createPanel();
 
     if (!isNewPanel) {
       return; // Failed to create panel
diff --git a/packages/vscode-ide-companion/src/webview/App.tsx b/packages/vscode-ide-companion/src/webview/App.tsx
index 094dc3a7..cb8b9a38 100644
--- a/packages/vscode-ide-companion/src/webview/App.tsx
+++ b/packages/vscode-ide-companion/src/webview/App.tsx
@@ -1048,12 +1048,33 @@ export const App: React.FC = () => {
                 <span>{getEditModeInfo().text}</span>
               </button>
               {activeFileName && (
-                <span
-                  className="active-file-indicator"
+                <button
+                  type="button"
+                  className="action-button active-file-indicator"
                   title={`Showing Qwen Code your current file selection: ${activeFileName}`}
+                  onClick={() => {
+                    // Request to focus/reveal the active file
+                    vscode.postMessage({
+                      type: 'focusActiveEditor',
+                      data: {},
+                    });
+                  }}
                 >
-                  {activeFileName}
-                </span>
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    viewBox="0 0 20 20"
+                    fill="currentColor"
+                    aria-hidden="true"
+                    data-slot="icon"
+                  >
+                    <path
+                      fillRule="evenodd"
+                      d="M6.28 5.22a.75.75 0 0 1 0 1.06L2.56 10l3.72 3.72a.75.75 0 0 1-1.06 1.06L.97 10.53a.75.75 0 0 1 0-1.06l4.25-4.25a.75.75 0 0 1 1.06 0Zm7.44 0a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.75.75 0 0 1-1.06-1.06L17.44 10l-3.72-3.72a.75.75 0 0 1 0-1.06ZM11.377 2.011a.75.75 0 0 1 .612.867l-2.5 14.5a.75.75 0 0 1-1.478-.255l2.5-14.5a.75.75 0 0 1 .866-.612Z"
+                      clipRule="evenodd"
+                    ></path>
+                  </svg>
+                  <span>{activeFileName}</span>
+                </button>
               )}
               <div className="action-divider"></div>
               <button
diff --git a/packages/vscode-ide-companion/src/webview/MessageHandler.ts b/packages/vscode-ide-companion/src/webview/MessageHandler.ts
index e64ee91c..6ae45106 100644
--- a/packages/vscode-ide-companion/src/webview/MessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/MessageHandler.ts
@@ -141,6 +141,18 @@ export class MessageHandler {
         break;
       }
 
+      case 'focusActiveEditor': {
+        // 聚焦到当前激活的编辑器
+        const activeEditor = vscode.window.activeTextEditor;
+        if (activeEditor) {
+          vscode.window.showTextDocument(activeEditor.document, {
+            viewColumn: activeEditor.viewColumn,
+            preserveFocus: false,
+          });
+        }
+        break;
+      }
+
       case 'switchQwenSession':
         await this.handleSwitchQwenSession((data?.sessionId as string) || '');
         break;
diff --git a/packages/vscode-ide-companion/src/webview/PanelManager.ts b/packages/vscode-ide-companion/src/webview/PanelManager.ts
index 8da55b41..75764eba 100644
--- a/packages/vscode-ide-companion/src/webview/PanelManager.ts
+++ b/packages/vscode-ide-companion/src/webview/PanelManager.ts
@@ -37,17 +37,65 @@ export class PanelManager {
    * 创建新的 WebView Panel
    * @returns 是否是新创建的 Panel
    */
-  createPanel(): boolean {
+  async createPanel(): Promise<boolean> {
     if (this.panel) {
       return false; // Panel already exists
     }
 
     // Find if there's already a Qwen Code webview tab open and get its view column
-    const existingQwenViewColumn = this.findExistingQwenCodeViewColumn();
+    const existingQwenInfo = this.findExistingQwenCodeGroup();
 
     // If we found an existing Qwen Code tab, open in the same view column
     // Otherwise, open beside the active editor
-    const targetViewColumn = existingQwenViewColumn ?? vscode.ViewColumn.Beside;
+    const targetViewColumn =
+      existingQwenInfo?.viewColumn ?? vscode.ViewColumn.Beside;
+    console.log('[PanelManager] existingQwenInfo', existingQwenInfo);
+    console.log('[PanelManager] targetViewColumn', targetViewColumn);
+
+    // If there's an existing Qwen Code group, ensure it's unlocked so we can add new tabs
+    // We try to unlock regardless of current state - if already unlocked, this is a no-op
+    if (existingQwenInfo?.group) {
+      console.log(
+        "[PanelManager] Found existing Qwen Code group, ensuring it's unlocked...",
+      );
+
+      try {
+        // We need to make the target group active first
+        // Find a Qwen Code tab in that group
+        const firstQwenTab = existingQwenInfo.group.tabs.find((tab) => {
+          const input: unknown = (tab as { input?: unknown }).input;
+          const isWebviewInput = (inp: unknown): inp is { viewType: string } =>
+            !!inp && typeof inp === 'object' && 'viewType' in inp;
+          return (
+            isWebviewInput(input) &&
+            input.viewType === 'mainThreadWebview-qwenCode.chat'
+          );
+        });
+
+        if (firstQwenTab) {
+          // Make the group active by focusing on one of its tabs
+          const activeTabGroup = vscode.window.tabGroups.activeTabGroup;
+          if (activeTabGroup !== existingQwenInfo.group) {
+            // Switch to the target group
+            await vscode.commands.executeCommand(
+              'workbench.action.focusFirstEditorGroup',
+            );
+          }
+        }
+
+        // Try to unlock the group (will be no-op if already unlocked)
+        await vscode.commands.executeCommand(
+          'workbench.action.unlockEditorGroup',
+        );
+        console.log('[PanelManager] Unlock command executed');
+      } catch (error) {
+        console.warn(
+          '[PanelManager] Failed to unlock group, continuing anyway:',
+          error,
+        );
+        // Continue anyway - the group might not be locked
+      }
+    }
 
     this.panel = vscode.window.createWebviewPanel(
       'qwenCode.chat',
@@ -77,23 +125,33 @@ export class PanelManager {
   }
 
   /**
-   * 查找已存在的 Qwen Code webview 所在的 view column
-   * @returns 找到的 view column，如果没有则返回 undefined
+   * 查找已存在的 Qwen Code webview 所在的 group 和 view column
+   * @returns 找到的 group 和 view column，如果没有则返回 undefined
    */
-  private findExistingQwenCodeViewColumn(): vscode.ViewColumn | undefined {
-    const allTabs = vscode.window.tabGroups.all.flatMap((g) => g.tabs);
+  private findExistingQwenCodeGroup():
+    | { group: vscode.TabGroup; viewColumn: vscode.ViewColumn }
+    | undefined {
+    for (const group of vscode.window.tabGroups.all) {
+      for (const tab of group.tabs) {
+        const input: unknown = (tab as { input?: unknown }).input;
+        const isWebviewInput = (inp: unknown): inp is { viewType: string } =>
+          !!inp && typeof inp === 'object' && 'viewType' in inp;
 
-    for (const tab of allTabs) {
-      const input: unknown = (tab as { input?: unknown }).input;
-      const isWebviewInput = (inp: unknown): inp is { viewType: string } =>
-        !!inp && typeof inp === 'object' && 'viewType' in inp;
-
-      if (isWebviewInput(input) && input.viewType === 'qwenCode.chat') {
-        // Found an existing Qwen Code tab, get its view column
-        const tabGroup = vscode.window.tabGroups.all.find((g) =>
-          g.tabs.includes(tab),
-        );
-        return tabGroup?.viewColumn;
+        if (
+          isWebviewInput(input) &&
+          input.viewType === 'mainThreadWebview-qwenCode.chat'
+        ) {
+          // Found an existing Qwen Code tab
+          console.log('[PanelManager] Found existing Qwen Code group:', {
+            viewColumn: group.viewColumn,
+            tabCount: group.tabs.length,
+            isActive: group.isActive,
+          });
+          return {
+            group,
+            viewColumn: group.viewColumn,
+          };
+        }
       }
     }
 
@@ -102,23 +160,30 @@ export class PanelManager {
 
   /**
    * 自动锁定编辑器组（仅在新创建 Panel 时调用）
+   * 注意：我们不再自动锁定 Qwen Code group，以允许用户创建多个 Qwen Code tab
    */
   async autoLockEditorGroup(): Promise<void> {
     if (!this.panel) {
       return;
     }
 
-    console.log('[PanelManager] Auto-locking editor group for Qwen Code chat');
-    try {
-      // Reveal panel without preserving focus to make it the active group
-      this.revealPanel(false);
+    // We don't auto-lock anymore to allow multiple Qwen Code tabs in the same group
+    console.log(
+      '[PanelManager] Skipping auto-lock to allow multiple Qwen Code tabs',
+    );
 
-      await vscode.commands.executeCommand('workbench.action.lockEditorGroup');
-      console.log('[PanelManager] Editor group locked successfully');
-    } catch (error) {
-      console.warn('[PanelManager] Failed to lock editor group:', error);
-      // Non-fatal error, continue anyway
-    }
+    // If you want to enable auto-locking for the first tab, uncomment the following:
+    // const existingQwenInfo = this.findExistingQwenCodeGroup();
+    // if (!existingQwenInfo) {
+    //   console.log('[PanelManager] First Qwen Code tab, locking editor group');
+    //   try {
+    //     this.revealPanel(false);
+    //     await vscode.commands.executeCommand('workbench.action.lockEditorGroup');
+    //     console.log('[PanelManager] Editor group locked successfully');
+    //   } catch (error) {
+    //     console.warn('[PanelManager] Failed to lock editor group:', error);
+    //   }
+    // }
   }
 
   /**