Commit graph

3801 commits

Author SHA1 Message Date
tanzhenxin
f9d4fa0a39 Merge branch 'main' into feature/arena-agent-collaboration 2026-03-09 11:13:31 +08:00
LaZzyMan
8c693ba738 test: 修复 extensionsCommand 测试
- 更新 mock ExtensionManager 以通过 instanceof 检查
- 确保测试与新的错误处理逻辑兼容
2026-03-09 11:12:46 +08:00
LaZzyMan
2d5088e58f fix: 修复 Extension Management 命令报错 (问题 6)
- 在 listAction 中添加 ExtensionManager 可用性检查
- 当 ExtensionManager 不可用时显示友好的错误提示
- 改进:避免用户遇到静默失败,提供明确的环境不支持信息
2026-03-09 11:11:18 +08:00
LaZzyMan
4dfaa12e16 refactor: 优化 Dialog 2 工具列表 (问题 5)
- 移除多余的序号,简化视觉元素
- 统一选中状态颜色方案 (与 Dialog 1 一致使用 accent 色)
- 保留工具功能说明 (annotations),提升可读性
2026-03-09 11:09:47 +08:00
LaZzyMan
2b1088682c refactor: 优化 Dialog 1 布局 (问题 4)
- 移除重复的服务器统计信息 (已在标题显示)
- 减少多余的空格和边距,使布局更紧凑
- 优化视觉层次,提升用户体验
2026-03-09 11:08:30 +08:00
LaZzyMan
9d3d51a283 feat: 简化 MCP 服务器禁用流程
- 问题 3: 自动匹配 scope,无需用户手动选择
- 改进:根据服务器配置位置 (user/workspace) 自动确定禁用 scope
- 改进:禁用操作一步完成,提升用户体验
- 注意:Extension 类型的服务器不支持通过此方式禁用
2026-03-09 11:06:47 +08:00
LaZzyMan
23c3518dff fix: 添加 handleAuthenticate 到依赖数组
- 修复 React Hooks exhaustive-deps 警告
2026-03-09 11:05:11 +08:00
LaZzyMan
41bb300542 fix: 修复 MCP 服务器禁用状态下的操作选项
- 问题 2.1: 禁用的服务器不再显示'查看工具'选项,避免用户查看空工具列表
- 问题 2.2: 禁用的服务器不再显示'重新连接'选项,保持逻辑一致性
- 改进:根据服务器状态动态生成可用操作列表
- 改进:启用/禁用选项始终显示,方便用户切换状态
2026-03-09 10:59:20 +08:00
LaZzyMan
ef772feea2 feat: support skills in .agents directory and other provider config directories 2026-03-09 10:14:47 +08:00
tanzhenxin
2e91f0a4cd Merge remote-tracking branch 'origin/main' into feat/ask-user-question-tool 2026-03-08 23:05:32 +08:00
tanzhenxin
411ebd03b8 fix(cli): improve ask_user_question tool handling and UI
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

- In ACP mode: allow ask_user_question in YOLO mode (user must respond)

- In ACP mode: allow ask_user_question in plan mode for clarifications

- Hide footer when confirmation dialog is active

- Fix tab index overflow with functional state updates

- Fix ask_user_question detection in VSCode companion (use rawInput)

- Add cleanup for pending ACP promises on panel/provider dispose

- Use theme.text.accent consistently for highlighted elements

- Remove unused 'answers' param from AskUserQuestionParams

This ensures users can always respond to clarification questions

in ACP mode regardless of approval mode, and improves dialog UX.
2026-03-08 22:15:18 +08:00
yiliang114
dc1fe6bc4b 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
2026-03-07 13:11:18 +08:00
yiliang114
9b05ae10d7 fix(vscode-ide-companion): fix PanelManager captureTab race condition
Guard the setTimeout callback in captureTab() against panel being
disposed or replaced before the deferred callback runs. Capture a
reference to the current panel before the timeout and verify it is
still the active panel inside the callback.

Co-authored-by: ZZBuAoYe <zzbuaoye@gmail.com>
2026-03-07 12:42:43 +08:00
yiliang114
2220936eac fix(vscode-ide-companion): fix PanelManager race condition and add session clear API
- Guard captureTab() setTimeout callback against panel dispose/replace
  that can occur before the deferred callback runs
