dsh-config-manager 0.2.4 → 0.3.0

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',

package/src/core/analyzer.ts

@@ -10,11 +10,10 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { sha256Hex } from '../utils/hashing.ts';
-import { parseJsonSafe } from '../utils/json.ts';
 import {
   SECTION_FILE_PREFIXES, SECTION_IDS, SECTION_JSON_PATHS, isFileSection, validateSectionData,
 } from '../schema/config.ts';
-import { CHECKSUMS_FILE, MANIFEST_FILE, parseManifest } from '../schema/manifest.ts';
+import { MANIFEST_FILE, parseManifest } from '../schema/manifest.ts';
 import {
   CURRENT_SCHEMA_VERSION, canImport, describeVersion, isSupported, isTooNew, needsMigration,
 } from '../schema/versions.ts';
@@ -23,6 +22,8 @@ import type { BootSafetyReport } from './boot-safety.ts';
 import type { FilesSection, Manifest, SectionId } from '../schema/types.ts';
 import { loadTombstones } from '../schema/tombstones.ts';
 import { DEFAULT_SENSITIVE_RELS, restoreVaultFiles } from '../security/vault.ts';
+import { applyUnverifiedFileBlocks, scanArchiveIntegrity, unverifiedNoticeText } from '../security/unverified-file-blocks.ts';
+import { UNVERIFIED_FILE_ENTRY_CODE } from '../security/integrity.ts';
 import { createSnapshot, fsForSection, planItemWritesTarget, resolveFileTarget, resolveFileTargetRel } from './backup.ts';
 import { isCredentialConfigured } from './credential-status.ts';
 import { rollback } from './rollback.ts';
