Merge remote-tracking branch 'origin/master' into worktree/composer-scrollbar-gutter

# Conflicts:
#	packages/client/ui-conversation/README.i18n.yaml

apps/web/tests/snapshots/bash-abort-row/ui.expected.md

@@ -14,10 +14,10 @@
   - img
   - img
   - text: Context injection
-- 'button "Failed Bash Error: command aborted" [expanded]':
+- 'button "Failed Bash Error: tool call aborted" [expanded]':
   - img
-  - text: "Failed Bash Error: command aborted"
-- text: "IN { \"command\": \"node -e \\\"require('node:fs').writeFileSync('started.txt', 'started'); setInterval(() => {}, 1000)\\\"\", \"description\": \"Wait until cancellation\" } OUT Error: command aborted"
+  - text: "Failed Bash Error: tool call aborted"
+- text: "IN { \"command\": \"node -e \\\"require('node:fs').writeFileSync('started.txt', 'started'); setInterval(() => {}, 1000)\\\"\", \"description\": \"Wait until cancellation\" } OUT Error: tool call aborted"
 - button "Inspect"
 - 'button "Failed Bash Error: tool call aborted before dispatch"':
   - img
@@ -26,8 +26,8 @@
 - button "Commands":
   - img
 - 'button "Access mode, current: Workspace Write"': Workspace Write
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: 1 turns · 1 steps Tool call {{duration}} Cache hit 0% Input 10 tok · Output 10 tok

apps/web/tests/snapshots/composer-tab-geometry/geometry.expected.md

@@ -12,7 +12,7 @@
 - input card right edge moves between tabs: 0px
 - input card width changes between tabs: 0px
 
-## Narrow viewport (900px, card shrinking with the column)
+## Narrow viewport (800px, card shrinking with the column)
 
 - Chat: scrollbar-gutter stable, overflow auto/auto
 - Chat scroller scrolls: true

apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md

@@ -28,6 +28,7 @@
 - textbox "Describe what you want to build"
 - button "Commands":
   - img
+- tooltip "Commands"
 - 'button "Access mode, current: Workspace Write"': Workspace Write
 - button "Select model, current DeepSeek-V4-Flash":
   - text: DeepSeek-V4-Flash

apps/web/tests/snapshots/lifecycle-chrome/plan-active.expected.md

@@ -30,8 +30,8 @@
   - img
 - 'button "Access mode, current: Workspace Write"': Workspace Write
 - button "Plan mode on, press to turn off": Plan
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: Details

apps/web/tests/snapshots/markdown-images/ui.expected.md

@@ -24,8 +24,8 @@
 - button "Commands":
   - img
 - 'button "Access mode, current: Workspace Write"': Workspace Write
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: 1 turns · 1 steps Input 0 tok · Output 0 tok

apps/web/tests/snapshots/message-actions/ui.expected.md

@@ -51,8 +51,8 @@
 - button "Commands":
   - img
 - 'button "Access mode, current: Workspace Write"': Workspace Write
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: 2 turns · 3 steps Tool call {{duration}} Cache hit 98% Input 7.8K tok · Output 103 tok

apps/web/tests/snapshots/models-settings/configured.expected.md

@@ -17,4 +17,6 @@
       - text: minimax-cn
       - button "编辑"
       - button "删除"
-  - button "+ 添加提供方"
+  - button "添加提供方":
+    - img
+    - text: 添加提供方

apps/web/tests/snapshots/onboarding-deepseek-config/models.expected.md

