dsh-config-manager 0.2.4 → 0.3.0

package/src/sync/webdav/webdav-transport.ts

@@ -28,6 +28,8 @@
 import { requestOnce, type RawResponse } from '../../utils/proxy.ts';
 import { zhMsg } from '../../core/messages.ts';
 import { composeMsg } from '../s3/messages.ts';
+import { GC_SKIP_REFERENCE_MISSING, GC_SKIP_REFERENCE_UNREADABLE, GC_SKIP_SNAPSHOT_UNPARSABLE } from '../gc-skip.ts';
+import type { GcSkipCode } from '../gc-skip.ts';
 // t6：「英文界面零中文」——注册同步域追加目录（this.o.msg 缺省 = zhMsg，其查找链会查注册目录；
 // sync.webdav.blobHashInvalid 这类新键必须能解析，绝不露裸键名）。
 import '../messages.ts';
@@ -302,6 +304,14 @@ export class WebDavTransport implements SyncTransport {
     msg: MsgFunc;
   };
 
+  /** 最近一轮 blob GC 的放弃码（`null` = 跑完或未触发；SYN-04）。 */
+  private gcSkip: GcSkipCode | null = null;
+
+  /** 最近一轮 blob GC 是否因「无法证明引用集完整」而整体放弃（`null` = 正常跑完），供上层给用户提示。 */
+  get lastGcSkip(): GcSkipCode | null {
+    return this.gcSkip;
+  }
+
   constructor(options: WebDavTransportOptions) {
     this.o = {
       baseUrl: '',
@@ -662,22 +672,33 @@ export class WebDavTransport implements SyncTransport {
 
   /**
    * blob 仓 GC（P1-4）：逐份读取**仍存在**的快照 JSON，收集被引用的哈希，删除无人引用且
-   * 超过保护窗口的 blob。读坏任一份快照 → 本轮直接放弃（宁可留垃圾，不可删在用的）。
+   * 超过保护窗口的 blob。读不坏任何一份快照 → 正常回收；否则本轮整体放弃（宁可留垃圾，不可删在用的）。
+   *
+   * SYN-04（P1）：**404 也放弃本轮**。旧实现把「索引有条目但快照文件 404」当作「文件不存在 ⇒ 不可能
+   * 引用任何 blob」直接 continue，于是引用集只剩「读得出来的那几份」，仍被该快照（假 404 / 孤儿条目）
+   * 使用的 blob 就被判成无人引用而删除 —— 不可恢复。拿不到内容就无法证明「没人引用」，与「读不出来」
+   * 是同一件事 ⇒ 一律放弃并记码（sync-N1 同族口径）。
    */
   private async gcBlobStore(pwd: string, remaining: SyncSnapshotMeta[]): Promise<void> {
+    this.gcSkip = null;
     const index = await this.readBlobIndex(pwd);
     if (Object.keys(index).length === 0) return;
     const referenced = new Set<string>();
     for (const meta of remaining) {
       const res = await this.send('GET', this.snapshotUrl(meta.id), pwd);
-      // 索引有条目但快照文件 404 ⇒ 该文件不存在，不可能引用任何 blob（安全跳过）。
-      // 其它失败 ⇒ **读不出来 ≠ 没引用**，本轮直接放弃（与「宁可留垃圾，不可删在用的」同口径；sync-N1 同族）。
-      if (res.status === 404) continue;
-      if (!res.ok) return;
+      if (res.status === 404) {
+        this.gcSkip = GC_SKIP_REFERENCE_MISSING;
+        return;
+      }
+      if (!res.ok) {
+        this.gcSkip = GC_SKIP_REFERENCE_UNREADABLE;
+        return;
+      }
       let snap: SyncSnapshot;
       try {
         snap = deserializeSnapshot(await res.text());
       } catch {
+        this.gcSkip = GC_SKIP_SNAPSHOT_UNPARSABLE;
         return;
       }
       const plain = snap.sections as Partial<Record<SectionId, unknown>>;

package/src/ui/disk-usage-view.test.ts

@@ -134,7 +134,8 @@ test('formatRetention：天 / 小时 / 缺失三档（en 与 zh 都走字典）'
   assert.equal(formatRetention(6 * 60 * 60 * 1000, zh), '6 小时');
   assert.equal(formatRetention(30 * 60 * 1000, zh), '30 分钟');
   assert.equal(formatRetention(0, zh), zh('diskUsage.retention.none'));
-  assert.equal(formatRetention(2 * DAY, en), '2 day(s)');
+  assert.equal(formatRetention(2 * DAY, en), '2 days');
+  assert.equal(formatRetention(DAY, en), '1 day', '单数（今日起由 plural 段选形）');
 });
 
 test('diskUsageViewModel：英文界面下所有标签来自 en 字典（不回落中文）', () => {

package/src/ui/i18n.test.ts

@@ -19,6 +19,7 @@
  */
 import test from 'node:test';
 import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
 
 import { makeUiT, uiEn, uiZh, zhUiT } from './i18n.ts';
 import {
@@ -145,3 +146,49 @@ test('i18n-05 默认超时路径走 error.requestTimeout（真实请求：getJso
     return true;
   });
 });
+
+// 复数语法（2026-11-01）：`{n, plural, one|other}`。英文 (s)/(ies) 括号式复数全站清零后，
+// 单复数由这条替换链决定 —— 它错了整站英文都会退回 "1 files"。
+test('i18n-06 plural 段按数量选形：1/-1 取 one，0/2/非数取 other', () => {
+  assert.equal(enT('report.unit.files', { n: 1 }), 'file');
+  assert.equal(enT('report.unit.files', { n: 2 }), 'files');
+  assert.equal(enT('report.unit.files', { n: 0 }), 'files');
+  assert.equal(enT('report.unit.files', { n: -1 }), 'file', '负数是绝对值为 1，不当成复数');
+  assert.equal(enT('report.unit.files', { n: '1' }), 'file', '占位符值是字符串也要认');
+  assert.equal(enT('report.unit.files', { n: 'n/a' }), 'files', '无法解析成数字时按复数兜底，不抛错');
+  // 缺参时与普通占位符同口径：原样保留模板（调用点漏传会显形，而不是静默选错形）
+  assert.equal(enT('report.unit.files'), '{n, plural, file|files}');
+});
+
+test('i18n-07 plural 段与数字并存：数字仍由普通占位符渲染，且只出现一次', () => {
+  const en = enT('consult.attention', { count: 1 });
+  assert.equal(en, '1 item needs attention');
+  assert.equal(enT('consult.attention', { count: 3 }), '3 items need attention');
+  // 动词单复数必须跟着变：`3 item need` / `1 items did` 这类残留是这条断言的主要目标
+  assert.equal(
+    enT('sync.importPartial', { n: 1 }),
+    'Partly successful: 1 item did not take effect (the rest were written; nothing rolled back)',
+  );
+  assert.equal(
+    enT('sync.importPartial', { n: 4 }),
+    'Partly successful: 4 items did not take effect (the rest were written; nothing rolled back)',
+  );
+});
+
+test('i18n-08 英文字典不留 (s)/(ies) 括号式复数（今日起由 plural 段承担）', () => {
+  const offenders: string[] = [];
+  const collect = (dict: Record<string, string>, label: string) => {
+    for (const [key, value] of Object.entries(dict)) {
+      if (/\(s\)|\(ies\)/.test(value) && !/http\(s\)/.test(value)) offenders.push(label + ':' + key + ' = ' + value);
+    }
+  };
+  collect(uiEn, 'uiEn');
+  // 客户端四本字典同查：改的是源码文本，不 import（client 侧不保证可被 node 直接加载）
+  for (const rel of ['../client/locales.ts', '../client/sync/sync-locales.ts', '../client/market/market-locales.ts', '../client/recovery/recovery-locales.ts']) {
+    const text = readFileSync(new URL(rel, import.meta.url), 'utf8');
+    for (const line of text.split('\n')) {
+      if (/\((s|ies)\)/.test(line) && !/http\(s\)/.test(line) && /:\s*'/.test(line)) offenders.push(rel + ' :: ' + line.trim());
+    }
+  }
+  assert.deepEqual(offenders, [], '括号式复数会让 1 渲染成 "1 file(s)"；改用 {n, plural, file|files}');
+});

package/src/ui/i18n.ts

@@ -528,14 +528,14 @@ export const uiEn: Record<UiTextKey, string> = {
   'report.backupCreated': 'Backup Created',
   'report.importComplete': 'Import Complete',
   'report.importFailed': 'Import Failed',
-  'report.tombstonedSkipped': '{count} item(s) skipped by deletion records',
+  'report.tombstonedSkipped': '{count} {count, plural, item|items} skipped by deletion records',
   'report.included': 'Included:',
   'report.excluded': 'Excluded:',
   'report.security': 'Security:',
   'report.apiKeysExcluded': 'API Keys excluded:',
   'report.containsSecrets': 'Contains secrets:',
   'report.encrypted': 'Encrypted:',
-  'report.redacted': '{count} sensitive field(s) redacted',
+  'report.redacted': '{count} sensitive {count, plural, field|fields} redacted',
   'report.file': 'File:',
   'report.yes': 'yes',
   'report.yesEncrypted': 'yes (encrypted)',
@@ -553,12 +553,12 @@ export const uiEn: Record<UiTextKey, string> = {
   'report.other': 'Other',
   'report.fullText': 'Full text report (with per-item reasons)',
   'report.secrets': 'Secrets:',
-  'report.credentialsNeedEntry': '{count} credential(s) need to be entered',
+  'report.credentialsNeedEntry': '{count} {count, plural, credential needs|credentials need} to be entered',
   'report.restartPluginsMcp': 'Plugin / MCP changes take effect after restarting DSH',
   'report.rollbackFull': 'Rollback: fully restored the pre-import configuration.',
   'report.rollbackPartial': 'Rollback partially completed.',
   'report.rollbackManual': 'These items may require manual recovery:',
-  'report.restored': 'Restored: {count} item(s)',
+  'report.restored': 'Restored: {count} {count, plural, item|items}',
   'report.includedCount': '{count} included',
   'report.excludedCount': '{count} excluded',
   'report.badgeEncrypted': 'encrypted',
@@ -569,18 +569,18 @@ export const uiEn: Record<UiTextKey, string> = {
   'report.includedSections': 'Included sections',
   'report.excludedSections': 'Excluded sections',
   'report.warnings': 'Warnings',
-  'report.unit.namespaces': 'namespace(s)',
-  'report.unit.files': 'file(s)',
-  'report.unit.servers': 'server(s)',
-  'report.unit.providers': 'provider(s)',
-  'report.unit.plugins': 'plugin(s)',
-  'report.unit.patchLines': 'patch line(s)',
-  'report.unit.patchFiles': 'patch file(s)',
-  'report.unit.localTarballs': 'local package(s)',
-  'report.unit.prompts': 'prompt(s)',
-  'report.unit.workspaces': 'workspace(s)',
-  'report.unit.credentials': 'credential status item(s)',
-  'report.unit.notes': 'note(s)',
+  'report.unit.namespaces': '{n, plural, namespace|namespaces}',
+  'report.unit.files': '{n, plural, file|files}',
+  'report.unit.servers': '{n, plural, server|servers}',
+  'report.unit.providers': '{n, plural, provider|providers}',
+  'report.unit.plugins': '{n, plural, plugin|plugins}',
+  'report.unit.patchLines': '{n, plural, patch line|patch lines}',
+  'report.unit.patchFiles': '{n, plural, patch file|patch files}',
+  'report.unit.localTarballs': '{n, plural, local package|local packages}',
+  'report.unit.prompts': '{n, plural, prompt|prompts}',
+  'report.unit.workspaces': '{n, plural, workspace|workspaces}',
+  'report.unit.credentials': '{n, plural, credential status item|credential status items}',
+  'report.unit.notes': '{n, plural, note|notes}',
   'error.notMounted': 'config-manager service is not mounted (plugin not loaded): make sure dsh-config-manager is installed in the profile and restart DSH',
   'error.apiPathMissed': 'API path not matched (HTTP {status}): the request prefix is {base} but that path did not return JSON — if you serve DSH under a reverse-proxy sub-path, check that this prefix is proxied (issue #108)',
   'error.httpInvalidJson': 'HTTP {status}: invalid JSON response',
@@ -671,16 +671,16 @@ export const uiEn: Record<UiTextKey, string> = {
   'sync.pushFailed': 'Push failed',
   'sync.pushOk': 'Push succeeded (snapshot {id})',
   'sync.conflictUnresolved': 'Conflict item {id} must be resolved first (keep current / use imported)',
-  'sync.pushPreviewHeadline': 'Will push {total} section(s) ({changed} changed)',
+  'sync.pushPreviewHeadline': 'Will push {total} {total, plural, section|sections} ({changed} changed)',
   'sync.pushPreviewEncrypted': 'Encrypted snapshot: the payload is encrypted as a whole; per-section changes vs the baseline cannot be compared.',
   'sync.pushPreviewCredentials': 'This push includes real credential values (encrypted with the payload; the remote only ever sees ciphertext).',
   'sync.pullFailed': 'Pull failed',
-  'sync.pullOk': 'Remote snapshot {id} diff preview: {count} change(s)',
+  'sync.pullOk': 'Remote snapshot {id} diff preview: {count} {count, plural, change|changes}',
   'sync.pullEmpty': 'Remote snapshot matches local (no changes)',
   'sync.previewHint': 'Read-only diff preview above; nothing is imported. One-click import is not supported in this version — use the Import wizard to apply a downloaded backup if needed.',
   'sync.syncing': 'Syncing…',
-  'sync.importDone': 'Imported {n} section(s)',
-  'sync.importPartial': 'Partly successful: {n} item(s) did not take effect (the rest were written; nothing rolled back)',
+  'sync.importDone': 'Imported {n} {n, plural, section|sections}',
+  'sync.importPartial': 'Partly successful: {n} {n, plural, item did|items did} not take effect (the rest were written; nothing rolled back)',
   'sync.importFailed': 'Import failed (rolled back)',
   'sync.autosyncNever': 'Never run',
   'sync.autosyncLastRun': 'Last run: {time}',
@@ -688,7 +688,7 @@ export const uiEn: Record<UiTextKey, string> = {
   'sync.autosyncSkipped': 'Skipped',
   'sync.autosyncFailed': 'Failed',
   'sync.autosyncPartial': 'Partial',
-  'sync.autosyncFailCount': '{n} consecutive failure(s)',
+  'sync.autosyncFailCount': '{n} consecutive {n, plural, failure|failures}',
   'sync.duration.min': '{n} min',
   'sync.duration.hour': '{n} hr',
   'sync.duration.day': '{n} day',
@@ -707,7 +707,7 @@ export const uiEn: Record<UiTextKey, string> = {
   'sync.github.pollError': 'GitHub OAuth error: {detail}',
   'sync.github.unknownError': 'Unknown error',
   'market.statusUnconfigured': 'No markets added (enter a public Git repository URL)',
-  'market.statusConfigured': '{count} market(s) added',
+  'market.statusConfigured': '{count} {count, plural, market|markets} added',
   'market.supplyUnofficial': 'From the public network, not officially reviewed',
   'market.supplySource': 'Source repo: {url}',
   'market.supplyDownloadedAt': 'Downloaded at: {time}',
@@ -739,18 +739,18 @@ export const uiEn: Record<UiTextKey, string> = {
   'consult.title': 'Migration Pre-flight Consultation',
   'consult.healthScore': 'Health score {score}',
   'consult.dryRun': 'Read-only analysis',
-  'consult.blockers': '{count} hard blocker(s) (cannot import safely until resolved)',
-  'consult.attention': '{count} item(s) need attention',
+  'consult.blockers': '{count} hard {count, plural, blocker|blockers} (cannot import safely until resolved)',
+  'consult.attention': '{count} {count, plural, item needs|items need} attention',
   'consult.reasons': 'Recommendation basis',
   'consult.willApply': 'Will apply',
-  'consult.sections': '{count} section(s)',
-  'consult.items': '{count} item(s)',
-  'consult.conflicts': '{count} conflict(s)',
-  'consult.risks': '{count} risk(s)',
+  'consult.sections': '{count} {count, plural, section|sections}',
+  'consult.items': '{count} {count, plural, item|items}',
+  'consult.conflicts': '{count} {count, plural, conflict|conflicts}',
+  'consult.risks': '{count} {count, plural, risk|risks}',
   'consult.dimensions': 'Score dimensions',
   'consult.loading': 'Generating consultation report…',
   'diskUsage.title': 'Disk Usage',
-  'diskUsage.files': '{count} file(s)',
+  'diskUsage.files': '{count} {count, plural, file|files}',
   'diskUsage.refresh': 'Re-scan',
   'diskUsage.loading': 'Measuring disk usage…',
   'diskUsage.unreadable': 'not measured',
@@ -784,9 +784,9 @@ export const uiEn: Record<UiTextKey, string> = {
   'diskUsage.area.vault': 'Sensitive file mirror',
   'diskUsage.area.vaultDesc': 'Mirror for the local editor write channel (enabled on demand)',
   'diskUsage.retention.none': 'Retention disabled (never auto-removed)',
-  'diskUsage.retention.days': '{count} day(s)',
-  'diskUsage.retention.hours': '{count} hour(s)',
-  'diskUsage.retention.minutes': '{count} minute(s)',
+  'diskUsage.retention.days': '{count} {count, plural, day|days}',
+  'diskUsage.retention.hours': '{count} {count, plural, hour|hours}',
+  'diskUsage.retention.minutes': '{count} {count, plural, minute|minutes}',
   'diskUsage.backupRetention': 'Scheduled backups keep the latest {count}; exports are auto-removed after {days} days.',
   'diskUsage.clean.title': 'Reclaim space',
   'diskUsage.clean.hint': 'Only regenerable caches and staging are cleaned; snapshots and sync data are never removed here.',
@@ -796,10 +796,10 @@ export const uiEn: Record<UiTextKey, string> = {
   'diskUsage.clean.tmpMarketDesc': 'Clears regardless of retention — all of it regenerates (avoid while an import is in flight).',
   'diskUsage.clean.expiredExports': 'Reclaim expired backups',
   'diskUsage.clean.expiredExportsDesc': 'Only exports past their retention window (scheduled backups are excluded).',
-  'diskUsage.clean.done': 'Freed {size}, removed {count} item(s)',
+  'diskUsage.clean.done': 'Freed {size}, removed {count} {count, plural, item|items}',
   'diskUsage.clean.nothing': 'Nothing to reclaim',
   'diskUsage.clean.nothingAbsent': 'Nothing to clean (the target directories are missing or already empty)',
-  'diskUsage.clean.failed': 'Cleanup finished with {count} failure(s) (skipped)',
+  'diskUsage.clean.failed': 'Cleanup finished with {count} {count, plural, failure|failures} (skipped)',
   'diskUsage.clean.confirmTitle': 'Clean disk usage',
   'diskUsage.clean.confirmMessage': 'This deletes regenerable caches/staging plus expired backup files; snapshots and sync data are untouched. It cannot be undone, but everything removed can be regenerated.',
   'diskUsage.clean.confirm': 'Clean',
@@ -904,7 +904,7 @@ export const uiEn: Record<UiTextKey, string> = {
   'foreign.found.no': 'Not detected',
   'foreign.paths': 'Matched paths: {paths}',
   'foreign.pathsNone': 'No truth-table path matched',
-  'foreign.credentialRefs': '{count} credential(s) to enter manually: {refs}',
+  'foreign.credentialRefs': '{count} {count, plural, credential|credentials} to enter manually: {refs}',
   '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',
@@ -988,6 +988,18 @@ export const uiEn: Record<UiTextKey, string> = {
 /** UI 翻译函数：key → 当前语言文案（{param} 插值；未知键回退 zh/键名）。 */
 export type UiT = (key: UiTextKey, params?: Record<string, string | number>) => string;
 
+/**
+ * 单复数段：`{count, plural, one-form|other-form}`（ICU 的极小子集，2026-11-01）。
+ *
+ * 为什么要它：英文旧写法把复数塞进括号 —— `{count} item(s)`、`{count} copy(ies)`。
+ * 界面读不出来：用户看到 "3 item(s)" 会先怀疑渲染漏了，单数时也照样写 "1 item(s)"。
+ * 真复数得按数量选形式，而模板是死字符串，只能把两种形式都放进值里、由插值层挑一个。
+ *
+ * 规则：`Number(v)` 的绝对值 === 1 取 one，其余（含 0、小数、非数字）取 other —— 英语常规
+ * （"0 items"）。中文值不写这段（中文没有单复数），同一键的中文照旧。
+ */
+const PLURAL_SEGMENT = /\{(\w+),\s*plural,\s*([^{}|]*)\|([^{}]*)\}/g;
+
 /** 构造 翻译函数（zh 源 / en 镜像；缺 key 回退）。 */
 export function makeUiT(lang: 'zh' | 'en'): UiT {
   const dict = lang === 'en' ? uiEn : uiZh;
@@ -996,9 +1008,17 @@ export function makeUiT(lang: 'zh' | 'en'): UiT {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const template = (dict as any)[key] ?? (fallback as any)?.[key] ?? key;
     if (params === undefined) return template;
-    return String(template).replace(/\{(\w+)\}/g, (match, k: string) =>
-      params[k] === undefined ? match : String(params[k]),
-    );
+    return String(template)
+      .replace(PLURAL_SEGMENT, (match, k: string, one: string, other: string) => {
+        const value = params[k];
+        if (value === undefined) return match;
+        const n = Number(value);
+        const form = Number.isFinite(n) && Math.abs(n) === 1 ? one : other;
+        return form.trim();
+      })
+      .replace(/\{(\w+)\}/g, (match, k: string) =>
+        params[k] === undefined ? match : String(params[k]),
+      );
   };
 }
 

package/src/ui/import-wizard.test.ts

@@ -13,6 +13,7 @@ import {
   importPreviewStageAfter, isSkippablePluginInstall, mergeSecretInput, nextImportPhase, pendingSecretRequests,
 } from './import-wizard.ts';
 import { MockImportPort, makeAnalysis, makeImportResult, makePlan, makePlanItem } from './test-helpers.ts';
+import { DEFAULT_ROLLBACK_ON_ERROR } from '../core/importer.ts';
 import type { ImportPlan, PathIssue } from '../core/types.ts';
 import type { SectionId } from '../schema/types.ts';
 import { ConfigManagerApiError } from '../client/common/http.ts';
@@ -101,7 +102,23 @@ test('import-wizard: execute 默认显式传 rollbackOnError=true（场景 E）'
   assert.equal(wiz.currentStep, 'result');
   assert.equal(port.executeCalls.length, 1);
   assert.equal(port.executeCalls[0]!.confirm, true);
-  assert.equal(port.executeCalls[0]!.rollbackOnError, true, '默认整体回滚');
+  assert.equal(port.executeCalls[0]!.rollbackOnError, DEFAULT_ROLLBACK_ON_ERROR, '默认整体回滚（与引擎同一缺省符号）');
+});
+
+test('IE-02: 向导缺省取引擎同一符号（IE-02 四入口同缺省）', async () => {
+  const port = new MockImportPort();
+  const wiz = new ImportWizard({ port });
+  assert.equal(wiz.snapshot().rollbackOnError, DEFAULT_ROLLBACK_ON_ERROR, '未传 defaultRollbackOnError → 引擎同一缺省');
+
+  await wiz.selectZip('x.zip');
+  await wiz.confirmCompatibility();
+  await wiz.execute({ confirm: true });
+  assert.equal(port.executeCalls[0]!.rollbackOnError, DEFAULT_ROLLBACK_ON_ERROR, '交给 /execute 的值也是同一缺省');
+
+  // 显式缺省仍以调用方为准（UI 可选项不被缺省吃掉）
+  const offPort = new MockImportPort();
+  const off = new ImportWizard({ port: offPort, defaultRollbackOnError: false });
+  assert.equal(off.snapshot().rollbackOnError, false);
 });
 
 test('import-wizard: 用户可选 rollbackOnError=false（单项失败继续 §34.17）', async () => {

package/src/ui/import-wizard.ts

@@ -25,11 +25,12 @@ import { EXECUTING_STAGE, IMPORT_STAGES, ProgressTracker } from './progress.ts';
 import { formatActionableError, toActionableError } from './errors.ts';
 import { liveUiT, type UiT } from './i18n.ts';
 import { nextFlowPhase, type FlowPhase } from './flow.ts';
+import { DEFAULT_ROLLBACK_ON_ERROR } from '../core/import-defaults.ts';
 
 export interface ImportWizardOptions {
   port: ImportPort;
   onProgress?: ProgressListener;
-  /** 默认回滚策略（场景 E：true=整体回滚；UI 可在执行前覆盖） */
+  /** 默认回滚策略（场景 E：true=整体回滚；UI 可在执行前覆盖；缺省取 `DEFAULT_ROLLBACK_ON_ERROR`） */
   defaultRollbackOnError?: boolean;
   /**
    * 渲染层翻译器（UiT）。缺省 = **活**翻译器 `liveUiT`（随 DSH 语言变化）——
@@ -282,7 +283,7 @@ export class ImportWizard {
     this.port = opts.port;
     this.onProgress = opts.onProgress;
     this.tracker = new ProgressTracker(IMPORT_STAGES, this.onProgress);
-    this.rollbackOnError = opts.defaultRollbackOnError ?? true;
+    this.rollbackOnError = opts.defaultRollbackOnError ?? DEFAULT_ROLLBACK_ON_ERROR;
     this.t = opts.t ?? liveUiT;
   }
 

package/src/ui/overview-view.test.ts

@@ -155,6 +155,15 @@ test('overviewHealth: SAFE MODE 优先 error；全空 warn；正常 ok', () => {
   assert.equal(scheduleFail.kind, 'warn')
   assert.equal(scheduleFail.textKey, 'health.scheduleFailed')
 
+  /* 有备份、但自动备份是关的 → 仍要 warn：状态条不能与脚下「Auto backup Off」并列报健康 */
+  const autoOff = overviewHealth(baseInputs({
+    backups: [{ name: 'a.zip', sizeBytes: 1, mtimeMs: NOW, source: 'manual' }],
+    snapshots: [{ createdAt: '2026-09-10T00:00:00Z', entryCount: 1 }],
+    schedule: { enabled: false, lastRunStatus: 'ok' },
+  }))
+  assert.equal(autoOff.kind, 'warn')
+  assert.equal(autoOff.textKey, 'health.autoBackupOff')
+
   assert.equal(overviewHealth(baseInputs()).kind, 'ok', '数据未加载不降级')
 })
 

package/src/ui/overview-view.ts

@@ -237,7 +237,7 @@ export type OverviewHealthKind = 'ok' | 'warn' | 'error'
 export interface OverviewHealth {
   kind: OverviewHealthKind
   /** UI 渲染 key（`overview.health.*`）。 */
-  textKey: 'health.ok' | 'health.noBackup' | 'health.scheduleFailed' | 'health.recovery'
+  textKey: 'health.ok' | 'health.noBackup' | 'health.scheduleFailed' | 'health.autoBackupOff' | 'health.recovery'
 }
 
 /**
@@ -245,7 +245,11 @@ export interface OverviewHealth {
  * 1. SAFE MODE 激活（有未解决恢复事项）→ error（最高优先，需用户处理）；
  * 2. 已加载且备份与快照均为空 → warn「尚无任何备份」（新装机引导场景）；
  * 3. 定时备份开启但上次运行失败 → warn；
- * 4. 其余 → ok。
+ * 4. 手上已有备份、但定时备份是关的 → warn「自动备份已关闭」（2026-11-01 视觉 pass 新增：
+ *    此前关闭档不判定，于是「All healthy」与「Auto backup Off / Backups 1」同屏并列，
+ *    状态条给出的结论与它脚下的指标自相矛盾 —— 一页只在回答「现在安全吗」，
+ *    在没有任何后续保护时报健康等于放弃这个结论）；
+ * 5. 其余 → ok。
  * 数据未加载（null）不降级健康状态（避免加载闪红）。
  */
 export function overviewHealth(inputs: OverviewInputs): OverviewHealth {
@@ -259,6 +263,9 @@ export function overviewHealth(inputs: OverviewInputs): OverviewHealth {
   if (inputs.schedule !== null && inputs.schedule.enabled && inputs.schedule.lastRunStatus === 'failed') {
     return { kind: 'warn', textKey: 'health.scheduleFailed' }
   }
+  if (inputs.schedule !== null && !inputs.schedule.enabled) {
+    return { kind: 'warn', textKey: 'health.autoBackupOff' }
+  }
   return { kind: 'ok', textKey: 'health.ok' }
 }
 

package/src/ui/report.test.ts

@@ -36,7 +36,7 @@ test('report: 导出报告含 Included/Excluded/Security/File（en / zh）', ()
   assert.ok(enText.includes('○ sessions'));
   assert.ok(enText.includes('API Keys excluded: yes'));
   assert.ok(enText.includes('File: dsh-config-2026-08-14.zip'));
-  assert.ok(enText.includes('2 sensitive field(s) redacted'));
+  assert.ok(enText.includes('2 sensitive fields redacted'));
   const zhText = renderExportReport(makeExportReport(), zhT);
   assert.ok(zhText.includes('备份已创建'));
 });
@@ -44,7 +44,8 @@ test('report: 导出报告含 Included/Excluded/Security/File（en / zh）', ()
 test('report: exportCountsText —— 计数单位中文化（zh/en），未知单位键原样回退', () => {
   assert.equal(exportCountsText({ namespaces: 18 }, zhT), '18 个命名空间');
   assert.equal(exportCountsText({ plugins: 10, patchLines: 11 }, zhT), '10 个插件，11 行补丁');
-  assert.equal(exportCountsText({ namespaces: 18 }, enT), '18 namespace(s)');
+  assert.equal(exportCountsText({ namespaces: 18 }, enT), '18 namespaces', '单位词按数量选形（1 → namespace）');
+  assert.equal(exportCountsText({ namespaces: 1 }, enT), '1 namespace', '单数不再写成 1 namespace(s)');
   assert.equal(exportCountsText({ servers: 0 }, zhT), '0 个服务器', '0 是有效值，不能当空');
   assert.equal(exportCountsText({ customThing: 2 }, zhT), '2 customThing', '未知单位键原样显示，不吞信息');
   assert.equal(exportCountsText({}, zhT), '', '空 counts → 空串（由调用方渲染占位符）');
@@ -66,7 +67,7 @@ test('report: 导入报告渲染含分节/重启/缺失 secret（en）', () => {
   const text = renderImportReport(makeImportResult(), enT);
   assert.ok(text.includes('Import Complete'));
   assert.ok(text.includes('settings: ✓ 2 imported/restored'));
-  assert.ok(text.includes('Secrets: ⚠ 1 credential(s) need to be entered'));
+  assert.ok(text.includes('Secrets: ⚠ 1 credential needs to be entered'), '动词单复数跟着数量走');
   assert.ok(text.includes('Plugin / MCP changes take effect'));
 });
 

package/src/ui/report.ts

@@ -45,7 +45,8 @@ export function exportCountsText(counts: Record<string, number>, t: UiT): string
   for (const [key, value] of Object.entries(counts)) {
     if (typeof value !== 'number' || !Number.isFinite(value)) continue;
     const unitKey = COUNT_UNIT_KEY[key];
-    parts.push(unitKey === undefined ? String(value) + ' ' + key : String(value) + ' ' + t(unitKey));
+    // 单位词按数量选单复数（en 的 `{n, plural, file|files}`）；中文单位不受影响
+    parts.push(unitKey === undefined ? String(value) + ' ' + key : String(value) + ' ' + t(unitKey, { n: value }));
   }
   // 分隔符也走字典：英文用半角逗号（全角标点在英文界面同样是缺陷）
   return parts.join(t('report.unitSeparator'));