fix(vscode): force fresh ACP session on new-session action

packages/vscode-ide-companion/src/services/qwenAgentManager.test.ts

@@ -103,3 +103,30 @@ describe('QwenAgentManager.setModelFromUi', () => {
     expect(onModelChanged).toHaveBeenCalledWith(selectedModel);
   });
 });
+
+describe('QwenAgentManager.createNewSession', () => {
+  it('creates a fresh ACP session when explicitly requested even if one is already active', async () => {
+    const manager = new QwenAgentManager();
+    const connection = {
+      currentSessionId: 'session-1',
+      newSession: vi.fn().mockImplementation(async () => {
+        connection.currentSessionId = 'session-2';
+        return { sessionId: 'session-2' };
+      }),
+      authenticate: vi.fn(),
+    };
+
+    (
+      manager as unknown as {
+        connection: typeof connection;
+      }
+    ).connection = connection;
+
+    const newSessionId = await manager.createNewSession('/workspace', {
+      forceNew: true,
+    } as never);
+
+    expect(connection.newSession).toHaveBeenCalledWith('/workspace');
+    expect(newSessionId).toBe('session-2');
+  });
+});

packages/vscode-ide-companion/src/services/qwenAgentManager.ts

@@ -82,6 +82,7 @@ interface AgentConnectOptions {
 }
 interface AgentSessionOptions {
   autoAuthenticate?: boolean;
+  forceNew?: boolean;
 }
 
 export class QwenAgentManager {
@@ -1163,8 +1164,10 @@ export class QwenAgentManager {
     options?: AgentSessionOptions,
   ): Promise<string | null> {
     const autoAuthenticate = options?.autoAuthenticate ?? true;
-    // Reuse existing session if present
-    if (this.connection.currentSessionId) {
+    const forceNew = options?.forceNew ?? false;
+    // Reuse the current session for implicit session bootstrap paths.
+    // Explicit "new session" actions must bypass this and call session/new.
+    if (!forceNew && this.connection.currentSessionId) {
       console.log(
         '[QwenAgentManager] createNewSession: reusing existing session',
         this.connection.currentSessionId,

packages/vscode-ide-companion/src/utils/imageSupport.bundle.test.ts

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import esbuild from 'esbuild';
+import { fileURLToPath } from 'node:url';
+import { describe, expect, it } from 'vitest';
+
+describe('imageSupport browser bundling', () => {
+  it('does not leave qwen-code-core runtime imports in the webview bundle', async () => {
+    const result = await esbuild.build({
+      entryPoints: [
+        fileURLToPath(new URL('./imageSupport.ts', import.meta.url)),
+      ],
+      bundle: true,
+      format: 'iife',
+      platform: 'browser',
+      write: false,
+      logLevel: 'silent',
+      external: ['@qwen-code/qwen-code-core'],
+    });
+
+    const output = result.outputFiles[0]?.text ?? '';
+
+    expect(output).not.toContain('@qwen-code/qwen-code-core');
+    expect(output).not.toContain('supportedImageFormats.js');
+  });
+
+  it('does not leave qwen-code-core runtime imports in the App webview bundle', async () => {
+    const result = await esbuild.build({
+      entryPoints: [
+        fileURLToPath(new URL('../webview/App.tsx', import.meta.url)),
+      ],
+      bundle: true,
+      format: 'iife',
+      platform: 'browser',
+      write: false,
+      logLevel: 'silent',
+      external: ['@qwen-code/qwen-code-core'],
+    });
+
+    const output = result.outputFiles[0]?.text ?? '';
+
+    expect(output).not.toContain('@qwen-code/qwen-code-core');
+    expect(output).not.toContain('tokenLimits.js');
+  });
+});

packages/vscode-ide-companion/src/utils/imageSupport.test.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, expect, it } from 'vitest';
+import { SUPPORTED_IMAGE_MIME_TYPES } from '@qwen-code/qwen-code-core/src/utils/request-tokenizer/supportedImageFormats.js';
+import { SUPPORTED_PASTED_IMAGE_MIME_TYPES } from './imageSupport.js';
+
+describe('imageSupport constants', () => {
+  it('keeps the browser-safe pasted image list aligned with core-supported formats', () => {
+    expect(SUPPORTED_PASTED_IMAGE_MIME_TYPES).toEqual(
+      new Set(SUPPORTED_IMAGE_MIME_TYPES),
+    );
+  });
+});

packages/vscode-ide-companion/src/utils/imageSupport.ts

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isSupportedImageMimeType } from '@qwen-code/qwen-code-core/src/utils/request-tokenizer/supportedImageFormats.js';
-
 // ---------- Types ----------
 
 export interface ImageAttachment {
@@ -73,6 +71,11 @@ const PASTED_IMAGE_MIME_TO_EXTENSION: Record<string, string> = {
   'image/webp': '.webp',
 };
 
+// Keep this list aligned with packages/core/src/utils/request-tokenizer/supportedImageFormats.ts.
+export const SUPPORTED_PASTED_IMAGE_MIME_TYPES = new Set(
+  Object.keys(PASTED_IMAGE_MIME_TO_EXTENSION),
+);
+
 const DISPLAYABLE_IMAGE_EXTENSION_TO_MIME: Record<string, string> = {
   '.bmp': 'image/bmp',
   '.gif': 'image/gif',
@@ -86,7 +89,7 @@ const DISPLAYABLE_IMAGE_EXTENSION_TO_MIME: Record<string, string> = {
 };
 
 export function isSupportedPastedImageMimeType(mimeType: string): boolean {
-  return isSupportedImageMimeType(mimeType);
+  return SUPPORTED_PASTED_IMAGE_MIME_TYPES.has(mimeType);
 }
 
 export function getImageExtensionForMimeType(mimeType: string): string {

packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.test.ts

@@ -161,4 +161,33 @@ describe('SessionMessageHandler', () => {
       },
     ]);
   });
+
+  it('forces a fresh ACP session when the webview requests a new session', async () => {
+    const agentManager = {
+      isConnected: true,
+      currentSessionId: 'session-1',
+      createNewSession: vi.fn().mockResolvedValue('session-2'),
+    };
+    const conversationStore = {
+      createConversation: vi.fn(),
+      getConversation: vi.fn(),
+      addMessage: vi.fn(),
+    };
+    const sendToWebView = vi.fn();
+
+    const handler = new SessionMessageHandler(
+      agentManager as never,
+      conversationStore as never,
+      null,
+      sendToWebView,
+    );
+
+    await handler.handle({
+      type: 'newQwenSession',
+    });
+
+    expect(agentManager.createNewSession).toHaveBeenCalledWith('/workspace', {
+      forceNew: true,
+    });
+  });
 });

packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts

@@ -587,7 +587,7 @@ export class SessionMessageHandler extends BaseMessageHandler {
       const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
       const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
 
-      await this.agentManager.createNewSession(workingDir);
+      await this.agentManager.createNewSession(workingDir, { forceNew: true });
 
       this.sendToWebView({
         type: 'conversationCleared',
@@ -726,8 +726,12 @@ export class SessionMessageHandler extends BaseMessageHandler {
         // If we are connected, try to create a fresh ACP session so user can interact
         if (this.agentManager.isConnected) {
           try {
-            const newAcpSessionId =
-              await this.agentManager.createNewSession(workingDir);
+            const newAcpSessionId = await this.agentManager.createNewSession(
+              workingDir,
+              {
+                forceNew: true,
+              },
+            );
 
             this.currentConversationId = newAcpSessionId;
 

packages/vscode-ide-companion/src/webview/providers/WebViewProvider.test.ts

@@ -68,6 +68,7 @@ vi.mock('../../services/qwenAgentManager.js', () => ({
     onPermissionRequest = vi.fn();
     onAskUserQuestion = vi.fn();
     disconnect = vi.fn();
+    createNewSession = vi.fn();
   },
 }));
 
@@ -288,3 +289,26 @@ describe('WebViewProvider.attachToView', () => {
     expect(panelPostMessage).not.toHaveBeenCalled();
   });
 });
+
+describe('WebViewProvider.createNewSession', () => {
+  it('forces a fresh ACP session for the sidebar new-session action', async () => {
+    const provider = new WebViewProvider(
+      { subscriptions: [] } as never,
+      { fsPath: '/extension-root' } as never,
+    );
+    const agentManager = (
+      provider as unknown as {
+        agentManager: {
+          createNewSession: ReturnType<typeof vi.fn>;
+        };
+      }
+    ).agentManager;
+
+    await provider.createNewSession();
+
+    expect(agentManager.createNewSession).toHaveBeenCalledWith(
+      '/workspace-root',
+      { forceNew: true },
+    );
+  });
+});

packages/vscode-ide-companion/src/webview/providers/WebViewProvider.ts

@@ -1614,7 +1614,7 @@ export class WebViewProvider {
       const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
 
       // Create new Qwen session via agent manager
-      await this.agentManager.createNewSession(workingDir);
+      await this.agentManager.createNewSession(workingDir, { forceNew: true });
 
       // Clear current conversation UI
       this.sendMessageToWebView({