fix(vscode-ide-companion): resolve all ESLint errors

Fixed unused variable errors in SessionMessageHandler.ts: - Commented out unused conversation and messages variables Also includes previous commits: 1. feat(vscode-ide-companion): add upgrade button to CLI version warning 2. fix(vscode-ide-companion): resolve ESLint errors in InputForm component When the Qwen Code CLI version is below the minimum required version, the warning message now includes an "Upgrade Now" button that opens a terminal and runs the npm install command to upgrade the CLI. Added tests to verify the functionality works correctly.
feat(vscode-ide-companion/completion): enhance completion menu performance and refresh logic
2025-12-23 10:17:50 +00:00 · 2025-12-13 09:56:18 +08:00 · 2025-12-13 09:19:18 +08:00 · 2025-12-13 09:19:09 +08:00 · 2025-12-12 16:32:13 +08:00 · 2025-12-12 16:29:50 +08:00
45 changed files with 750 additions and 1435 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.4.1",
+      "version": "0.5.0",
      "workspaces": [
        "packages/*"
      ],
@@ -568,7 +568,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      },
@@ -592,7 +591,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      }
@@ -2157,7 +2155,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
      "license": "Apache-2.0",
-      "peer": true,
      "engines": {
        "node": ">=8.0.0"
      }
@@ -3671,7 +3668,6 @@
      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.10.4",
        "@babel/runtime": "^7.12.5",
@@ -4142,7 +4138,6 @@
      "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -4153,7 +4148,6 @@
      "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "peerDependencies": {
        "@types/react": "^19.0.0"
      }
@@ -4359,7 +4353,6 @@
      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.35.0",
        "@typescript-eslint/types": "8.35.0",
@@ -5135,7 +5128,6 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "license": "MIT",
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -5530,7 +5522,8 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/array-includes": {
      "version": "3.1.9",
@@ -6865,6 +6858,7 @@
      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "safe-buffer": "5.2.1"
      },
@@ -7982,7 +7976,6 @@
      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -8518,6 +8511,7 @@
      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
@@ -8579,6 +8573,7 @@
      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -8588,6 +8583,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -8597,6 +8593,7 @@
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.8"
      }
@@ -8763,6 +8760,7 @@
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "debug": "2.6.9",
        "encodeurl": "~2.0.0",
@@ -8781,6 +8779,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -8789,13 +8788,15 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/finalhandler/node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.8"
      }
@@ -9909,7 +9910,6 @@
      "resolved": "https://registry.npmjs.org/ink/-/ink-6.2.3.tgz",
      "integrity": "sha512-fQkfEJjKbLXIcVWEE3MvpYSnwtbbmRsmeNDNz1pIuOFlwE+UF2gsy228J36OXKZGWJWZJKUigphBSqCNMcARtg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@alcalzone/ansi-tokenize": "^0.2.0",
        "ansi-escapes": "^7.0.0",
@@ -11864,6 +11864,7 @@
      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -13162,7 +13163,8 @@
      "version": "0.1.12",
      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/path-type": {
      "version": "3.0.0",
@@ -13821,7 +13823,6 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
      "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -13832,7 +13833,6 @@
      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "shell-quote": "^1.6.1",
        "ws": "^7"
@@ -13866,7 +13866,6 @@
      "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "scheduler": "^0.26.0"
      },
@@ -15932,7 +15931,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16112,8 +16110,7 @@
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
    },
    "node_modules/tsx": {
      "version": "4.20.3",
@@ -16121,7 +16118,6 @@
      "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "~0.25.0",
        "get-tsconfig": "^4.7.5"
@@ -16316,7 +16312,6 @@
      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -16623,6 +16618,7 @@
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.4.0"
      }
@@ -16678,7 +16674,6 @@
      "integrity": "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.6",
@@ -16792,7 +16787,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16806,7 +16800,6 @@
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -17485,7 +17478,6 @@
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -17501,7 +17493,7 @@
    },
    "packages/cli": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.4.1",
