Merge origin/main into feat/wait-banner: resolve floats retirement + openTabInBottomPane

src/client/locales.ts

@@ -24,6 +24,12 @@
 /** The zh dictionary (also registered into the DSH locale registry under {@link LOCALE_NS}). */
 export const zh = {
   files: '文件',
+  guideDescFiles: '浏览工作区文件树，点开即预览或编辑',
+  guideDescGit: 'Git 变更与本轮文件改动，双视角合一',
+  guideDescSubagent: '子代理拓扑与后台任务，实时状态',
+  guideDescSidechat: '继承当前会话上下文的独立追问线程',
+  guideDescTerminal: '真实 shell 终端（xterm + pty），断线重连',
+  guideDescBrowser: '内嵌网页浏览器，可接管聊天里的外链',
   changesSessionEmpty: '本会话还没有文件操作',
   changesRead: '读取',
   changesMdReading: '阅读',
@@ -93,7 +99,6 @@ export const zh = {
   closeOtherTabs: '关闭其他页签',
   closeLeftTabs: '关闭左侧页签',
   closeRightTabs: '关闭右侧页签',
-  moveToFreeWindow: '移动到自由窗口',
   floatDropHint: '松开以在自由窗口中打开',
   dockToSidebar: '回到侧边栏',
   pinTerminal: '固定终端',
@@ -108,8 +113,6 @@ export const zh = {
   pinnedTerminalScopeGlobal: '固定到全局',
   pinnedRailLabel: '固定终端',
   closePinnedTerminal: '关闭终端',
-  collapse: '折叠侧边栏',
-  expand: '展开侧边栏',
   collapseBottomPanel: '折叠底部面板',
   expandBottomPanel: '展开底部面板',
   terminalError: '终端连接失败',
@@ -166,12 +169,6 @@ export const zh = {
   changesOpenDiffTab: '在独立页签中打开',
   changesClosePreview: '关闭预览',
   changesResizePreview: '调整预览高度',
-  changesDiffOpenTitle: '差异展开方式',
-  changesDiffOpenDesc: '「展开为独立页签」把 diff 放到哪里',
-  changesDiffOpenFloat: '浮窗',
-  changesDiffOpenFloatDesc: '作为自由窗口居中打开，可拖拽、缩放、置顶',
-  changesDiffOpenPane: '面板',
-  changesDiffOpenPaneDesc: '停靠在源面板下方（VSCode 式 diff 分栏）',
   changesLoadError: '会话文件记录暂不可用',
   staged: '已暂存',
   unstaged: '未暂存',
@@ -246,13 +243,6 @@ export const zh = {
   settingsIntro: '管理侧边卡片的显示内容与默认行为',
   settingsPopupDesc: '为「{feature}」配置相关选项',
   settingsDone: '完成',
-  settingsOpenTitle: '新会话默认打开',
-  settingsOpenDesc: '新建会话时自动展开侧边卡片；已存在的会话保持各自布局',
-  settingsWidthTitle: '默认宽度占比',
-  settingsWidthDesc: '新建会话时侧边卡片占窗口宽度的百分比 (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: '聊天区文件在侧边栏打开',
-  settingsOpenPathDesc: '在聊天里点击文件链接（工具行、产物列表、文件提及）时，在侧边栏编辑器中打开，不再调用系统默认应用',
   settingsOpenToolsTitle: '为模型注入侧边栏打开工具',
   settingsOpenToolsDesc: '开启后，模型可通过 sidebar_open 工具在侧边栏主动打开文件、文件夹和 HTTP(S) 网页（默认关闭）',
   settingsTitleBarTitle: '位置兼容模式',
@@ -476,6 +466,12 @@ export const zh = {
 /** The en dictionary (key-set-equal to zh, enforced by the type annotation). */
 export const en: Record<keyof typeof zh, string> = {
   files: 'Files',
+  guideDescFiles: 'Browse the workspace tree; click a file to preview or edit',
+  guideDescGit: 'Git changes and this session\'s file edits, in one tab',
+  guideDescSubagent: 'Subagent topology and background jobs, live',
+  guideDescSidechat: 'An independent follow-up thread inheriting this session\'s context',
+  guideDescTerminal: 'A real shell (xterm + pty) with reconnect',
+  guideDescBrowser: 'An embedded browser that can take over chat links',
   changesSessionEmpty: 'No file operations in this session yet',
   changesRead: 'Read',
   changesMdReading: 'Reading',
@@ -545,7 +541,6 @@ export const en: Record<keyof typeof zh, string> = {
   closeOtherTabs: 'Close Other Tabs',
   closeLeftTabs: 'Close Tabs to the Left',
   closeRightTabs: 'Close Tabs to the Right',
-  moveToFreeWindow: 'Move to Free Window',
   floatDropHint: 'Release to open in a free window',
   dockToSidebar: 'Dock Back to Sidebar',
   pinTerminal: 'Pin Terminal',
@@ -560,8 +555,6 @@ export const en: Record<keyof typeof zh, string> = {
   pinnedTerminalScopeGlobal: 'Pinned globally',
   pinnedRailLabel: 'Pinned Terminals',
   closePinnedTerminal: 'Close Terminal',
-  collapse: 'Collapse sidebar',
-  expand: 'Expand sidebar',
   collapseBottomPanel: 'Collapse bottom panel',
   expandBottomPanel: 'Expand bottom panel',
   terminalError: 'Terminal connection failed',
@@ -618,12 +611,6 @@ export const en: Record<keyof typeof zh, string> = {
   changesOpenDiffTab: 'Open in a diff tab',
   changesClosePreview: 'Close preview',
   changesResizePreview: 'Resize preview',
-  changesDiffOpenTitle: 'Diff opens as',
-  changesDiffOpenDesc: 'Where the "expand to a diff tab" action lands the diff',
-  changesDiffOpenFloat: 'Free window',
-  changesDiffOpenFloatDesc: 'A floating window centered on the viewport — drag, resize, keep on top',
-  changesDiffOpenPane: 'Pane',
-  changesDiffOpenPaneDesc: 'Docked below the source panel (VSCode-style diff split)',
   changesLoadError: 'Session file records are unavailable right now',
   staged: 'Staged',
   unstaged: 'Unstaged',
@@ -698,13 +685,6 @@ export const en: Record<keyof typeof zh, string> = {
   settingsIntro: 'Manage what the side card shows and how it behaves',
   settingsPopupDesc: 'Configure related options for {feature}',
   settingsDone: 'Done',
-  settingsOpenTitle: 'Open by default for new conversations',
-  settingsOpenDesc: 'Expand the side card automatically for brand-new conversations; existing conversations keep their own layouts',
-  settingsWidthTitle: 'Default width share',
-  settingsWidthDesc: 'The side card\'s default share of the window width for new conversations (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Open chat files in the sidebar',
-  settingsOpenPathDesc: 'Open file links in the chat (tool rows, produced files, mentions) in the sidebar editor instead of the system default app',
   settingsOpenToolsTitle: 'Inject the sidebar-open tool for the model',
   settingsOpenToolsDesc: 'When enabled, the model can actively open files, folders, and HTTP(S) pages in the sidebar through the sidebar_open tool (off by default)',
   settingsTitleBarTitle: 'Position compatibility mode',