Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
fe23de6
feat(cli): add --quiet-restore flag to suppress history output on ses…
Gove2004 May 12, 2026
22e4ea7
fix: preserve history state for /rewind while suppressing rendering
Gove2004 May 12, 2026
fa68f3e
refactor: model quiet-restore as display policy with shared utilities
Gove2004 May 12, 2026
a731631
refactor: replace --quiet-restore with /history collapse|expand slash…
Gove2004 May 12, 2026
0feef32
fix: persist history collapse state as user setting
Gove2004 May 13, 2026
0f9e3e0
fix(cli): address maintainer feedback on history collapse persistence…
Gove2004 May 13, 2026
844b9c0
test(cli): fix TypeScript compilation errors in historyCommand tests
Gove2004 May 14, 2026
e943a16
fix(cli): address maintainer review feedback on history collapse
Gove2004 May 14, 2026
bcff48f
test: fix act() warning in slashCommandProcessor.test.ts
Gove2004 May 14, 2026
2dcb217
fix: make applyCollapsePolicyAndSummary pure to avoid React batching bug
Gove2004 May 14, 2026
e5e9d29
chore: revert unrelated changes to lockfile and NOTICES.txt
Gove2004 May 14, 2026
3b7ac2d
test: verify isRealUserTurn handles suppressOnRestore items correctly
Gove2004 May 14, 2026
156c82d
wip(cli): preserve local history review fixes before redesign
Gove2004 May 15, 2026
c94e316
feat(cli): refine history resume collapse commands
Gove2004 May 15, 2026
d5e15d9
fix(cli): address maintainer review feedback on history collapse
Gove2004 May 15, 2026
2e21961
test(cli): cover cold-boot collapsed resume
Gove2004 May 15, 2026
56a6918
fix(cli): address reviewer feedback on history collapse
Gove2004 May 17, 2026
d921b9d
fix(cli): resolve rebase conflicts and missing imports
Gove2004 May 17, 2026
aba0a2d
fix(cli): strip suppressOnRestore in handleRewindConfirm
Gove2004 May 17, 2026
c03a1ed
chore: resolve merge conflict in slashCommandProcessor.ts
Gove2004 May 17, 2026
033e2a9
fix(i18n): add Chinese translations for history collapse commands
Gove2004 May 18, 2026
019779d
fix: address wenshao review comments on PR #4085
Gove2004 May 18, 2026
d64cff8
fix(i18n): add missing English translations for history collapse comm…
Gove2004 May 18, 2026
560a7b2
fix: address wenshao follow-up review comments
Gove2004 May 18, 2026
c3e43c2
fix: restore optional chaining for remount in useResumeCommand
Gove2004 May 18, 2026
514afae
test: update slashCommandProcessor tests for history command feedback…
Gove2004 May 18, 2026
881e3fc
chore: remove generated artifact files from branch
Gove2004 May 18, 2026
ab3bb63
fix: address wenshao review comments on PR #4085
Gove2004 May 19, 2026
9147c1b
fix: address wenshao review comments on PR #4085
Gove2004 May 19, 2026
c279ea0
fix: add braces around if statement body (eslint curly rule)
Gove2004 May 19, 2026
8ed62ad
fix: address wenshao follow-up review comments on PR #4085
Gove2004 May 19, 2026
7fee9c2
fix: address wenshao latest review comments on PR #4085
Gove2004 May 20, 2026
17b3751
fix: address wenshao latest review comments on PR #4085
Gove2004 May 20, 2026
28cc304
merge: sync with upstream main and fix expand-now stale summary
Gove2004 May 29, 2026
ebb267b
merge: sync with upstream main, resolve useResumeCommand conflict
Gove2004 May 29, 2026
510db63
fix: address wenshao latest review comments
Gove2004 May 29, 2026
6a28f43
fix: add missing mockUpdateItem arg to test renderHook calls, remove …
Gove2004 May 29, 2026
86f17aa
fix: address review comments (type, gitignore, test, split-brain)
Gove2004 May 30, 2026
785c754
Merge remote-tracking branch 'origin/main' into pr-4085
Gove2004 Jun 8, 2026
6d261c3
merge: sync with upstream main (afd631335)
Gove2004 Jun 11, 2026
d0bbceb
fix: complete history collapse translations in 6 locale files
Gove2004 Jun 11, 2026
40a7bca
fix: add missing history parameter in slashCommandProcessor test
Gove2004 Jun 11, 2026
4bb4708
merge: resolve conflicts with upstream main
Gove2004 Jun 15, 2026
cd635e9
merge: sync with latest upstream main (02bd82abf)
Gove2004 Jun 15, 2026
1549924
merge: sync with upstream main (69d64c8a2)
Gove2004 Jun 17, 2026
bfd91cd
Merge branch 'main' into feat/quiet-restore
Gove2004 Jun 18, 2026
b689b62
Merge remote-tracking branch 'origin/main' into feat/quiet-restore
Gove2004 Jun 18, 2026
9f80bf9
Merge branch 'feat/quiet-restore' of https://github.com/Gove2004/qwen…
Gove2004 Jun 18, 2026
21fe0a6
fix(cli): repair history collapse CI failures
qqqys Jun 18, 2026
6291670
Merge branch 'main' into feat/quiet-restore
wenshao Jun 18, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ tmp/
# code graph skills
.venv
.codegraph
.qwen/computer-use/installed.json
1 change: 1 addition & 0 deletions docs/users/configuration/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ Settings are organized into categories. Most settings should be placed within th
| `ui.showLineNumbers` | boolean | Show line numbers in code blocks in the CLI output. | `true` |
| `ui.renderMode` | string | Default Markdown display mode. Use `"render"` for rich visual previews or `"raw"` to show source-oriented Markdown by default. Toggle during a session with `Alt/Option+M`; on macOS the terminal must send Option as Meta. See [Markdown Rendering](../features/markdown-rendering). | `"render"` |
| `ui.showCitations` | boolean | Show citations for generated text in the chat. | `false` |
| `ui.history.collapseOnResume` | boolean | Whether to collapse history by default when resuming a session. Can be toggled via `/history collapse-on-resume` and `/history expand-on-resume`. | `false` |
| `ui.compactMode` | boolean | Hide tool output and thinking for a cleaner view. Toggle with `Ctrl+O` during a session or via the Settings dialog. Tool approval prompts are never hidden, even in compact mode. The setting persists across sessions. | `false` |
| `ui.shellOutputMaxLines` | number | Max number of shell output lines shown inline. Set to `0` to disable the cap and show full output. Hidden lines are surfaced via the `+N lines` indicator. Errors, `!`-prefix user-initiated commands, confirming tools, and focused embedded shells always show full output. | `5` |
| `ui.enableWelcomeBack` | boolean | Show welcome back dialog when returning to a project with conversation history. When enabled, Qwen Code will automatically detect if you're returning to a project with a previously generated project summary (`.qwen/PROJECT_SUMMARY.md`) and show a dialog allowing you to continue your previous conversation or start fresh. If you choose **Start new chat session**, that choice is remembered for the current project until the project summary changes. This feature integrates with the `/summary` command and quit confirmation dialog. | `true` |
Expand Down
21 changes: 21 additions & 0 deletions packages/cli/src/config/settingsSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,27 @@ const SETTINGS_SCHEMA = {
description: 'Hide helpful tips in the UI',
showInDialog: true,
},
history: {
type: 'object',
label: 'History',
category: 'UI',
requiresRestart: false,
default: {},
description: 'History display settings.',
showInDialog: false,
properties: {
collapseOnResume: {
type: 'boolean',
label: 'Collapse On Resume',
category: 'UI',
requiresRestart: false,
default: false,
description:
'Whether to collapse history by default when resuming a session.',
showInDialog: false,
},
},
},
showLineNumbers: {
type: 'boolean',
label: 'Show Line Numbers in Code',
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -1990,4 +1990,24 @@ export default {
in: 'ent.',
out: 'sort.',
'In/Out': 'Ent/Sort',

// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Establir la història per reduir-se per defecte en reprendre una sessió',
'Set history to expand by default when resuming a session':
"Establir la història per expandir-se per defecte en reprendre una sessió",
'Expand the currently collapsed history transcript':
'Expandir la transcripció de la història actualment reduïda',
'Control history display preferences and visibility':
'Controlar les preferències de visualització de la història i la visibilitat',
'History will be collapsed by default for future resumed sessions.':
'La història es reduirà per defecte per a futures sessions represes.',
'History will be expanded by default for future resumed sessions.':
"La història s'expandirà per defecte per a futures sessions represes.",
'History is already expanded in this session.':
'La història ja està expandida en aquesta sessió.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Ús: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'Història reduïda: {{n}} missatges ocults. Utilitzeu /history expand-now per mostrar.',
};
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,26 @@ export default {
'Weitere Dream-Läufe können als gesperrt übersprungen werden, bis der nächste Stale-Sweep der Sitzung die Datei bereinigt.',
"The scheduler gate did not see this dream's timestamp; the next dream cycle may re-fire sooner than usual.":
'Das Scheduler-Gate hat den Zeitstempel dieses Dream-Laufs nicht gesehen; der nächste Dream-Zyklus kann früher als üblich erneut starten.',
// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',
'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'Geschichte eingeklappt: {{n}} Nachrichten ausgeblendet. Verwenden Sie /history expand-now zum Anzeigen.',

// === Same-as-English optimization ===
'Agents:': 'Agenten:',
Prompt: 'Eingabe',
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,26 @@ export default {
'Terminal "{{terminal}}" is not supported yet.':
'Terminal "{{terminal}}" is not supported yet.',

// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',

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.

[Suggestion] The 9 new i18n strings for the history collapse feature are added to only 3 of 9 locale files (en.js, zh.js, zh-TW.js). The other 6 locale files (ca.js, de.js, fr.js, ja.js, pt.js, ru.js) are missing all of these translations.

Affected strings:

  • 'Set history to collapse by default when resuming a session'
  • 'Set history to expand by default when resuming a session'
  • 'Expand the currently collapsed history transcript'
  • 'Control history display preferences and visibility'
  • 'History will be collapsed by default for future resumed sessions.'
  • 'History will be expanded by default for future resumed sessions.'
  • 'History is already expanded in this session.'
  • 'Usage: /history collapse-on-resume|expand-on-resume|expand-now'
  • 'History collapsed: {{n}} messages hidden. Use /history expand-now to show.'

Add these keys to ca.js, de.js, fr.js, ja.js, pt.js, and ru.js (English placeholders are acceptable for community translation).

— qwen-latest-series-invite-beta-v34 via Qwen Code /review

'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.',

// ============================================================================
// Commands - Language
// ============================================================================
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -1987,6 +1987,26 @@ export default {
'% context used': '% de contexte utilisé',
'Context exceeds limit! Use /compress or /clear to reduce.':
'Le contexte dépasse la limite ! Utilisez /compress ou /clear pour le réduire.',
// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',
'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'Historique réduit : {{n}} messages masqués. Utilisez /history expand-now pour afficher.',

// === Same-as-English optimization ===
Auth: 'Authentification',
Auto: 'Automatique',
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/ja.js
Original file line number Diff line number Diff line change
Expand Up @@ -1756,6 +1756,26 @@ export default {
'次回のセッション期限切れクリーンアップでファイルが削除されるまで、以降の dream はロック中としてスキップされる可能性があります。',
"The scheduler gate did not see this dream's timestamp; the next dream cycle may re-fire sooner than usual.":
'スケジューラーゲートがこの dream のタイムスタンプを認識しませんでした。次の dream サイクルは通常より早く再実行される可能性があります。',
// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',
'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'履歴を折りたたみました:{{n}} 件のメッセージが非表示です。/history expand-now で表示します。',

// === Same-as-English optimization ===
' (not in model registry)': '(モデルレジストリにありません)',
'Attribution: commit': 'コミットの帰属表示',
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/pt.js
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,26 @@ export default {
'Dreams posteriores podem ser ignorados como bloqueados até que a próxima varredura de sessões obsoletas limpe o arquivo.',
"The scheduler gate did not see this dream's timestamp; the next dream cycle may re-fire sooner than usual.":
'O gate do agendador não viu o timestamp deste dream; o próximo ciclo de dream pode disparar novamente antes do normal.',
// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',
'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'Histórico recolhido: {{n}} mensagens ocultas. Use /history expand-now para mostrar.',

// === Same-as-English optimization ===
'(workspace)': '(espaço de trabalho)',
'Ref:': 'Referência:',
Expand Down
20 changes: 20 additions & 0 deletions packages/cli/src/i18n/locales/ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -1966,6 +1966,26 @@ export default {
'Последующие dream-запуски могут пропускаться как заблокированные, пока следующая очистка устаревших сессий не удалит файл.',
"The scheduler gate did not see this dream's timestamp; the next dream cycle may re-fire sooner than usual.":
'Планировщик не увидел временную метку этого dream-запуска; следующий цикл dream может запуститься раньше обычного.',
// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'Set history to collapse by default when resuming a session',
'Set history to expand by default when resuming a session':
'Set history to expand by default when resuming a session',
'Expand the currently collapsed history transcript':
'Expand the currently collapsed history transcript',
'Control history display preferences and visibility':
'Control history display preferences and visibility',
'History will be collapsed by default for future resumed sessions.':
'History will be collapsed by default for future resumed sessions.',
'History will be expanded by default for future resumed sessions.':
'History will be expanded by default for future resumed sessions.',
'History is already expanded in this session.':
'History is already expanded in this session.',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'Usage: /history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'История свёрнута: {{n}} сообщений скрыто. Используйте /history expand-now для отображения.',

// === Same-as-English optimization ===
' (not in model registry)': ' (не в реестре моделей)',
'start server': 'запустить сервер',
Expand Down
18 changes: 18 additions & 0 deletions packages/cli/src/i18n/locales/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,24 @@ export default {
'\u2191 tabs \u00B7 r to cycle dates \u00B7 esc to close':
'\u2191 tab 切換標籤 \u00B7 r 切換時間範圍 \u00B7 esc 關閉',

// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'恢復會話時預設摺疊歷史記錄',
'Set history to expand by default when resuming a session':
'恢復會話時預設展開歷史記錄',
'Expand the currently collapsed history transcript': '展開當前摺疊的歷史記錄',
'Control history display preferences and visibility':
'控制歷史記錄顯示偏好和可見性',
'History will be collapsed by default for future resumed sessions.':
'未來恢復的會話將預設摺疊歷史記錄。',
'History will be expanded by default for future resumed sessions.':
'未來恢復的會話將預設展開歷史記錄。',
'History is already expanded in this session.': '當前會話的歷史記錄已展開。',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'用法:/history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'歷史記錄已摺疊:{{n}} 條訊息已隱藏。使用 /history expand-now 展開。',

// === Same-as-English optimization ===
' (not in model registry)': '(不在模型註冊表中)',
'start server': '啟動伺服器',
Expand Down
18 changes: 18 additions & 0 deletions packages/cli/src/i18n/locales/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,24 @@ export default {
in: '输入',
out: '输出',

// === History collapse/expand commands ===
'Set history to collapse by default when resuming a session':
'恢复会话时默认折叠历史记录',
'Set history to expand by default when resuming a session':
'恢复会话时默认展开历史记录',
'Expand the currently collapsed history transcript': '展开当前折叠的历史记录',
'Control history display preferences and visibility':
'控制历史记录显示偏好和可见性',
'History will be collapsed by default for future resumed sessions.':
'未来恢复的会话将默认折叠历史记录。',
'History will be expanded by default for future resumed sessions.':
'未来恢复的会话将默认展开历史记录。',
'History is already expanded in this session.': '当前会话的历史记录已展开。',
'Usage: /history collapse-on-resume|expand-on-resume|expand-now':
'用法:/history collapse-on-resume|expand-on-resume|expand-now',
'History collapsed: {{n}} messages hidden. Use /history expand-now to show.':
'历史记录已折叠:{{n}} 条消息已隐藏。使用 /history expand-now 展开。',

// === Same-as-English optimization ===
' (not in model registry)': '(不在模型注册表中)',
'start server': '启动服务器',
Expand Down
Loading
Loading