- Add AcpConnection.resetSessionState() to clear session without
  disconnecting the child process
- Add QwenAgentManager.clearCurrentSession() so sidebar/panel views
  can force creation of a fresh session

Co-authored-by: ZZBuAoYe <zzbuaoye@gmail.com>
2026-03-07 12:28:36 +08:00
DennisYu07
3458c1d68b merge main de resolve conflict 2026-03-06 16:00:51 -08:00
yiliang114
c10aa7ebe5 feat(vscode-ide-companion/layout): add sidebar view and simplify chat positioning
All chat positions (sidebar, editor tab, panel, secondary sidebar) are now
available simultaneously. Remove the old chat.location configuration and
setChatLocation commands. Add focusChat, newConversation, and showLogs commands.
Refactor ChatWebviewViewProvider to use lazy factory pattern and move webview
files into providers/ subdirectory.
2026-03-07 00:30:40 +08:00
yiliang114
be2d0975b5 Merge branch 'main' into feat/vscode-ide-companion-layout 2026-03-06 22:35:11 +08:00
mingholy.lmh
f1c88e9bc9 style: apply formatting and linting fixes across codebase
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 21:58:22 +08:00
mingholy.lmh
b3bbd33846 fix(acp): resolve permission option IDs and preserve session state baselines
- Fix permission handling to map between kind (e.g. "allow_once") and optionId (e.g. "proceed_once")
- Add baseline state tracking for mode/model to handle partial session/load responses
- Introduce extractSessionModeState utility for mode state extraction
- Ensure UI consistency when session load omits optional fields

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 21:57:41 +08:00
mingholy.lmh
c044d4dba1 refactor(acp): migrate to @agentclientprotocol/sdk and clean up handlers
- Replace deprecated ACP session manager with new SDK integration
- Add acpFileHandler test coverage
- Remove obsolete acpMessageHandler and acpSessionManager
- Update type definitions and connection handlers
- Apply code formatting fixes

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 21:57:41 +08:00
mingholy.lmh
180dcd8b36 refactor(acp): migrate ACP integration to use @agentclientprotocol/sdk
- Remove acp.ts and schema.ts in favor of SDK types
- Refactor acpAgent.ts to leverage SDK client
- Update session management types and implementations
- Adjust all test cases for new SDK-based architecture
- Update integration tests and export utilities

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 21:57:35 +08:00
tanzhenxin
79adac930f
Merge pull request #2008 from QwenLM/feature/extension-management-tui
Some checks are pending
Qwen Code CI / Lint (push) Waiting to run
Qwen Code CI / Test (push) Blocked by required conditions
Qwen Code CI / Test-1 (push) Blocked by required conditions
Qwen Code CI / Test-2 (push) Blocked by required conditions
Qwen Code CI / Test-3 (push) Blocked by required conditions
Qwen Code CI / Test-4 (push) Blocked by required conditions
Qwen Code CI / Test-5 (push) Blocked by required conditions
Qwen Code CI / Test-6 (push) Blocked by required conditions
Qwen Code CI / Test-7 (push) Blocked by required conditions
Qwen Code CI / Test-8 (push) Blocked by required conditions
Qwen Code CI / Post Coverage Comment (push) Blocked by required conditions
Qwen Code CI / CodeQL (push) Waiting to run
E2E Tests / E2E Test (Linux) - sandbox:docker (push) Waiting to run
E2E Tests / E2E Test (Linux) - sandbox:none (push) Waiting to run
E2E Tests / E2E Test - macOS (push) Waiting to run
feat: Add interactive TUI for extension management
2026-03-06 20:43:16 +08:00
DragonnZhang
4ce6f6f597 Keep rejected plan content visible in plan mode
When a plan is rejected, preserve and display the plan content so users
can still see what was proposed. The rejection message is now shown in
yellow (AccentYellow) instead of green to visually indicate the rejected
state.