@@ -0,0 +1,70 @@
+- dialog "设置":
+  - navigation:
+    - text: 设置
+    - button "通用设置":
+      - img
+      - text: 通用设置
+    - button "模型":
+      - img
+      - text: 模型
+  - button "关闭":
+    - img
+    - text: 关闭
+  - heading "模型" [level=2]
+  - paragraph: 填入各提供方的 API 密钥即可使用其模型。
+  - list:
+    - listitem:
+      - text: DeepSeek
+      - button "编辑"
+      - text: DeepSeek deepseek-official API 密钥
+      - textbox "API 密钥":
+        - /placeholder: 已配置——输入新值可替换
+      - group:
+        - text: 自定义设置 API 地址
+        - textbox "API 地址":
+          - /placeholder: https://api.deepseek.com
+        - text: 推理强度
+        - combobox "推理强度":
+          - option "默认" [selected]
+          - option "off"
+          - option "high"
+          - option "max"
+        - region "模型目录":
+          - text: 模型目录 已自定义模型目录
+          - button "恢复默认模型"
+          - textbox "模型 ID 1":
+            - /placeholder: 模型 ID
+            - text: deepseek-v4-pro
+          - textbox "显示名称 1":
+            - /placeholder: 显示名称
+            - text: DeepSeek-V4-Pro
+          - button "容量 1":
+            - img
+          - button "删除模型 1":
+            - img
+          - textbox "模型 ID 2":
+            - /placeholder: 模型 ID
+            - text: private-preview
+          - textbox "显示名称 2":
+            - /placeholder: 显示名称
+            - text: Private Preview
+          - button "容量 2" [expanded]:
+            - img
+          - button "删除模型 2":
+            - img
+          - text: 上下文窗口
+          - textbox "上下文窗口 2":
+            - /placeholder: 1M
+            - text: "131072"
+          - text: 最大输出 token 数
+          - textbox "最大输出 token 数 2":
+            - /placeholder: 256K
+            - text: 64K
+          - button "添加模型":
+            - img
+            - text: 添加模型
+      - button "取消"
+      - button "保存"
+  - button "添加提供方":
+    - img
+    - text: 添加提供方

apps/web/tests/snapshots/plan-review/sidebar.expected.md

@@ -0,0 +1 @@
+- 'treeitem "Plan awaiting review Plan a small change: add now" [selected]'

apps/web/tests/snapshots/question-composer/sidebar.expected.md

@@ -0,0 +1 @@
+- treeitem "Waiting for answer Use the ask_user_question tool to now" [selected]

apps/web/tests/snapshots/queue-actions/editing.expected.md

@@ -30,6 +30,7 @@
     - textbox "Edit queued message": Edited queue item
     - button "Save queued message":
       - img
+    - tooltip "Save queued message"
     - button "Cancel editing":
       - img
 - textbox "Message the agent"

apps/web/tests/snapshots/queue-actions/layout.expected.md

@@ -23,7 +23,7 @@
 - paragraph: partial
 - status: Deep diving...
 - region "To-dos":
-  - button "To-dos 1/2 tasks · 1 in progress"
+  - button "To-dos 1 completed · 1 in progress"
 - img
 - text: Ongoing Goal Keep the composer context panels aligned
 - button "Pause goal":

apps/web/tests/snapshots/queue-actions/ui.expected.md

@@ -21,6 +21,7 @@
     - text: Edited queue item
     - button "Edit queued message":
       - img
+    - tooltip "Edit queued message"
     - button "Remove queued message":
       - img
     - button "Steer queued message":

apps/web/tests/snapshots/seeded-history/command-row.expected.md

@@ -47,8 +47,8 @@
 - button "Commands":
   - img
 - 'button "Access mode, current: Read Only"': Read Only
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: 1 turns · 2 steps Tool call {{duration}} Cache hit 98% Input 15.8K tok · Output 135 tok

apps/web/tests/snapshots/seeded-history/ui.expected.md

@@ -45,8 +45,8 @@
 - button "Commands":
   - img
 - 'button "Access mode, current: Workspace Write"': Workspace Write
-- button "Select model, current deepseek-v4-flash":
-  - text: deepseek-v4-flash
+- button "Select model":
+  - text: Select model
   - img
 - button "Send message" [disabled]
 - text: 1 turns · 2 steps Tool call {{duration}} Cache hit 98% Input 15.8K tok · Output 135 tok

apps/web/tests/snapshots/sidebar-scrollbar/geometry.expected.md

@@ -28,8 +28,8 @@
 - scrollbar-width: auto
 - scrollbar-color: auto
 - ::-webkit-scrollbar-thumb:hover declarations: var(--dsh-scrollbar-thumb-hover)
-- --dsh-scrollbar-thumb, pointer over the list: rgb(60, 60, 61)
-- --dsh-scrollbar-thumb-hover, pointer over the list: rgb(84, 85, 87)
+- --dsh-scrollbar-thumb, pointer over the list: rgb(84, 85, 87)
+- --dsh-scrollbar-thumb-hover, pointer over the list: rgb(101, 103, 107)
 - list overflows: true
 - reserved band: 8px
 - scrollbar inset from the sidebar edge: 2px