Conversation
…generic-acp # Conflicts: # CHANGELOG.md
Collaborator
|
已合入最新 main 并解决 CHANGELOG 冲突,功能修复保持原有最小范围。验证结果:254 项桌面单元测试全部通过,Electron 设置页冒烟测试通过(修改语言保留 ACP 配置、不可用状态呈现、主动选择 none),相关 eslint 通过,最新提交全部 CI 通过。感谢提供修复和真实设置页回归测试。 |
Collaborator
|
已同步最新 main,解决的冲突仅为 CHANGELOG 顶部条目,双方内容均保留。复核后功能范围不变:只保留已配置的通用 ACP 选项及实际可用状态,不新增命令配置入口。本地 254 项桌面测试通过(1 项 Windows 专用测试跳过),真实 Electron 设置页 smoke、改动文件 ESLint 通过;正在等待本次更新的 CI,全部通过后合并。 |
x-lixu
approved these changes
Sep 18, 2026
x-lixu
left a comment
Collaborator
There was a problem hiding this comment.
复核通过:修复桌面设置将已配置通用 ACP 静默改为 none 的明确问题。同步最新 main 后,本地桌面单测、Electron 设置页 smoke 与 ESLint 均通过,最新提交的跨平台 CI 全部通过。感谢贡献及回归测试。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Settings currently changes an env-configured
AGENT_PROTOCOL=acptononewhen rendering the backend picker, so applying unrelated preferences overwrites the user's backend selection.Keep generic ACP in the detection-backed picker only when it is already selected, and preserve the renderer's current value. Its readiness still comes from detection: unavailable commands are not presented as ready, and unselected generic ACP remains hidden because this picker cannot configure its command. Explicitly selecting another backend still works. No command editor or configuration schema is added.
Closes #436.
Validation on macOS, Node 24.20.0:
AGENT_PROTOCOL,ACP_COMMANDandACP_ARGS; an unavailable command is not marked ready; explicitly selectingnonepersists. The smoke fails with the original implementation and passes with the fix.npm run lint,npm test(2,374 passed, one conditional consumer-package test skipped),npm run build,npm run release:check, andnpm run test:desktop-smokepassed.Persistence/security: this uses the existing settings-store write path and does not expose or execute custom command arguments. Smoke fixtures use isolated directories and mocked detection, without starting a Gateway or external Agent. Reverting this PR restores the previous picker behavior; no data migration is required. Windows/Linux were not exercised locally.