Changes:
- Add 'rejected' flag to PlanResultDisplay interface
- Update PlanSummaryDisplay to conditionally color message based on rejection
- Preserve plan content in coreToolScheduler when plan is cancelled
- Add tests for both rejected and approved plan rendering

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 19:00:49 +08:00
DennisYu07
f3b56f5a31
Merge pull request #2139 from QwenLM/feat/hook-stop-implementation
fix(hooks):  fix result aggregator for userPromptSubmit and fix enable for integration test
2026-03-06 17:19:46 +08:00
LaZzyMan
43faa51378 Merge branch 'main' into feature/extension-management-tui 2026-03-06 17:19:40 +08:00
TianHao Zhang
ed6608ed19
Merge pull request #2137 from kkhomej33-netizen/fix/kitty-keypad-private-use
fix(keyboard): handle Kitty keypad private-use keycodes
2026-03-06 17:12:46 +08:00
DragonnZhang
6d112a1c0e fix(keyboard): add comments for kitty keypad private-use keycodes 2026-03-06 17:10:15 +08:00
LaZzyMan
32d499944a Merge branch 'main' into feat/mcp-tui 2026-03-06 16:55:38 +08:00
LaZzyMan
45716ab6fc fix ci test 2026-03-06 16:53:47 +08:00
LaZzyMan
79d1622eda fix i18n 2026-03-06 16:53:12 +08:00
LaZzyMan
2699b88661 Merge branch 'main' into feature/extension-management-tui 2026-03-06 16:25:08 +08:00
LaZzyMan
b923463690 fix zh width 2026-03-06 16:24:48 +08:00
LaZzyMan
b942c0241f fix list align 2026-03-06 16:21:20 +08:00
DennisYu07
5ef7894e86 reslove aggregator for userpromptsubmit 2026-03-05 23:59:43 -08:00
tanzhenxin
67b9e3438c Merge branch 'main' into feat/ask-user-question-tool 2026-03-06 15:48:44 +08:00
tanzhenxin
a8d3d54b43 chore(vscode): update settings schema for enableInteractiveShell default change
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 15:21:25 +08:00
DragonnZhang
6514e104a2 Merge remote-tracking branch 'origin/main' into fix/kitty-keypad-private-use 2026-03-06 15:17:51 +08:00
tanzhenxin
23df34b204 chore(cli): remove unused debugLogger import from settings
Removes an unused debugLogger import that was left over from previous changes.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 15:06:17 +08:00
tanzhenxin
38dafeb839 Merge branch 'main' into feat/mcp-tui 2026-03-06 15:03:47 +08:00
tanzhenxin
b346622ec2 Merge branch 'main' into feat/ask-user-question-tool 2026-03-06 15:03:10 +08:00
tanzhenxin
648d48edbc Merge branch 'main' into feat/shell-pty-default-and-enhancements 2026-03-06 15:02:41 +08:00
tanzhenxin
8ad5838acb chore: update settings.schema.json
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-03-06 14:44:07 +08:00
zach
8a0189c32d fix(keyboard): handle kitty keypad private-use keycodes 2026-03-06 06:38:43 +00:00
tanzhenxin
3a549419ba Merge branch 'main' into feat/sandbox-config-improvements 2026-03-06 14:38:39 +08:00
tanzhenxin
ca3a2be2ec Merge branch 'main' into feat/shell-pty-default-and-enhancements 2026-03-06 14:36:18 +08:00
LaZzyMan
7b227a7eb5 Merge branch 'main' into feat/mcp-tui 2026-03-06 14:27:56 +08:00
LaZzyMan
892fe4f706 fix list align 2026-03-06 14:13:57 +08:00
tanzhenxin
fcebd14a90
Merge pull request #2092 from QwenLM/fix/disable-llm-loop-detection
fix(core): remove LLM-based loop detection and enable skipLoopDetection by default
2026-03-06 14:13:36 +08:00
tanzhenxin
76650819f3
Merge pull request #2120 from QwenLM/refactor/message-components-and-themes
refactor(cli): consolidate message components and fix leading icon display issues
2026-03-06 14:05:21 +08:00
tanzhenxin
bca799e818 Merge branch 'main' into feat/ask-user-question-tool 2026-03-06 14:03:42 +08:00