+      "version": "0.5.0",
      "dependencies": {
        "@google/genai": "1.16.0",
        "@iarna/toml": "^2.2.5",
@@ -17616,7 +17608,7 @@
    },
    "packages/core": {
      "name": "@qwen-code/qwen-code-core",
-      "version": "0.4.1",
+      "version": "0.5.0",
      "hasInstallScript": true,
      "dependencies": {
        "@google/genai": "1.16.0",
@@ -17747,7 +17739,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -17757,7 +17748,7 @@
    },
    "packages/sdk-typescript": {
      "name": "@qwen-code/sdk",
-      "version": "0.1.0",
+      "version": "0.5.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.0.4"
@@ -18324,7 +18315,6 @@
      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
      "dev": true,
      "license": "BSD-2-Clause",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "7.18.0",
        "@typescript-eslint/types": "7.18.0",
@@ -18746,7 +18736,6 @@
      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.6.1",
@@ -19623,7 +19612,6 @@
      "integrity": "sha512-Ljb1cnSJSivGN0LqXd/zmDbWEM0RNNg2t1QW/XUhYl/qPqyu7CsqeWtqQXHVaJsecLPuDoak2oJcZN2QoRIOag==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vitest/expect": "1.6.1",
        "@vitest/runner": "1.6.1",
@@ -20189,7 +20177,7 @@
    },
    "packages/test-utils": {
      "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.4.1",
+      "version": "0.5.0",
      "dev": true,
      "license": "Apache-2.0",
      "devDependencies": {
@@ -20201,7 +20189,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "qwen-code-vscode-ide-companion",
-      "version": "0.4.1",
+      "version": "0.5.0",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.15.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "engines": {
    "node": ">=20.0.0"
  },
@@ -13,7 +13,7 @@
    "url": "git+https://github.com/QwenLM/qwen-code.git"
  },
  "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.4.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.5.0"
  },
  "scripts": {
    "start": "cross-env node scripts/start.js",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "description": "Qwen Code",
  "repository": {
    "type": "git",
@@ -33,7 +33,7 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.4.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.5.0"
  },
  "dependencies": {
    "@google/genai": "1.16.0",
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -138,6 +138,7 @@ export interface CliArgs {
  coreTools: string[] | undefined;
  excludeTools: string[] | undefined;
  authType: string | undefined;
+  channel: string | undefined;
 }

 function normalizeOutputFormat(
@@ -297,6 +298,11 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
          type: 'boolean',
          description: 'Starts the agent in ACP mode',
        })
+        .option('channel', {
+          type: 'string',
+          choices: ['VSCode', 'ACP', 'SDK', 'CI'],
+          description: 'Channel identifier (VSCode, ACP, SDK, CI)',
+        })
        .option('allowed-mcp-server-names', {
          type: 'array',
          string: true,
@@ -559,6 +565,12 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {

  // The import format is now only controlled by settings.memoryImportFormat
  // We no longer accept it as a CLI argument
+
+  // Apply ACP fallback: if experimental-acp is present but no explicit --channel, treat as ACP
+  if (result['experimentalAcp'] && !result['channel']) {
+    (result as Record<string, unknown>)['channel'] = 'ACP';
+  }
+
  return result as unknown as CliArgs;
 }

@@ -983,6 +995,7 @@ export async function loadCliConfig(
    output: {
      format: outputSettingsFormat,
    },
+    channel: argv.channel,
  });
 }

--- a/packages/cli/src/gemini.test.tsx
+++ b/packages/cli/src/gemini.test.tsx
@@ -485,6 +485,7 @@ describe('gemini.tsx main function kitty protocol', () => {
      excludeTools: undefined,
      authType: undefined,
      maxSessionTurns: undefined,
+      channel: undefined,
    });

    await main();
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-core",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "description": "Qwen Code Core",
  "repository": {
    "type": "git",
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -349,6 +349,7 @@ export interface ConfigParameters {
  skipStartupContext?: boolean;
  sdkMode?: boolean;
  sessionSubagents?: SubagentConfig[];
+  channel?: string;
 }

 function normalizeConfigOutputFormat(
@@ -485,6 +486,7 @@ export class Config {
  private readonly enableToolOutputTruncation: boolean;
  private readonly eventEmitter?: EventEmitter;
  private readonly useSmartEdit: boolean;
+  private readonly channel: string | undefined;

  constructor(params: ConfigParameters) {
    this.sessionId = params.sessionId ?? randomUUID();
@@ -598,6 +600,7 @@ export class Config {
    this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
    this.useSmartEdit = params.useSmartEdit ?? false;
    this.extensionManagement = params.extensionManagement ?? true;
+    this.channel = params.channel;
    this.storage = new Storage(this.targetDir);
    this.vlmSwitchMode = params.vlmSwitchMode;
    this.inputFormat = params.inputFormat ?? InputFormat.TEXT;
@@ -1144,6 +1147,10 @@ export class Config {
    return this.cliVersion;
  }

+  getChannel(): string | undefined {
+    return this.channel;
+  }
+
  /**
   * Get the current FileSystemService
   */
--- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts
+++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts
@@ -130,10 +130,13 @@ export class DashScopeOpenAICompatibleProvider
  }

  buildMetadata(userPromptId: string): DashScopeRequestMetadata {
+    const channel = this.cliConfig.getChannel?.();
+
    return {
      metadata: {
        sessionId: this.cliConfig.getSessionId?.(),
        promptId: userPromptId,
+        ...(channel ? { channel } : {}),
      },
    };
  }
--- a/packages/core/src/core/openaiContentGenerator/provider/types.ts
+++ b/packages/core/src/core/openaiContentGenerator/provider/types.ts
@@ -28,5 +28,6 @@ export type DashScopeRequestMetadata = {
  metadata: {
    sessionId?: string;
    promptId: string;
+    channel?: string;
  };
 };
--- a/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
+++ b/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
@@ -249,6 +249,9 @@ export class QwenLogger {
          authType === AuthType.USE_OPENAI
            ? this.config?.getContentGeneratorConfig().baseUrl || ''
            : '',
+        ...(this.config?.getChannel?.()
+          ? { channel: this.config.getChannel() }
+          : {}),
      },
      _v: `qwen-code@${version}`,
    } as RumPayload;
--- a/packages/sdk-typescript/package.json
+++ b/packages/sdk-typescript/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/sdk",
-  "version": "0.1.0",
+  "version": "0.5.0",
  "description": "TypeScript SDK for programmatic access to qwen-code CLI",
  "main": "./dist/index.cjs",
  "module": "./dist/index.mjs",
--- a/packages/sdk-typescript/src/transport/ProcessTransport.ts
+++ b/packages/sdk-typescript/src/transport/ProcessTransport.ts
@@ -139,6 +139,7 @@ export class ProcessTransport implements Transport {
      'stream-json',
      '--output-format',
      'stream-json',
+      '--channel=SDK',
    ];

    if (this.options.model) {
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-test-utils",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "private": true,
  "main": "src/index.ts",
  "license": "Apache-2.0",
--- a/packages/vscode-ide-companion/package.json
+++ b/packages/vscode-ide-companion/package.json
@@ -2,7 +2,7 @@
  "name": "qwen-code-vscode-ide-companion",
  "displayName": "Qwen Code Companion",
  "description": "Enable Qwen Code with direct access to your VS Code workspace.",
-  "version": "0.4.1",
+  "version": "0.5.0",
  "publisher": "qwenlm",
  "icon": "assets/icon.png",
  "repository": {
--- a/packages/vscode-ide-companion/src/cli/cliVersionManager.ts
+++ b/packages/vscode-ide-companion/src/cli/cliVersionManager.ts
@@ -7,7 +7,7 @@
 import semver from 'semver';
 import { CliDetector, type CliDetectionResult } from './cliDetector.js';

-export const MIN_CLI_VERSION_FOR_SESSION_METHODS = '0.4.0';
+export const MIN_CLI_VERSION_FOR_SESSION_METHODS = '0.5.0';

 export interface CliFeatureFlags {
  supportsSessionList: boolean;
--- a/packages/vscode-ide-companion/src/ide-server.ts
+++ b/packages/vscode-ide-companion/src/ide-server.ts
@@ -164,6 +164,7 @@ export class IDEServer {
        const allowedHosts = [
          `localhost:${this.port}`,
          `127.0.0.1:${this.port}`,
+          `host.docker.internal:${this.port}`, // Add Docker support
        ];
        if (!allowedHosts.includes(host)) {
          return res.status(403).json({ error: 'Invalid Host header' });
--- a/packages/vscode-ide-companion/src/services/acpConnection.ts
+++ b/packages/vscode-ide-companion/src/services/acpConnection.ts
@@ -10,8 +10,8 @@ import type {
  AcpPermissionRequest,
  AcpResponse,
  AcpSessionUpdate,
-  ApprovalModeValue,
 } from '../types/acpTypes.js';
+import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js';
 import type { ChildProcess, SpawnOptions } from 'child_process';
 import { spawn } from 'child_process';
 import type {
@@ -94,7 +94,12 @@ export class AcpConnection {
    if (cliPath.startsWith('npx ')) {
      const parts = cliPath.split(' ');
      spawnCommand = isWindows ? 'npx.cmd' : 'npx';
-      spawnArgs = [...parts.slice(1), '--experimental-acp', ...extraArgs];
+      spawnArgs = [
+        ...parts.slice(1),
+        '--experimental-acp',
+        '--channel=VSCode',
+        ...extraArgs,
+      ];
    } else {
      // For qwen CLI, ensure we use the correct Node.js version
      // Handle various Node.js version managers (nvm, n, manual installations)
@@ -103,11 +108,16 @@ export class AcpConnection {
        const nodePathResult = determineNodePathForCli(cliPath);
        if (nodePathResult.path) {
          spawnCommand = nodePathResult.path;
-          spawnArgs = [cliPath, '--experimental-acp', ...extraArgs];
+          spawnArgs = [
+            cliPath,
+            '--experimental-acp',
+            '--channel=VSCode',
+            ...extraArgs,
+          ];
        } else {
          // Fallback to direct execution
          spawnCommand = cliPath;
-          spawnArgs = ['--experimental-acp', ...extraArgs];
+          spawnArgs = ['--experimental-acp', '--channel=VSCode', ...extraArgs];

          // Log any error for debugging
          if (nodePathResult.error) {
@@ -118,7 +128,7 @@ export class AcpConnection {
        }
      } else {
        spawnCommand = cliPath;
-        spawnArgs = ['--experimental-acp', ...extraArgs];
+        spawnArgs = ['--experimental-acp', '--channel=VSCode', ...extraArgs];
      }
    }

--- a/packages/vscode-ide-companion/src/services/acpSessionManager.ts
+++ b/packages/vscode-ide-companion/src/services/acpSessionManager.ts
@@ -14,8 +14,8 @@ import type {
  AcpRequest,
  AcpNotification,
  AcpResponse,
-  ApprovalModeValue,
 } from '../types/acpTypes.js';
+import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js';
 import { AGENT_METHODS } from '../constants/acpSchema.js';
 import type { PendingRequest } from '../types/connectionTypes.js';
 import type { ChildProcess } from 'child_process';
--- a/packages/vscode-ide-companion/src/services/authStateManager.ts
+++ b/packages/vscode-ide-companion/src/services/authStateManager.ts
@@ -1,215 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type * as vscode from 'vscode';
-
-interface AuthState {
-  isAuthenticated: boolean;
-  authMethod: string;
-  timestamp: number;
-  workingDir?: string;
-}
-
-/**
- * Manages authentication state caching to avoid repeated logins
- */
-export class AuthStateManager {
-  private static instance: AuthStateManager | null = null;
-  private static context: vscode.ExtensionContext | null = null;
-  private static readonly AUTH_STATE_KEY = 'qwen.authState';
-  private static readonly AUTH_CACHE_DURATION = 24 * 60 * 60 * 1000; // 24 hours
-  private constructor() {}
-
-  /**
-   * Get singleton instance of AuthStateManager
-   */
-  static getInstance(context?: vscode.ExtensionContext): AuthStateManager {
-    if (!AuthStateManager.instance) {
-      AuthStateManager.instance = new AuthStateManager();
-    }
-
-    // If a context is provided, update the static context
-    if (context) {
-      AuthStateManager.context = context;
-    }
-
-    return AuthStateManager.instance;
-  }
-
-  /**
-   * Check if there's a valid cached authentication
-   */
-  async hasValidAuth(workingDir: string, authMethod: string): Promise<boolean> {
-    const state = await this.getAuthState();
-
-    if (!state) {
-      console.log('[AuthStateManager] No cached auth state found');
-      return false;
-    }
-
-    console.log('[AuthStateManager] Found cached auth state:', {
-      workingDir: state.workingDir,
-      authMethod: state.authMethod,
-      timestamp: new Date(state.timestamp).toISOString(),
-      isAuthenticated: state.isAuthenticated,
-    });
-    console.log('[AuthStateManager] Checking against:', {
-      workingDir,
-      authMethod,
-    });
-
-    // Check if auth is still valid (within cache duration)
-    const now = Date.now();
-    const isExpired =
-      now - state.timestamp > AuthStateManager.AUTH_CACHE_DURATION;
-
-    if (isExpired) {
-      console.log('[AuthStateManager] Cached auth expired');
-      console.log(
-        '[AuthStateManager] Cache age:',
-        Math.floor((now - state.timestamp) / 1000 / 60),
-        'minutes',
-      );
-      await this.clearAuthState();
-      return false;
-    }
-
-    // Check if it's for the same working directory and auth method
-    const isSameContext =
-      state.workingDir === workingDir && state.authMethod === authMethod;
-
-    if (!isSameContext) {
-      console.log('[AuthStateManager] Working dir or auth method changed');
-      console.log('[AuthStateManager] Cached workingDir:', state.workingDir);
-      console.log('[AuthStateManager] Current workingDir:', workingDir);
-      console.log('[AuthStateManager] Cached authMethod:', state.authMethod);
-      console.log('[AuthStateManager] Current authMethod:', authMethod);
-      return false;
-    }
-
-    console.log('[AuthStateManager] Valid cached auth found');
-    return state.isAuthenticated;
-  }
-
-  /**
-   * Force check auth state without clearing cache
-   * This is useful for debugging to see what's actually cached
-   */
-  async debugAuthState(): Promise<void> {
-    const state = await this.getAuthState();
-    console.log('[AuthStateManager] DEBUG - Current auth state:', state);
-
-    if (state) {
-      const now = Date.now();
-      const age = Math.floor((now - state.timestamp) / 1000 / 60);
-      const isExpired =
-        now - state.timestamp > AuthStateManager.AUTH_CACHE_DURATION;
-
-      console.log('[AuthStateManager] DEBUG - Auth state age:', age, 'minutes');
-      console.log('[AuthStateManager] DEBUG - Auth state expired:', isExpired);
-      console.log(
-        '[AuthStateManager] DEBUG - Auth state valid:',
-        state.isAuthenticated,
-      );
-    }
-  }
-
-  /**
-   * Save successful authentication state
-   */
-  async saveAuthState(workingDir: string, authMethod: string): Promise<void> {
-    // Ensure we have a valid context
-    if (!AuthStateManager.context) {
-      throw new Error(
-        '[AuthStateManager] No context available for saving auth state',
-      );
-    }
-
-    const state: AuthState = {
-      isAuthenticated: true,
-      authMethod,
-      workingDir,
-      timestamp: Date.now(),
-    };
-
-    console.log('[AuthStateManager] Saving auth state:', {
-      workingDir,
-      authMethod,
-      timestamp: new Date(state.timestamp).toISOString(),
-    });
-
-    await AuthStateManager.context.globalState.update(
-      AuthStateManager.AUTH_STATE_KEY,
-      state,
-    );
-    console.log('[AuthStateManager] Auth state saved');
-
-    // Verify the state was saved correctly
-    const savedState = await this.getAuthState();
-    console.log('[AuthStateManager] Verified saved state:', savedState);
-  }
-
-  /**
-   * Clear authentication state
-   */
-  async clearAuthState(): Promise<void> {
-    // Ensure we have a valid context
-    if (!AuthStateManager.context) {
-      throw new Error(
-        '[AuthStateManager] No context available for clearing auth state',
-      );
-    }
-
-    console.log('[AuthStateManager] Clearing auth state');
-    const currentState = await this.getAuthState();
-    console.log(
-      '[AuthStateManager] Current state before clearing:',
-      currentState,
-    );
-
-    await AuthStateManager.context.globalState.update(
-      AuthStateManager.AUTH_STATE_KEY,
-      undefined,
-    );
-    console.log('[AuthStateManager] Auth state cleared');
-
-    // Verify the state was cleared
-    const newState = await this.getAuthState();
-    console.log('[AuthStateManager] State after clearing:', newState);
-  }
-
-  /**
-   * Get current auth state
-   */
-  private async getAuthState(): Promise<AuthState | undefined> {
-    // Ensure we have a valid context
-    if (!AuthStateManager.context) {
-      console.log(
-        '[AuthStateManager] No context available for getting auth state',
-      );
-      return undefined;
-    }
-
-    const a = AuthStateManager.context.globalState.get<AuthState>(
-      AuthStateManager.AUTH_STATE_KEY,
-    );
-    console.log('[AuthStateManager] Auth state:', a);
-    return a;
-  }
-
-  /**
-   * Get auth state info for debugging
-   */
-  async getAuthInfo(): Promise<string> {
-    const state = await this.getAuthState();
-    if (!state) {
-      return 'No cached auth';
-    }
-
-    const age = Math.floor((Date.now() - state.timestamp) / 1000 / 60);
-    return `Auth cached ${age}m ago, method: ${state.authMethod}`;
-  }
-}
--- a/packages/vscode-ide-companion/src/services/qwenAgentManager.ts
+++ b/packages/vscode-ide-companion/src/services/qwenAgentManager.ts
@@ -7,11 +7,10 @@ import { AcpConnection } from './acpConnection.js';
 import type {
  AcpSessionUpdate,
  AcpPermissionRequest,
-  ApprovalModeValue,
 } from '../types/acpTypes.js';
+import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js';
 import { QwenSessionReader, type QwenSession } from './qwenSessionReader.js';
 import { QwenSessionManager } from './qwenSessionManager.js';
-import type { AuthStateManager } from './authStateManager.js';
 import type {
  ChatMessage,
  PlanEntry,
@@ -42,9 +41,9 @@ export class QwenAgentManager {
  // session/update notifications. We set this flag to route message chunks
  // (user/assistant) as discrete chat messages instead of live streaming.
  private rehydratingSessionId: string | null = null;
-  // Cache the last used AuthStateManager so internal calls (e.g. fallback paths)
-  // can reuse it and avoid forcing a fresh authentication unnecessarily.
-  private defaultAuthStateManager?: AuthStateManager;
+  // CLI is now the single source of truth for authentication state
+  // Deduplicate concurrent session/new attempts
+  private sessionCreateInFlight: Promise<string | null> | null = null;

  // Callback storage
  private callbacks: QwenAgentCallbacks = {};
@@ -163,22 +162,14 @@ export class QwenAgentManager {
   * Connect to Qwen service
   *
   * @param workingDir - Working directory
-   * @param authStateManager - Authentication state manager (optional)
   * @param cliPath - CLI path (optional, if provided will override the path in configuration)
   */
-  async connect(
-    workingDir: string,
-    authStateManager?: AuthStateManager,
-    _cliPath?: string,
-  ): Promise<void> {
+  async connect(workingDir: string, _cliPath?: string): Promise<void> {
    this.currentWorkingDir = workingDir;
-    // Remember the provided authStateManager for future calls
-    this.defaultAuthStateManager = authStateManager;
    await this.connectionHandler.connect(
      this.connection,
      this.sessionReader,
      workingDir,
-      authStateManager,
      _cliPath,
    );
  }
@@ -345,8 +336,10 @@ export class QwenAgentManager {
          name: this.sessionReader.getSessionTitle(session),
          startTime: session.startTime,
          lastUpdated: session.lastUpdated,
-          messageCount: session.messages.length,
+          messageCount: session.messageCount ?? session.messages.length,
          projectHash: session.projectHash,
+          filePath: session.filePath,
+          cwd: session.cwd,
        }),
      );

@@ -461,8 +454,10 @@ export class QwenAgentManager {
        name: this.sessionReader.getSessionTitle(x.raw),
        startTime: x.raw.startTime,
        lastUpdated: x.raw.lastUpdated,
-        messageCount: x.raw.messages.length,
+        messageCount: x.raw.messageCount ?? x.raw.messages.length,
        projectHash: x.raw.projectHash,
+        filePath: x.raw.filePath,
+        cwd: x.raw.cwd,
      }));
      const nextCursorVal =
        page.length > 0 ? page[page.length - 1].mtime : undefined;
@@ -900,80 +895,6 @@ export class QwenAgentManager {
    return this.saveSessionViaCommand(sessionId, tag);
  }

-  /**
-   * Save session as checkpoint (using CLI format)
-   * Saves to ~/.qwen/tmp/{projectHash}/checkpoint-{tag}.json
-   * Saves two copies with sessionId and conversationId to ensure recovery via either ID
-   *
-   * @param messages - Current session messages
-   * @param conversationId - Conversation ID (from VSCode extension)
-   * @returns Save result
-   */
-  async saveCheckpoint(
-    messages: ChatMessage[],
-    conversationId: string,
-  ): Promise<{ success: boolean; tag?: string; message?: string }> {
-    try {
-      console.log('[QwenAgentManager] ===== CHECKPOINT SAVE START =====');
-      console.log('[QwenAgentManager] Conversation ID:', conversationId);
-      console.log('[QwenAgentManager] Message count:', messages.length);
-      console.log(
-        '[QwenAgentManager] Current working dir:',
-        this.currentWorkingDir,
-      );
-      console.log(
-        '[QwenAgentManager] Current session ID (from CLI):',
-        this.currentSessionId,
-      );
-      // In ACP mode, the CLI does not accept arbitrary slash commands like
-      // "/chat save". To ensure we never block on unsupported features,
-      // persist checkpoints directly to ~/.qwen/tmp using our SessionManager.
-      const qwenMessages = messages.map((m) => ({
-        // Generate minimal QwenMessage shape expected by the writer
-        id: `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-        timestamp: new Date().toISOString(),
-        type: m.role === 'user' ? ('user' as const) : ('qwen' as const),
-        content: m.content,
-      }));
-
-      const tag = await this.sessionManager.saveCheckpoint(
-        qwenMessages,
-        conversationId,
-        this.currentWorkingDir,
-        this.currentSessionId || undefined,
-      );
-
-      return { success: true, tag };
-    } catch (error) {
-      console.error('[QwenAgentManager] ===== CHECKPOINT SAVE FAILED =====');
-      console.error('[QwenAgentManager] Error:', error);
-      console.error(
-        '[QwenAgentManager] Error stack:',
-        error instanceof Error ? error.stack : 'N/A',
-      );
-      return {
-        success: false,
-        message: error instanceof Error ? error.message : String(error),
-      };
-    }
-  }
-
-  /**
-   * Save session directly to file system (without relying on ACP)
-   *
-   * @param messages - Current session messages
-   * @param sessionName - Session name
-   * @returns Save result
-   */
-  async saveSessionDirect(
-    messages: ChatMessage[],
-    sessionName: string,
-  ): Promise<{ success: boolean; sessionId?: string; message?: string }> {
-    // Use checkpoint format instead of session format
-    // This matches CLI's /chat save behavior
-    return this.saveCheckpoint(messages, sessionName);
-  }
-
  /**
   * Try to load session via ACP session/load method
   * This method will only be used if CLI version supports it
@@ -1161,16 +1082,6 @@ export class QwenAgentManager {
    }
  }

-  /**
-   * Load session, preferring ACP method if CLI version supports it
-   *
-   * @param sessionId - Session ID
-   * @returns Loaded session messages or null
-   */
-  async loadSessionDirect(sessionId: string): Promise<ChatMessage[] | null> {
-    return this.loadSession(sessionId);
-  }
-
  /**
   * Create new session
   *
@@ -1179,97 +1090,62 @@ export class QwenAgentManager {
   * @param workingDir - Working directory
   * @returns Newly created session ID
   */
-  async createNewSession(
-    workingDir: string,
-    authStateManager?: AuthStateManager,
-  ): Promise<string | null> {
+  async createNewSession(workingDir: string): Promise<string | null> {
+    // Reuse existing session if present
+    if (this.connection.currentSessionId) {
+      return this.connection.currentSessionId;
+    }
+    // Deduplicate concurrent session/new attempts
+    if (this.sessionCreateInFlight) {
+      return this.sessionCreateInFlight;
+    }
+
    console.log('[QwenAgentManager] Creating new session...');

-    // Check if we have valid cached authentication
-    let hasValidAuth = false;
-    // Prefer the provided authStateManager, otherwise fall back to the one
-    // remembered during connect(). This prevents accidental re-auth in
-    // fallback paths (e.g. session switching) when the handler didn't pass it.
-    const effectiveAuth = authStateManager || this.defaultAuthStateManager;
-    if (effectiveAuth) {
-      hasValidAuth = await effectiveAuth.hasValidAuth(workingDir, authMethod);
-      console.log(
-        '[QwenAgentManager] Has valid cached auth for new session:',
-        hasValidAuth,
-      );
-    }
-
-    // Only authenticate if we don't have valid cached auth
-    if (!hasValidAuth) {
-      console.log(
-        '[QwenAgentManager] Authenticating before creating session...',
-      );
+    this.sessionCreateInFlight = (async () => {
      try {
-        await this.connection.authenticate(authMethod);
-        console.log('[QwenAgentManager] Authentication successful');
-
-        // Save auth state
-        if (effectiveAuth) {
-          console.log(
-            '[QwenAgentManager] Saving auth state after successful authentication',
-          );
-          await effectiveAuth.saveAuthState(workingDir, authMethod);
-        }
-      } catch (authError) {
-        console.error('[QwenAgentManager] Authentication failed:', authError);
-        // Clear potentially invalid cache
-        if (effectiveAuth) {
-          console.log(
-            '[QwenAgentManager] Clearing auth cache due to authentication failure',
-          );
-          await effectiveAuth.clearAuthState();
-        }
-        throw authError;
-      }
-    } else {
-      console.log(
-        '[QwenAgentManager] Skipping authentication - using valid cached auth',
-      );
-    }
-
-    // Try to create a new ACP session. If Qwen asks for auth despite our
-    // cached flag (e.g. fresh process or expired tokens), re-authenticate and retry.
-    try {
-      await this.connection.newSession(workingDir);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      const requiresAuth =
-        msg.includes('Authentication required') ||
-        msg.includes('(code: -32000)');
-
-      if (requiresAuth) {
-        console.warn(
-          '[QwenAgentManager] session/new requires authentication. Retrying with authenticate...',
-        );
+        // Try to create a new ACP session. If Qwen asks for auth, let it handle authentication.
        try {
-          await this.connection.authenticate(authMethod);
-          // Persist auth cache so subsequent calls can skip the web flow.
-          if (effectiveAuth) {
-            await effectiveAuth.saveAuthState(workingDir, authMethod);
-          }
          await this.connection.newSession(workingDir);
-        } catch (reauthErr) {
-          // Clear potentially stale cache on failure and rethrow
-          if (effectiveAuth) {
-            await effectiveAuth.clearAuthState();
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          const requiresAuth =
+            msg.includes('Authentication required') ||
+            msg.includes('(code: -32000)');
+
+          if (requiresAuth) {
+            console.warn(
+              '[QwenAgentManager] session/new requires authentication. Retrying with authenticate...',
+            );
+            try {
+              // Let CLI handle authentication - it's the single source of truth
+              await this.connection.authenticate(authMethod);
+              // Add a slight delay to ensure auth state is settled
+              await new Promise((resolve) => setTimeout(resolve, 300));
+              await this.connection.newSession(workingDir);
+            } catch (reauthErr) {
+              console.error(
+                '[QwenAgentManager] Re-authentication failed:',
+                reauthErr,
+              );
+              throw reauthErr;
+            }
+          } else {
+            throw err;
          }
-          throw reauthErr;
        }
-      } else {
-        throw err;
+        const newSessionId = this.connection.currentSessionId;
+        console.log(
+          '[QwenAgentManager] New session created with ID:',
+          newSessionId,
+        );
+        return newSessionId;
+      } finally {
+        this.sessionCreateInFlight = null;
      }
-    }
-    const newSessionId = this.connection.currentSessionId;
-    console.log(
-      '[QwenAgentManager] New session created with ID:',
-      newSessionId,
-    );
-    return newSessionId;
+    })();
+
+    return this.sessionCreateInFlight;
  }

  /**
--- a/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts
+++ b/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts
@@ -13,7 +13,6 @@
 import * as vscode from 'vscode';
 import type { AcpConnection } from './acpConnection.js';
 import type { QwenSessionReader } from '../services/qwenSessionReader.js';
-import type { AuthStateManager } from '../services/authStateManager.js';
 import {
  CliVersionManager,
  MIN_CLI_VERSION_FOR_SESSION_METHODS,
@@ -32,14 +31,12 @@ export class QwenConnectionHandler {
   * @param connection - ACP connection instance
   * @param sessionReader - Session reader instance
   * @param workingDir - Working directory
-   * @param authStateManager - Authentication state manager (optional)
   * @param cliPath - CLI path (optional, if provided will override the path in configuration)
   */
  async connect(
    connection: AcpConnection,
    sessionReader: QwenSessionReader,
    workingDir: string,
-    authStateManager?: AuthStateManager,
    cliPath?: string,
  ): Promise<void> {
    const connectId = Date.now();
@@ -57,9 +54,18 @@ export class QwenConnectionHandler {
    // Show warning if CLI version is below minimum requirement
    if (!versionInfo.isSupported) {
      // Wait to determine release version number
-      vscode.window.showWarningMessage(
+      const selection = await vscode.window.showWarningMessage(
        `Qwen Code CLI version ${versionInfo.version} is below the minimum required version. Some features may not work properly. Please upgrade to version ${MIN_CLI_VERSION_FOR_SESSION_METHODS} or later.`,
+        'Upgrade Now',
      );
+
+      // Handle the user's selection
+      if (selection === 'Upgrade Now') {
+        // Open terminal and run npm install command
+        const terminal = vscode.window.createTerminal('Qwen Code CLI Upgrade');
+        terminal.show();
+        terminal.sendText('npm install -g @qwen-code/qwen-code@latest');
+      }
    }

    const config = vscode.workspace.getConfiguration('qwenCode');
@@ -72,21 +78,6 @@ export class QwenConnectionHandler {

    await connection.connect(effectiveCliPath, workingDir, extraArgs);

-    // Check if we have valid cached authentication
-    if (authStateManager) {
-      console.log('[QwenAgentManager] Checking for cached authentication...');
-      console.log('[QwenAgentManager] Working dir:', workingDir);
-      console.log('[QwenAgentManager] Auth method:', authMethod);
-
-      const hasValidAuth = await authStateManager.hasValidAuth(
-        workingDir,
-        authMethod,
-      );
-      console.log('[QwenAgentManager] Has valid auth:', hasValidAuth);
-    } else {
-      console.log('[QwenAgentManager] No authStateManager provided');
-    }
-
    // Try to restore existing session or create new session
    // Note: Auto-restore on connect is disabled to avoid surprising loads
    // when user opens a "New Chat" tab. Restoration is now an explicit action
@@ -99,81 +90,15 @@ export class QwenConnectionHandler {
        '[QwenAgentManager] no sessionRestored, Creating new session...',
      );

-      // Check if we have valid cached authentication
-      let hasValidAuth = false;
-      if (authStateManager) {
-        hasValidAuth = await authStateManager.hasValidAuth(
-          workingDir,
-          authMethod,
-        );
-      }
-
-      // Only authenticate if we don't have valid cached auth
-      if (!hasValidAuth) {
-        console.log(
-          '[QwenAgentManager] Authenticating before creating session...',
-        );
-        try {
-          await connection.authenticate(authMethod);
-          console.log('[QwenAgentManager] Authentication successful');
-
-          // Save auth state
-          if (authStateManager) {
-            console.log(
-              '[QwenAgentManager] Saving auth state after successful authentication',
-            );
-            console.log('[QwenAgentManager] Working dir for save:', workingDir);
-            console.log('[QwenAgentManager] Auth method for save:', authMethod);
-            await authStateManager.saveAuthState(workingDir, authMethod);
-            console.log('[QwenAgentManager] Auth state save completed');
-          }
-        } catch (authError) {
-          console.error('[QwenAgentManager] Authentication failed:', authError);
-          // Clear potentially invalid cache
-          if (authStateManager) {
-            console.log(
-              '[QwenAgentManager] Clearing auth cache due to authentication failure',
-            );
-            await authStateManager.clearAuthState();
-          }
-          throw authError;
-        }
-      } else {
-        console.log(
-          '[QwenAgentManager] Skipping authentication - using valid cached auth',
-        );
-      }
-
      try {
        console.log(
-          '[QwenAgentManager] Creating new session after authentication...',
-        );
-        await this.newSessionWithRetry(
-          connection,
-          workingDir,
-          3,
-          authMethod,
-          authStateManager,
+          '[QwenAgentManager] Creating new session (letting CLI handle authentication)...',
        );
+        await this.newSessionWithRetry(connection, workingDir, 3, authMethod);
        console.log('[QwenAgentManager] New session created successfully');
-
-        // Ensure auth state is saved (prevent repeated authentication)
-        if (authStateManager) {
-          console.log(
-            '[QwenAgentManager] Saving auth state after successful session creation',
-          );
-          await authStateManager.saveAuthState(workingDir, authMethod);
-        }
      } catch (sessionError) {
        console.log(`\n⚠️ [SESSION FAILED] newSessionWithRetry threw error\n`);
        console.log(`[QwenAgentManager] Error details:`, sessionError);
-
-        // Clear cache
-        if (authStateManager) {
-          console.log('[QwenAgentManager] Clearing auth cache due to failure');
-          await authStateManager.clearAuthState();
-        }
-
        throw sessionError;
      }
    }
@@ -195,7 +120,6 @@ export class QwenConnectionHandler {
    workingDir: string,
    maxRetries: number,
    authMethod: string,
-    authStateManager?: AuthStateManager,
  ): Promise<void> {
    for (let attempt = 1; attempt <= maxRetries; attempt++) {
      try {
@@ -224,9 +148,10 @@ export class QwenConnectionHandler {
          );
          try {
            await connection.authenticate(authMethod);
-            if (authStateManager) {
-              await authStateManager.saveAuthState(workingDir, authMethod);
-            }
+            // FIXME: @yiliang114 If there is no delay for a while, immediately executing
+            // newSession may cause the cli authorization jump to be triggered again
+            // Add a slight delay to ensure auth state is settled
+            await new Promise((resolve) => setTimeout(resolve, 300));
            // Retry immediately after successful auth
            await connection.newSession(workingDir);
            console.log(
@@ -238,9 +163,6 @@ export class QwenConnectionHandler {
              '[QwenAgentManager] Re-authentication failed:',
              authErr,
            );
-            if (authStateManager) {
-              await authStateManager.clearAuthState();
-            }
            // Fall through to retry logic below
          }
        }
--- a/packages/vscode-ide-companion/src/services/qwenSessionManager.ts
+++ b/packages/vscode-ide-companion/src/services/qwenSessionManager.ts
@@ -51,131 +51,7 @@ export class QwenSessionManager {
  }

  /**
-   * Save current conversation as a checkpoint (matching CLI's /chat save format)
-   * Creates checkpoint with BOTH conversationId and sessionId as tags for compatibility
-   *
-   * @param messages - Current conversation messages
-   * @param conversationId - Conversation ID (from VSCode extension)
-   * @param sessionId - Session ID (from CLI tmp session file, optional)
-   * @param workingDir - Current working directory
-   * @returns Checkpoint tag
-   */
-  async saveCheckpoint(
-    messages: QwenMessage[],
-    conversationId: string,
-    workingDir: string,
-    sessionId?: string,
-  ): Promise<string> {
-    try {
-      console.log('[QwenSessionManager] ===== SAVEPOINT START =====');
-      console.log('[QwenSessionManager] Conversation ID:', conversationId);
-      console.log(
-        '[QwenSessionManager] Session ID:',
-        sessionId || 'not provided',
-      );
-      console.log('[QwenSessionManager] Working dir:', workingDir);
-      console.log('[QwenSessionManager] Message count:', messages.length);
-
-      // Get project directory (parent of chats directory)
-      const projectHash = this.getProjectHash(workingDir);
-      console.log('[QwenSessionManager] Project hash:', projectHash);
-
-      const projectDir = path.join(this.qwenDir, 'tmp', projectHash);
-      console.log('[QwenSessionManager] Project dir:', projectDir);
-
-      if (!fs.existsSync(projectDir)) {
-        console.log('[QwenSessionManager] Creating project directory...');
-        fs.mkdirSync(projectDir, { recursive: true });
-        console.log('[QwenSessionManager] Directory created');
-      } else {
-        console.log('[QwenSessionManager] Project directory already exists');
-      }
-
-      // Convert messages to checkpoint format (Gemini-style messages)
-      console.log(
-        '[QwenSessionManager] Converting messages to checkpoint format...',
-      );
-      const checkpointMessages = messages.map((msg, index) => {
-        console.log(
-          `[QwenSessionManager] Message ${index}: type=${msg.type}, contentLength=${msg.content?.length || 0}`,
-        );
-        return {
-          role: msg.type === 'user' ? 'user' : 'model',
-          parts: [
-            {
-              text: msg.content,
-            },
-          ],
-        };
-      });
-
-      console.log(
-        '[QwenSessionManager] Converted',
-        checkpointMessages.length,
-        'messages',
-      );
-
-      const jsonContent = JSON.stringify(checkpointMessages, null, 2);
-      console.log(
-        '[QwenSessionManager] JSON content length:',
-        jsonContent.length,
-      );
-
-      // Save with conversationId as primary tag
-      const convFilename = `checkpoint-${conversationId}.json`;
-      const convFilePath = path.join(projectDir, convFilename);
-      console.log(
-        '[QwenSessionManager] Saving checkpoint with conversationId:',
-        convFilePath,
-      );
-      fs.writeFileSync(convFilePath, jsonContent, 'utf-8');
-
-      // Also save with sessionId if provided (for compatibility with CLI session/load)
-      if (sessionId) {
-        const sessionFilename = `checkpoint-${sessionId}.json`;
-        const sessionFilePath = path.join(projectDir, sessionFilename);
-        console.log(
-          '[QwenSessionManager] Also saving checkpoint with sessionId:',
-          sessionFilePath,
-        );
-        fs.writeFileSync(sessionFilePath, jsonContent, 'utf-8');
-      }
-
-      // Verify primary file exists
-      if (fs.existsSync(convFilePath)) {
-        const stats = fs.statSync(convFilePath);
-        console.log(
-          '[QwenSessionManager] Primary checkpoint verified, size:',
-          stats.size,
-        );
-      } else {
-        console.error(
-          '[QwenSessionManager] ERROR: Primary checkpoint does not exist after write!',
-        );
-      }
-
-      console.log('[QwenSessionManager] ===== CHECKPOINT SAVED =====');
-      console.log('[QwenSessionManager] Primary path:', convFilePath);
-      if (sessionId) {
-        console.log(
-          '[QwenSessionManager] Secondary path (sessionId):',
-          path.join(projectDir, `checkpoint-${sessionId}.json`),
-        );
-      }
-      return conversationId;
-    } catch (error) {
-      console.error('[QwenSessionManager] ===== CHECKPOINT SAVE FAILED =====');
-      console.error('[QwenSessionManager] Error:', error);
-      console.error(
-        '[QwenSessionManager] Error stack:',
-        error instanceof Error ? error.stack : 'N/A',
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Save current conversation as a named session (checkpoint-like functionality)
+   * Save current conversation as a named session
   *
   * @param messages - Current conversation messages
   * @param sessionName - Name/tag for the saved session
--- a/packages/vscode-ide-companion/src/services/qwenSessionReader.ts
+++ b/packages/vscode-ide-companion/src/services/qwenSessionReader.ts
@@ -7,6 +7,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
+import * as readline from 'readline';
+import * as crypto from 'crypto';

 export interface QwenMessage {
  id: string;
@@ -32,6 +34,9 @@ export interface QwenSession {
  lastUpdated: string;
  messages: QwenMessage[];
  filePath?: string;
+  messageCount?: number;
+  firstUserText?: string;
+  cwd?: string;
 }

 export class QwenSessionReader {
@@ -96,11 +101,17 @@ export class QwenSessionReader {
      return sessions;
    }

-    const files = fs
-      .readdirSync(chatsDir)
-      .filter((f) => f.startsWith('session-') && f.endsWith('.json'));
+    const files = fs.readdirSync(chatsDir);

-    for (const file of files) {
+    const jsonSessionFiles = files.filter(
+      (f) => f.startsWith('session-') && f.endsWith('.json'),
+    );
+
+    const jsonlSessionFiles = files.filter((f) =>
+      /^[0-9a-fA-F-]{32,36}\.jsonl$/.test(f),
+    );
+
+    for (const file of jsonSessionFiles) {
      const filePath = path.join(chatsDir, file);
      try {
        const content = fs.readFileSync(filePath, 'utf-8');
@@ -116,6 +127,23 @@ export class QwenSessionReader {
      }
    }

+    // Support new JSONL session format produced by the CLI
+    for (const file of jsonlSessionFiles) {
+      const filePath = path.join(chatsDir, file);
+      try {
+        const session = await this.readJsonlSession(filePath, false);
+        if (session) {
+          sessions.push(session);
+        }
+      } catch (error) {
+        console.error(
+          '[QwenSessionReader] Failed to read JSONL session file:',
+          filePath,
+          error,
+        );
+      }
+    }
+
    return sessions;
  }

@@ -128,7 +156,25 @@ export class QwenSessionReader {
  ): Promise<QwenSession | null> {
    // First try to find in all projects
    const sessions = await this.getAllSessions(undefined, true);
-    return sessions.find((s) => s.sessionId === sessionId) || null;
+    const found = sessions.find((s) => s.sessionId === sessionId);
+
+    if (!found) {
+      return null;
+    }
+
+    // If the session points to a JSONL file, load full content on demand
+    if (
+      found.filePath &&
+      found.filePath.endsWith('.jsonl') &&
+      found.messages.length === 0
+    ) {
+      const hydrated = await this.readJsonlSession(found.filePath, true);
+      if (hydrated) {
+        return hydrated;
+      }
+    }
+
+    return found;
  }

  /**
@@ -136,7 +182,6 @@ export class QwenSessionReader {
   * Qwen CLI uses SHA256 hash of project path
   */
  private async getProjectHash(workingDir: string): Promise<string> {
-    const crypto = await import('crypto');
    return crypto.createHash('sha256').update(workingDir).digest('hex');
  }

@@ -144,6 +189,14 @@ export class QwenSessionReader {
   * Get session title (based on first user message)
   */
  getSessionTitle(session: QwenSession): string {
+    // Prefer cached prompt text to avoid loading messages for JSONL sessions
+    if (session.firstUserText) {
+      return (
+        session.firstUserText.substring(0, 50) +
+        (session.firstUserText.length > 50 ? '...' : '')
+      );
+    }
+
    const firstUserMessage = session.messages.find((m) => m.type === 'user');
    if (firstUserMessage) {
      // Extract first 50 characters as title
@@ -155,6 +208,137 @@ export class QwenSessionReader {
    return 'Untitled Session';
  }

+  /**
+   * Parse a JSONL session file written by the CLI.
+   * When includeMessages is false, only lightweight metadata is returned.
+   */
+  private async readJsonlSession(
+    filePath: string,
+    includeMessages: boolean,
+  ): Promise<QwenSession | null> {
+    try {
+      if (!fs.existsSync(filePath)) {
+        return null;
+      }
+
+      const stats = fs.statSync(filePath);
+      const fileStream = fs.createReadStream(filePath, { encoding: 'utf-8' });
+      const rl = readline.createInterface({
+        input: fileStream,
+        crlfDelay: Infinity,
+      });
+
+      const messages: QwenMessage[] = [];
+      const seenUuids = new Set<string>();
+      let sessionId: string | undefined;
+      let startTime: string | undefined;
+      let firstUserText: string | undefined;
+      let cwd: string | undefined;
+
+      for await (const line of rl) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+          continue;
+        }
+
+        let obj: Record<string, unknown>;
+        try {
+          obj = JSON.parse(trimmed) as Record<string, unknown>;
+        } catch {
+          continue;
+        }
+
+        if (!sessionId && typeof obj.sessionId === 'string') {
+          sessionId = obj.sessionId;
+        }
+        if (!startTime && typeof obj.timestamp === 'string') {
+          startTime = obj.timestamp;
+        }
+        if (!cwd && typeof obj.cwd === 'string') {
+          cwd = obj.cwd;
+        }
+
+        const type = typeof obj.type === 'string' ? obj.type : '';
+        if (type === 'user' || type === 'assistant') {
+          const uuid = typeof obj.uuid === 'string' ? obj.uuid : undefined;
+          if (uuid) {
+            seenUuids.add(uuid);
+          }
+
+          const text = this.contentToText(obj.message);
+          if (includeMessages) {
+            messages.push({
+              id: uuid || `${messages.length}`,
+              timestamp: typeof obj.timestamp === 'string' ? obj.timestamp : '',
+              type: type === 'user' ? 'user' : 'qwen',
+              content: text,
+            });
+          }
+
+          if (!firstUserText && type === 'user' && text) {
+            firstUserText = text;
+          }
+        }
+      }
+
+      // Ensure stream is closed
+      rl.close();
+
+      if (!sessionId) {
+        return null;
+      }
+
+      const projectHash = cwd
+        ? await this.getProjectHash(cwd)
+        : path.basename(path.dirname(path.dirname(filePath)));
+
+      return {
+        sessionId,
+        projectHash,
+        startTime: startTime || new Date(stats.birthtimeMs).toISOString(),
+        lastUpdated: new Date(stats.mtimeMs).toISOString(),
+        messages: includeMessages ? messages : [],
+        filePath,
+        messageCount: seenUuids.size,
+        firstUserText,
+        cwd,
+      };
+    } catch (error) {
+      console.error(
+        '[QwenSessionReader] Failed to parse JSONL session:',
+        error,
+      );
+      return null;
+    }
+  }
+
+  // Extract plain text from CLI Content structure
+  private contentToText(message: unknown): string {
+    try {
+      if (typeof message !== 'object' || message === null) {
+        return '';
+      }
+
+      const typed = message as { parts?: unknown[] };
+      const parts = Array.isArray(typed.parts) ? typed.parts : [];
+      const texts: string[] = [];
+      for (const part of parts) {
+        if (typeof part !== 'object' || part === null) {
+          continue;
+        }
+        const p = part as Record<string, unknown>;
+        if (typeof p.text === 'string') {
+          texts.push(p.text);
+        } else if (typeof p.data === 'string') {
+          texts.push(p.data);
+        }
+      }
+      return texts.join('\n');
+    } catch {
+      return '';
+    }
+  }
+
  /**
   * Delete session file
   */
--- a/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts
+++ b/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts
@@ -10,7 +10,8 @@
 * Handles session updates from ACP and dispatches them to appropriate callbacks
 */

-import type { AcpSessionUpdate, ApprovalModeValue } from '../types/acpTypes.js';
+import type { AcpSessionUpdate } from '../types/acpTypes.js';
+import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js';
 import type { QwenAgentCallbacks } from '../types/chatTypes.js';

 /**
--- a/packages/vscode-ide-companion/src/types/acpTypes.ts
+++ b/packages/vscode-ide-companion/src/types/acpTypes.ts
@@ -3,6 +3,7 @@
 * Copyright 2025 Qwen Team
 * SPDX-License-Identifier: Apache-2.0
 */
+import type { ApprovalModeValue } from './approvalModeValueTypes.js';

 export const JSONRPC_VERSION = '2.0' as const;
 export const authMethod = 'qwen-oauth';
@@ -138,8 +139,6 @@ export interface PlanUpdate extends BaseSessionUpdate {
  };
 }

-export type ApprovalModeValue = 'plan' | 'default' | 'auto-edit' | 'yolo';
-
 export {
  ApprovalMode,
  APPROVAL_MODE_MAP,
--- a/packages/vscode-ide-companion/src/types/approvalModeValueTypes.ts
+++ b/packages/vscode-ide-companion/src/types/approvalModeValueTypes.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Type for approval mode values
+ * Used in ACP protocol for controlling agent behavior
+ */
+export type ApprovalModeValue = 'plan' | 'default' | 'auto-edit' | 'yolo';
--- a/packages/vscode-ide-companion/src/types/chatTypes.ts
+++ b/packages/vscode-ide-companion/src/types/chatTypes.ts
@@ -3,7 +3,8 @@
 * Copyright 2025 Qwen Team
 * SPDX-License-Identifier: Apache-2.0
 */
-import type { AcpPermissionRequest, ApprovalModeValue } from './acpTypes.js';
+import type { AcpPermissionRequest } from './acpTypes.js';
+import type { ApprovalModeValue } from './approvalModeValueTypes.js';

 export interface ChatMessage {
  role: 'user' | 'assistant';
--- a/packages/vscode-ide-companion/src/webview/App.tsx
+++ b/packages/vscode-ide-companion/src/webview/App.tsx
@@ -43,7 +43,7 @@ import { InputForm } from './components/layout/InputForm.js';
 import { SessionSelector } from './components/layout/SessionSelector.js';
 import { FileIcon, UserIcon } from './components/icons/index.js';
 import { ApprovalMode, NEXT_APPROVAL_MODE } from '../types/acpTypes.js';
-import type { ApprovalModeValue } from '../types/acpTypes.js';
+import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js';
 import type { PlanEntry } from '../types/chatTypes.js';

 export const App: React.FC = () => {
@@ -90,9 +90,13 @@ export const App: React.FC = () => {
  const getCompletionItems = React.useCallback(
    async (trigger: '@' | '/', query: string): Promise<CompletionItem[]> => {
      if (trigger === '@') {
-        if (!fileContext.hasRequestedFiles) {
-          fileContext.requestWorkspaceFiles();
-        }
+        console.log('[App] getCompletionItems @ called', {
+          query,
+          requested: fileContext.hasRequestedFiles,
+          workspaceFiles: fileContext.workspaceFiles.length,
+        });
+        // 始终根据当前 query 触发请求，让 hook 判断是否需要真正请求
+        fileContext.requestWorkspaceFiles(query);

        const fileIcon = <FileIcon />;
        const allItems: CompletionItem[] = fileContext.workspaceFiles.map(
@@ -109,7 +113,6 @@ export const App: React.FC = () => {
        );

        if (query && query.length >= 1) {
-          fileContext.requestWorkspaceFiles(query);
          const lowerQuery = query.toLowerCase();
          return allItems.filter(
            (item) =>
@@ -154,20 +157,42 @@ export const App: React.FC = () => {

  const completion = useCompletionTrigger(inputFieldRef, getCompletionItems);

+  // Track a lightweight signature of workspace files to detect content changes even when length is unchanged
+  const workspaceFilesSignature = useMemo(
+    () =>
+      fileContext.workspaceFiles
+        .map(
+          (file) =>
+            `${file.id}|${file.label}|${file.description ?? ''}|${file.path}`,
+        )
+        .join('||'),
+    [fileContext.workspaceFiles],
+  );
+
  // When workspace files update while menu open for @, refresh items so the first @ shows the list
  // Note: Avoid depending on the entire `completion` object here, since its identity
  // changes on every render which would retrigger this effect and can cause a refresh loop.
  useEffect(() => {
-    if (completion.isOpen && completion.triggerChar === '@') {
+    // Only auto-refresh when there's no query (first @ popup) to avoid repeated refreshes during search
+    if (
+      completion.isOpen &&
+      completion.triggerChar === '@' &&
+      !completion.query
+    ) {
      // Only refresh items; do not change other completion state to avoid re-renders loops
      completion.refreshCompletion();
    }
    // Only re-run when the actual data source changes, not on every render
    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [fileContext.workspaceFiles, completion.isOpen, completion.triggerChar]);
+  }, [
+    workspaceFilesSignature,
+    completion.isOpen,
+    completion.triggerChar,
+    completion.query,
+  ]);

  // Message submission
-  const handleSubmit = useMessageSubmit({
+  const { handleSubmit: submitMessage } = useMessageSubmit({
    inputText,
    setInputText,
    messageHandling,
@@ -487,6 +512,22 @@ export const App: React.FC = () => {
    setThinkingEnabled((prev) => !prev);
  };

+  // When user sends a message after scrolling up, re-pin and jump to the bottom
+  const handleSubmitWithScroll = useCallback(
+    (e: React.FormEvent) => {
+      setPinnedToBottom(true);
+
+      const container = messagesContainerRef.current;
+      if (container) {
+        const top = container.scrollHeight - container.clientHeight;
+        container.scrollTo({ top });
+      }
+
+      submitMessage(e);
+    },
+    [submitMessage],
+  );
+
  // Create unified message array containing all types of messages and tool calls
  const allMessages = useMemo<
    Array<{
@@ -686,7 +727,7 @@ export const App: React.FC = () => {
        onCompositionStart={() => setIsComposing(true)}
        onCompositionEnd={() => setIsComposing(false)}
        onKeyDown={() => {}}
-        onSubmit={handleSubmit.handleSubmit}
+        onSubmit={handleSubmitWithScroll}
        onCancel={handleCancel}
        onToggleEditMode={handleToggleEditMode}
        onToggleThinking={handleToggleThinking}
--- a/packages/vscode-ide-companion/src/webview/MessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/MessageHandler.ts
@@ -73,11 +73,4 @@ export class MessageHandler {
  appendStreamContent(chunk: string): void {
    this.router.appendStreamContent(chunk);
  }
-
-  /**
-   * Check if saving checkpoint
-   */
-  getIsSavingCheckpoint(): boolean {
-    return this.router.getIsSavingCheckpoint();
-  }
 }
--- a/packages/vscode-ide-companion/src/webview/WebViewProvider.ts
+++ b/packages/vscode-ide-companion/src/webview/WebViewProvider.ts
@@ -9,20 +9,18 @@ import { QwenAgentManager } from '../services/qwenAgentManager.js';
 import { ConversationStore } from '../services/conversationStore.js';
 import type { AcpPermissionRequest } from '../types/acpTypes.js';
 import { CliDetector } from '../cli/cliDetector.js';
-import { AuthStateManager } from '../services/authStateManager.js';
 import { PanelManager } from '../webview/PanelManager.js';
 import { MessageHandler } from '../webview/MessageHandler.js';
 import { WebViewContent } from '../webview/WebViewContent.js';
 import { CliInstaller } from '../cli/cliInstaller.js';
 import { getFileName } from './utils/webviewUtils.js';
-import { authMethod, type ApprovalModeValue } from '../types/acpTypes.js';
+import { type ApprovalModeValue } from '../types/approvalModeValueTypes.js';

 export class WebViewProvider {
  private panelManager: PanelManager;
  private messageHandler: MessageHandler;
  private agentManager: QwenAgentManager;
  private conversationStore: ConversationStore;
-  private authStateManager: AuthStateManager;
  private disposables: vscode.Disposable[] = [];
  private agentInitialized = false; // Track if agent has been initialized
  // Track a pending permission request and its resolver so extension commands
@@ -39,7 +37,6 @@ export class WebViewProvider {
  ) {
    this.agentManager = new QwenAgentManager();
    this.conversationStore = new ConversationStore(context);
-    this.authStateManager = AuthStateManager.getInstance(context);
    this.panelManager = new PanelManager(extensionUri, () => {
      // Panel dispose callback
      this.disposables.forEach((d) => d.dispose());
@@ -522,40 +519,16 @@ export class WebViewProvider {
   */
  private async attemptAuthStateRestoration(): Promise<void> {
    try {
-      if (this.authStateManager) {
-        // Debug current auth state
-        await this.authStateManager.debugAuthState();
-
-        const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
-        const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
-        const hasValidAuth = await this.authStateManager.hasValidAuth(
-          workingDir,
-          authMethod,
-        );
-        console.log('[WebViewProvider] Has valid cached auth:', hasValidAuth);
-
-        if (hasValidAuth) {
-          console.log(
-            '[WebViewProvider] Valid auth found, attempting connection...',
-          );
-          // Try to connect with cached auth
-          await this.initializeAgentConnection();
-        } else {
-          console.log(
-            '[WebViewProvider] No valid auth found, rendering empty conversation',
-          );
-          // Render the chat UI immediately without connecting
-          await this.initializeEmptyConversation();
-        }
-      } else {
-        console.log(
-          '[WebViewProvider] No auth state manager, rendering empty conversation',
-        );
-        await this.initializeEmptyConversation();
-      }
-    } catch (_error) {
-      console.error('[WebViewProvider] Auth state restoration failed:', _error);
-      // Fallback to rendering empty conversation
+      console.log(
+        '[WebViewProvider] Attempting connection (CLI handle authentication)...',
+      );
+      //always attempt connection and let CLI handle authentication
+      await this.initializeAgentConnection();
+    } catch (error) {
+      console.error(
+        '[WebViewProvider] Error in attemptAuthStateRestoration:',
+        error,
+      );
      await this.initializeEmptyConversation();
    }
  }
@@ -565,84 +538,84 @@ export class WebViewProvider {
   * Can be called from show() or via /login command
   */
  async initializeAgentConnection(): Promise<void> {
-    const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
-    const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
+    return this.doInitializeAgentConnection();
+  }

-    console.log(
-      '[WebViewProvider] Starting initialization, workingDir:',
-      workingDir,
-    );
-    console.log(
-      '[WebViewProvider] AuthStateManager available:',
-      !!this.authStateManager,
-    );
+  /**
+   * Internal: perform actual connection/initialization (no auth locking).
+   */
+  private async doInitializeAgentConnection(): Promise<void> {
+    const run = async () => {
+      const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
+      const workingDir = workspaceFolder?.uri.fsPath || process.cwd();

-    // Check if CLI is installed before attempting to connect
-    const cliDetection = await CliDetector.detectQwenCli();
-
-    if (!cliDetection.isInstalled) {
      console.log(
-        '[WebViewProvider] Qwen CLI not detected, skipping agent connection',
+        '[WebViewProvider] Starting initialization, workingDir:',
+        workingDir,
      );
-      console.log('[WebViewProvider] CLI detection error:', cliDetection.error);
+      console.log('[WebViewProvider] Using CLI-managed authentication');

-      // Show VSCode notification with installation option
-      await CliInstaller.promptInstallation();
+      // Check if CLI is installed before attempting to connect
+      const cliDetection = await CliDetector.detectQwenCli();

-      // Initialize empty conversation (can still browse history)
-      await this.initializeEmptyConversation();
-    } else {
-      console.log(
-        '[WebViewProvider] Qwen CLI detected, attempting connection...',
-      );
-      console.log('[WebViewProvider] CLI path:', cliDetection.cliPath);
-      console.log('[WebViewProvider] CLI version:', cliDetection.version);
-
-      try {
-        console.log('[WebViewProvider] Connecting to agent...');
+      if (!cliDetection.isInstalled) {
        console.log(
-          '[WebViewProvider] Using authStateManager:',
-          !!this.authStateManager,
+          '[WebViewProvider] Qwen CLI not detected, skipping agent connection',
        );
-        const authInfo = await this.authStateManager.getAuthInfo();
-        console.log('[WebViewProvider] Auth cache status:', authInfo);
-
-        // Pass the detected CLI path to ensure we use the correct installation
-        await this.agentManager.connect(
-          workingDir,
-          this.authStateManager,
-          cliDetection.cliPath,
+        console.log(
+          '[WebViewProvider] CLI detection error:',
+          cliDetection.error,
        );
-        console.log('[WebViewProvider] Agent connected successfully');
-        this.agentInitialized = true;

-        // Load messages from the current Qwen session
-        await this.loadCurrentSessionMessages();
+        // Show VSCode notification with installation option
+        await CliInstaller.promptInstallation();

-        // Notify webview that agent is connected
-        this.sendMessageToWebView({
-          type: 'agentConnected',
-          data: {},
-        });
-      } catch (_error) {
-        console.error('[WebViewProvider] Agent connection error:', _error);
-        // Clear auth cache on error (might be auth issue)
-        await this.authStateManager.clearAuthState();
-        vscode.window.showWarningMessage(
-          `Failed to connect to Qwen CLI: ${_error}\nYou can still use the chat UI, but messages won't be sent to AI.`,
-        );
-        // Fallback to empty conversation
+        // Initialize empty conversation (can still browse history)
        await this.initializeEmptyConversation();
+      } else {
+        console.log(
+          '[WebViewProvider] Qwen CLI detected, attempting connection...',
+        );
+        console.log('[WebViewProvider] CLI path:', cliDetection.cliPath);
+        console.log('[WebViewProvider] CLI version:', cliDetection.version);

-        // Notify webview that agent connection failed
-        this.sendMessageToWebView({
-          type: 'agentConnectionError',
-          data: {
-            message: _error instanceof Error ? _error.message : String(_error),
-          },
-        });
+        try {
+          console.log('[WebViewProvider] Connecting to agent...');
+
+          // Pass the detected CLI path to ensure we use the correct installation
+          await this.agentManager.connect(workingDir, cliDetection.cliPath);
+          console.log('[WebViewProvider] Agent connected successfully');
+          this.agentInitialized = true;
+
+          // Load messages from the current Qwen session
+          await this.loadCurrentSessionMessages();
+
+          // Notify webview that agent is connected
+          this.sendMessageToWebView({
+            type: 'agentConnected',
+            data: {},
+          });
+        } catch (_error) {
+          console.error('[WebViewProvider] Agent connection error:', _error);
+          vscode.window.showWarningMessage(
+            `Failed to connect to Qwen CLI: ${_error}\nYou can still use the chat UI, but messages won't be sent to AI.`,
+          );
+          // Fallback to empty conversation
+          await this.initializeEmptyConversation();
+
+          // Notify webview that agent connection failed
+          this.sendMessageToWebView({
+            type: 'agentConnectionError',
+            data: {
+              message:
+                _error instanceof Error ? _error.message : String(_error),
+            },
+          });
+        }
      }
-    }
+    };
+
+    return run();
  }

  /**
@@ -651,12 +624,8 @@ export class WebViewProvider {
   */
  async forceReLogin(): Promise<void> {
    console.log('[WebViewProvider] Force re-login requested');
-    console.log(
-      '[WebViewProvider] Current authStateManager:',
-      !!this.authStateManager,
-    );

-    await vscode.window.withProgress(
+    return vscode.window.withProgress(
      {
        location: vscode.ProgressLocation.Notification,
        title: 'Logging in to Qwen Code... ',
@@ -666,14 +635,6 @@ export class WebViewProvider {
        try {
          progress.report({ message: 'Preparing sign-in...' });

-          // Clear existing auth cache
-          if (this.authStateManager) {
-            await this.authStateManager.clearAuthState();
-            console.log('[WebViewProvider] Auth cache cleared');
-          } else {
-            console.log('[WebViewProvider] No authStateManager to clear');
-          }
-
          // Disconnect existing connection if any
          if (this.agentInitialized) {
            try {
@@ -693,19 +654,11 @@ export class WebViewProvider {
          });

          // Reinitialize connection (will trigger fresh authentication)
-          await this.initializeAgentConnection();
+          await this.doInitializeAgentConnection();
          console.log(
            '[WebViewProvider] Force re-login completed successfully',
          );

-          // Ensure auth state is saved after successful re-login
-          if (this.authStateManager) {
-            const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
-            const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
-            await this.authStateManager.saveAuthState(workingDir, authMethod);
-            console.log('[WebViewProvider] Auth state saved after re-login');
-          }
-
          // Send success notification to WebView
          this.sendMessageToWebView({
            type: 'loginSuccess',
@@ -793,28 +746,23 @@ export class WebViewProvider {
      const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
      const workingDir = workspaceFolder?.uri.fsPath || process.cwd();

-      // Skip session restoration entirely and create a new session directly
-      try {
-        await this.agentManager.createNewSession(
-          workingDir,
-          this.authStateManager,
-        );
-        console.log('[WebViewProvider] ACP session created successfully');
-
-        // Ensure auth state is saved after successful session creation
-        if (this.authStateManager) {
-          await this.authStateManager.saveAuthState(workingDir, authMethod);
-          console.log(
-            '[WebViewProvider] Auth state saved after session creation',
+      // avoid creating another session if connect() already created one.
+      if (!this.agentManager.currentSessionId) {
+        try {
+          await this.agentManager.createNewSession(workingDir);
+          console.log('[WebViewProvider] ACP session created successfully');
+        } catch (sessionError) {
+          console.error(
+            '[WebViewProvider] Failed to create ACP session:',
+            sessionError,
+          );
+          vscode.window.showWarningMessage(
+            `Failed to create ACP session: ${sessionError}. You may need to authenticate first.`,
          );
        }
-      } catch (sessionError) {
-        console.error(
-          '[WebViewProvider] Failed to create ACP session:',
-          sessionError,
-        );
-        vscode.window.showWarningMessage(
-          `Failed to create ACP session: ${sessionError}. You may need to authenticate first.`,
+      } else {
+        console.log(
+          '[WebViewProvider] Existing ACP session detected, skipping new session creation',
        );
      }

@@ -974,17 +922,6 @@ export class WebViewProvider {
    this.agentManager.disconnect();
  }

-  /**
-   * Clear authentication cache for this WebViewProvider instance
-   */
-  async clearAuthCache(): Promise<void> {
-    console.log('[WebViewProvider] Clearing auth cache for this instance');
-    if (this.authStateManager) {
-      await this.authStateManager.clearAuthState();
-      this.resetAgentState();
-    }
-  }
-
  /**
   * Restore an existing WebView panel (called during VSCode restart)
   * This sets up the panel with all event listeners
@@ -992,8 +929,7 @@ export class WebViewProvider {
  async restorePanel(panel: vscode.WebviewPanel): Promise<void> {
    console.log('[WebViewProvider] Restoring WebView panel');
    console.log(
-      '[WebViewProvider] Current authStateManager in restore:',
-      !!this.authStateManager,
+      '[WebViewProvider] Using CLI-managed authentication in restore',
    );
    this.panelManager.setPanel(panel);

@@ -1196,18 +1132,13 @@ export class WebViewProvider {
      const workingDir = workspaceFolder?.uri.fsPath || process.cwd();

      // Create new Qwen session via agent manager
-      await this.agentManager.createNewSession(
-        workingDir,
-        this.authStateManager,
-      );
+      await this.agentManager.createNewSession(workingDir);

      // Clear current conversation UI
      this.sendMessageToWebView({
        type: 'conversationCleared',
        data: {},
      });
-
-      console.log('[WebViewProvider] New session created successfully');
    } catch (_error) {
      console.error('[WebViewProvider] Failed to create new session:', _error);
      vscode.window.showErrorMessage(`Failed to create new session: ${_error}`);
--- a/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx
+++ b/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx
@@ -92,9 +92,8 @@ export const CompletionMenu: React.FC<CompletionMenuProps> = ({
      ref={containerRef}
      role="menu"
      className={[
-        // Semantic class name for readability (no CSS attached)
        'completion-menu',
-        // Positioning and container styling (Tailwind)
+        // Positioning and container styling
        'absolute bottom-full left-0 right-0 mb-2 flex flex-col overflow-hidden',
        'rounded-large border bg-[var(--app-menu-background)]',
        'border-[var(--app-input-border)] max-h-[50vh] z-[1000]',
--- a/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx
+++ b/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx
@@ -11,7 +11,7 @@ import {
  PlanModeIcon,
  CodeBracketsIcon,
  HideContextIcon,
-  ThinkingIcon,
+  // ThinkingIcon,  // Temporarily disabled
  SlashCommandIcon,
  LinkIcon,
  ArrowUpIcon,
@@ -20,7 +20,7 @@ import {
 import { CompletionMenu } from '../layout/CompletionMenu.js';
 import type { CompletionItem } from '../../../types/completionItemTypes.js';
 import { getApprovalModeInfoFromString } from '../../../types/acpTypes.js';
-import type { ApprovalModeValue } from '../../../types/acpTypes.js';
+import type { ApprovalModeValue } from '../../../types/approvalModeValueTypes.js';

 interface InputFormProps {
  inputText: string;
@@ -92,7 +92,7 @@ export const InputForm: React.FC<InputFormProps> = ({
  isWaitingForResponse,
  isComposing,
  editMode,
-  thinkingEnabled,
+  // thinkingEnabled,  // Temporarily disabled
  activeFileName,
  activeSelection,
  skipAutoActiveContext,
@@ -103,7 +103,7 @@ export const InputForm: React.FC<InputFormProps> = ({
  onSubmit,
  onCancel,
  onToggleEditMode,
-  onToggleThinking,
+  // onToggleThinking,  // Temporarily disabled
  onToggleSkipAutoActiveContext,
  onShowCommandMenu,
  onAttachContext,
@@ -236,15 +236,16 @@ export const InputForm: React.FC<InputFormProps> = ({
            {/* Spacer */}
            <div className="flex-1 min-w-0" />

+            {/* @yiliang114. closed temporarily */}
            {/* Thinking button */}
-            <button
+            {/* <button
              type="button"
              className={`btn-icon-compact ${thinkingEnabled ? 'btn-icon-compact--active' : ''}`}
              title={thinkingEnabled ? 'Thinking on' : 'Thinking off'}
              onClick={onToggleThinking}
            >
              <ThinkingIcon enabled={thinkingEnabled} />
-            </button>
+            </button> */}

            {/* Command button */}
            <button
--- a/packages/vscode-ide-companion/src/webview/components/layout/SessionSelector.tsx
+++ b/packages/vscode-ide-companion/src/webview/components/layout/SessionSelector.tsx
@@ -5,8 +5,10 @@
 */

 import React from 'react';
-import { groupSessionsByDate } from '../../utils/sessionGrouping.js';
-import { getTimeAgo } from '../../utils/timeUtils.js';
+import {
+  getTimeAgo,
+  groupSessionsByDate,
+} from '../../utils/sessionGrouping.js';
 import { SearchIcon } from '../icons/index.js';

 interface SessionSelectorProps {
--- a/packages/vscode-ide-companion/src/webview/components/messages/toolcalls/shared/utils.ts
+++ b/packages/vscode-ide-companion/src/webview/components/messages/toolcalls/shared/utils.ts
@@ -61,25 +61,6 @@ export const safeTitle = (title: unknown): string => {
  return '';
 };

-/**
- * Get icon emoji for a given tool kind
- */
-export const getKindIcon = (kind: string): string => {
-  const kindMap: Record<string, string> = {
-    edit: '✏️',
-    write: '✏️',
-    read: '📖',
-    execute: '⚡',
-    fetch: '🌐',
-    delete: '🗑️',
-    move: '📦',
-    search: '🔍',
-    think: '💭',
-    diff: '📝',
-  };
-  return kindMap[kind.toLowerCase()] || '🔧';
-};
-
 /**
 * Check if a tool call should be displayed
 * Hides internal tool calls
--- a/packages/vscode-ide-companion/src/webview/handlers/FileMessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/handlers/FileMessageHandler.ts
@@ -49,7 +49,6 @@ export class FileMessageHandler extends BaseMessageHandler {
        break;

      case 'openDiff':
-        console.log('[FileMessageHandler ===== ] openDiff called with:', data);
        await this.handleOpenDiff(data);
        break;

--- a/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts
+++ b/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts
@@ -11,7 +11,6 @@ import { SessionMessageHandler } from './SessionMessageHandler.js';
 import { FileMessageHandler } from './FileMessageHandler.js';
 import { EditorMessageHandler } from './EditorMessageHandler.js';
 import { AuthMessageHandler } from './AuthMessageHandler.js';
-import { SettingsMessageHandler } from './SettingsMessageHandler.js';

 /**
 * Message Router
@@ -63,20 +62,12 @@ export class MessageRouter {
      sendToWebView,
    );

-    const settingsHandler = new SettingsMessageHandler(
-      agentManager,
-      conversationStore,
-      currentConversationId,
-      sendToWebView,
-    );
-
    // Register handlers in order of priority
    this.handlers = [
      this.sessionHandler,
      fileHandler,
      editorHandler,
      this.authHandler,
-      settingsHandler,
    ];
  }

@@ -159,11 +150,4 @@ export class MessageRouter {
  appendStreamContent(chunk: string): void {
    this.sessionHandler.appendStreamContent(chunk);
  }
-
-  /**
-   * Check if saving checkpoint
-   */
-  getIsSavingCheckpoint(): boolean {
-    return this.sessionHandler.getIsSavingCheckpoint();
-  }
 }
--- a/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts
@@ -7,6 +7,7 @@
 import * as vscode from 'vscode';
 import { BaseMessageHandler } from './BaseMessageHandler.js';
 import type { ChatMessage } from '../../services/qwenAgentManager.js';
+import type { ApprovalModeValue } from '../../types/approvalModeValueTypes.js';

 /**
 * Session message handler
@@ -14,7 +15,6 @@ import type { ChatMessage } from '../../services/qwenAgentManager.js';
 */
 export class SessionMessageHandler extends BaseMessageHandler {
  private currentStreamContent = '';
-  private isSavingCheckpoint = false;
  private loginHandler: (() => Promise<void>) | null = null;
  private isTitleSet = false; // Flag to track if title has been set

@@ -29,6 +29,8 @@ export class SessionMessageHandler extends BaseMessageHandler {
      'cancelStreaming',
      // UI action: open a new chat tab (new WebviewPanel)
      'openNewChatTab',
+      // Settings-related messages
+      'setApprovalMode',
    ].includes(messageType);
  }

@@ -112,6 +114,14 @@ export class SessionMessageHandler extends BaseMessageHandler {
        await this.handleCancelStreaming();
        break;

+      case 'setApprovalMode':
+        await this.handleSetApprovalMode(
+          message.data as {
+            modeId?: ApprovalModeValue;
+          },
+        );
+        break;
+
      default:
        console.warn(
          '[SessionMessageHandler] Unknown message type:',
@@ -143,10 +153,47 @@ export class SessionMessageHandler extends BaseMessageHandler {
  }

  /**
-   * Check if saving checkpoint
+   * Prompt user to login and invoke the registered login handler/command.
+   * Returns true if a login was initiated.
   */
-  getIsSavingCheckpoint(): boolean {
-    return this.isSavingCheckpoint;
+  private async promptLogin(message: string): Promise<boolean> {
+    const result = await vscode.window.showWarningMessage(message, 'Login Now');
+    if (result === 'Login Now') {
+      if (this.loginHandler) {
+        await this.loginHandler();
+      } else {
+        await vscode.commands.executeCommand('qwen-code.login');
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Prompt user to login or view offline. Returns 'login', 'offline', or 'dismiss'.
+   * When login is chosen, it triggers the login handler/command.
+   */
+  private async promptLoginOrOffline(
+    message: string,
+  ): Promise<'login' | 'offline' | 'dismiss'> {
+    const selection = await vscode.window.showWarningMessage(
+      message,
+      'Login Now',
+      'View Offline',
+    );
+
+    if (selection === 'Login Now') {
+      if (this.loginHandler) {
+        await this.loginHandler();
+      } else {
+        await vscode.commands.executeCommand('qwen-code.login');
+      }
+      return 'login';
+    }
+    if (selection === 'View Offline') {
+      return 'offline';
+    }
+    return 'dismiss';
  }

  /**
@@ -271,26 +318,37 @@ export class SessionMessageHandler extends BaseMessageHandler {
      console.warn('[SessionMessageHandler] Agent not connected');

      // Show non-modal notification with Login button
-      const result = await vscode.window.showWarningMessage(
-        'You need to login first to use Qwen Code.',
-        'Login Now',
-      );
-
-      if (result === 'Login Now') {
-        // Use login handler directly
-        if (this.loginHandler) {
-          await this.loginHandler();
-        } else {
-          // Fallback to command
-          vscode.window.showInformationMessage(
-            'Please wait while we connect to Qwen Code...',
-          );
-          await vscode.commands.executeCommand('qwen-code.login');
-        }
-      }
+      await this.promptLogin('You need to login first to use Qwen Code.');
      return;
    }

+    // Ensure an ACP session exists before sending prompt
+    if (!this.agentManager.currentSessionId) {
+      try {
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
+        const workingDir = workspaceFolder?.uri.fsPath || process.cwd();
+        await this.agentManager.createNewSession(workingDir);
+      } catch (createErr) {
+        console.error(
+          '[SessionMessageHandler] Failed to create session before sending message:',
+          createErr,
+        );
+        const errorMsg =
+          createErr instanceof Error ? createErr.message : String(createErr);
+        if (
+          errorMsg.includes('Authentication required') ||
+          errorMsg.includes('(code: -32000)')
+        ) {
+          await this.promptLogin(
+            'Your login session has expired or is invalid. Please login again to continue using Qwen Code.',
+          );
+          return;
+        }
+        vscode.window.showErrorMessage(`Failed to create session: ${errorMsg}`);
+        return;
+      }
+    }
+
    // Send to agent
    try {
      this.resetStreamContent();
@@ -319,41 +377,6 @@ export class SessionMessageHandler extends BaseMessageHandler {
        type: 'streamEnd',
        data: { timestamp: Date.now() },
      });
-
-      // Auto-save checkpoint
-      if (this.currentConversationId) {
-        try {
-          const conversation = await this.conversationStore.getConversation(
-            this.currentConversationId,
-          );
-
-          const messages = conversation?.messages || [];
-
-          this.isSavingCheckpoint = true;
-
-          const result = await this.agentManager.saveCheckpoint(
-            messages,
-            this.currentConversationId,
-          );
-
-          setTimeout(() => {
-            this.isSavingCheckpoint = false;
-          }, 2000);
-
-          if (result.success) {
-            console.log(
-              '[SessionMessageHandler] Checkpoint saved:',
-              result.tag,
-            );
-          }
-        } catch (error) {
-          console.error(
-            '[SessionMessageHandler] Checkpoint save failed:',
-            error,
-          );
-          this.isSavingCheckpoint = false;
-        }
-      }
    } catch (error) {
      console.error('[SessionMessageHandler] Error sending message:', error);

@@ -391,19 +414,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('Invalid token')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to continue using Qwen Code.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -428,38 +442,14 @@ export class SessionMessageHandler extends BaseMessageHandler {

      // Ensure connection (login) before creating a new session
      if (!this.agentManager.isConnected) {
-        const result = await vscode.window.showWarningMessage(
+        const proceeded = await this.promptLogin(
          'You need to login before creating a new session.',
-          'Login Now',
        );
-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        } else {
+        if (!proceeded) {
          return;
        }
      }

-      // Save current session before creating new one
-      if (this.currentConversationId && this.agentManager.isConnected) {
-        try {
-          const conversation = await this.conversationStore.getConversation(
-            this.currentConversationId,
-          );
-          const messages = conversation?.messages || [];
-
-          await this.agentManager.saveCheckpoint(
-            messages,
-            this.currentConversationId,
-          );
-        } catch (error) {
-          console.warn('[SessionMessageHandler] Failed to auto-save:', error);
-        }
-      }
-
      const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
      const workingDir = workspaceFolder?.uri.fsPath || process.cwd();

@@ -489,19 +479,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('No active ACP session')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to create a new session.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -525,19 +506,11 @@ export class SessionMessageHandler extends BaseMessageHandler {

      // If not connected yet, offer to login or view offline
      if (!this.agentManager.isConnected) {
-        const selection = await vscode.window.showWarningMessage(
+        const choice = await this.promptLoginOrOffline(
          'You are not logged in. Login now to fully restore this session, or view it offline.',
-          'Login Now',
-          'View Offline',
        );

-        if (selection === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        } else if (selection === 'View Offline') {
+        if (choice === 'offline') {
          // Show messages from local cache only
          const messages =
            await this.agentManager.getSessionMessages(sessionId);
@@ -550,33 +523,12 @@ export class SessionMessageHandler extends BaseMessageHandler {
            'Showing cached session content. Login to interact with the AI.',
          );
          return;
-        } else {
+        } else if (choice !== 'login') {
          // User dismissed; do nothing
          return;
        }
      }

-      // Save current session before switching
-      if (
-        this.currentConversationId &&
-        this.currentConversationId !== sessionId &&
-        this.agentManager.isConnected
-      ) {
-        try {
-          const conversation = await this.conversationStore.getConversation(
-            this.currentConversationId,
-          );
-          const messages = conversation?.messages || [];
-
-          await this.agentManager.saveCheckpoint(
-            messages,
-            this.currentConversationId,
-          );
-        } catch (error) {
-          console.warn('[SessionMessageHandler] Failed to auto-save:', error);
-        }
-      }
-
      // Get session details (includes cwd and filePath when using ACP)
      let sessionDetails: Record<string, unknown> | null = null;
      try {
@@ -637,19 +589,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
          errorMsg.includes('No active ACP session')
        ) {
          // Show a more user-friendly error message for expired sessions
-          const result = await vscode.window.showWarningMessage(
+          await this.promptLogin(
            'Your login session has expired or is invalid. Please login again to switch sessions.',
-            'Login Now',
          );

-          if (result === 'Login Now') {
-            if (this.loginHandler) {
-              await this.loginHandler();
-            } else {
-              await vscode.commands.executeCommand('qwen-code.login');
-            }
-          }
-
          // Send a specific error to the webview for better UI handling
          this.sendToWebView({
            type: 'sessionExpired',
@@ -706,19 +649,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
              createErrorMsg.includes('No active ACP session')
            ) {
              // Show a more user-friendly error message for expired sessions
-              const result = await vscode.window.showWarningMessage(
+              await this.promptLogin(
                'Your login session has expired or is invalid. Please login again to switch sessions.',
-                'Login Now',
              );

-              if (result === 'Login Now') {
-                if (this.loginHandler) {
-                  await this.loginHandler();
-                } else {
-                  await vscode.commands.executeCommand('qwen-code.login');
-                }
-              }
-
              // Send a specific error to the webview for better UI handling
              this.sendToWebView({
                type: 'sessionExpired',
@@ -755,19 +689,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('No active ACP session')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to switch sessions.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -819,19 +744,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('No active ACP session')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to view sessions.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -855,11 +771,6 @@ export class SessionMessageHandler extends BaseMessageHandler {
        throw new Error('No active conversation to save');
      }

-      const conversation = await this.conversationStore.getConversation(
-        this.currentConversationId,
-      );
-      const messages = conversation?.messages || [];
-
      // Try ACP save first
      try {
        const response = await this.agentManager.saveSessionViaAcp(
@@ -883,19 +794,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
          errorMsg.includes('No active ACP session')
        ) {
          // Show a more user-friendly error message for expired sessions
-          const result = await vscode.window.showWarningMessage(
+          await this.promptLogin(
            'Your login session has expired or is invalid. Please login again to save sessions.',
-            'Login Now',
          );

-          if (result === 'Login Now') {
-            if (this.loginHandler) {
-              await this.loginHandler();
-            } else {
-              await vscode.commands.executeCommand('qwen-code.login');
-            }
-          }
-
          // Send a specific error to the webview for better UI handling
          this.sendToWebView({
            type: 'sessionExpired',
@@ -903,17 +805,6 @@ export class SessionMessageHandler extends BaseMessageHandler {
          });
          return;
        }
-
-        // Fallback to direct save
-        const response = await this.agentManager.saveSessionDirect(
-          messages,
-          tag,
-        );
-
-        this.sendToWebView({
-          type: 'saveSessionResponse',
-          data: response,
-        });
      }

      await this.handleGetQwenSessions();
@@ -931,19 +822,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('No active ACP session')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to save sessions.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -996,19 +878,11 @@ export class SessionMessageHandler extends BaseMessageHandler {
    try {
      // If not connected, offer to login or view offline
      if (!this.agentManager.isConnected) {
-        const selection = await vscode.window.showWarningMessage(
+        const choice = await this.promptLoginOrOffline(
          'You are not logged in. Login now to fully restore this session, or view it offline.',
-          'Login Now',
-          'View Offline',
        );

-        if (selection === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        } else if (selection === 'View Offline') {
+        if (choice === 'offline') {
          const messages =
            await this.agentManager.getSessionMessages(sessionId);
          this.currentConversationId = sessionId;
@@ -1020,7 +894,7 @@ export class SessionMessageHandler extends BaseMessageHandler {
            'Showing cached session content. Login to interact with the AI.',
          );
          return;
-        } else {
+        } else if (choice !== 'login') {
          return;
        }
      }
@@ -1054,19 +928,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
          errorMsg.includes('No active ACP session')
        ) {
          // Show a more user-friendly error message for expired sessions
-          const result = await vscode.window.showWarningMessage(
+          await this.promptLogin(
            'Your login session has expired or is invalid. Please login again to resume sessions.',
-            'Login Now',
          );

-          if (result === 'Login Now') {
-            if (this.loginHandler) {
-              await this.loginHandler();
-            } else {
-              await vscode.commands.executeCommand('qwen-code.login');
-            }
-          }
-
          // Send a specific error to the webview for better UI handling
          this.sendToWebView({
            type: 'sessionExpired',
@@ -1074,20 +939,6 @@ export class SessionMessageHandler extends BaseMessageHandler {
          });
          return;
        }
-
-        // Fallback to direct load
-        const messages = await this.agentManager.loadSessionDirect(sessionId);
-
-        if (messages) {
-          this.currentConversationId = sessionId;
-
-          this.sendToWebView({
-            type: 'qwenSessionSwitched',
-            data: { sessionId, messages },
-          });
-        } else {
-          throw new Error('Failed to load session');
-        }
      }

      await this.handleGetQwenSessions();
@@ -1105,19 +956,10 @@ export class SessionMessageHandler extends BaseMessageHandler {
        errorMsg.includes('No active ACP session')
      ) {
        // Show a more user-friendly error message for expired sessions
-        const result = await vscode.window.showWarningMessage(
+        await this.promptLogin(
          'Your login session has expired or is invalid. Please login again to resume sessions.',
-          'Login Now',
        );

-        if (result === 'Login Now') {
-          if (this.loginHandler) {
-            await this.loginHandler();
-          } else {
-            await vscode.commands.executeCommand('qwen-code.login');
-          }
-        }
-
        // Send a specific error to the webview for better UI handling
        this.sendToWebView({
          type: 'sessionExpired',
@@ -1131,4 +973,23 @@ export class SessionMessageHandler extends BaseMessageHandler {
      }
    }
  }
+
+  /**
+   * Set approval mode via agent (ACP session/set_mode)
+   */
+  private async handleSetApprovalMode(data?: {
+    modeId?: ApprovalModeValue;
+  }): Promise<void> {
+    try {
+      const modeId = data?.modeId || 'default';
+      await this.agentManager.setApprovalModeFromUi(modeId);
+      // No explicit response needed; WebView listens for modeChanged
+    } catch (error) {
+      console.error('[SessionMessageHandler] Failed to set mode:', error);
+      this.sendToWebView({
+        type: 'error',
+        data: { message: `Failed to set mode: ${error}` },
+      });
+    }
+  }
 }
--- a/packages/vscode-ide-companion/src/webview/handlers/SettingsMessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/handlers/SettingsMessageHandler.ts
@@ -1,101 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode';
-import { BaseMessageHandler } from './BaseMessageHandler.js';
-import type { ApprovalModeValue } from '../../types/acpTypes.js';
-
-/**
- * Settings message handler
- * Handles all settings-related messages
- */
-export class SettingsMessageHandler extends BaseMessageHandler {
-  canHandle(messageType: string): boolean {
-    return ['openSettings', 'recheckCli', 'setApprovalMode'].includes(
-      messageType,
-    );
-  }
-
-  async handle(message: { type: string; data?: unknown }): Promise<void> {
-    switch (message.type) {
-      case 'openSettings':
-        await this.handleOpenSettings();
-        break;
-
-      case 'recheckCli':
-        await this.handleRecheckCli();
-        break;
-
-      case 'setApprovalMode':
-        await this.handleSetApprovalMode(
-          message.data as {
-            modeId?: ApprovalModeValue;
-          },
-        );
-        break;
-
-      default:
-        console.warn(
-          '[SettingsMessageHandler] Unknown message type:',
-          message.type,
-        );
-        break;
-    }
-  }
-
-  /**
-   * Open settings page
-   */
-  private async handleOpenSettings(): Promise<void> {
-    try {
-      // Open settings in a side panel
-      await vscode.commands.executeCommand('workbench.action.openSettings', {
-        query: 'qwenCode',
-      });
-    } catch (error) {
-      console.error('[SettingsMessageHandler] Failed to open settings:', error);
-      vscode.window.showErrorMessage(`Failed to open settings: ${error}`);
-    }
-  }
-
-  /**
-   * Recheck CLI
-   */
-  private async handleRecheckCli(): Promise<void> {
-    try {
-      await vscode.commands.executeCommand('qwenCode.recheckCli');
-      this.sendToWebView({
-        type: 'cliRechecked',
-        data: { success: true },
-      });
-    } catch (error) {
-      console.error('[SettingsMessageHandler] Failed to recheck CLI:', error);
-      this.sendToWebView({
-        type: 'error',
-        data: { message: `Failed to recheck CLI: ${error}` },
-      });
-    }
-  }
-
-  /**
-   * Set approval mode via agent (ACP session/set_mode)
-   */
-  private async handleSetApprovalMode(data?: {
-    modeId?: ApprovalModeValue;
-  }): Promise<void> {
-    try {
-      const modeId = data?.modeId || 'default';
-      await this.agentManager.setApprovalModeFromUi(modeId);
-      // No explicit response needed; WebView listens for modeChanged
-    } catch (error) {
-      console.error('[SettingsMessageHandler] Failed to set mode:', error);
-      this.sendToWebView({
-        type: 'error',
-        data: { message: `Failed to set mode: ${error}` },
-      });
-    }
-  }
-}
--- a/packages/vscode-ide-companion/src/webview/hooks/file/useFileContext.ts
+++ b/packages/vscode-ide-companion/src/webview/hooks/file/useFileContext.ts
@@ -34,6 +34,9 @@ export const useFileContext = (vscode: VSCodeAPI) => {
  // Whether workspace files have been requested
  const hasRequestedFilesRef = useRef(false);

+  // Last non-empty query to decide when to refetch full list
+  const lastQueryRef = useRef<string | undefined>(undefined);
+
  // Search debounce timer
  const searchTimerRef = useRef<NodeJS.Timeout | null>(null);

@@ -42,12 +45,10 @@ export const useFileContext = (vscode: VSCodeAPI) => {
   */
  const requestWorkspaceFiles = useCallback(
    (query?: string) => {
-      if (!hasRequestedFilesRef.current && !query) {
-        hasRequestedFilesRef.current = true;
-      }
+      const normalizedQuery = query?.trim();

      // If there's a query, clear previous timer and set up debounce
-      if (query && query.length >= 1) {
+      if (normalizedQuery && normalizedQuery.length >= 1) {
        if (searchTimerRef.current) {
          clearTimeout(searchTimerRef.current);
        }
@@ -55,14 +56,23 @@ export const useFileContext = (vscode: VSCodeAPI) => {
        searchTimerRef.current = setTimeout(() => {
          vscode.postMessage({
            type: 'getWorkspaceFiles',
-            data: { query },
+            data: { query: normalizedQuery },
          });
        }, 300);
+        lastQueryRef.current = normalizedQuery;
      } else {
-        vscode.postMessage({
-          type: 'getWorkspaceFiles',
-          data: query ? { query } : {},
-        });
+        // For empty query, request once initially and whenever we are returning from a search
+        const shouldRequestFullList =
+          !hasRequestedFilesRef.current || lastQueryRef.current !== undefined;
+
+        if (shouldRequestFullList) {
+          lastQueryRef.current = undefined;
+          hasRequestedFilesRef.current = true;
+          vscode.postMessage({
+            type: 'getWorkspaceFiles',
+            data: {},
+          });
+        }
      }
    },
    [vscode],
--- a/packages/vscode-ide-companion/src/webview/hooks/useCompletionTrigger.ts
+++ b/packages/vscode-ide-companion/src/webview/hooks/useCompletionTrigger.ts
@@ -131,12 +131,55 @@ export function useCompletionTrigger(
    [getCompletionItems, LOADING_ITEM, TIMEOUT_ITEM],
  );

+  // Helper function to compare completion items arrays
+  const areItemsEqual = (
+    items1: CompletionItem[],
+    items2: CompletionItem[],
+  ): boolean => {
+    if (items1.length !== items2.length) {
+      return false;
+    }
+
+    // Compare each item by stable fields (ignore non-deterministic props like icons)
+    for (let i = 0; i < items1.length; i++) {
+      const a = items1[i];
+      const b = items2[i];
+      if (a.id !== b.id) {
+        return false;
+      }
+      if (a.label !== b.label) {
+        return false;
+      }
+      if ((a.description ?? '') !== (b.description ?? '')) {
+        return false;
+      }
+      if (a.type !== b.type) {
+        return false;
+      }
+      if ((a.value ?? '') !== (b.value ?? '')) {
+        return false;
+      }
+      if ((a.path ?? '') !== (b.path ?? '')) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+
  const refreshCompletion = useCallback(async () => {
    if (!state.isOpen || !state.triggerChar) {
      return;
    }
    const items = await getCompletionItems(state.triggerChar, state.query);
-    setState((prev) => ({ ...prev, items }));
+
+    // Only update state if items have actually changed
+    setState((prev) => {
+      if (areItemsEqual(prev.items, items)) {
+        return prev;
+      }
+      return { ...prev, items };
+    });
  }, [state.isOpen, state.triggerChar, state.query, getCompletionItems]);

  useEffect(() => {
--- a/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts
+++ b/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts
@@ -12,7 +12,7 @@ import type {
  ToolCall as PermissionToolCall,
 } from '../components/PermissionDrawer/PermissionRequest.js';
 import type { ToolCallUpdate } from '../../types/chatTypes.js';
-import type { ApprovalModeValue } from '../../types/acpTypes.js';
+import type { ApprovalModeValue } from '../../types/approvalModeValueTypes.js';
 import type { PlanEntry } from '../../types/chatTypes.js';

 interface UseWebViewMessagesProps {
@@ -227,40 +227,26 @@ export const useWebViewMessages = ({
          break;
        }

-        // case 'cliNotInstalled': {
-        //   // Show CLI not installed message
-        //   const errorMsg =
-        //     (message?.data?.error as string) ||
-        //     'Qwen Code CLI is not installed. Please install it to enable full functionality.';
+        case 'agentConnected': {
+          // Agent connected successfully; clear any pending spinner
+          handlers.messageHandling.clearWaitingForResponse();
+          break;
+        }

-        //   handlers.messageHandling.addMessage({
-        //     role: 'assistant',
-        //     content: `Qwen CLI is not installed. Please install it to enable full functionality.\n\nError: ${errorMsg}\n\nInstallation instructions:\n1. Install via npm:\n   npm install -g @qwen-code/qwen-code@latest\n\n2. After installation, reload VS Code or restart the extension.`,
-        //     timestamp: Date.now(),
-        //   });
-        //   break;
-        // }
+        case 'agentConnectionError': {
+          // Agent connection failed; surface the error and unblock the UI
+          handlers.messageHandling.clearWaitingForResponse();
+          const errorMsg =
+            (message?.data?.message as string) ||
+            'Failed to connect to Qwen agent.';

-        // case 'agentConnected': {
-        //   // Agent connected successfully
-        //   handlers.messageHandling.clearWaitingForResponse();
-        //   break;
-        // }
-
-        // case 'agentConnectionError': {
-        //   // Agent connection failed
-        //   handlers.messageHandling.clearWaitingForResponse();
-        //   const errorMsg =
-        //     (message?.data?.message as string) ||
-        //     'Failed to connect to Qwen agent.';
-
-        //   handlers.messageHandling.addMessage({
-        //     role: 'assistant',
-        //     content: `Failed to connect to Qwen agent: ${errorMsg}\nYou can still use the chat UI, but messages won't be sent to AI.`,
-        //     timestamp: Date.now(),
-        //   });
-        //   break;
-        // }
+          handlers.messageHandling.addMessage({
+            role: 'assistant',
+            content: `Failed to connect to Qwen agent: ${errorMsg}\nYou can still use the chat UI, but messages won't be sent to AI.`,
+            timestamp: Date.now(),
+          });
+          break;
+        }

        case 'loginError': {
          // Clear loading state and show error notice
--- a/packages/vscode-ide-companion/src/webview/styles/styles.css
+++ b/packages/vscode-ide-companion/src/webview/styles/styles.css
@@ -5,7 +5,6 @@
 */

 /* Import component styles */
-@import '../components/messages/Assistant/AssistantMessage.css';
@import './timeline.css';
@import '../components/messages/MarkdownRenderer/MarkdownRenderer.css';

--- a/packages/vscode-ide-companion/src/webview/utils/sessionGrouping.ts
+++ b/packages/vscode-ide-companion/src/webview/utils/sessionGrouping.ts
@@ -62,3 +62,38 @@ export const groupSessionsByDate = (
    .filter(([, sessions]) => sessions.length > 0)
    .map(([label, sessions]) => ({ label, sessions }));
 };
+
+/**
+ * Time ago formatter
+ *
+ * @param timestamp - ISO timestamp string
+ * @returns Formatted time string
+ */
+export const getTimeAgo = (timestamp: string): string => {
+  if (!timestamp) {
+    return '';
+  }
+  const now = new Date().getTime();
+  const then = new Date(timestamp).getTime();
+  const diffMs = now - then;
+  const diffMins = Math.floor(diffMs / 60000);
+  const diffHours = Math.floor(diffMs / 3600000);
+  const diffDays = Math.floor(diffMs / 86400000);
+
+  if (diffMins < 1) {
+    return 'now';
+  }
+  if (diffMins < 60) {
+    return `${diffMins}m`;
+  }
+  if (diffHours < 24) {
+    return `${diffHours}h`;
+  }
+  if (diffDays === 1) {
+    return 'Yesterday';
+  }
+  if (diffDays < 7) {
+    return `${diffDays}d`;
+  }
+  return new Date(timestamp).toLocaleDateString();
+};
--- a/packages/vscode-ide-companion/src/webview/utils/simpleDiff.ts
+++ b/packages/vscode-ide-companion/src/webview/utils/simpleDiff.ts
@@ -1,92 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- *
- * Minimal line-diff utility for webview previews.
- *
- * This is a lightweight LCS-based algorithm to compute add/remove operations
- * between two texts. It intentionally avoids heavy dependencies and is
- * sufficient for rendering a compact preview inside the chat.
- */
-
-export type DiffOp =
-  | { type: 'add'; line: string; newIndex: number }
-  | { type: 'remove'; line: string; oldIndex: number };
-
-/**
- * Compute a minimal line-diff (added/removed only).
- * - Equal lines are omitted from output by design (we only preview changes).
- * - Order of operations follows the new text progression so the preview feels natural.
- */
-export function computeLineDiff(
-  oldText: string | null | undefined,
-  newText: string | undefined,
-): DiffOp[] {
-  const a = (oldText || '').split('\n');
-  const b = (newText || '').split('\n');
-
-  const n = a.length;
-  const m = b.length;
-
-  // Build LCS DP table
-  const dp: number[][] = Array.from({ length: n + 1 }, () =>
-    new Array(m + 1).fill(0),
-  );
-  for (let i = n - 1; i >= 0; i--) {
-    for (let j = m - 1; j >= 0; j--) {
-      if (a[i] === b[j]) {
-        dp[i][j] = dp[i + 1][j + 1] + 1;
-      } else {
-        dp[i][j] = Math.max(dp[i + 1][j], dp[i][j + 1]);
-      }
-    }
-  }
-
-  // Walk to produce operations
-  const ops: DiffOp[] = [];
-  let i = 0;
-  let j = 0;
-  while (i < n && j < m) {
-    if (a[i] === b[j]) {
-      i++;
-      j++;
-    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
-      // remove a[i]
-      ops.push({ type: 'remove', line: a[i], oldIndex: i });
-      i++;
-    } else {
-      // add b[j]
-      ops.push({ type: 'add', line: b[j], newIndex: j });
-      j++;
-    }
-  }
-
-  // Remaining tails
-  while (i < n) {
-    ops.push({ type: 'remove', line: a[i], oldIndex: i });
-    i++;
-  }
-  while (j < m) {
-    ops.push({ type: 'add', line: b[j], newIndex: j });
-    j++;
-  }
-
-  return ops;
-}
-
-/**
- * Truncate a long list of operations for preview purposes.
- * Keeps first `head` and last `tail` operations, inserting a gap marker.
- */
-export function truncateOps<T>(
-  ops: T[],
-  head = 120,
-  tail = 80,
-): { items: T[]; truncated: boolean; omitted: number } {
-  if (ops.length <= head + tail) {
-    return { items: ops, truncated: false, omitted: 0 };
-  }
-  const items = [...ops.slice(0, head), ...ops.slice(-tail)];
-  return { items, truncated: true, omitted: ops.length - head - tail };
-}
--- a/packages/vscode-ide-companion/src/webview/utils/timeUtils.ts
+++ b/packages/vscode-ide-companion/src/webview/utils/timeUtils.ts
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Time ago formatter
- *
- * @param timestamp - ISO timestamp string
- * @returns Formatted time string
- */
-export const getTimeAgo = (timestamp: string): string => {
-  if (!timestamp) {
-    return '';
-  }
-  const now = new Date().getTime();
-  const then = new Date(timestamp).getTime();
-  const diffMs = now - then;
-  const diffMins = Math.floor(diffMs / 60000);
-  const diffHours = Math.floor(diffMs / 3600000);
-  const diffDays = Math.floor(diffMs / 86400000);
-
-  if (diffMins < 1) {
-    return 'now';
-  }
-  if (diffMins < 60) {
-    return `${diffMins}m`;
-  }
-  if (diffHours < 24) {
-    return `${diffHours}h`;
-  }
-  if (diffDays === 1) {
-    return 'Yesterday';
-  }
-  if (diffDays < 7) {
-    return `${diffDays}d`;
-  }
-  return new Date(timestamp).toLocaleDateString();
-};
Author	SHA1	Message	Date
yiliang114	e895c49f5c	fix(vscode-ide-companion): resolve all ESLint errors Fixed unused variable errors in SessionMessageHandler.ts: - Commented out unused conversation and messages variables Also includes previous commits: 1. feat(vscode-ide-companion): add upgrade button to CLI version warning 2. fix(vscode-ide-companion): resolve ESLint errors in InputForm component When the Qwen Code CLI version is below the minimum required version, the warning message now includes an "Upgrade Now" button that opens a terminal and runs the npm install command to upgrade the CLI. Added tests to verify the functionality works correctly.	2025-12-13 09:56:18 +08:00
yiliang114	3191cf73b3	feat(vscode-ide-companion/completion): enhance completion menu performance and refresh logic Implement item comparison to prevent unnecessary re-renders when completion items haven't actually changed. Optimize refresh logic to only trigger when workspace files content changes. Improve completion menu stability and responsiveness. refactor(vscode-ide-companion/handlers): remove SettingsMessageHandler and consolidate functionality Move setApprovalMode functionality from SettingsMessageHandler to SessionMessageHandler to reduce code duplication and simplify message handling architecture. Remove unused settings-related imports and clean up message router configuration. chore(vscode-ide-companion/ui): minor UI improvements and code cleanup Consolidate imports in SessionSelector component. Remove debug console log statement from FileMessageHandler. Move getTimeAgo utility function to sessionGrouping file and remove obsolete timeUtils file. Clean up completion menu CSS classes.	2025-12-13 09:19:18 +08:00
yiliang114	f5306339f6	refactor(vscode-ide-companion/types): move ApprovalModeValue type to dedicated file feat(vscode-ide-companion/file-context): improve file context handling and search Enhance file context hook to better handle search queries and reduce redundant requests. Track last query to optimize when to refetch full file list. Improve logging for debugging purposes.	2025-12-13 09:19:09 +08:00
tanzhenxin	8b29dd130e	Merge pull request #1233 from QwenLM/chore/v0.5.0 pump version to 0.5.0	2025-12-12 16:32:13 +08:00
tanzhenxin	d0be8b43d7	pump version to 0.5.0	2025-12-12 16:29:50 +08:00
tanzhenxin	3095442eb3	Merge pull request #1223 from QwenLM/fix/vscode-ide-companion-login-twice fix(vscode-ide-companion/auth): deduplicate concurrent authentication calls	2025-12-12 16:19:25 +08:00
tanzhenxin	2ceecab503	Merge pull request #1226 from QwenLM/feat/support-channel-field feat: Add channel field support for client identification	2025-12-12 16:16:36 +08:00
pomelo	e5ed0334ab	Merge pull request #1230 from BlockHand/docker-ide	2025-12-12 16:16:23 +08:00
刘伟光	2b62b1e8bc	feat: 将注释修改成英文	2025-12-12 14:40:30 +08:00
yiliang114	89be6edb5e	chore(vscode-ide-companion): add comment	2025-12-12 13:59:05 +08:00
yiliang114	d812c9dcf2	chore(vscode-ide-companion): add fixme comment for auth delay	2025-12-12 13:51:14 +08:00
yiliang114	d754767e73	chore(vscode-ide-companion): rm authState manager in vscode-ide-companion to simplify the login architecture	2025-12-12 13:40:18 +08:00
刘伟光	bb8447edd7	fix: 修复在docker环境中无法连接ide的问题	2025-12-12 11:36:15 +08:00
yiliang114	02234f5434	chore(vscode-ide-companion): change comments and delays	2025-12-12 01:17:38 +08:00
yiliang114	25261ab88d	fix(vscode-ide-companion): slight delay to ensure auth state settlement	2025-12-12 01:14:28 +08:00
DragonnZhang	60a58ad8e5	feat: add support for the channel field to CLI parameters and configurations	2025-12-12 01:06:00 +08:00
yiliang114	c20df192a8	chore(vscode-ide-companion): revert some log util, will continue next time	2025-12-11 23:57:21 +08:00
yiliang114	b34894c8ea	feat(vscode-ide-companion/auth): deduplicate concurrent authentication calls Prevent multiple simultaneous authentication flows by: - Adding static authInFlight promise tracking in AcpConnection - Implementing runExclusiveAuth method in AuthStateManager - Adding sessionCreateInFlight tracking in QwenAgentManager - Ensuring only one auth flow runs at a time across different components This prevents race conditions and duplicate login prompts when multiple components request authentication simultaneously.	2025-12-11 22:56:58 +08:00