Skip to content
Closed
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1d6940f
fix(cli): keep model switches session-scoped
zjunothing Jul 9, 2026
77da2b8
Merge branch 'main' into fix/model-session-default
wenshao Jul 10, 2026
c044a02
fix(cli): add model command translations
zjunothing Jul 10, 2026
bf724cc
Merge branch 'main' into fix/model-session-default
wenshao Jul 10, 2026
a6e995d
Merge branch 'main' into fix/model-session-default
wenshao Jul 10, 2026
b6e9b58
Merge branch 'main' into fix/model-session-default
wenshao Jul 11, 2026
a36e33d
Merge branch 'main' into fix/model-session-default
wenshao Jul 11, 2026
4044ff7
Merge branch 'main' into fix/model-session-default
wenshao Jul 12, 2026
60cc536
Merge branch 'main' into fix/model-session-default
wenshao Jul 12, 2026
0a01d89
Merge branch 'main' into fix/model-session-default
wenshao Jul 18, 2026
d57bdf0
Merge branch 'main' into fix/model-session-default
wenshao Jul 23, 2026
7b7cb51
Merge branch 'main' into fix/model-session-default
wenshao Jul 23, 2026
02b23fc
Merge branch 'main' into fix/model-session-default
wenshao Jul 23, 2026
d6e7252
merge(main): combine --default and --image flags in model command
qwen-code-dev-bot Jul 26, 2026
ff7e91d
Merge branch 'main' into fix/model-session-default
wenshao Jul 26, 2026
1adfab3
fix(cli): preserve model command persistence semantics
zjunothing Jul 29, 2026
d1c23dc
Merge branch 'main' into fix/model-session-default
wenshao Jul 30, 2026
ded4336
fix(cli): address review feedback on /model --default (#6579)
Aug 1, 2026
6e81163
chore(cli): merge main into fix/model-session-default
Aug 1, 2026
9cbc430
Merge branch 'main' into fix/model-session-default
qwen-code-dev-bot Aug 1, 2026
fdac9fd
test(cli): cover resolved config baseUrl in default model picker
qwen-code-dev-bot Aug 1, 2026
f893109
fix(cli): restrict --default flag parsing to leading positions (#6579)
qwen-code-ci-bot Aug 1, 2026
991395a
test(cli): cover selectedType persistence for --default with explicit…
qwen-code-ci-bot Aug 1, 2026
5b12caf
test(cli): cover --voice and --vision in --default mutual-exclusion g…
qwen-code-ci-bot Aug 1, 2026
db59eb8
test(cli): cover --default --global direct-switch and trailing-flag f…
qwen-code-ci-bot Aug 1, 2026
78df51b
fix(cli): show inline-prompt rejection before scope guard in /model (…
qwen-code-ci-bot Aug 2, 2026
ed0ac4f
fix(cli): point inline-prompt rejection hint at working --default com…
qwen-code-ci-bot Aug 2, 2026
9246bbf
fix(cli): address review feedback on --default model persistence (#6579)
qwen-code-ci-bot Aug 2, 2026
237b2ed
fix(cli): align model persistence docs and locales (#6579)
zjunothing Aug 3, 2026
44be9d7
fix(cli): detect trailing --default after whitespace runs and aux fla…
qwen-code-ci-bot Aug 3, 2026
a90f499
Merge branch 'main' into fix/model-session-default
qwen-code-ci-bot Aug 3, 2026
c50a114
Merge remote-tracking branch 'origin/main' into fix/model-session-def…
qwen-code-ci-bot Aug 3, 2026
56d62ff
Merge branch 'main' into fix/model-session-default
qwen-code-dev-bot Aug 3, 2026
5152271
fix(cli): align --default docs and rejections with persistence behavi…
qwen-code-ci-bot Aug 3, 2026
7e9cc4d
Merge branch 'fix/model-session-default' of https://github.com/zjunot…
qwen-code-dev-bot Aug 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/cli/src/i18n/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1492,8 +1492,14 @@ export default {
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, [model-id] to switch immediately).',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 237b2ed. I removed both unreferenced description variants from en, zh, and zh-TW, leaving only the full --default + --compaction + --image key used by modelCommand. npm run check-i18n passes.

'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).',
"Inline one-shot override isn't supported in this mode — run '/model {{model}}' first, then send your prompt.":
"Inline one-shot override isn't supported in this mode — run '/model {{model}}' first, then send your prompt.",
"Inline one-shot override can't switch providers. '{{model}}' belongs to a different provider — run '/model {{model}}' first, then send your prompt.":
Expand Down
6 changes: 6 additions & 0 deletions packages/cli/src/i18n/locales/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -1318,8 +1318,14 @@ export default {
'切換此會話的模型(--fast 可設置建議模型,--voice 可設置語音轉寫模型,[model-id] 可立即切換)',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切換此會話的模型(--fast 建議模型,--voice 語音轉寫模型,--vision 視覺橋接模型,--project 持久化到專案設定,--global 持久化到使用者設定,[model-id] 立即切換,或用 [model-id] [prompt] 在另一個模型上執行一次性提示;內聯提示按原文發送,不展開 @file)',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切換此會話的模型(--fast 建議模型,--voice 語音轉寫模型,--vision 視覺橋接模型,--image 圖像生成模型,--project 持久化到專案設定,--global 持久化到使用者設定,[model-id] 立即切換,或用 [model-id] [prompt] 在另一個模型上執行一次性提示;內聯提示按原文發送,不展開 @file)',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切換此會話的模型(--default 將主模型持久化為未來會話預設值,--fast 建議模型,--voice 語音轉寫模型,--vision 視覺橋接模型,--image 圖像生成模型,--project 持久化到專案設定,--global 持久化到使用者設定,[model-id] 立即切換,或用 [model-id] [prompt] 在另一個模型上執行一次性提示;內聯提示按原文發送,不展開 @file)',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切換此會話的模型(--fast 建議模型,--voice 語音轉寫模型,--vision 視覺橋接模型,--compaction 聊天壓縮模型,--image 圖像生成模型,--project 持久化到專案設定,--global 持久化到使用者設定,[model-id] 立即切換,或用 [model-id] [prompt] 在另一個模型上執行一次性提示;內聯提示按原文發送,不展開 @file)',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切換此會話的模型(--default 將主模型持久化為未來會話預設值,--fast 建議模型,--voice 語音轉寫模型,--vision 視覺橋接模型,--compaction 聊天壓縮模型,--image 圖像生成模型,--project 持久化到專案設定,--global 持久化到使用者設定,[model-id] 立即切換,或用 [model-id] [prompt] 在另一個模型上執行一次性提示;內聯提示按原文發送,不展開 @file)',
"Inline one-shot override isn't supported in this mode — run '/model {{model}}' first, then send your prompt.":
"此模式不支援內聯一次性覆寫——請先執行 '/model {{model}}',再發送你的提示。",
"Inline one-shot override can't switch providers. '{{model}}' belongs to a different provider — run '/model {{model}}' first, then send your prompt.":
Expand Down
6 changes: 6 additions & 0 deletions packages/cli/src/i18n/locales/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -1432,8 +1432,14 @@ export default {
'切换此会话的模型(--fast 可设置建议模型,--voice 可设置语音转写模型,[model-id] 可立即切换)',

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deferred. The nine new t() strings fall back to English for zh users, which is the existing behavior for untranslated keys. Adding translations is valid but out of scope for this round; deferred to a follow-up.

中文说明

延期处理。9 条新增 t() 字符串对中文用户会回退为英文,这与现有未翻译键的行为一致。添加翻译是有效的,但超出本轮范围;延期至后续处理。

'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切换此会话的模型(--fast 建议模型,--voice 语音转写模型,--vision 视觉桥接模型,--project 持久化到项目设置,--global 持久化到用户设置,[model-id] 立即切换,或用 [model-id] [prompt] 在另一个模型上运行一次性提示;内联提示按原文发送,不展开 @file)',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切换此会话的模型(--fast 建议模型,--voice 语音转写模型,--vision 视觉桥接模型,--image 图像生成模型,--project 持久化到项目设置,--global 持久化到用户设置,[model-id] 立即切换,或用 [model-id] [prompt] 在另一个模型上运行一次性提示;内联提示按原文发送,不展开 @file)',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切换此会话的模型(--default 将主模型持久化为未来会话默认值,--fast 建议模型,--voice 语音转写模型,--vision 视觉桥接模型,--image 图像生成模型,--project 持久化到项目设置,--global 持久化到用户设置,[model-id] 立即切换,或用 [model-id] [prompt] 在另一个模型上运行一次性提示;内联提示按原文发送,不展开 @file)',
'Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切换此会话的模型(--fast 建议模型,--voice 语音转写模型,--vision 视觉桥接模型,--compaction 聊天压缩模型,--image 图像生成模型,--project 持久化到项目设置,--global 持久化到用户设置,[model-id] 立即切换,或用 [model-id] [prompt] 在另一个模型上运行一次性提示;内联提示按原文发送,不展开 @file)',
'Switch the model for this session (--default to persist the main model for future sessions, --fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion).':
'切换此会话的模型(--default 将主模型持久化为未来会话默认值,--fast 建议模型,--voice 语音转写模型,--vision 视觉桥接模型,--compaction 聊天压缩模型,--image 图像生成模型,--project 持久化到项目设置,--global 持久化到用户设置,[model-id] 立即切换,或用 [model-id] [prompt] 在另一个模型上运行一次性提示;内联提示按原文发送,不展开 @file)',
"Inline one-shot override isn't supported in this mode — run '/model {{model}}' first, then send your prompt.":
"此模式不支持内联一次性覆盖——请先运行 '/model {{model}}',再发送你的提示。",
"Inline one-shot override can't switch providers. '{{model}}' belongs to a different provider — run '/model {{model}}' first, then send your prompt.":
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/src/ui/AppContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,7 @@ export const AppContainer = (props: AppContainerProps) => {
isCompactionModelMode,
isImageModelMode,
modelDialogPersistScope,
modelDialogPersistDefault,
openModelDialog,
closeModelDialog,
} = useModelCommand();
Expand Down Expand Up @@ -4282,6 +4283,7 @@ export const AppContainer = (props: AppContainerProps) => {
isCompactionModelMode,
isImageModelMode,
modelDialogPersistScope,
modelDialogPersistDefault,
isTrustDialogOpen,
activeArenaDialog,
isPermissionsDialogOpen,
Expand Down Expand Up @@ -4427,6 +4429,7 @@ export const AppContainer = (props: AppContainerProps) => {
isCompactionModelMode,
isImageModelMode,
modelDialogPersistScope,
modelDialogPersistDefault,
isTrustDialogOpen,
activeArenaDialog,
isPermissionsDialogOpen,
Expand Down
Loading
Loading