dsh-config-manager 0.2.4 → 0.3.0

package/src/client/import/import-wizard-steps.tsx

@@ -97,16 +97,8 @@ export function SelectStep(props: {
   onReset: () => void
   apiT: UiT
   t: TranslateNS<'config-manager'>
-  /**
-   * 「从其它 agent 导入」入口（t17，**可选**）：壳层注入 uiT 与导航回调时才渲染。
-   *
-   * 为什么放在本步而不是加一级页签：导入是 Task 面板里的多阶段流程，外部来源只是
-   * 「包从哪来」的另一种选择 —— 与「选择 ZIP 文件」并列，用户心智上是同一件事的两个入口。
-   * 老调用方不传该 prop → 本区块不渲染，既有行为逐字不变。
-   */
-  foreignEntry?: { uiT: UiT; onOpen: () => void }
 }) {
-  const { fileInput, selectModel, uploading, error, onCancel, onPickFile, onReset, apiT, t, foreignEntry } = props
+  const { fileInput, selectModel, uploading, error, onCancel, onPickFile, onReset, apiT, t } = props
   return (
     <div className={`${css.viewBody} ${css.sparseFill}`}>
       <SectionTitle title={t('import.select.title')} info={<InfoHint text={t('import.select.hint')} label={t('common.infoHint')} />} />
@@ -143,14 +135,6 @@ export function SelectStep(props: {
         </Button>
       </div>
       {error !== null && <ErrorBanner error={error} onRetry={onReset} t={apiT} />}
-      {foreignEntry !== undefined && (
-        <>
-          <div className={css.actionRow} style={{ marginBottom: 0 }}>
-            <Button onClick={foreignEntry.onOpen}>{t('foreign.source.title')}</Button>
-            <InfoHint text={t('foreign.source.hint')} label={t('common.infoHint')} />
-          </div>
-        </>
-      )}
     </div>
   )
 }

package/src/client/library/ArtifactRow.tsx

@@ -18,6 +18,7 @@ import {
 } from '../../ui/artifact-view.ts'
 import type { UiT } from '../../ui/i18n.ts'
 import type { TranslateNS } from '../client-types.ts'
+import { midEllipsis } from '../../ui/mid-ellipsis.ts'
 import { Badge, Button, Spinner } from '../common/ui.tsx'
 import { ExpandChevron } from '../common/Icon.tsx'
 import { MoreMenu } from '../common/MoreMenu.tsx'
@@ -104,7 +105,14 @@ export function ArtifactRowView({
           <div className={css.artifactTitle}>
             {/* 来源标签上标题行（定案 B）：来源已由此表达，再放一个 kind 图标属重复表达 */}
             <span className={css.kindTag}>{uiT(ARTIFACT_KIND_LABEL_KEY[row.kind])}</span>
-            <span className={css.artifactName} title={name}>{name}</span>
+            {/* 文件名走等宽栈 + 中段省略（DESIGN.md:93 / §9-5）：尾部才是区分信息
+                （同一分钟导出的两份备份只差尾部时间戳），尾部截断会让两行看起来一样。 */}
+            <span
+              className={row.title.kind === 'text' ? `${css.artifactName} ${css.mono}` : css.artifactName}
+              title={name}
+            >
+              {row.title.kind === 'text' ? midEllipsis(name) : name}
+            </span>
           </div>
           {/* 元数据是**自由序列**而不是表格列：某一段没有（如快照没有体积）就整段不出现，
               绝不补一个「—」占位 —— 这里没有对齐问题，占位只会变成噪音（§3 第三条） */}
@@ -127,7 +135,10 @@ export function ArtifactRowView({
           {primary !== undefined && (
             <Button
               size="sm"
-              variant={primary === 'delete' ? 'danger' : 'primary'}
+              // 常态 ghost：八行八颗实心按钮会把 accent 变成壁纸，整屏最亮的是 chrome。
+              // 悬停/展开时由 CSS（.rowPrimary）升到 primary —— 那时它才真是「这一行要做的事」。
+              variant={primary === 'delete' ? 'danger' : 'ghost'}
+              className={primary === 'delete' ? undefined : css.rowPrimary}
               // 进行中图标由 Button 原语按 loading 自动渲染（DESIGN §14.11：不要手写 Spinner）
               loading={pendingPrimary}
               disabled={pending !== null && !pendingPrimary}

package/src/client/library/LibraryPanel.tsx

@@ -283,7 +283,14 @@ export function LibraryPanel({ api, syncApi, marketApi, t, uiT, onAction, onOpen
 
       {/* 计数条：**不显示合计体积** —— 四源里只有备份文件有体积，求和会把「未知」混进「合计」（§6.8 ①） */}
       <div className={css.libraryFooter}>
-        <span className={css.libraryCount}>{t('library.summary.count', { count: filtered.length })}</span>
+        {/* 计数只在筛选/搜索生效时出现（2026-11-01）：无筛选时它与上方「全部 16」是同一个数
+            出现在同一屏的两处 —— app-screens §5「一个数字只出现一处」。筛掉多少要看得出
+            「眼前几条 / 一共几条」，所以这时写成分数而不是重复总数。 */}
+        {filtered.length !== rows.length && (
+          <span className={css.libraryCount}>
+            {t('library.summary.filtered', { shown: filtered.length, total: rows.length })}
+          </span>
+        )}
         {/* 加密计数只统计**当前筛选后**的行：此前用 rows（全部来源）⇒ 切到「本机快照」等
             没有加密项的类别时底部仍显示「1 个加密」，与眼前看到的列表不符（真机反馈）。 */}
         {encryptedCount > 0 && (
@@ -291,7 +298,10 @@ export function LibraryPanel({ api, syncApi, marketApi, t, uiT, onAction, onOpen
         )}
         <InfoHint text={t('backupFiles.hint')} label={t('common.infoHint')} />
         <span className={css.statusSpacer} />
-        <Button size="sm" onClick={onOpenExport}>{t('library.new.export')}</Button>
+        {/* 底栏四个入口，只有「导出」是这一页的产品级动作（把本机配置打成可分享的包）；
+            其余三个是「拿别人的东西进来 / 去别处找」。主按钮只留一个，否则整屏没有焦点
+            （app-screens §13：强调色应用在数据与至多一个控件上）。 */}
+        <Button size="sm" variant="primary" onClick={onOpenExport}>{t('library.new.export')}</Button>
         <Button size="sm" onClick={() => { onOpenTask('import') }}>{t('library.new.import')}</Button>
         <Button size="sm" onClick={() => { onOpenTask('market') }}>{t('library.new.market')}</Button>
         <Button size="sm" onClick={onOpenPublish}>{t('task.title.publish')}</Button>

package/src/client/locales.ts

@@ -65,6 +65,7 @@ export const zh = {
   'overview.health.noBackup': '尚无任何备份',
   'overview.health.scheduleFailed': '上次定时备份失败，建议检查备份设置',
   'overview.health.recovery': '存在未解决的恢复事项，需要处理',
+  'overview.health.autoBackupOff': '自动备份已关闭，目前只有手动备份',
   'overview.health.recoveryAction': '前往「事故恢复」处理',
   'overview.metric.backups': '备份文件',
   'overview.metric.snapshots': '安全快照',
@@ -95,6 +96,10 @@ export const zh = {
   'overview.quick.backupSkippedOther': '已跳过：备份服务当前无法执行（详情见宿主日志）',
   'overview.quick.backupFailed': '备份失败：{message}',
   'overview.activity.title': '最近活动',
+  'overview.activity.colTime': '时间',
+  'overview.activity.colEvent': '动作',
+  'overview.activity.colDetail': '详情',
+  'overview.activity.colResult': '结果',
   'overview.activity.empty': '暂无操作记录',
   'overview.activity.unavailable': '活动记录读取失败（这不是「没有记录」）',
   // 首屏 5 个只读请求有失败时如实说清（此前失败被吞成 null，页面仍显示绿色健康 + 空活动）
@@ -492,6 +497,9 @@ export const zh = {
   'profiles.running.port': '端口 {port}',
   'profiles.running.open': '打开',
   'profiles.running.badge': ':{port} 运行中',
+  // 行徽章专用：状态由相邻的「运行中」ok 徽章表达，这里只回答「在哪个端口」
+  // （2026-11-01：原先把 ':{port} 运行中' 与它并排，同一个词三格内出现两次）。
+  'profiles.running.portBadge': ':{port}',
   'profiles.running.originCurrent': '当前实例',
   'profiles.running.originOwned': '本插件启动',
   'profiles.running.originExternal': '其他实例',
@@ -800,6 +808,7 @@ export const zh = {
   'library.remoteDeleteBaseline': '注意：这是当前的同步基线（本机上次同步到的那份）。删除不会改动本机配置，但下次同步会重新比对远端最新快照。',
   'library.remoteDeleted': '已删除远端快照',
   'library.summary.count': '共 {count} 个',
+  'library.summary.filtered': '{shown} / {total} 个',
   'library.new.export': '手动导出',
   'library.new.import': '从文件导入',
   'library.new.market': '逛市场',
@@ -957,6 +966,7 @@ export const en: Record<keyof typeof zh, string> = {
   'overview.health.noBackup': 'No backups yet',
   'overview.health.scheduleFailed': 'The last scheduled backup failed — check backup settings',
   'overview.health.recovery': 'Unresolved recovery items need attention',
+  'overview.health.autoBackupOff': 'Auto backup is off — this machine only has manual backups',
   'overview.health.recoveryAction': 'Go to Incident recovery',
   'overview.metric.backups': 'Backups',
   'overview.metric.snapshots': 'Snapshots',
@@ -987,10 +997,14 @@ export const en: Record<keyof typeof zh, string> = {
   'overview.quick.backupSkippedOther': 'Skipped: the backup service cannot run right now (see host logs for details)',
   'overview.quick.backupFailed': 'Backup failed: {message}',
   'overview.activity.title': 'Recent activity',
+  'overview.activity.colTime': 'Time',
+  'overview.activity.colEvent': 'Action',
+  'overview.activity.colDetail': 'Detail',
+  'overview.activity.colResult': 'Result',
   'overview.activity.empty': 'No activity yet',
   'overview.activity.unavailable': 'The activity log could not be read (this is not \"no activity\")',
   // Say it plainly when some of the five read-only requests failed (failures used to be swallowed into null)
-  'overview.loadFailed': '{count} data request(s) failed: {message} — the metrics below may be incomplete',
+  'overview.loadFailed': '{count} data {count, plural, request|requests} failed: {message} — the metrics below may be incomplete',
   'overview.empty.title': 'Start protecting your configuration',
   'overview.empty.step1': 'Create a backup',
   'overview.empty.step2': 'Export the ZIP',
@@ -1034,7 +1048,7 @@ export const en: Record<keyof typeof zh, string> = {
   'export.noteHint': 'The note is shown in the local backup list (and travels with the config backup) so you can tell exports apart.',
   'export.compositionTitle': 'This export',
   'export.compositionHint': 'Estimated from the current selection (read-only, zero writes)',
-  'export.compositionPartial': '{sections} section(s) · {units} item(s) read · ~{size} (includes sections not read yet; the real total is no less)',
+  'export.compositionPartial': '{sections} {sections, plural, section|sections} · {units} {units, plural, item|items} read · ~{size} (includes sections not read yet; the real total is no less)',
   'export.compositionEmpty': 'Nothing selected to export',
   // —— Content picker (Phase 1: per-item export selection) ——
   'picker.title': 'Choose what to export',
@@ -1050,8 +1064,8 @@ export const en: Record<keyof typeof zh, string> = {
   'picker.locked': 'Bundle',
   'picker.lockedHint': 'Must be exported together with its group (e.g. a pnpm patch declaration and its patch file); clearing either clears the whole group.',
   'picker.selectedOf': '{selected}/{total} selected',
-  'picker.fileCount': '{count} file(s)',
-  'picker.summary': 'Exporting {sections} section(s) · {units} item(s) · ~{size}',
+  'picker.fileCount': '{count} {count, plural, file|files}',
+  'picker.summary': 'Exporting {sections} {sections, plural, section|sections} · {units} {units, plural, item|items} · ~{size}',
   'picker.loading': 'Reading exportable items…',
   'picker.loadingItems': 'Reading items…',
   'picker.loadingSection': 'Loading…',
@@ -1062,7 +1076,7 @@ export const en: Record<keyof typeof zh, string> = {
   'picker.deviceSpecific': 'Device-specific',
   'picker.sensitive': 'Sensitive',
   'picker.showAll': 'Show all ({count})',
-  'picker.summaryImport': '{sections} section(s) · {units} item(s)',
+  'picker.summaryImport': '{sections} {sections, plural, section|sections} · {units} {units, plural, item|items}',
   // —— Plugin tree embedded in the Extensions group (plugin → list entry / data dirs / large files) ——
   'picker.pluginRoot': 'Plugins',
   'picker.pluginLeafPlugin': 'Plugin list entry',
@@ -1114,21 +1128,21 @@ export const en: Record<keyof typeof zh, string> = {
   'import.compatibility.title': 'Compatibility',
   'import.compatibility.score': 'Compatibility score: {score}',
   'import.preview.title': 'Import Preview',
-  'import.preview.willChange': '{count} item(s) will change',
-  'import.preview.unchanged': '{count} item(s) already identical (skipped)',
-  'import.preview.settings': '{count} settings update(s)',
-  'import.preview.plugins': '{count} plugin(s) to install',
-  'import.preview.mcp': '{count} MCP server(s) added',
-  'import.preview.prompts': '{count} prompt(s)',
-  'import.preview.paths': '{count} path mapping(s) needed',
+  'import.preview.willChange': '{count} {count, plural, item|items} will change',
+  'import.preview.unchanged': '{count} {count, plural, item|items} already identical (skipped)',
+  'import.preview.settings': '{count} settings {count, plural, update|updates}',
+  'import.preview.plugins': '{count} {count, plural, plugin|plugins} to install',
+  'import.preview.mcp': '{count} MCP {count, plural, server|servers} added',
+  'import.preview.prompts': '{count} {count, plural, prompt|prompts}',
+  'import.preview.paths': '{count} path {count, plural, mapping|mappings} needed',
   'import.preview.rebase': 'Base path rebased automatically (the backup came from a machine with a different DSH base path): {from} -> {to}; no manual mapping needed',
-  'import.preview.secrets': '{count} secret(s) to re-enter',
-  'import.preview.conflicts': '{count} conflict(s)',
+  'import.preview.secrets': '{count} {count, plural, secret|secrets} to re-enter',
+  'import.preview.conflicts': '{count} {count, plural, conflict|conflicts}',
   'import.preview.restart': 'A DSH restart is required after import',
   'import.confirm.execute': 'Confirm Import',
   'import.confirm.warning': 'Import modifies the current DSH configuration; a snapshot is taken first.',
   'import.confirm.warningNoRollback': 'Import modifies the current DSH configuration; a snapshot is taken first. Bulk rollback is off — a failure does not stop the rest, and writes are not reverted.',
-  'import.confirm.encrypted': 'The backup password will decrypt and restore {count} credential(s).',
+  'import.confirm.encrypted': 'The backup password will decrypt and restore {count} {count, plural, credential|credentials}.',
   'import.rollbackOnError': 'Roll back everything on failure (recommended)',
   'import.log.title': 'Import Log',
   'import.log.empty': 'Waiting for command output…',
@@ -1161,7 +1175,7 @@ export const en: Record<keyof typeof zh, string> = {
   'import.conflicts.detailCurrent': 'Current',
   'import.conflicts.detailImported': 'Backup',
   'import.conflicts.empty': 'No conflicts',
-  'import.conflicts.unresolved': '{count} item(s) unresolved',
+  'import.conflicts.unresolved': '{count} {count, plural, item|items} unresolved',
   'import.conflicts.keepCurrentAll': 'Keep all current',
   'import.conflicts.useImportedAll': 'Use all backup',
   'import.paths.title': 'Path Mapping',
@@ -1171,7 +1185,7 @@ export const en: Record<keyof typeof zh, string> = {
   'import.paths.kind.missing': 'Set a new location',
   'import.paths.kind.platformMismatch': 'Cross-platform path',
   'import.paths.kind.homeMismatch': 'Different base path',
-  'import.paths.unresolved': '{count} path(s) unmapped (blank = skip that path, you can continue)',
+  'import.paths.unresolved': '{count} {count, plural, path|paths} unmapped (blank = skip that path, you can continue)',
   'import.paths.empty': 'No paths to map',
   'import.paths.browse': 'Choose a local path',
   'import.paths.picker.title': 'Choose a local path',
@@ -1210,7 +1224,7 @@ export const en: Record<keyof typeof zh, string> = {
   'snapshots.failed': 'Failed',
   'snapshots.skipped': 'Skipped',
   // —— git-style restore preview (line-by-line) ——
-  'snapshots.plan.changed': '{count} file(s) to restore',
+  'snapshots.plan.changed': '{count} {count, plural, file|files} to restore',
   'snapshots.plan.added': '{count} added',
   'snapshots.plan.deleted': '{count} to delete',
   'snapshots.plan.plugins': '{count} plugin uninstall',
@@ -1274,7 +1288,7 @@ export const en: Record<keyof typeof zh, string> = {
   'backupSchedule.status.success': 'Success',
   'backupSchedule.status.skipped': 'Skipped',
   'backupSchedule.status.failed': 'Failed',
-  'backupSchedule.consecutiveFailures': 'Scheduled backups failed {count} time(s) in a row — check the configuration (disk space / permissions / section export errors)',
+  'backupSchedule.consecutiveFailures': 'Scheduled backups failed {count} {count, plural, time|times} in a row — check the configuration (disk space / permissions / section export errors)',
   'backupSchedule.loading': 'Loading scheduled backup settings…',
   'backupSchedule.error': 'Failed to load scheduled backup settings',
   // —— Retention policy (m-retention: GFS tiers) ——
@@ -1364,6 +1378,7 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.running.port': 'port {port}',
   'profiles.running.open': 'Open',
   'profiles.running.badge': ':{port} running',
+  'profiles.running.portBadge': ':{port}',
   'profiles.running.originCurrent': 'current instance',
   'profiles.running.originOwned': 'launched here',
   'profiles.running.originExternal': 'other instance',
@@ -1406,9 +1421,12 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.list.title': 'All profiles',
   'profiles.list.count': '{count} total',
   'profiles.list.hint': 'Click a profile row for full details (bundle layers / dependencies / raw patch)',
-  'profiles.row.summary': '{bundles} layer(s) · {patch} patch entry(ies) · {deps} dependencies',
+  // 英文侧不再用 (s)/(ies) 括号式复数（2026-11-01）：档案只有 1 个时它渲染成
+  // "1 layer(s) · 5 patch entry(ies)"，在一行被截断的元信息里既占宽又不专业。
+  // zh 侧本来就是无复数形态，改成同样的「数字 + 名词」短形态后两侧结构一致。
+  'profiles.row.summary': '{bundles} layers · {patch} patches · {deps} deps',
   'profiles.detail.info': 'Profile info',
-  'profiles.bundles.count': '{count} bundle layer(s)',
+  'profiles.bundles.count': '{count} bundle {count, plural, layer|layers}',
   'profiles.shape.web': 'Web',
   'profiles.shape.headless': 'Headless',
   'profiles.shape.generic': 'Custom',
@@ -1418,7 +1436,7 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.incomplete.startedAt': 'started at {time}',
   'profiles.incomplete.dir': 'Directory {path}',
   'profiles.incomplete.hint': 'This is an interrupted profile copy: it has no package.json and cannot be launched. Delete it if you no longer need it (only this directory is removed).',
-  'profiles.list.incompleteCount': '{count} incomplete copy(ies) (not launchable)',
+  'profiles.list.incompleteCount': '{count} incomplete {count, plural, copyy|copyies} (not launchable)',
   'profiles.delete.incompleteMessage': 'Delete the incomplete copy “{name}”? The whole directory (including partially copied files) will be physically removed and cannot be recovered.',
   'profiles.issue.manifestInvalid': 'package.json is corrupted',
   'profiles.issue.patchTooLarge': 'patch file too large (content not shown)',
@@ -1426,7 +1444,7 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.deps': 'Dependencies',
   'profiles.patchReload.live': 'patch hot-reloads',
   'profiles.patchReload.startup': 'patch applies at startup only',
-  'profiles.patchEntries': '{count} patch entry(ies)',
+  'profiles.patchEntries': '{count} patch {count, plural, entryy|entryies}',
   'profiles.bundles.none': '(none)',
   'profiles.nodeModules.yes': 'node_modules present',
   'profiles.nodeModules.no': 'no node_modules',
@@ -1475,10 +1493,10 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.error.instanceRunning': 'An instance of this profile is running — stop it before deleting',
   'profiles.error.generic': 'Operation failed: {message}',
   // —— Import compatibility (Workbench Rebuild) ——
-  'import.compatibility.sections': '{count} section(s)',
+  'import.compatibility.sections': '{count} {count, plural, section|sections}',
   'import.compatibility.plugins': 'installed {installed} · to install {toInstall}',
-  'import.compatibility.paths': '{count} path issue(s)',
-  'import.compatibility.secrets': '{count} secret(s) to re-enter',
+  'import.compatibility.paths': '{count} path {count, plural, issue|issues}',
+  'import.compatibility.secrets': '{count} {count, plural, secret|secrets} to re-enter',
   'import.compatibility.score.excellent': 'Excellent',
   'import.compatibility.score.good': 'Good',
   'import.compatibility.score.partial': 'Partial',
@@ -1501,7 +1519,7 @@ export const en: Record<keyof typeof zh, string> = {
   // After the restart the banner must stop asking for one (real-machine feedback)
   'shell.running.restore': 'Snapshot restore',
   'shell.status.idle': 'Idle',
-  'shell.status.running': '{count} task(s) running',
+  'shell.status.running': '{count} {count, plural, task|tasks} running',
   'shell.status.recovery': 'Recovery pending',
   // —— Run center (the drawer's "In progress" segment; terminate = cooperative cancel) ——
   'shell.status.runningAction': 'View running tasks',
@@ -1565,7 +1583,7 @@ export const en: Record<keyof typeof zh, string> = {
   'overview.result.skipped': 'Skipped',
   'overview.activity.copy': 'Copy',
   'overview.activity.redacted': '(filename redacted)',
-  'overview.sections.entries': '{count} item(s)',
+  'overview.sections.entries': '{count} {count, plural, item|items}',
   'overview.nav.activity': 'Activity',
   'overview.nav.about': 'About',
   // ---------- session grouping (issue #45) ----------
@@ -1628,13 +1646,13 @@ export const en: Record<keyof typeof zh, string> = {
   'profiles.version.format': 'session format v{version}',
   'profiles.format.newer': 'its conversations are hidden here',
   'profiles.format.older': 'conversations here are hidden there',
-  'nextSteps.sessionsRestart.hint': '{count} session file(s) written. DSH builds the session list and workspace projection only at startup — on Desktop quit and reopen the app, for CLI profiles restart dsh.',
+  'nextSteps.sessionsRestart.hint': '{count} session {count, plural, file|files} written. DSH builds the session list and workspace projection only at startup — on Desktop quit and reopen the app, for CLI profiles restart dsh.',
   'import.source.title': 'Source & compatibility',
   'import.source.dsh': 'DSH version: {source} → local {target}',
   'import.source.platform': 'Platform: {source} → local {target}',
   'import.source.schema': 'Backup format: v{version}',
   'import.source.reasons': 'Why this score',
-  'import.sessionFormat.skipped': '{count} session(s) were not imported because of the \"skip\" disposition (their format is newer than this DSH build — they would not be visible anyway)',
+  'import.sessionFormat.skipped': '{count} {count, plural, session was|sessions were} not imported because of the \"skip\" disposition (their format is newer than this DSH build — they would not be visible anyway)',
   'import.sessionFormat.retryPlan': 'Regenerate plan',
   'import.sessionFormat.option.abort': 'Abort the import (recommended)',
   'import.sessionFormat.hint.abort': 'Stops at the planning stage and writes nothing.',
@@ -1644,7 +1662,7 @@ export const en: Record<keyof typeof zh, string> = {
   'import.sessionFormat.hint.guide': 'Session files are written as usual, but this DSH build will not show those conversations.',
   'import.sessionFormat.title': 'Sessions this DSH build cannot read',
   'import.sessionFormat.blocked': 'Stopped by \"abort\" — nothing was written. Pick \"skip\" or \"warn only\" and regenerate the plan.',
-  'import.sessionFormat.summary': '{count} session log(s) are v{newer} while this build supports v{target}: DSH skips them silently — no error, and they never appear in the workspace',
+  'import.sessionFormat.summary': '{count} {count, plural, session log is|session logs are} v{newer} while this build supports v{target}: DSH skips them silently — no error, and they never appear in the workspace',
   'import.sessionFormat.sampled': 'The format check was sampled: {checked} checked, {skipped} not checked (unchecked ones are treated as readable and are not affected by this disposition)',
   'import.sessionFormat.guide.upgrade': 'Upgrade the DSH build of this profile to one that supports v{newer} (this build supports v{target}) and import again; or re-export on the source machine with a DSH build no newer than v{target}.',
   'import.sessionFormat.guide.doctor': 'Inspect the sessions already on this machine (read-only):',
@@ -1677,6 +1695,7 @@ export const en: Record<keyof typeof zh, string> = {
   'library.remoteDeleteBaseline': 'Note: this is the current sync baseline (the snapshot this machine last synced to). Deleting it does not change this machine, but the next sync will re-compare against the latest remote snapshot.',
   'library.remoteDeleted': 'Remote snapshot deleted',
   'library.summary.count': '{count} total',
+  'library.summary.filtered': '{shown} of {total}',
   'library.new.export': 'Export',
   'library.new.import': 'Import from file',
   'library.new.market': 'Browse market',
@@ -1686,7 +1705,7 @@ export const en: Record<keyof typeof zh, string> = {
   // S7: rollback points (workspace + session rewind) command title
   'palette.rescue.rollback': 'Rollback points (workspace + session rewind)',
   'import.reason.schemaUnsupported': 'The bundle uses schema v{version}, beyond what this plugin supports',
-  'import.reason.missingSections': 'Declared by the backup but missing from the archive: {count} section(s) — {sections}',
+  'import.reason.missingSections': 'Declared by the backup but missing from the archive: {count} {count, plural, section|sections} — {sections}',
   'import.reason.sourceNewer': 'Backup comes from a newer DSH ({source} → local {target}): it may contain settings this build does not know',
   'import.reason.sourceOlder': 'Backup comes from an older DSH ({source} → local {target}): backward compatible',
   // ---------- Importing from other agents (2026-10-04) ----------
@@ -1737,9 +1756,9 @@ export const en: Record<keyof typeof zh, string> = {
   'foreign.lossy.hint': 'These three behaviours are built into the "external config → bundle → import" pipeline: none of them blocks the import, and the compatibility score never explains them.',
   'foreign.lossy.applies': 'Applies here',
   'foreign.lossy.notApplies': 'Not applicable here',
-  'foreign.credentialRefs': '{count} credential(s) to re-enter (values never travel)',
+  'foreign.credentialRefs': '{count} {count, plural, credential|credentials} to re-enter (values never travel)',
   'foreign.credentialRefsNone': 'No credentials to enter',
-  'foreign.skipped': '{count} item(s) not migrated',
+  'foreign.skipped': '{count} {count, plural, item|items} not migrated',
   'foreign.skip.unsupported-hooks': 'settings hooks: DSH has no equivalent, not migrated',
   'foreign.skip.unsupported-commands': 'Slash commands: not the same thing as DSH prompts, not migrated this round',
   'foreign.skip.credentials-not-migrated': 'Credential fields: only the names are recorded; the values are never read or migrated',

package/src/client/lucide-icons.d.ts

@@ -38,6 +38,8 @@ declare module 'lucide-react/dist/esm/icons/lock.mjs' { const i: LucideIconCompo
 declare module 'lucide-react/dist/esm/icons/message-square.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/package-check.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/pencil.mjs' { const i: LucideIconComponent; export default i }
+// 测试连接（同步页动作行的 28px 图标按钮）
+declare module 'lucide-react/dist/esm/icons/plug.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/refresh-cw.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/rotate-cw.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/search.mjs' { const i: LucideIconComponent; export default i }

package/src/client/market/MarketPanel.tsx

@@ -473,18 +473,19 @@ export function MarketPanel({ api, myConfigsApi, importApi, syncApi, t, cmT, ope
       {!downloadOpen && (<>
       <SectionTitle title={t('section.label')} info={<InfoHint text={t('section.description')} label={t('common.infoHint')} />} />
 
-      {/* 内置市场操作卡：保留面板标题；移除 URL / 官方徽章 / 名称 / 条目数 / 状态行等文字展示 */}
-      <Card>
+      {/* 市场操作行（2026-11-01）：原为一张卡，卡里只有标题 + 两个按钮，右侧四百多像素永远空着
+          （app-screens §4.2 卡内死空间，白吃约 50px）。改成标题与动作同一行 —— 它本来就是
+          「对仓库做两件事」，不是一块独立内容区。 */}
+      <div className={css.marketRepoRow}>
         <span className={css.groupLabel}>{t('config.title')}</span>
-        <div className={css.actionRow}>
-          <Button variant="primary" loading={state.refreshing} disabled={state.importing || state.browsing} onClick={() => { void runRefresh() }}>
-            {t('config.refresh')}
-          </Button>
-          <Button loading={state.browsing} disabled={state.refreshing || state.importing} onClick={() => { void runBrowse() }}>
-            {t('list.browse')}
-          </Button>
-        </div>
-      </Card>
+        <span className={css.statusSpacer} />
+        <Button variant="primary" loading={state.refreshing} disabled={state.importing || state.browsing} onClick={() => { void runRefresh() }}>
+          {t('config.refresh')}
+        </Button>
+        <Button loading={state.browsing} disabled={state.refreshing || state.importing} onClick={() => { void runBrowse() }}>
+          {t('list.browse')}
+        </Button>
+      </div>
       </>)}
 
       {/* R-21：动作失败（拉取最新 / 浏览 / 下载 / 导入）已全部改由全局 Toast 送达，

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

@@ -216,7 +216,7 @@ export const en: Record<keyof typeof zh, string> = {
   'list.searchPlaceholder': 'Search name / author / description…',
   'list.categoriesAll': 'All categories',
   'list.sectionsAll': 'All sections',
-  'list.sectionsUnknown': '{count} more item(s) not downloaded yet — cannot match by section',
+  'list.sectionsUnknown': '{count} more {count, plural, item|items} not downloaded yet — cannot match by section',
   'list.sourceAll': 'All sources',
   'list.sourceOfficial': 'Official',
   'list.sourcePersonal': 'Community',
@@ -226,7 +226,7 @@ export const en: Record<keyof typeof zh, string> = {
   'list.sortName': 'Name A–Z',
   'list.stars': '⭐ {count}',
   'list.starsHint': 'Stars of the source repo (repo-level, not per item)',
-  'list.count': '{count} item(s)',
+  'list.count': '{count} {count, plural, item|items}',
   'list.filtered': '({count} after filter)',
   'list.cacheCached': 'cached',
   'list.cacheFresh': 'just fetched',
@@ -238,11 +238,11 @@ export const en: Record<keyof typeof zh, string> = {
   'detail.emptySections': 'This item contains no importable sections',
   'detail.needReview': 'Needs human confirmation',
   'detail.previewHint': 'Read-only preview — nothing changed yet',
-  'detail.impact.willChange': '{count} item(s) will change',
+  'detail.impact.willChange': '{count} {count, plural, item|items} will change',
   'detail.impact.unchanged': '{count} identical',
-  'detail.impact.conflicts': '{count} conflict(s)',
-  'detail.impact.secrets': '{count} secret(s) to re-enter',
-  'detail.impact.paths': '{count} path mapping(s)',
+  'detail.impact.conflicts': '{count} {count, plural, conflict|conflicts}',
+  'detail.impact.secrets': '{count} {count, plural, secret|secrets} to re-enter',
+  'detail.impact.paths': '{count} path {count, plural, mapping|mappings}',
   'detail.impact.restart': 'DSH restart required',
   'detail.import': 'Confirm import',
   'detail.back': 'Back to list',
@@ -250,14 +250,14 @@ export const en: Record<keyof typeof zh, string> = {
   // semantics — cascade tree, select-all by default, "Select all" includes high-risk sections;
   // risk is carried by the inline warning + disclaimer + pre-import snapshot + rollback).
   'review.highRiskHint': 'High-risk sections selected ({sections}): an unreviewed public-repo item that installs plugins / writes files / injects global instructions on this machine.',
-  'review.changeCount': '{selected}/{total} item(s) selected',
+  'review.changeCount': '{selected}/{total} {total, plural, item|items} selected',
   'review.changeWillChange': '{count} will change',
   'review.changeUnchanged': '{count} identical',
   'review.changeEmpty': 'This item has no selectable content items.',
   'review.rowWillChange': 'Will change',
   'review.rowUnchanged': 'Identical',
   'review.rowExcluded': 'Not imported',
-  'review.conflictHint': '{count} conflict(s) need a decision; undecided ones keep local content.',
+  'review.conflictHint': '{count} {count, plural, conflict needs|conflicts need} a decision; undecided ones keep local content.',
   'review.nothingSelected': 'Nothing selected — cannot import',
   'review.rollback': 'Roll back to pre-import snapshot',
   'review.rollbackHint': 'Restores this machine to its state before the import.',
@@ -267,8 +267,8 @@ export const en: Record<keyof typeof zh, string> = {
   'review.rollbackConfirm': 'Roll back now',
   'review.rollbackDone': 'Rolled back to the pre-import snapshot',
   'review.rollbackReport': 'Rollback report',
-  'review.rollbackRestored': '{count} item(s) restored',
-  'review.rollbackRemovedPlugins': '{count} plugin(s) removed',
+  'review.rollbackRestored': '{count} {count, plural, item|items} restored',
+  'review.rollbackRemovedPlugins': '{count} {count, plural, plugin|plugins} removed',
   'review.rollbackFailed': '{count} failed',
   'review.rollbackManual': '{count} need manual handling',
   // Stepwise flow (P1): preview → select → (conflicts) → confirm → result.
@@ -284,16 +284,16 @@ export const en: Record<keyof typeof zh, string> = {
   'review.filter.highRisk': 'High risk',
   'review.filter.unselected': 'Not selected',
   'review.filterEmpty': 'No items match the current filter.',
-  'review.sectionUnits': '{selected}/{total} item(s) selected',
+  'review.sectionUnits': '{selected}/{total} {total, plural, item|items} selected',
   'review.excludedCount': '{count} excluded',
   'review.next': 'Next',
   'review.back': 'Back',
   'review.confirmHint': 'A rollback snapshot is taken before importing',
-  'review.resultOk': '{count} item(s) written',
-  'review.resultFailed': '{count} item(s) failed',
+  'review.resultOk': '{count} {count, plural, item|items} written',
+  'review.resultFailed': '{count} {count, plural, item|items} failed',
   'review.reviewAgain': 'Back to selection',
-  'import.done': 'Import complete: {count} item(s) written',
-  'import.failed': 'Import failed ({count} item(s) failed)',
+  'import.done': 'Import complete: {count} {count, plural, item|items} written',
+  'import.failed': 'Import failed ({count} {count, plural, item|items} failed)',
   'import.needsRestart': 'Some changes need a DSH restart to take effect',
   'detail.failed': 'Download failed — see the notice at the bottom right',
   'myconfigs.tab.browse': 'Browse Market',
@@ -345,7 +345,7 @@ export const en: Record<keyof typeof zh, string> = {
   'myconfigs.list.empty': 'No configs uploaded yet',
   'myconfigs.list.loading': 'Loading…',
   'myconfigs.list.refresh': 'Refresh',
-  'myconfigs.list.summary': '{total} item(s) · {listed} listed · {pending} pending · {none} not listed',
+  'myconfigs.list.summary': '{total} {total, plural, item|items} · {listed} listed · {pending} pending · {none} not listed',
   'myconfigs.list.openRepo': 'Open repo',
   'myconfigs.item.update': 'Update',
   'myconfigs.item.install': 'Install locally',

package/src/client/recovery/RollbackCard.tsx

@@ -790,10 +790,12 @@ export function RollbackCard({ recoveryApi, t }: RollbackCardProps) {
               <div className={css.hint}>{t(dyn(verdict.reasonKey))}</div>
             )}
 
+            {/* 动作顺序与 MergeModal 同口径（DESIGN §9）：**取消在左、主操作在右**。
+                以前危险操作在左、取消在右 —— 两个弹窗的「取消」位置相反，用户会点错。 */}
             <div className={css.actionRow}>
-              <Button variant="danger" disabled={busy || !canRewind || selectionBlocked} loading={busy} onClick={() => { setConfirmOpen(true) }}>{t('rollback.rewind')}</Button>
-              <span className={css.statusSpacer} />
               <Button disabled={busy} onClick={closePreview}>{t('common.cancel')}</Button>
+              <span className={css.statusSpacer} />
+              <Button variant="danger" disabled={busy || !canRewind || selectionBlocked} loading={busy} onClick={() => { setConfirmOpen(true) }}>{t('rollback.rewind')}</Button>
             </div>
           </>
         )}

package/src/client/recovery/recovery-locales.test.ts

@@ -342,9 +342,11 @@ test('T18-F1④：createdAfter / result.counts 必须说「留点时并不存在
   }
   assert.deepEqual(offenders, [], '计数类文案不得再写「未记录」（那是旧判据：既有文件也会落进那个计数）：' + offenders.join(', '))
   assert.ok(zh['rollback.preview.createdAfter'].includes('留点时并不存在'), 'zh createdAfter 必须说「留点时并不存在」')
+  // 2026-11-01 起单复数由 `{n, plural, one|other}` 段承担 ⇒ 动词跟着进段，
+  // 模板里不再有连续的 "did not exist"（渲染后才有）。断言模板结构，不断言拼接结果。
   assert.ok(
-    en['rollback.preview.createdAfter'].toLowerCase().includes('did not exist at that point'),
-    'en createdAfter 必须说 did not exist at that point',
+    en['rollback.preview.createdAfter'].includes('{n, plural, item did|items did} not exist at that point'),
+    'en createdAfter 必须说 did not exist at that point（动词进 plural 段后仍是这句）',
   )
   assert.ok(zh['rollback.rewind.result.counts'].includes('之后新建'), 'zh 结果计数必须说清 leftovers 的口径')
   assert.ok(en['rollback.rewind.result.counts'].includes('created afterwards'), 'en 结果计数必须说清 leftovers 的口径')