dsh-config-manager 0.2.3 → 0.3.0

package/src/client/sync/AutosyncCard.tsx

@@ -4,10 +4,11 @@
  * 约定：只接收「渲染所需的数据 + 回调」；React 状态、副作用与网络调用仍由
  * SyncPanel 持有（单一状态源）；可测纯逻辑在 src/ui/sync-settings-view.ts。
  */
+import { useId } from 'react'
 import type { ChangeEvent } from 'react'
 import type { TranslateNS } from '../client-types.ts'
 import type { UiT } from '../../ui/i18n.ts'
-import { Badge, Card } from '../common/ui.tsx'
+import { Badge } from '../common/ui.tsx'
 import { Select } from '../common/Select.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import {
@@ -60,18 +61,37 @@ export function AutosyncCard({ t, uiT, settings, busy, onToggleAutosync, onUpdat
   // 的旧错误会被当成当前结论继续展示；判据现在收在 autosyncFailureMessage 一处。
   const failureMessage = settings.autosync !== null ? autosyncFailureMessage(settings.autosync) : null
   const lastMessage = failureMessage === null ? null : redact(failureMessage)
+  /** 开关的 id：标题在左、勾选框在右，靠 htmlFor 把两者绑成一行（见 .toggleRow 注释） */
+  const enableId = useId()
+  const realtimeId = useId()
   return (
-    <Card>
-      <span className={css.groupLabel}>{t('autosync.title')} <InfoHint text={t('autosync.description')} label={t('common.infoHint')} /></span>
-      <label className={css.checkboxRow}>
+    /* 卡内小节，不再套一层 Card（2026-11-01）：本组件唯一的调用点在
+       SyncPanel 的「通道动作卡」内部（SyncPanel.tsx:1262 的 <Card> 里、快照选择行下面），
+       而 Card 自带 1px 边框 + 12px 内边距 + 10px 外边距 —— 于是卡里出现一张浮起来的卡，
+       边界多出一圈、上下白吃 22px，把 Auto Sync 从首屏挤到折叠线以下。
+       同页卡内分节的既有口径是 0.5px border-l2 顶线（css 里另有 4 处同款），照它走。 */
+    <div className={css.syncSubBlock}>
+      {/* 总开关并进标题行（2026-11-01 用户要求「左标题右按钮」）：原来标题一行、下面
+          再单列一行「☑ 启用」，同一件事占两行，而右侧一直空着。开关此刻就叫「自动同步」是否开启。 */}
+      <div className={css.subBlockHead}>
+        <span className={css.groupLabel}>{t('autosync.title')} <InfoHint text={t('autosync.description')} label={t('common.infoHint')} /></span>
+        <span className={css.statusSpacer} />
         <input
+          id={enableId}
+          className={css.toggleInput}
           type="checkbox"
           checked={settings.autosyncEnabled}
           disabled={busy}
+          aria-label={t('autosync.enable')}
           onChange={(e: ChangeEvent<HTMLInputElement>) => { onToggleAutosync(e.target.checked) }}
         />
-        <span>{t('autosync.enable')}</span>
-      </label>
+      </div>
+      {/* 关闭时不再展示策略项（2026-11-01）：Enabled 没勾选，下面 4 个下拉 + 状态徽章 +
+          失败原文仍然全铺开，占掉画布最后三屏里的两屏 —— 用户要按的「合并 / 推送」被推到
+          首屏之外，而这一整组在关闭状态下没有一个控件能生效。app-screens §11 与 DESIGN.md §9
+          同口径：不给未启用的能力配满配置项。开启后这些控件立刻出现，没有隐藏的能力。 */}
+      {settings.autosyncEnabled && (
+        <>
       <label className={css.field}>
         <span className={css.fieldLabel}>{t('autosync.interval')} <InfoHint text={t('autosync.intervalHint')} label={t('common.infoHint')} /></span>
         <Select
@@ -82,15 +102,19 @@ export function AutosyncCard({ t, uiT, settings, busy, onToggleAutosync, onUpdat
           options={AUTOSYNC_INTERVAL_OPTIONS.map((iv) => ({ value: iv, label: intervalLabel(iv, t) }))}
         />
       </label>
-      <label className={css.checkboxRow}>
+      <div className={css.toggleRow}>
+        <label className={css.toggleLabel} htmlFor={realtimeId}>{t('autosync.realtime')}</label>
+        <InfoHint text={t('autosync.realtimeHint')} label={t('common.infoHint')} />
+        <span className={css.statusSpacer} />
         <input
+          id={realtimeId}
+          className={css.toggleInput}
           type="checkbox"
           checked={realtime}
           disabled={busy}
           onChange={(e: ChangeEvent<HTMLInputElement>) => { onUpdateOptions({ realtime: e.target.checked }) }}
         />
-        <span>{t('autosync.realtime')} <InfoHint text={t('autosync.realtimeHint')} label={t('common.infoHint')} /></span>
-      </label>
+      </div>
       <label className={css.field}>
         <span className={css.fieldLabel}>{t('autosync.autoApplyTier')} <InfoHint text={t('autosync.autoApplyTierHint')} label={t('common.infoHint')} /></span>
         <Select
@@ -145,6 +169,8 @@ export function AutosyncCard({ t, uiT, settings, busy, onToggleAutosync, onUpdat
           )}
         </div>
       )}
-    </Card>
+        </>
+      )}
+    </div>
   )
 }

package/src/client/sync/SyncChannelEntryCard.tsx

@@ -53,7 +53,15 @@ export function SyncChannelEntryCard({ t, channel, statusInfo, remoteReady, repo
         : repoUrl
   return (
     <Card>
-      <span className={css.groupLabel}>{t('channel.title')} <InfoHint text={t('channel.openHint')} label={t('common.infoHint')} /></span>
+      <div className={css.cardTitleRow}>
+        <span className={css.groupLabel}>{t('channel.title')} <InfoHint text={t('channel.openHint')} label={t('common.infoHint')} /></span>
+        {/* 上次同步是单条事实，贴标题行右端（见 .cardTitleRow 注释） */}
+        <span className={css.statusSpacer} />
+        <span className={css.factInline}>
+          {t('syncStatus.lastSync')}{' '}
+          {formatSyncStatusTimestamp(statusInfo?.lastSyncAt)}
+        </span>
+      </div>
       <div className={css.statRow}>
         <Badge kind="info">{t(SYNC_CHANNEL_LABEL_KEY[channel])}</Badge>
         <Badge kind={remoteReady ? 'ok' : 'warn'}>
@@ -83,24 +91,12 @@ export function SyncChannelEntryCard({ t, channel, statusInfo, remoteReady, repo
           <Badge kind={workdirKind}>{t(workdirKey)}</Badge>
         )}
       </div>
-      {/* 状态事实行（Workbench：上次同步/可同步分区——未配置时也要给硬事实）。
+      {/* 远端地址（Workbench：未配置时也要给硬事实）。
           配置状态只由上面那排徽章表达：同一张卡里用「徽章 + 事实行」两处说同一件事，
           用户得比对两遍才知道是不是同一状态。 */}
-      <div className={css.factGrid} style={{ marginTop: 8 }}>
-        <div className={css.factCell}>
-          <span className={css.factLabel}>{t('syncStatus.lastSync')}</span>
-          <span className={css.factValue}>
-            {formatSyncStatusTimestamp(statusInfo?.lastSyncAt)}
-          </span>
-        </div>
-        {statusInfo?.sectionCount !== undefined && (
+      {remoteReady && (
+        <div className={css.factGrid} style={{ marginTop: 8 }}>
           <div className={css.factCell}>
-            <span className={css.factLabel}>{t('syncStatus.sections')}</span>
-            <span className={`${css.factValue} ${css.mono}`}>{String(statusInfo.sectionCount)}</span>
-          </div>
-        )}
-        {remoteReady && (
-          <div className={css.factCell} style={{ gridColumn: '1 / -1' }}>
             <span className={css.factLabel}>{t('channel.currentUrl')}</span>
             <span className={css.factValue}>
               <span className={css.mono}>
@@ -108,10 +104,13 @@ export function SyncChannelEntryCard({ t, channel, statusInfo, remoteReady, repo
               </span>
             </span>
           </div>
-        )}
-      </div>
+        </div>
+      )}
       <div className={css.actionRowTop}>
-        <Button variant="primary" onClick={onOpen}>
+        {/* ghost 而不是 primary（2026-11-01）：本页唯一的主行动是「把本地改动推上去 /
+            把远端拉下来」，而那是下方 pickSyncPrimary 决定的那颗按钮。
+            配置入口与它并列同填充时，用户在首屏看到两个「主按钮」，谁也不会先按。 */}
+        <Button variant="ghost" onClick={onOpen}>
           {t('channel.open')}
         </Button>
         {/* 断开出口：只有**配置过**的通道才渲染（未配置时这个按钮没有意义，也不该存在）。

package/src/client/sync/SyncPanel.tsx

@@ -44,7 +44,7 @@ import type { ReactNode } from 'react'
 import type { TranslateNS } from '../client-types.ts'
 import type { SyncPullReport, SyncPushPreview, SyncPushReport } from '../../sync/sync-engine.ts'
 import type { SectionId } from '../../schema/types.ts'
-import { Badge, Banner, Button, Card, SectionTitle } from '../common/ui.tsx'
+import { Badge, Banner, Button, Card, SectionTitle, Spinner } from '../common/ui.tsx'
 import { ErrorBanner } from '../common/ErrorBanner.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import { Select } from '../common/Select.tsx'
@@ -1238,32 +1238,35 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
         <Collapse open={ready && isChannelExpanded(channel)} id={channelContentId(channel)} className={css.syncChannelBody}>
         {ready && (
           <Card>
-            {/* 同步内容：**跟着通道卡走** —— autosync 与 sync-selection 都按通道独立，
-                做成全局一节会让用户以为两个通道共用一份选择（§8 的关键修正）。 */}
+            {/* 同步内容跟着通道卡走 —— autosync 与 sync-selection 都按通道独立，做成全局一节
+                会让用户以为两个通道共用一份选择（§8 的关键修正）。
+                2026-11-01：原为独立一张卡，卡内只有「9 selected」+ 一个 Choose…，右侧四百多像素
+                全空（app-screens §4.2 卡内死空间，白吃约 115px 把 Auto Sync 挤出画布）。改成本卡
+                内的选择行：它本来就是动作的前置条件（选哪些分区的改动才参与合并/推送）。 */}
             {/* ⓘ 一律跟在**相关标题/操作的右边**（同一行）：单独成行会让卡片出现「孤零零一个图标」
                 的断行。标题内联沿用 AboutPanel / EnvironmentPanel 的既有写法（零新增样式）。 */}
-            <span className={css.groupLabel}>{t('mode.title')} <InfoHint text={t('mode.hint')} label={t('common.infoHint')} /></span>
-            <span className={css.categoryDesc}>
-              {state.loadError !== null ? t('load.failed')
-                : state.catalog.length === 0 ? t('common.loading')
-                  : t('mode.selectedCount', { n: String(cs.syncSections.length) })}
-            </span>
-            <div className={css.actionRowTop}>
-              <Button onClick={() => { openSectionPickerFor(channel) }} disabled={busy}>
+            <div className={css.sectionPickerRow}>
+              <span className={css.groupLabel}>{t('mode.title')} <InfoHint text={t('mode.hint')} label={t('common.infoHint')} /></span>
+              <span className={css.categoryDesc}>
+                {state.loadError !== null ? t('load.failed')
+                  : state.catalog.length === 0 ? t('common.loading')
+                    : t('mode.selectedCount', { n: String(cs.syncSections.length), total: String(state.catalog.length) })}
+              </span>
+              {/* 按钮靠右成列（2026-11-01 用户要求：左描述、右按钮）。行内不再挂「已保存」ⓘ ——
+                  它在说一件用户无从选择的事（选完自然保存），与弹窗底那颗重复。 */}
+              <Button className={css.pickerBtn} onClick={() => { openSectionPickerFor(channel) }} disabled={busy}>
                 {t('mode.choose')}
               </Button>
-              <InfoHint text={t('mode.persistHint')} label={t('common.infoHint')} />
             </div>
             {cs.syncSections.length === 0 && <Banner kind="warn">{t('mode.atLeastOne')}</Banner>}
             {gistSessionsRiskKey(channel, cs.syncSections) !== null && <Banner kind="warn">{t(gistSessionsRiskKey(channel, cs.syncSections)!)}</Banner>}
-          </Card>
-        )}
-        {ready && (
-          <Card>
-            {/* 动作行（方案 A 定案）：用户只面对两个方向 —— 下行「从远端合并到本机」/ 上行「推送到远端」。
-                合并裁决并入下行按钮（有基线走三方裁决视图、无基线走老导入确认）；并排两个按钮看不出该按哪个（issue 115）⇒ 按已确证远端事实只让一个落在 primary。 */}
-            <div className={css.actionRow}>
+            {/* 动作行（方案 A）：用户只面对两个方向，合并裁决并入下行（有基线走三方裁决、无基线走导入确认），
+                按已确证远端事实只让一个落在 primary（issue 115：并排两个都亮看不出按哪个）。
+                2026-11-01：两枚改为平分整行宽（flex 1 1 0）—— 三个宽度各异的文字按钮并排时右边缘参差、
+                每个都像主行动；只读自检因此退到下方工具组（与「刷新快照」同款 28px 图标按钮，title 给全名）。 */}
+            <div className={css.actionRow} data-split>
               <Button
+                className={css.splitBtn}
                 variant={pickSyncPrimary(state.statusInfo, channel) === 'sync' ? 'primary' : 'ghost'}
                 disabled={busy}
                 loading={state.busy === 'sync'}
@@ -1273,14 +1276,9 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
                   ? (syncPhase === 'preview' ? t('syncflow.checkingRemote') : t('syncflow.syncing'))
                   : t('syncflow.button')}
               </Button>
-              <Button variant={pickSyncPrimary(state.statusInfo, channel) === 'push' ? 'primary' : 'ghost'} disabled={!computeSyncButtons(state.busy, ready, uiT).canPush || githubBusy || !hasSelectedSections(cs) || computeEncryptInvalid(cs)} onClick={() => { switchChannel(channel); void runPushPreview() }}>
+              <Button className={css.splitBtn} variant={pickSyncPrimary(state.statusInfo, channel) === 'push' ? 'primary' : 'ghost'} disabled={!computeSyncButtons(state.busy, ready, uiT).canPush || githubBusy || !hasSelectedSections(cs) || computeEncryptInvalid(cs)} onClick={() => { switchChannel(channel); void runPushPreview() }}>
                 {computeSyncButtons(state.busy, ready, uiT).pushLabel}
               </Button>
-              {/* 测试连接（只读自检）：与两个主操作同一行、排在最后；结果走 toast（不再占页面高度） */}
-              <SyncProbeRow
-                t={t} api={api} presentation="action" remoteReady={ready} busy={busy}
-                body={buildSyncChannelBody({ ...formOf(state), channel })}
-              />
             </div>
             {/* 同步在途的活动条：按钮 Spinner 只在按钮上，这条横条让「正在拉远端快照」在整张卡上可见 */}
             {syncPhase !== null && <SyncActivityBar phase={syncPhase} t={t} />}
@@ -1311,15 +1309,16 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
                   ]}
                 />
               </label>
+              {/* 工具组（2026-11-01）：刷新与只读自检都是低频诊断动作、都只服务这一行，收成两枚 28px 图标
+                  按钮（与下拉同高、同组右对齐）。此前刷新是带图标的宽文字按钮，把下拉压到约 380px。 */}
               <span className={css.pickerAction}>
-                <Button
-                  loading={cs.loadingSnapshots === true}
-                  disabled={busy}
-                  onClick={() => { void loadSnapshots(undefined, channel, true) }}
-                  title={t('syncflow.refreshSnapshots')}
-                >
-                  {cs.loadingSnapshots === true ? null : <RefreshIcon size={14} />} {t('syncflow.refreshSnapshots')}
-                </Button>
+                <button type="button" className={css.iconBtn} onClick={() => { void loadSnapshots(undefined, channel, true) }}
+                  disabled={busy} aria-label={t('syncflow.refreshSnapshots')} title={t('syncflow.refreshSnapshots')}
+                  aria-busy={cs.loadingSnapshots === true || undefined}>
+                  {cs.loadingSnapshots === true ? <Spinner /> : <RefreshIcon size={16} />}
+                </button>
+                <SyncProbeRow t={t} api={api} presentation="icon" remoteReady={ready} busy={busy}
+                  body={buildSyncChannelBody({ ...formOf(state), channel })} />
               </span>
               {/* 空态 = 选快照这一行的状态，跟控件同排（徽章），不另占一行：
                   此前它是 picker 下方单独一行的 hint，把下面整块内容整体顶低 4+10px。 */}

package/src/client/sync/SyncProbeRow.tsx

@@ -23,7 +23,8 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import type { ReactNode } from 'react'
 import type { TranslateNS } from '../client-types.ts'
 import type { SyncApi, SyncProbeResult, SyncPushPayload } from './sync-api.ts'
-import { Badge, Banner, Button } from '../common/ui.tsx'
+import { Badge, Banner, Button, Spinner } from '../common/ui.tsx'
+import { ProbeIcon } from '../common/Icon.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import { projectProbeResult } from './probe-view.ts'
 import { toast } from '../common/toast-store.ts'
@@ -45,11 +46,12 @@ export interface SyncProbeRowProps {
    *  - 'card'：动作行 + 内联结果横幅；
    *  - 'action'：只渲染按钮 + ⓘ（嵌进别的动作行），结果走 toast。
    */
-  presentation?: 'card' | 'action'
+  presentation?: 'card' | 'action' | 'icon'
 }
 
 export function SyncProbeRow({ api, t, body, remoteReady, busy, presentation = 'card' }: SyncProbeRowProps): ReactNode {
-  const actionMode = presentation === 'action'
+  /** 两种「轻形态」都走 toast，只有渲染出来的控件不同 */
+  const actionMode = presentation === 'action' || presentation === 'icon'
   const [result, setResult] = useState<SyncProbeResult | null>(null)
   const [loading, setLoading] = useState(false)
   const /** 传输层异常（与「自检结论 = 失败」分开：前者是宿主/网络没走通，后者是通道层给出的结论） */
@@ -102,6 +104,19 @@ export function SyncProbeRow({ api, t, body, remoteReady, busy, presentation = '
    */
   const view = result === null ? null : projectProbeResult(result, t('probe.unsupported'))
 
+  const iconButton = (
+    <button
+      type="button"
+      className={css.iconBtn}
+      onClick={() => { void run() }}
+      disabled={busy || !remoteReady}
+      aria-label={t('probe.run')}
+      aria-busy={loading || undefined}
+      title={t('probe.run')}
+    >
+      {loading ? <Spinner /> : <ProbeIcon size={16} />}
+    </button>
+  )
   const button = (
     <Button onClick={() => { void run() }} loading={loading} disabled={busy || !remoteReady}>
       {t('probe.run')}
@@ -113,9 +128,11 @@ export function SyncProbeRow({ api, t, body, remoteReady, busy, presentation = '
     <>
       {/* action 形态：直接摊进调用方自己的动作行（不再套一层 .actionRow），结果走 toast。
           动作行里只留按钮：与同排其它按钮并排时，ⓘ 会被读成该按钮的开关（issue 121 用户要求移除）。 */}
-      {actionMode
-        ? <>{button}</>
-        : <div className={css.actionRow}>{button}{hintNode}</div>}
+      {presentation === 'icon'
+        ? iconButton
+        : actionMode
+          ? <>{button}</>
+          : <div className={css.actionRow}>{button}{hintNode}</div>}
       {!actionMode && error !== null && (
         <ErrorBanner
           error={redact(error)}

package/src/client/sync/SyncSectionPickerDialog.tsx

@@ -193,8 +193,8 @@ export function SyncSectionPickerDialog({ open, t, cmT, uiT, sectionName, catalo
         {sections.length === 0 && <Banner kind="warn">{t('mode.atLeastOne')}</Banner>}
       </Modal.Body>
       <Modal.Footer>
-        {/* 「改动即时生效并保存」是**这个按钮**的说明：贴在「完成」右边同一行 */}
-        <InfoHint text={t('mode.pickerHint')} label={t('common.infoHint')} />
+        {/* 2026-11-01 用户要求：删掉「改动即时生效并保存（关闭弹窗即完成）」那颗 ⓘ ——
+            它在解释一件用户无从选择的事（勾了就走，没有保存按钮），占位置不改决定。 */}
         <Button variant="primary" onClick={onClose}>{t('mode.pickerDone')}</Button>
       </Modal.Footer>
     </Modal>

package/src/client/sync/sync-locales.ts

@@ -30,7 +30,7 @@ export const zh = {
   'channel.gist': 'GitHub Gist',
   'channel.perChannelHint': '每条通道（Git / WebDAV / 对象存储 / Gist）的自动同步、同步模式、加密与远端快照各自独立配置。',
   // 通道入口卡（弹窗驱动：点按钮 → 弹窗内配置通道）
-  'channel.open': '配置…',
+  'channel.open': '配置',
   'channel.openHint': '远程同步通过「同步通道」进行：Git 私有仓库或 WebDAV 服务器。',
   // 断开通道配置（用户实测要求：配置过就必须能删掉，否则打不通的通道会永久占位）
   'channel.expand': '展开通道详情',
@@ -106,7 +106,7 @@ export const zh = {
   'repoPicker.empty': '没有可用的私有仓库',
   'repoPicker.loadFailed': '仓库列表加载失败，可重试或直接手填地址。',
   'repoPicker.updatedAt': '更新于 {time}',
-  'repoPicker.create': '＋ 新建私有仓库…',
+  'repoPicker.create': '＋ 新建私有仓库',
   'repoPicker.createTitle': '新建私有仓库',
   'repoPicker.name': '仓库名',
   'repoPicker.namePlaceholder': '如 dsh-configs',
@@ -180,7 +180,7 @@ export const zh = {
   // 同步模式（默认快速导出 / 高级自定义导出）
   'mode.title': '同步分区',
   'mode.hint': '同步范围 = 勾选的分区集合（默认已勾选推荐分区，可随时改）。',
-  'mode.selectedCount': '已勾选 {n} 个',
+  'mode.selectedCount': '已勾选 {n} / {total}',
   'mode.sectionsHint': '默认可同步的是可移植分区；平台相关分区（MCP 服务器）与设备相关分区（插件文件、凭据状态、历史会话）只有你在这里主动勾选才参与同步。',
   'mode.atLeastOne': '请至少勾选一个同步分区',
   'mode.sectionPortable': '可移植',
@@ -198,7 +198,7 @@ export const zh = {
   'mode.sessionsWorkspaceWarn': '已勾选历史对话，但没有勾选「工作区」分区：目标机上这些对话可能归属不到任何工作区而显示不出来。建议一并勾选「工作区」。',
   'mode.gistSessionsWarn': '当前通道是 GitHub Gist，且勾选了「历史会话」：gist 会一次取回全部文件内容、单文件超限即截断、文件数还有上限，大分区同步可能失败或内容被截断。建议改用 Git / WebDAV / 对象存储通道同步历史会话，或取消勾选该分区。',
   'mode.persistHint': '分区选择已保存到本机：自动同步和手动推送都会使用此配置（重启后仍生效）。',
-  'mode.choose': '选择…',
+  'mode.choose': '选择',
   'mode.pickerTitle': '选择同步分区',
   'mode.pickerHint': '改动即时生效并保存（关闭弹窗即完成）。',
   'mode.pickerBack': '返回分区列表',
@@ -485,7 +485,7 @@ export const en: Record<keyof typeof zh, string> = {
   'channel.gist': 'GitHub Gist',
   'channel.perChannelHint': 'Auto sync, sync mode, encryption and remote snapshots are configured independently for each channel (Git / WebDAV / object storage / Gist).',
   // Channel entry card (dialog-driven: click the button → configure the channel in the dialog)
-  'channel.open': 'Configure…',
+  'channel.open': 'Configure',
   'channel.openHint': 'Remote sync runs through a sync channel: a private Git repository or a WebDAV server.',
   // Disconnect channel config (user report: once configured there was no way out)
   'channel.expand': 'Expand channel details',
@@ -559,7 +559,7 @@ export const en: Record<keyof typeof zh, string> = {
   'repoPicker.empty': 'No private repository available',
   'repoPicker.loadFailed': 'Could not load the repository list — retry, or type the address below.',
   'repoPicker.updatedAt': 'Updated {time}',
-  'repoPicker.create': '+ New private repository…',
+  'repoPicker.create': '+ New private repository',
   'repoPicker.createTitle': 'Create a private repository',
   'repoPicker.name': 'Repository name',
   'repoPicker.namePlaceholder': 'e.g. dsh-configs',
@@ -593,24 +593,24 @@ export const en: Record<keyof typeof zh, string> = {
   'syncflow.adoptHint': 'Check = import item; uncheck = skip',
   'syncflow.needsReviewBadge': 'Needs decision',
   'syncflow.empty': 'Remote snapshot matches local (no changes)',
-  'syncflow.listScope': '{review} item(s) listed for your decision · the other {auto} adopted by default',
+  'syncflow.listScope': '{review} {review, plural, item|items} listed for your decision · the other {auto} adopted by default',
   'syncflow.keepLocalAll': 'Keep all current',
   'syncflow.useRemoteAll': 'Use all backup',
-  'syncflow.bulkHint': 'Bulk applies to {n} item(s) above',
+  'syncflow.bulkHint': 'Bulk applies to {n} {n, plural, item|items} above',
   'syncflow.bulkErrorNote': 'error items need individual handling',
   'syncflow.conflictUseLocal': 'Keep current',
   'syncflow.conflictUseRemote': 'Use backup',
   'syncflow.conflictUnresolved': 'Conflict item {itemId} has no resolution yet (keep current / use backup)',
   'syncflow.diff': 'Diff',
-  'syncflow.importDone': 'Imported {n} section(s)',
+  'syncflow.importDone': 'Imported {n} {n, plural, section|sections}',
   'syncflow.importFailed': 'Import failed (rolled back)',
   'syncflow.importedSections': 'Written',
   'syncflow.importWarnings': 'Import warnings',
   'syncflow.rollback': 'Rollback',
   'syncflow.rollbackDone': 'Rolled back',
   // Honesty (2026-10): a partial rollback is never reported as "rolled back"
-  'syncflow.rollbackPartialToast': 'Rollback incomplete: {n} item(s) could not be restored',
-  'syncflow.rollbackIncomplete': 'Rollback incomplete: {n} item(s) could not be restored automatically (the configuration may be left partially changed)',
+  'syncflow.rollbackPartialToast': 'Rollback incomplete: {n} {n, plural, item|items} could not be restored',
+  'syncflow.rollbackIncomplete': 'Rollback incomplete: {n} {n, plural, item|items} could not be restored automatically (the configuration may be left partially changed)',
   'syncflow.rollbackFailedItems': 'Items not rolled back (need manual handling)',
   'syncflow.importRollbackIncomplete': 'Import failed and the overall rollback did not complete: some changes could not be restored (see the warnings below)',
   'syncflow.needsRestart': 'Some changes require a DSH restart to take effect',
@@ -626,7 +626,7 @@ export const en: Record<keyof typeof zh, string> = {
   // Sync mode (default quick export / advanced custom export)
   'mode.title': 'Sync Sections',
   'mode.hint': 'Sync scope = the ticked set of sections (recommended sections are ticked by default and can be changed any time).',
-  'mode.selectedCount': '{n} selected',
+  'mode.selectedCount': '{n} / {total} selected',
   'mode.sectionsHint': 'Portable sections sync by default; platform-dependent sections (MCP servers) and device-specific sections (plugin files, credentials status, sessions) only participate when you explicitly tick them here.',
   'mode.atLeastOne': 'Select at least one section to sync',
   'mode.sectionPortable': 'Portable',
@@ -637,14 +637,14 @@ export const en: Record<keyof typeof zh, string> = {
   'mode.sessionsLimit': 'How many recent sessions to sync',
   'mode.sessionsLimitHint': 'Session content is sensitive, so only the latest 5 are included by default (0 = select the section but carry no sessions); the unit is a session directory, so all logs of one session travel together.',
   'mode.sessionsPick': 'Pick specific conversations',
-  'mode.sessionsPickCount': '{n} conversation(s) picked',
+  'mode.sessionsPickCount': '{n} {n, plural, conversation|conversations} picked',
   'mode.sessionsPickTitle': 'Pick conversations to sync',
   'mode.sessionsPickHint': 'Only the picked conversations are synced (this wins over the count above). Picking none returns to the "latest N" mode.',
   'mode.sessionsPickReset': 'Use "latest N" instead',
   'mode.sessionsWorkspaceWarn': 'Conversations are selected but the "Workspaces" section is not: on the target machine they may not be attributed to any workspace and stay invisible. Selecting "Workspaces" too is recommended.',
   'mode.gistSessionsWarn': 'The current channel is GitHub Gist and "Conversations" is selected: a gist returns all file content in one request, truncates any oversized single file, and caps the number of files, so syncing a large section may fail or be truncated. Use a Git / WebDAV / object-storage channel for conversations, or clear that section.',
   'mode.persistHint': 'The section selection is saved locally: both auto sync and manual push use this configuration (persists across restarts).',
-  'mode.choose': 'Choose…',
+  'mode.choose': 'Choose',
   'mode.pickerTitle': 'Choose Sync Sections',
   'mode.pickerHint': 'Changes apply and are saved immediately (closing the dialog finishes the task).',
   'mode.pickerBack': 'Back to sections',
@@ -699,7 +699,7 @@ export const en: Record<keyof typeof zh, string> = {
   'autosync.partial': 'Partial',
   // issue #79: surface the skip reason in the status line (previously info-level log only)
   'autosync.skipReasonLabel': 'Skip reason',
-  'autosync.skipReasonConflictCount': '{reason} ({n} more section(s) on the remote need confirmation — handle them on the sync page)',
+  'autosync.skipReasonConflictCount': '{reason} ({n} more {n, plural, section|sections} on the remote need confirmation — handle them on the sync page)',
   'autosync.lastMessage': 'Last message',
   'history.title': 'Sync History',
   'history.empty': 'No sync history yet',
@@ -753,8 +753,8 @@ export const en: Record<keyof typeof zh, string> = {
   'toast.snapshotsLoadFailed': 'Failed to load remote snapshots',
   'toast.snapshotsRefreshed': 'Remote snapshot list refreshed',
   // issue #59: remote snapshots that exist but cannot be read (skipping is defensive, never silent)
-  'toast.snapshotsUnreadable': '{n} remote snapshot(s) could not be read (list is incomplete) — see the note below',
-  'snapshots.unreadableHint': '{n} remote snapshot(s) cannot be parsed and are missing from this list: {files}',
+  'toast.snapshotsUnreadable': '{n} remote {n, plural, snapshot|snapshots} could not be read (list is incomplete) — see the note below',
+  'snapshots.unreadableHint': '{n} remote {n, plural, snapshot|snapshots} cannot be parsed and are missing from this list: {files}',
   // Page-level load failure (M-16: inline error state; loadError had no render point before)
   'load.failed': 'Failed to load sync status',
   'common.close': 'Close',
@@ -765,8 +765,8 @@ export const en: Record<keyof typeof zh, string> = {
   'common.loading': 'Loading…',
   'common.infoHint': 'Show description',
   'common.cancel': 'Cancel',
-  'syncflow.importPartialToast': 'Partly successful: {n} item(s) did not take effect — check the result details',
-  'syncflow.importPartial': 'Partly successful: {n} item(s) did not take effect (the rest were written; nothing rolled back)',
+  'syncflow.importPartialToast': 'Partly successful: {n} {n, plural, item did|items did} not take effect — check the result details',
+  'syncflow.importPartial': 'Partly successful: {n} {n, plural, item did|items did} not take effect (the rest were written; nothing rolled back)',
   'syncflow.ineffectiveItems': 'Items that did not take effect',
   'history.remoteMovedAction': 'View remote snapshots in Library',
   'syncflow.compat.excellent': 'Compatibility: excellent',
@@ -855,8 +855,8 @@ export const en: Record<keyof typeof zh, string> = {
   'merge.reason.format': 'This content format does not support auto-merge',
   'merge.reason.array': 'Arrays cannot be merged position by position',
   'merge.reason.section': 'The whole section conflicts',
-  'merge.conflictCount': '{n} conflict(s)',
-  'merge.autoMergedCount': '{n} change(s) merged automatically',
+  'merge.conflictCount': '{n} {n, plural, conflict|conflicts}',
+  'merge.autoMergedCount': '{n} {n, plural, change|changes} merged automatically',
   'merge.col.local': 'Local',
   'merge.col.remote': 'Remote',
   'merge.col.ancestor': 'Ancestor',
@@ -872,8 +872,8 @@ export const en: Record<keyof typeof zh, string> = {
   'merge.bulk.hint': '"Use auto-merge for all" only affects sections that really have an auto-merged result; "Leave conflicts for next sync" moves every section that needs your decision out of this run (nothing is written, the baseline does not advance) — they come back on the next sync.',
   'merge.bulk.title': 'Bulk',
   'merge.apply': 'Apply merge',
-  'merge.apply.summary': '{decided} of {needs} section(s) decided',
-  'merge.apply.willApply': '{n} section(s) will be applied now',
+  'merge.apply.summary': '{decided} of {needs} {needs, plural, section|sections} decided',
+  'merge.apply.willApply': '{n} {n, plural, section|sections} will be applied now',
   'merge.result.title': 'Merge result',
   'merge.result.applied': 'Applied sections',
   'merge.result.skipped': 'Skipped',
@@ -881,7 +881,7 @@ export const en: Record<keyof typeof zh, string> = {
   'merge.result.restoreId': 'Restore point',
   'merge.result.rolledBack': 'Rolled back in full',
   'merge.result.rollbackIncomplete': 'Rollback was incomplete: some items were not restored (see warnings)',
-  'merge.result.pending': '{n} section(s) still need a decision (skip is not resolved, so they will come back on the next sync)',
+  'merge.result.pending': '{n} {n, plural, section|sections} still need a decision (skip is not resolved, so they will come back on the next sync)',
   'merge.result.rollback': 'Roll back',
   'merge.result.rolledBackTo': 'Rolled back to {id}',
   'merge.result.failed': '{n} failed',