feat(desktop): 模型不支持多模态时自动调用识图协助 - #2673
Conversation
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
5fffff8 to
dea1b21
Compare
heyanxing-eng
changed the title
heyanxing-eng
changed the title
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dea1b21660
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
| Filename | Overview |
|---|---|
| apps/desktop/src/shared/subagentModelSettings.ts | 新增视觉兜底配置结构、按代理保存的供应商映射，以及已知纯文本模型运行时拦截集合。 |
| apps/desktop/src/main/maker-host/vision-fallback.ts | 集中实现当前轮图片检测、视觉模型配置归一化和纯文本模型识别。 |
| apps/desktop/src/main/maker-host/codex-proxy-host.ts | 为 Codex 图片请求解析视觉兜底路由，并支持不同供应商协议桥接及会话归属记录。 |
| apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts | 为 Claude Code 和 Pi 增加图片兜底路由、协议桥接、凭证选择及续接处理。 |
| apps/desktop/src/renderer/components/settings/VisionFallbackSection.tsx | 新增视觉兜底开关和模型选择界面，并提示已知纯文本模型配置。 |
| packages/anthropic-responses-bridge/src/translate-request.ts | 扩展 Anthropic 到 Responses 的请求转换以保留图片输入。 |
| packages/responses-chat-bridge/src/handler.ts | 扩展 Responses 到 Chat 的桥接处理以支持视觉兜底请求和流式响应。 |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart LR
A["用户发送含图片的请求"] --> B{"当前模型是否为已知纯文本模型"}
B -- 否 --> C["保持原请求路由"]
B -- 是 --> D{"视觉兜底是否启用并已配置"}
D -- 否 --> E["返回设置提醒"]
D -- 是 --> F{"兜底模型是否为已知纯文本模型"}
F -- 是 --> E
F -- 否 --> G["按 Claude Code / Codex / Pi 解析供应商"]
G --> H["按目标 wire protocol 转换图片请求"]
H --> I["视觉模型处理并继续当前对话"]
Reviews (24): Last reviewed commit: "fix(desktop): stop aborted vision chat b..." | Re-trigger Greptile
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
已修复两条 Codex 审查意见：
补充了回归测试并完成桌面端类型检查。 @codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 9edf5dd62f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
0e3132e to
2267596
Compare
|
已修复 Codex 最新审查意见：
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 22675967e4
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
已修复 Codex 最新提出的两个 P2 问题：
补充了回归测试，并完成桌面端相关测试、代理测试和类型检查。 @codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1e3041759a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
@codex review 已修复最新反馈：
回归测试和 typecheck 已通过，请重点复查这两个 P1。 |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ed40a2512f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
已处理本轮两项可修复的 P1：
“下拉展示全部已配置模型，已知纯文本模型在运行时拦截并提示重新配置”仍是有意保留的产品取舍，已在对应线程说明。 验证：相关回归测试、桌面端 typecheck、i18n、DCO 均通过。完整单测为 24771 通过、1 个与本改动无关的英文自定义供应商预设文案断言失败。 @codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 89d740af50
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
已处理最新一轮的 4 个 P2：
新增了转换顺序、跨协议桥接、按 Agent 来源、语言提示的回归测试。已通过相关单测（237 + 318）、桌面端 typecheck、i18n 检查、DCO 和 diff 检查。 @codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: c1e104eb20
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@heyanxing-eng 👋 这个 PR 还有 2 条 review conversation 没 resolve(apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts / apps/desktop/src/main/maker-host/codex-proxy-host.ts),auto-review 因此暂时跳过、没法继续审查 / 合并。 如果你已经按评论改完或回应了,请到对应 thread 上点 Resolve conversation;全部 resolve 后,下一轮 auto-review 会自动重新审查这个 PR。 |
MagicLizi
left a comment
MagicLizi
left a comment
There was a problem hiding this comment.
格式检查未通过
Title 缺少合规 type 前缀。
需要修改
请把标题改成仓库约定格式：<type>(<scope>): <描述>。
可用 type：feat / fix / refactor / perf / chore / docs / test / revert / build / ci。
例如：feat(desktop): 模型不支持多模态时自动调用识图协助
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: cd6d23349a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 01f99a2a8b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
heyanxing-eng
changed the title
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f465ce7f79
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 72aa912559
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@heyanxing-eng 👋 这个 PR 还有 3 条 review conversation 没 resolve(packages/maker-core/src/agents/claude-code/index.ts / apps/desktop/src/renderer/components/settings/BuiltinToolsSection.tsx / apps/desktop/src/main/maker-ipc/register.ts),auto-review 因此暂时跳过、没法继续审查 / 合并。 如果你已经按评论改完或回应了,请到对应 thread 上点 Resolve conversation;全部 resolve 后,下一轮 auto-review 会自动重新审查这个 PR。 |
|
@heyanxing-eng 👋 这个 PR 目前与 请在本地 merge 最新的 |
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d295da5b3b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com> # Conflicts: # apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts # packages/anthropic-compat-proxy/src/server.ts
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4dcc52ba32
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@heyanxing-eng 👋 这个 PR 还有 4 条 review conversation 没 resolve(apps/desktop/src/main/maker-host/codex-proxy-host.ts / apps/desktop/src/shared/subagentModelSettings.ts / apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts),auto-review 因此暂时跳过、没法继续审查 / 合并。 如果你已经按评论改完或回应了,请到对应 thread 上点 Resolve conversation;全部 resolve 后,下一轮 auto-review 会自动重新审查这个 PR。 |
|
@heyanxing-eng 👋 这个 PR 目前与 请在本地 merge 最新的 |
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 6d82bf3e23
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
@heyanxing-eng 👋 这个 PR 还有 1 条 review conversation 没 resolve(apps/desktop/src/main/maker-host/codex-proxy-host.ts),auto-review 因此暂时跳过、没法继续审查 / 合并。 如果你已经按评论改完或回应了,请到对应 thread 上点 Resolve conversation;全部 resolve 后,下一轮 auto-review 会自动重新审查这个 PR。 |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 78858a59cf
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: heyanxing-eng <heyanxing@xd.com>
|
该功能已由已合并的 PR #2543 覆盖，本 PR 与现有实现重复，因此关闭。 |
2 participants
这次改了什么
摘要
当用户选择的模型不支持图片，却在对话中发送了图片时，Cindy 不再把图片直接发给这个模型，避免出现类似
unknown variant image_url的报错。Cindy 会按照用户在“设置 → 工具”中选择的视觉模型，把本轮图片交给该模型处理，再继续完成对话。视觉模型由用户自己决定，Cindy 不会擅自挑选模型或自动切换到所谓“最便宜”的模型。
变更类型
范围
设置与使用
UI 变化
新增设置项放在“设置 → 工具”分类中，与其他工具设置保持一致：
怎么验证的
自动验证
手工验证
未执行的验证
未在所有第三方模型和所有远程环境中逐一实机验证；模型是否支持图片仍由用户在设置中选择，远程 SSH 会话暂时不使用本机视觉兜底。
风险
风险分类
影响与回滚
提交前检查
git commit -s，见 DCO）新功能加入后的 UI 界面