@@ -107,12 +108,15 @@ export interface AnalyzerOptions {
    * 缺省 = 不做会话格式体检（旧调用方零改动）。
    */
   sessionFormatProbe?: (files: readonly { relativePath: string; data: Uint8Array }[]) => SessionFormatProbeResult;
+  /** SEC-05：按分区豁免「表外条目阻断」（缺省空 = 严格）；判据见 security/unverified-file-blocks.ts */
+  extraEntryExemptSections?: readonly SectionId[];
 }
 
 interface Bundle {
   archive: ZipArchive;
   manifest: Manifest;
   checksums: { ok: boolean; mismatches: string[]; missing: string[] };
+  unverifiedEntries: string[];
   zipWarnings: string[];
   /** G-06：schema 迁移链实际执行的步骤告警（`import.migrated`；CURRENT=MIN=1 时恒为空） */
   migrationWarnings: string[];
@@ -227,6 +231,7 @@ export class Analyzer {
   private readonly parseZipFn: (buf: Uint8Array, limits?: ZipSafetyLimits) => ZipArchive;
   private readonly msg: MsgFunc;
   private readonly sessionFormatProbe?: (files: readonly { relativePath: string; data: Uint8Array }[]) => SessionFormatProbeResult;
+  private readonly extraEntryExemptSections: readonly string[];
   /**
    * 会话内 bundle 缓存（zipPath → { 身份, 解析结果 }）。
    *
@@ -250,6 +255,7 @@ export class Analyzer {
     this.parseZipFn = opts.parseZipOverride ?? parseZip;
     this.msg = opts.msg ?? msgOf(opts.ctx);
     this.sessionFormatProbe = opts.sessionFormatProbe;
+    this.extraEntryExemptSections = opts.extraEntryExemptSections ?? [];
   }
 
   /* ---------------- 第 1-6 步：ZIP 读入 → 安全解析 → manifest → 完整性 → schema ---------------- */
@@ -297,55 +303,12 @@ export class Analyzer {
       throw new Error(this.msg('import.manifestParseFailed', { reason: err instanceof Error ? err.message : String(err) }));
     }
 
-    // 4. 完整性（integrity/checksums.json 逐一 SHA-256）
+    // 4. 完整性（checksums.json 逐一 SHA-256）+ 4b 反向覆盖（表外条目）：判据下沉在 security 侧。
     const zipWarnings: string[] = [];
-    let checksums = { ok: true, mismatches: [] as string[], missing: [] as string[] };
-    // 4a. H2：校验表**缺失**或**为空**时，全部条目都处于「未登记 ⇒ 未被校验」状态。
-    //     此前整段完整性逻辑（含下面的反向检查）都嵌在 `if (archive.has(CHECKSUMS_FILE))` 内，
-    //     于是「剥掉 checksums.json」或「把它置为 {}」= 一个条目都不校验，却 valid=true / 零告警。
-    //     两种形态对用户是同一件事（没有任何条目被校验），故共用同一条告警，不制造近重复文案。
-    const table = archive.has(CHECKSUMS_FILE)
-      ? (parseJsonSafe(archive.readEntryText(CHECKSUMS_FILE)) as Record<string, string>)
-      : null;
-    if (table === null || Object.keys(table).length === 0) {
-      zipWarnings.push(this.msg('import.checksumsMissing'));
-    }
-    if (table !== null && Object.keys(table).length > 0) {
-      const entries = new Map<string, Uint8Array>();
-      for (const name of archive.names()) {
-        if (name === MANIFEST_FILE || name === CHECKSUMS_FILE) continue;
-        try {
-          // 异步解压：这是全仓**唯一**逐条解压全部条目的地方，`inflateRawSync` 会整段阻塞
-          // 事件循环（实测 29 MiB 归档 108 ms，大备份就是几秒的界面冻结）。判据与同步版逐字相同。
-          entries.set(name, await archive.readEntryAsync(name));
-        } catch {
-          entries.delete(name); // 损坏条目在完整性阶段即失败
-          checksums.ok = false;
-          checksums.mismatches.push(name);
-        }
-      }
-      const result = await verifyAgainstTable(entries, table);
-      checksums = result;
-      if (!checksums.ok) {
-        throw new Error(this.msg('import.integrityFailed', {
-          entries: [...checksums.mismatches, ...checksums.missing].map((m) => `"${m}"`).join(', '),
-        }));
-      }
-      // 4b. G-04：反向完整性——ZIP 内**不在**校验表里的条目（未登记 ⇒ 未被校验）。
-      //     verifyAgainstTable 只遍历表里的键，所以 ZIP 里多出的条目此前既不校验也不告知；
-      //     这里把它变成显式 warning（不阻断：未知 ZIP 条目不参与校验是格式 v1 的既定语义）。
-      //     排除 manifest.json / checksums.json 自身与目录条目（以 "/" 结尾）。
-      const tableKeys = new Set(Object.keys(table));
-      const extraEntries = archive.names().filter(
-        (name) => name !== MANIFEST_FILE && name !== CHECKSUMS_FILE
-          && !name.endsWith('/') && !tableKeys.has(name),
-      );
-      if (extraEntries.length > 0) {
-        zipWarnings.push(this.msg('import.extraEntries', {
-          entries: extraEntries.map((e) => `"${e}"`).join(', '),
-        }));
-      }
-    }
+    const integrity = await scanArchiveIntegrity(archive, this.msg);
+    if (integrity.failure !== undefined) throw new Error(integrity.failure);
+    zipWarnings.push(...integrity.warnings);
+    const { checksums, unverified } = integrity;
 
     // 5. schema 版本判定（集中）：过新（isTooNew）或过旧（低于 MIN_SUPPORTED）→ 一律硬失败（行为不变）
     if (isTooNew(manifest.schemaVersion) || !isSupported(manifest.schemaVersion)) {
@@ -371,7 +334,7 @@ export class Analyzer {
       }
     }
 
-    const bundle: Bundle = { archive, manifest, checksums, zipWarnings, migrationWarnings };
+    const bundle: Bundle = { archive, manifest, checksums, unverifiedEntries: unverified, zipWarnings, migrationWarnings };
     // 身份读得到才入实例缓存（与跨请求缓存同一判据：不拿未知身份签结果）。
     if (identity !== null) this.bundleCache.set(zipPath, { stamp: identity.stamp, bundle });
     // 写入跨请求缓存：execute（refresh）也写 —— 它刚做过完整校验，这份结果对后续只读入口同样有效。
@@ -584,6 +547,12 @@ export class Analyzer {
     // 会话格式体检只跑一次：告警、计划项标记、ImportAnalysis 摘要共用（探针要解首帧，别重复跑）。
     const sessionFormats = this.resolveSessionFormats(sections);
 
+    // SEC-05：会落盘的文件分区条目必须在校验表内（表外条目此前照样被原样写进目标目录）。
+    // 阻断结果就在计划项自己身上（kind:'Error' + description），不另存一份名单（单一事实）。
+    applyUnverifiedFileBlocks(
+      bundle.unverifiedEntries, adapterItems, this.fileCollectionIds(), this.extraEntryExemptSections, this.msg,
+    );
+
     return {
       ...bundle,
       sections,
@@ -629,7 +598,13 @@ export class Analyzer {
     const analyzed = await this.analyzeBundle(bundle);
 
     const errors = [...analyzed.adapterIssues];
-    const warnings = [...zipWarnings, ...bundle.migrationWarnings, ...analyzed.sectionWarnings];
+    // SEC-05：未覆盖条目（表外 + 校验表缺失时的全部文件分区条目）≠ 被篡改 —— 逐条 Error 已保证零写入，
+    // 不再把整包判死。全仓只此一条 warning（RV1-F11：与 scanArchiveIntegrity 的 import.extraEntries 合并）；
+    // 名单取**全部**未覆盖条目而非「被阻断」子集：豁免分区（历史包兼容）不阻断但仍必须被说出来。
+    const blockedCount = analyzed.adapterItems.filter((i) => i.detail === UNVERIFIED_FILE_ENTRY_CODE).length;
+    const unverifiedNotice = analyzed.unverifiedEntries.length > 0
+      ? [unverifiedNoticeText(this.msg, analyzed.unverifiedEntries, blockedCount)] : [];
+    const warnings = [...zipWarnings, ...bundle.migrationWarnings, ...analyzed.sectionWarnings, ...unverifiedNotice];
     warnings.push(...this.secretsPayloadWarnings(manifest, opts.decryptedCredentials));
     if (!canImport(manifest.schemaVersion)) {
       errors.push(this.msg('import.versionUnsupported', { version: describeVersion(manifest.schemaVersion) }));
@@ -1074,11 +1049,17 @@ export class Analyzer {
             message: outcome.executed.message ?? null,
           });
         }
-        // 仅硬失败计入 anyFailed（warning 属非致命：目标不可达等，不触发回滚，§34.17）
-        if (outcome.executed.status === 'failed') anyFailed = true;
+        // 仅硬失败计入 anyFailed（warning 属非致命：目标不可达等，不触发回滚，§34.17）。
+        // 「硬失败」= 真的尝试过写、并且失败了（applyOne/adapter 抛错、applyItem 返回 failed、写一半的
+        // 目标不可达）。执行前就被策略拦下的项（kind 'Error'：安全白名单 / SEC-05 未覆盖条目）**根本没
+        // 碰目标** —— 它连一个字节都没写，把它算成失败只会让 rollbackOnError（IE-02 缺省 true）在
+        // 「本来能导入的部分」上做一次整笔回滚，等于用安全策略制造数据损失；它也没留下半套状态可回滚。
+        // 因此这类预判阻断只记账（executed 里 status 'failed'，用户可见），不触发回滚、不中断后续条目。
+        const hardFailed = outcome.executed.status === 'failed' && item.kind !== 'Error';
+        if (hardFailed) anyFailed = true;
         if (outcome.needsRestart) needsRestart = true;
         if (outcome.warning) warnings.push(outcome.warning);
-        if (opts.rollbackOnError && outcome.executed.status === 'failed') break;
+        if (opts.rollbackOnError && hardFailed) break;
       }
       // 分区收尾（issue #45 ④）：会话位置护栏等必须等本分区全部写完才做的动作。
       // 「终止 + 回滚」例外：整笔马上要被回滚，再跑收尾纯属浪费且可能中途失败。
@@ -1493,7 +1474,7 @@ export class Analyzer {
 import {
   applyMappingsToSections, applyTombstoneFilter, buildCredentialPlanItems, detectPathIssues,
   mergePathMappings, rebaseMapping, reportRollbackToJournal, runSchemaMigration, sessionUnitVersion,
-  usableSecretValue, verifyAgainstTable,
+  usableSecretValue,
 } from './import-planning.ts';
 
 // 对外导入面保持不变（core/index.ts 与既有测试按 './analyzer.ts' 取这三个名字）。

package/src/core/backup.test.ts

@@ -29,7 +29,12 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { FileSnapshotStore, createSnapshot, normalizeDshVersion, resolveFileTarget, verifySnapshot } from './backup.ts';
+import {
+  FileSnapshotStore, PRE_RESTORE_KEEP_ATTEMPTS, PRE_RESTORE_KEEP_DAYS,
+  createSnapshot, normalizeDshVersion, resolveFileTarget, verifySnapshot,
+} from './backup.ts';
+import type { PrunePlan } from './backup.ts';
+import { existsSync } from 'node:fs';
 import { rollback } from './rollback.ts';
 import { makeContext, MemSnapshotStore } from '../adapters/test-helpers.ts';
 import type { ImportPlan, Snapshot, SnapshotStore } from './types.ts';
@@ -461,3 +466,136 @@ test('mcp 连接器：storages/mcp_connector.json 进快照为整文件条目，
   assert.deepEqual(report.restored, ['mcp:' + rel], '回滚必须报告真正被还原的那一条');
   assert.equal(new TextDecoder().decode(await ctx.fs.readFile(abs)), original);
 });
+
+/* ---------------- BK-05：prune 不得销毁反悔副本（pre-restore） ----------------
+ *
+ * 反悔副本 = 恢复链路在覆盖/删除前落的原文副本：<snapshotsDir>/<snapshotId>/pre-restore/<attempt>/（restore.ts:888）。
+ * 此前 prune 用 fs.rm(<snapshotsDir>/<id>, { recursive: true }) 整目录删 ⇒ 快照一被淘汰，用户最后一次
+ * 「反悔」的原文就跟着消失，而那份字节是**唯一**的（不在 blobs 里、不进同步、不进导出）。
+ * 现在的口径：快照本体照常回收，pre-restore 子树留下；它有自己的保留策略（数量 + 天数），
+ * 且删除前先把「要删什么」回调出去（onPrunePlan），不先删后报。
+ */
+
+/** 与 restore.ts 的 preRestoreStamp 同格式（本地时间 yyyyMMdd-HHmmss-SSS）。 */
+function stamp(date: Date): string {
+  const p = (n: number, width = 2): string => String(n).padStart(width, '0');
+  return p(date.getFullYear(), 4) + p(date.getMonth() + 1) + p(date.getDate())
+    + '-' + p(date.getHours()) + p(date.getMinutes()) + p(date.getSeconds())
+    + '-' + p(date.getMilliseconds(), 3);
+}
+
+async function plantPreRestore(
+  dir: string,
+  snapshotId: string,
+  attempt: string,
+  files: Record<string, string>,
+): Promise<string> {
+  const pre = path.join(dir, snapshotId, 'pre-restore', attempt);
+  await fs.mkdir(pre, { recursive: true });
+  for (const [name, body] of Object.entries(files)) await fs.writeFile(path.join(pre, name), body, 'utf8');
+  return pre;
+}
+
+test('BK-05/①：prune 淘汰旧快照时保留 pre-restore 反悔副本（原文逐字节还在），删什么先落计划', async (t) => {
+  const dir = await tmpDir(t, 'prune-prerestore');
+  const { ctx } = countingCtx();
+  await seedHostFiles(ctx);
+  const plans: PrunePlan[] = [];
+  /** 计划回调里快照本体还在吗 —— 证明「先出清单，再删」而不是删完再编 */
+  let snapshotJsonAliveAtPlanTime: boolean | null = null;
+  const store = new FileSnapshotStore({
+    dir,
+    retentionPolicy: () => ({ keepLast: 1, keepMonthly: 0, keepYearly: 0 }),
+    onPrunePlan: (plan) => {
+      plans.push(plan);
+      if (plan.removeSnapshots.length > 0) {
+        snapshotJsonAliveAtPlanTime = existsSync(path.join(dir, plan.removeSnapshots[0]!, 'snapshot.json'));
+      }
+    },
+  });
+
+  const first = await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+  const attempt = stamp(new Date());
+  const pre = await plantPreRestore(dir, first.id, attempt, { '0001-settings.yaml': 'old-settings' });
+  const second = await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+
+  // 快照本体照常回收（否则保留清理等于失效）
+  await assert.rejects(fs.readFile(path.join(dir, first.id, 'snapshot.json'), 'utf8'), '旧快照的 snapshot.json 必须删掉');
+  await assert.rejects(fs.stat(path.join(dir, first.id, 'blobs')), '旧快照的 blobs 必须回收');
+  // 反悔副本一字不差
+  assert.equal(await fs.readFile(path.join(pre, '0001-settings.yaml'), 'utf8'), 'old-settings', '反悔副本必须原样保留');
+  assert.equal(existsSync(path.join(dir, second.id, 'snapshot.json')), true);
+
+  const plan = plans.at(-1)!;
+  assert.deepEqual(plan.removeSnapshots, [first.id], '计划里必须有「要删哪个快照」');
+  assert.ok(plan.keepPreRestoreFor.includes(first.id), '因反悔副本而不整目录删的快照要如实列出：' + JSON.stringify(plan));
+  assert.ok(plan.paths.includes(first.id + '/snapshot.json'), '计划要含具体路径（审计「到底删了什么」）：' + JSON.stringify(plan.paths));
+  assert.equal(snapshotJsonAliveAtPlanTime, true, '计划必须在真正删除**之前**给出');
+});
+
+test('BK-05/②：反悔副本自有保留策略 —— 每次恢复一个 attempt，只留最新 5 个', async (t) => {
+  const dir = await tmpDir(t, 'prune-prerestore-count');
+  const { ctx } = countingCtx();
+  await seedHostFiles(ctx);
+  const plans: PrunePlan[] = [];
+  const store = new FileSnapshotStore({ dir, onPrunePlan: (plan) => { plans.push(plan) } });
+  const snap = await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+
+  // 7 个 attempt（时间递增；每个 attempt 只装它那一次被覆盖的文件）
+  const base = Date.now() - 6 * 60 * 60 * 1000;
+  const names: string[] = [];
+  for (let i = 0; i < 7; i += 1) {
+    const name = stamp(new Date(base + i * 60 * 60 * 1000));
+    names.push(name);
+    await plantPreRestore(dir, snap.id, name, { '0001-settings.yaml': 'v' + i });
+  }
+  await store.pruneNow();
+
+  const left = (await fs.readdir(path.join(dir, snap.id, 'pre-restore'))).sort();
+  assert.deepEqual(left, names.slice(-PRE_RESTORE_KEEP_ATTEMPTS).sort(), '只留最新 ' + PRE_RESTORE_KEEP_ATTEMPTS + ' 个 attempt');
+  const plan = plans.at(-1)!;
+  const dropped = plan.dropPreRestore.map((d) => d.attempt).sort();
+  assert.deepEqual(dropped, names.slice(0, names.length - PRE_RESTORE_KEEP_ATTEMPTS).sort(), '被删的 attempt 必须逐条进计划');
+  assert.ok(plan.dropPreRestore.every((d) => d.reason === 'count'));
+  assert.ok(plan.dropPreRestore.every((d) => d.files === 1), '计划要带文件数（用户能看出删了多少）');
+  assert.equal(existsSync(path.join(dir, snap.id, 'snapshot.json')), true, '活着的快照本体绝不能被这轮清理碰到');
+});
+
+test('BK-05/③：反悔副本超过保留天数 → 删；近期的不动', async (t) => {
+  const dir = await tmpDir(t, 'prune-prerestore-age');
+  const { ctx } = countingCtx();
+  await seedHostFiles(ctx);
+  const plans: PrunePlan[] = [];
+  const store = new FileSnapshotStore({ dir, onPrunePlan: (plan) => { plans.push(plan) } });
+  const snap = await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+
+  const oldAttempt = stamp(new Date(Date.now() - (PRE_RESTORE_KEEP_DAYS + 5) * 24 * 60 * 60 * 1000));
+  const freshAttempt = stamp(new Date(Date.now() - 60 * 60 * 1000));
+  await plantPreRestore(dir, snap.id, oldAttempt, { '0001-settings.yaml': 'ancient' });
+  await plantPreRestore(dir, snap.id, freshAttempt, { '0001-settings.yaml': 'fresh' });
+  await store.pruneNow();
+
+  const left = (await fs.readdir(path.join(dir, snap.id, 'pre-restore'))).sort();
+  assert.deepEqual(left, [freshAttempt], '超过 ' + PRE_RESTORE_KEEP_DAYS + ' 天的反悔副本该按天数淘汰');
+  assert.deepEqual(
+    plans.at(-1)!.dropPreRestore.map((d) => ({ attempt: d.attempt, reason: d.reason })),
+    [{ attempt: oldAttempt, reason: 'over-age' }],
+  );
+});
+
+test('BK-05/④：反悔副本全部过期后不留空壳目录（快照已不在 ⇒ 目录一起收掉）', async (t) => {
+  const dir = await tmpDir(t, 'prune-prerestore-shell');
+  const { ctx } = countingCtx();
+  await seedHostFiles(ctx);
+  const store = new FileSnapshotStore({
+    dir,
+    retentionPolicy: () => ({ keepLast: 1, keepMonthly: 0, keepYearly: 0 }),
+  });
+  const first = await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+  const oldAttempt = stamp(new Date(Date.now() - (PRE_RESTORE_KEEP_DAYS + 1) * 24 * 60 * 60 * 1000));
+  await plantPreRestore(dir, first.id, oldAttempt, { '0001-settings.yaml': 'ancient' });
+  await createSnapshot({ ctx, plan: emptyPlan(), sourceZip: 'unit.zip', store, adapters: [] });
+
+  assert.equal(existsSync(path.join(dir, first.id)), false, '快照没了 + 反悔副本也过期 ⇒ 不留空壳');
+});
+