Merge branch 'main' of https://github.com/QwenLM/qwen-code into feat/vscode-ide-companion-layout

# Conflicts:
#	packages/cli/src/acp-integration/service/filesystem.ts
#	packages/vscode-ide-companion/package.json
#	packages/vscode-ide-companion/src/webview/providers/WebViewProvider.ts
This commit is contained in:
yiliang114 2026-03-07 13:11:18 +08:00
commit dc1fe6bc4b
228 changed files with 18429 additions and 7073 deletions

View file

@ -38,10 +38,12 @@
"onCommand:qwen-code.showLogs"
],
"contributes": {
"configuration": {
"title": "Qwen Code Companion",
"properties": {}
},
"jsonValidation": [
{
"fileMatch": "**/.qwen/settings.json",
"url": "./schemas/settings.schema.json"
}
],
"viewsContainers": {
"activitybar": [
{
@ -226,6 +228,7 @@
"vitest": "^3.2.4"
},
"dependencies": {
"@agentclientprotocol/sdk": "^0.14.1",
"@qwen-code/webui": "*",
"@modelcontextprotocol/sdk": "^1.25.1",
"cors": "^2.8.5",