dsh-config-manager 0.2.4 → 0.3.0

package/src/adapters/self.test.ts

@@ -3,19 +3,27 @@
  * 白名单收集（存在才收、白名单外不收、不递归）、Create/Skip/Conflict 分析、
  * applyItem 写回 $DSH_HOME/dsh-config-manager/<rel>、默认包含 + portable 语义、
  * createAdapters 的 selfDir 挂载行为（缺省挂载 / '' 不挂）。
+ *
+ * SEC-01（P0）：sync/sync-config.json 与 sync/sync-autosync.json 都含「同步目标地址」，
+ * 允许导入写盘 = 备份包可以改本机同步目标，下一次同步把 token 送进包控制的主机。
+ * 因此两者退出裸写白名单：既不导出，也不允许导入写盘（包内出现 → 报告级 warning，绝不静默）。
  */
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import { createAdapters } from './index.ts';
-import { SelfAdapter, SELF_CONFIG_FILES } from './self.ts';
+import { SelfAdapter, SELF_CONFIG_FILES, SELF_IMPORT_BLOCKED_RELS, SELF_IMPORT_BLOCKED_CODE } from './self.ts';
 import { hashSection } from '../sync/sync-state.ts';
+import { sha256Hex } from '../utils/hashing.ts';
 import { makeContext, makeImportContext } from './test-helpers.ts';
 
 test('self: 白名单收集（存在才收，子目录路径保留，白名单外不收集）', async () => {
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{"transport":"git","git":{"repoUrl":"https://x"},"webdav":{}}', 'utf8'));
   await src.fs.writeFile('dsh-config-manager/sync/sync-selection.json', Buffer.from('{"schemaVersion":1,"mode":"default"}', 'utf8'));
   await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{"schemaVersion":1,"lastSyncChannel":"webdav"}', 'utf8'));
+  await src.fs.writeFile('dsh-config-manager/market/market-config.json', Buffer.from('{"schemaVersion":1,"sources":[]}', 'utf8'));
+  // SEC-01：含同步目标地址的两个文件不再进载荷（否则备份包可借它改本机同步目标）
+  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{"transport":"git","git":{"repoUrl":"https://x"}}', 'utf8'));
+  await src.fs.writeFile('dsh-config-manager/sync/sync-autosync.json', Buffer.from('{"schemaVersion":2}', 'utf8'));
   // 白名单外：历史/缓存/快照/临时产物不得收集
   await src.fs.writeFile('dsh-config-manager/sync/sync-history.json', Buffer.from('{"schemaVersion":1}', 'utf8'));
   await src.fs.writeFile('dsh-config-manager/market/cache/index.json', Buffer.from('{}', 'utf8'));
@@ -26,14 +34,16 @@ test('self: 白名单收集（存在才收，子目录路径保留，白名单
   const out = await adapter.export(src, { includeSecrets: false });
   const rels = out.data.files.map((f) => f.relativePath).sort();
   assert.deepEqual(rels, [
-    'sync/sync-config.json',
+    'market/market-config.json',
     'sync/sync-selection.json',
     'sync/ui-prefs.json',
   ]);
   assert.equal(out.counts.files, 3);
   assert.equal(out.warnings.length, 0, '存在文件时不告警');
-  // 白名单常量齐全（sync-autosync / market-config 未创建时自然跳过）
-  assert.ok(SELF_CONFIG_FILES.includes('sync/sync-autosync.json'));
+  // 白名单常量：SEC-01 移出两个同步目标文件，其余照旧
+  assert.ok(!SELF_CONFIG_FILES.includes('sync/sync-config.json'), 'SEC-01：sync-config.json 不得在裸写白名单里');
+  assert.ok(!SELF_CONFIG_FILES.includes('sync/sync-autosync.json'), 'SEC-01：sync-autosync.json 不得在裸写白名单里');
+  assert.ok(SELF_CONFIG_FILES.includes('sync/backup-schedule.json'), '调度配置（无同步目标地址）仍在白名单');
   assert.ok(SELF_CONFIG_FILES.includes('market/market-config.json'));
 });
 
@@ -53,7 +63,7 @@ test('self: 全部缺失 → 空分区 + dirEmpty 警告', async () => {
 
 test('self: 导入往返（Create → 写回 $DSH_HOME/dsh-config-manager/<rel>；幂等 Skip；不同 Conflict）', async () => {
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{"transport":"git"}', 'utf8'));
+  await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{"schemaVersion":1}', 'utf8'));
   const adapter = new SelfAdapter();
   const out = await adapter.export(src, { includeSecrets: false });
 
@@ -65,9 +75,9 @@ test('self: 导入往返（Create → 写回 $DSH_HOME/dsh-config-manager/<rel>
   const r = await adapter.applyItem(items[0]!, makeImportContext(dst, sections));
   assert.equal(r.ok, true);
   assert.equal(
-    Buffer.from(await dst.fs.readFile('dsh-config-manager/sync/sync-config.json')).toString(),
-    '{"transport":"git"}',
-    '导入写回 $DSH_HOME/dsh-config-manager/sync/sync-config.json（基准目录 + 相对路径）',
+    Buffer.from(await dst.fs.readFile('dsh-config-manager/sync/ui-prefs.json')).toString(),
+    '{"schemaVersion":1}',
+    '导入写回 $DSH_HOME/dsh-config-manager/<rel>（基准目录 + 相对路径）',
   );
 
   // 幂等：一致 → Skip
@@ -75,11 +85,52 @@ test('self: 导入往返（Create → 写回 $DSH_HOME/dsh-config-manager/<rel>
   assert.equal(items[0]?.kind, 'Skip');
 
   // 内容不同 → Conflict
-  await dst.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{"transport":"webdav"}', 'utf8'));
+  await dst.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{"schemaVersion":1,"lastSyncChannel":"s3"}', 'utf8'));
   items = await adapter.analyzeImport(out.data, makeImportContext(dst, sections));
   assert.equal(items[0]?.kind, 'Conflict');
 });
 
+/* ---------------- SEC-01：导入包不得写同步目标文件 ---------------- */
+
+test('SEC-01：包内含 sync-config.json / sync-autosync.json → 报告级 warning + 绝不写盘', async () => {
+  const adapter = new SelfAdapter();
+  const evil = '{"schemaVersion":3,"transport":"git","git":{"repoUrl":"https://attacker.example/collect.git"}}';
+  const section = {
+    version: 1 as const,
+    files: SELF_IMPORT_BLOCKED_RELS.map((relativePath) => ({
+      relativePath,
+      data: Buffer.from(evil, 'utf8'),
+      contentHash: sha256Hex(Buffer.from(evil, 'utf8')),
+    })),
+  };
+  const dst = makeContext('linux', '/home/bob');
+  const localConfig = '{"schemaVersion":3,"transport":"git","git":{"repoUrl":"https://github.com/u/r.git"},"webdav":{}}';
+  await dst.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from(localConfig, 'utf8'));
+  const ctx = makeImportContext(dst, new Map([['self', section]]));
+
+  const items = await adapter.analyzeImport(section, ctx);
+  assert.equal(items.length, SELF_IMPORT_BLOCKED_RELS.length);
+  for (const item of items) {
+    assert.equal(item.kind, 'Warning', '不写盘项必须是 Warning（引擎跳过：不进快照范围、不调 applyItem）');
+    assert.equal(item.severity, 'warning');
+    assert.ok((item.description ?? '').length > 0, '必须带可展示文案，不得静默');
+    assert.ok(String(item.detail ?? '').startsWith(SELF_IMPORT_BLOCKED_CODE), '必须带稳定机器码: ' + String(item.detail));
+    assert.ok(String(item.detail ?? '').includes(item.id.slice('self:'.length)), '机器码里带上具体 rel');
+  }
+
+  // 纵深防御：即使绕过引擎直接 apply，也一字节都不写
+  for (const item of items) {
+    const r = await adapter.applyItem(item, makeImportContext(dst, new Map([['self', section]])));
+    assert.equal(r.ok, false, '被挡下的项不得报告成功写入');
+  }
+  assert.equal(
+    Buffer.from(await dst.fs.readFile('dsh-config-manager/sync/sync-config.json')).toString(),
+    localConfig,
+    '本机既有的同步目标不得被包内地址覆盖',
+  );
+  assert.equal(await dst.fs.exists('dsh-config-manager/sync/sync-autosync.json'), false, '不得凭空创建同步调度配置');
+});
+
 test('createAdapters: selfDir 缺省挂载 dsh-config-manager；空串不挂载', () => {
   const withSelf = createAdapters({ selfDir: undefined });
   assert.ok(withSelf.some((a) => a.id === 'self'), '缺省挂载 self adapter');
@@ -97,10 +148,10 @@ test('createAdapters: selfDir 缺省挂载 dsh-config-manager；空串不挂载'
 
 test('self: 预览只列白名单 —— 快照/同步工作副本等内部数据不得进入选择器（与导出逐项相等）', async () => {
   const src = makeContext('win32', 'C:\\Users\\alice');
-  const syncConfig = Buffer.from('{"transport":"git"}', 'utf8');
   const uiPrefs = Buffer.from('{"schemaVersion":1}', 'utf8');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', syncConfig);
+  const marketConfig = Buffer.from('{"schemaVersion":1,"sources":[]}', 'utf8');
   await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', uiPrefs);
+  await src.fs.writeFile('dsh-config-manager/market/market-config.json', marketConfig);
   // 插件自身的数据：此前基类的目录递归把它们全当成该分区的「可勾选单元」
   await src.fs.writeFile('dsh-config-manager/snapshots/eec/snapshot.json', Buffer.from('x'.repeat(4096), 'utf8'));
   await src.fs.writeFile('dsh-config-manager/config-snapshots/2026/config-snapshot.json', Buffer.from('x'.repeat(4096), 'utf8'));
@@ -115,10 +166,10 @@ test('self: 预览只列白名单 —— 快照/同步工作副本等内部数
 
   assert.deepEqual(
     previewed.items.map((u) => u.id),
-    ['self:sync/sync-config.json', 'self:sync/ui-prefs.json'],
+    ['self:sync/ui-prefs.json', 'self:market/market-config.json'],
     '预览只列白名单里的配置（回归：只覆写 export() 时会列出上述全部 8 个文件）',
   );
-  assert.equal(previewed.sizeBytes, syncConfig.byteLength + uiPrefs.byteLength, '体积只算白名单文件');
+  assert.equal(previewed.sizeBytes, uiPrefs.byteLength + marketConfig.byteLength, '体积只算白名单文件');
   assert.deepEqual(previewed.items, adapter.listUnits(exported), '预览的单元清单必须与导出逐项相同');
   assert.deepEqual(previewed.section.counts, exported.counts);
   assert.deepEqual(previewed.section.warnings, exported.warnings);
@@ -131,8 +182,8 @@ test('self: 预览只列白名单 —— 快照/同步工作副本等内部数
 
 test('self: 磁盘体检新统计的目录（rollback-points / 遗留 checkpoints）不进本分区载荷', async () => {
   const src = makeContext('win32', 'C:\\Users\\alice');
-  const syncConfig = Buffer.from('{"transport":"git"}', 'utf8');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', syncConfig);
+  const uiPrefs = Buffer.from('{"schemaVersion":1}', 'utf8');
+  await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', uiPrefs);
   // 磁盘体检会统计这两块占用（回滚点库 + 旧检查点库）——但它们是**数据**，不是 self 分区的配置
   await src.fs.writeFile('dsh-config-manager/rollback-points/index.json', Buffer.from('x'.repeat(4096), 'utf8'));
   await src.fs.writeFile('dsh-config-manager/rollback-points/objects/rb-1/session.v4.jsonl.zstd', Buffer.from('x'.repeat(4096), 'utf8'));
@@ -144,66 +195,59 @@ test('self: 磁盘体检新统计的目录（rollback-points / 遗留 checkpoint
   const previewed = await adapter.preview(src, { includeSecrets: false });
   const rels = exported.data.files.map((f) => f.relativePath);
 
-  assert.deepEqual(rels, ['sync/sync-config.json'], '白名单外一律不收（新增统计目录不得混进载荷）');
+  assert.deepEqual(rels, ['sync/ui-prefs.json'], '白名单外一律不收（新增统计目录不得混进载荷）');
   assert.equal(new Set(rels).size, rels.length, '不得出现重复条目');
   assert.equal(exported.counts.files, 1);
-  assert.deepEqual(
-    previewed.items.map((u) => u.id),
-    ['self:sync/sync-config.json'],
-    '预览与导出同口径（只列白名单）',
-  );
-  assert.equal(previewed.sizeBytes, syncConfig.byteLength, '体积只算白名单文件');
+  assert.deepEqual(previewed.items.map((u) => u.id), ['self:sync/ui-prefs.json'], '预览与导出同口径（只列白名单）');
+  assert.equal(previewed.sizeBytes, uiPrefs.byteLength, '体积只算白名单文件');
 });
 
 test('self: 宿主未实现 statSize（旧版门面）时，白名单判定仍只收配置、不误列内部数据', async () => {
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{}', 'utf8'));
+  await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{}', 'utf8'));
   await src.fs.writeFile('dsh-config-manager/snapshots/x/snapshot.json', Buffer.from('{}', 'utf8'));
   Object.defineProperty(src.fs, 'statSize', { value: undefined, configurable: true });
 
   const adapter = new SelfAdapter();
   const previewed = await adapter.preview(src, { includeSecrets: false });
-  assert.deepEqual(previewed.items.map((u) => u.id), ['self:sync/sync-config.json']);
+  assert.deepEqual(previewed.items.map((u) => u.id), ['self:sync/ui-prefs.json']);
   assert.equal(previewed.sizeBytes, 2, '退回 readFile 时体积 = 文件字节数');
 });
 
 /* ---------------- issue #73：调度配置不得因运行态漂移而每轮重现 ---------------- */
 
-const AUTOSYNC_REL = 'dsh-config-manager/sync/sync-autosync.json';
 const BACKUP_SCHEDULE_REL = 'dsh-config-manager/sync/backup-schedule.json';
 
+/** backup-schedule.json 的配置本体（无运行态） */
+function backupScheduleBody(overrides: Record<string, unknown> = {}, runState: Record<string, unknown> = {}): Buffer {
+  return Buffer.from(JSON.stringify({
+    schemaVersion: 1, enabled: true, interval: '24h', startupMinIntervalMs: 3600000,
+    consecutiveFailures: 0, ...overrides, ...runState,
+  }, null, 2), 'utf8');
+}
+
 test('self: 调度配置仅运行态不同 → Skip（键序不同亦然）；配置本体不同 → Conflict', async () => {
   const adapter = new SelfAdapter();
-  const remote = JSON.stringify({
-    schemaVersion: 2,
-    channels: {
-      git: { enabled: true, interval: '30m', startupMinIntervalMs: 300000, consecutiveFailures: 0, lastRunAt: '2026-10-01T00:00:00.000Z', lastRunStatus: 'success' },
-      webdav: { enabled: false, interval: '30m', startupMinIntervalMs: 300000, consecutiveFailures: 0 },
-    },
-  }, null, 2);
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile(AUTOSYNC_REL, Buffer.from(remote, 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-01T00:00:00.000Z', lastRunStatus: 'success',
+  }));
   const out = await adapter.export(src, { includeSecrets: false });
   const sections = new Map([['self', out.data]]);
 
   // 本机：配置本体一致，但运行态已被本机调度器改写（每轮同步收尾都会发生），且键序不同
   const dst = makeContext('linux', '/home/bob');
-  await dst.fs.writeFile(AUTOSYNC_REL, Buffer.from(JSON.stringify({
-    schemaVersion: 2,
-    channels: {
-      webdav: { consecutiveFailures: 0, startupMinIntervalMs: 300000, interval: '30m', enabled: false },
-      git: { lastRunAt: '2026-10-06T09:00:00.000Z', lastRunStatus: 'failed', lastRunMessage: '网络不可达', lastRunHistoryId: 'h-1', consecutiveFailures: 3, startupMinIntervalMs: 300000, interval: '30m', enabled: true },
-    },
+  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, Buffer.from(JSON.stringify({
+    lastRunStatus: 'failed', lastRunMessage: '网络不可达', lastRunHistoryId: 'h-1', consecutiveFailures: 3,
+    startupMinIntervalMs: 3600000, interval: '24h', enabled: true, schemaVersion: 1,
+    lastRunAt: '2026-10-06T09:00:00.000Z',
   }, null, 2), 'utf8'));
   let items = await adapter.analyzeImport(out.data, makeImportContext(dst, sections));
   assert.equal(items.length, 1);
   assert.equal(items[0]?.kind, 'Skip', '仅运行态字段不同（且键序不同）→ Skip，否则每轮同步都重现同一条 Conflict');
 
   // 配置本体（enabled）不同 → 仍是 Conflict（剔除运行态不得把配置差异一起吞掉）
-  await dst.fs.writeFile(AUTOSYNC_REL, Buffer.from(JSON.stringify({
-    schemaVersion: 2,
-    channels: { git: { enabled: false, interval: '30m', startupMinIntervalMs: 300000, consecutiveFailures: 0 } },
-  }, null, 2), 'utf8'));
+  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({ enabled: false }));
   items = await adapter.analyzeImport(out.data, makeImportContext(dst, sections));
   assert.equal(items[0]?.kind, 'Conflict');
 });
@@ -211,18 +255,16 @@ test('self: 调度配置仅运行态不同 → Skip（键序不同亦然）；
 test('self: backup-schedule.json 同口径 + 坏 JSON 回落整文件哈希', async () => {
   const adapter = new SelfAdapter();
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile(BACKUP_SCHEDULE_REL, Buffer.from(JSON.stringify({
-    schemaVersion: 1, enabled: true, interval: '24h', startupMinIntervalMs: 3600000,
-    consecutiveFailures: 0, lastRunAt: '2026-10-01T00:00:00.000Z', lastRunStatus: 'success',
-  }, null, 2), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-01T00:00:00.000Z', lastRunStatus: 'success',
+  }));
   const out = await adapter.export(src, { includeSecrets: false });
   const sections = new Map([['self', out.data]]);
   const dst = makeContext('linux', '/home/bob');
 
-  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, Buffer.from(JSON.stringify({
-    schemaVersion: 1, enabled: true, interval: '24h', startupMinIntervalMs: 3600000,
+  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
     consecutiveFailures: 2, lastRunAt: '2026-10-06T09:00:00.000Z', lastRunStatus: 'failed',
-  }, null, 2), 'utf8'));
+  }));
   let items = await adapter.analyzeImport(out.data, makeImportContext(dst, sections));
   assert.equal(items[0]?.kind, 'Skip');
 
@@ -235,39 +277,38 @@ test('self: backup-schedule.json 同口径 + 坏 JSON 回落整文件哈希', as
 test('self: 其余白名单文件的比对口径不外溢（仍是整文件哈希）', async () => {
   const adapter = new SelfAdapter();
   const src = makeContext('win32', 'C:\\Users\\alice');
-  await src.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{"transport":"git","git":{"repoUrl":"https://x"},"webdav":{}}', 'utf8'));
+  await src.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{"schemaVersion":1,"lastSyncChannel":"webdav"}', 'utf8'));
   const out = await adapter.export(src, { includeSecrets: false });
   const sections = new Map([['self', out.data]]);
   const dst = makeContext('linux', '/home/bob');
-  await dst.fs.writeFile('dsh-config-manager/sync/sync-config.json', Buffer.from('{ "webdav": {}, "git": { "repoUrl": "https://x" }, "transport": "git" }', 'utf8'));
+  await dst.fs.writeFile('dsh-config-manager/sync/ui-prefs.json', Buffer.from('{ "lastSyncChannel": "webdav", "schemaVersion": 1 }', 'utf8'));
   const items = await adapter.analyzeImport(out.data, makeImportContext(dst, sections));
-  assert.equal(items[0]?.kind, 'Conflict', '键序不同但语义相同 —— sync-config 不是调度配置，仍按字节判');
+  assert.equal(items[0]?.kind, 'Conflict', '键序不同但语义相同 —— 非调度配置仍按字节判');
 });
 
 /**
  * issue #127 回归：运行态漂移不得改变导出的分区 hash。
  *
- * 现场：调度器每轮收尾改写 sync-autosync.json 的运行态字段 → self 分区 hashSection 每轮都变
+ * 现场：调度器每轮收尾改写调度配置的运行态字段 → self 分区 hashSection 每轮都变
  * → SyncEngine.hasLocalChanges() 永远为真 → 自动同步的每次远端轮询（缺省 60s）都真推一个
  * 只差 lastRunAt 的新快照（真机 2026-10-25 一天 41 次 push，远端累积 325 个垃圾快照）。
+ *
+ * 载体说明：SEC-01 之后 sync-autosync.json 不再进载荷，同一套运行态剔除语义由仍在白名单的
+ * backup-schedule.json 承载（两个调度配置共用同一份剔除表，见 self.ts 的 VOLATILE_RUN_STATE_KEY_LIST）。
  */
 test('self: 运行态改写不改变分区 hash（自动同步不再每轮误判「本地有改动」）', async () => {
-  const rel = 'dsh-config-manager/sync/sync-autosync.json';
   const src = makeContext('win32', 'C:\\Users\\alice');
   const adapter = new SelfAdapter();
-  const config = (runState: Record<string, unknown>, repoUrl: string) => JSON.stringify({
-    schemaVersion: 2,
-    channels: {
-      git: { enabled: true, intervalMinutes: 30, realtime: true, remoteCheckMs: 60000, repoUrl, branch: 'main', ...runState },
-      webdav: { enabled: false },
-    },
-  }, null, 2);
-
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-25T12:00:00.000Z', lastRunStatus: 'success', lastRunHistoryId: 'h-1', consecutiveFailures: 0 }, 'https://x/repo.git'), 'utf8'));
+
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-25T12:00:00.000Z', lastRunStatus: 'success', lastRunHistoryId: 'h-1', consecutiveFailures: 0,
+  }));
   const first = await adapter.export(src, { includeSecrets: false });
 
   // 模拟一次同步收尾：只推进运行态（配置本体不动）
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-25T12:01:00.000Z', lastRunStatus: 'failed', lastRunMessage: 'boom', lastRunHistoryId: 'h-2', consecutiveFailures: 1 }, 'https://x/repo.git'), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-25T12:01:00.000Z', lastRunStatus: 'failed', lastRunMessage: 'boom', lastRunHistoryId: 'h-2', consecutiveFailures: 1,
+  }));
   const second = await adapter.export(src, { includeSecrets: false });
 
   assert.equal(
@@ -275,13 +316,13 @@ test('self: 运行态改写不改变分区 hash（自动同步不再每轮误判
     hashSection(first.data),
     '仅运行态不同 → 分区 hash 必须不变（否则每轮远端轮询都真推一次）',
   );
-  const payload = Buffer.from(second.data.files.find((f) => f.relativePath === 'sync/sync-autosync.json')!.data).toString('utf8');
+  const payload = Buffer.from(second.data.files.find((f) => f.relativePath === 'sync/backup-schedule.json')!.data).toString('utf8');
   assert.ok(!payload.includes('lastRunAt'), '导出载荷不含运行态：远端不该接收本机执行记录');
   assert.ok(!payload.includes('consecutiveFailures'));
-  assert.ok(payload.includes('"repoUrl":"https://x/repo.git"'), '配置本体仍在载荷里');
+  assert.ok(payload.includes('"interval":"24h"'), '配置本体仍在载荷里');
 
   // 配置本体变化必须被识别（不能把运行态过滤做成「什么都判不变」）
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-25T12:02:00.000Z' }, 'https://y/repo.git'), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({ interval: '12h' }, { lastRunAt: '2026-10-25T12:02:00.000Z' }));
   const third = await adapter.export(src, { includeSecrets: false });
   assert.notEqual(hashSection(third.data), hashSection(second.data), '真实配置变化必须让分区 hash 变化');
 });
@@ -296,46 +337,46 @@ test('self: 运行态改写不改变分区 hash（自动同步不再每轮误判
  * → hasLocalChanges() 恒真 → 每轮都真推一个新快照。
  */
 test('self: 跳过码翻转不改变分区 hash（issue #119：自动同步不再每轮真推快照）', async () => {
-  const rel = 'dsh-config-manager/sync/sync-autosync.json';
   const src = makeContext('win32', 'C:\\Users\\alice');
   const adapter = new SelfAdapter();
-  const config = (runState: Record<string, unknown>, repoUrl = 'https://x/repo.git') => JSON.stringify({
-    schemaVersion: 2,
-    channels: {
-      git: { enabled: true, intervalMinutes: 30, realtime: true, remoteCheckMs: 60000, repoUrl, branch: 'main', ...runState },
-      webdav: { enabled: false },
-    },
-  }, null, 2);
 
   // 轮次 A：跳过（无本地改动）
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-29T09:00:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'upToDate', consecutiveFailures: 0 }), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-29T09:00:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'upToDate', consecutiveFailures: 0,
+  }));
   const skipRound = await adapter.export(src, { includeSecrets: false });
 
   // 轮次 B：真推一次 —— 跳过码被清空，其余与 A 相同
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-29T09:01:00.000Z', lastRunStatus: 'success', consecutiveFailures: 0 }), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-29T09:01:00.000Z', lastRunStatus: 'success', consecutiveFailures: 0,
+  }));
   const pushRound = await adapter.export(src, { includeSecrets: false });
 
   // 轮次 C：跳过（冲突，带待确认分区数）
-  await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-29T09:02:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'conflict', lastRunSkipCount: 3, consecutiveFailures: 0 }), 'utf8'));
+  await src.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-29T09:02:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'conflict', lastRunSkipCount: 3, consecutiveFailures: 0,
+  }));
   const conflictRound = await adapter.export(src, { includeSecrets: false });
 
   const base = hashSection(skipRound.data);
   assert.equal(hashSection(pushRound.data), base, '跳过码被清空不得改变分区 hash（否则每轮都判「本地有改动」）');
   assert.equal(hashSection(conflictRound.data), base, '跳过码换值 / 带分区数不得改变分区 hash');
 
-  const payload = Buffer.from(pushRound.data.files.find((f) => f.relativePath === 'sync/sync-autosync.json')!.data).toString('utf8');
+  const payload = Buffer.from(pushRound.data.files.find((f) => f.relativePath === 'sync/backup-schedule.json')!.data).toString('utf8');
   assert.ok(!payload.includes('lastRunSkip'), '导出载荷不含跳过码：远端不该接收本机执行记录');
-  assert.ok(payload.includes('"repoUrl":"https://x/repo.git"'), '配置本体仍在载荷里');
+  assert.ok(payload.includes('"interval":"24h"'), '配置本体仍在载荷里');
 
   // 同一份远端载荷回灌本机（本机多出跳过码）→ Skip，不是 Conflict
   const dst = makeContext('linux', '/home/bob');
-  await dst.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-29T09:05:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'upToDate' }), 'utf8'));
+  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({}, {
+    lastRunAt: '2026-10-29T09:05:00.000Z', lastRunStatus: 'success', lastRunSkipReason: 'upToDate',
+  }));
   const sections = new Map([['self', pushRound.data]]);
   let items = await adapter.analyzeImport(pushRound.data, makeImportContext(dst, sections));
   assert.equal(items[0]?.kind, 'Skip', '仅跳过码不同 → Skip（此前每轮判 Conflict 并重复推送）');
 
   // 配置本体变化仍必须被识别（不能把剔除做成「什么都判不变」）
-  await dst.fs.writeFile(rel, Buffer.from(config({ lastRunSkipReason: 'upToDate' }, 'https://y/repo.git'), 'utf8'));
+  await dst.fs.writeFile(BACKUP_SCHEDULE_REL, backupScheduleBody({ interval: '6h' }, { lastRunSkipReason: 'upToDate' }));
   items = await adapter.analyzeImport(pushRound.data, makeImportContext(dst, sections));
   assert.equal(items[0]?.kind, 'Conflict', '真实配置变化必须仍判 Conflict');
-});
+});

package/src/adapters/self.ts

@@ -1,11 +1,15 @@
 /**
  * self 分区 adapter（插件自身配置，设计「self 分区」）：
  * 数据源 = $DSH_HOME/dsh-config-manager/ 下的插件自身配置文件（白名单收集，非递归）：
- *   - sync/sync-config.json     同步通道配置（git repoUrl / webdav url+username；凭据值走 credentials 槽位，不含 secret）
- *   - sync/sync-autosync.json   自动同步调度配置
  *   - sync/sync-selection.json  同步分区选择（默认/高级模式 + 勾选分区）
  *   - sync/ui-prefs.json        插件 UI 偏好（如上次选择的同步通道；从 localStorage 迁入）
+ *   - sync/backup-schedule.json 备份调度配置
  *   - market/market-config.json 配置市场配置
+ *   - exports/.backup-notes.json 导出产物备注清单
+ *
+ * **可信边界（SEC-01）**：`sync/sync-config.json` 与 `sync/sync-autosync.json` 是「同步目标」本身，
+ * 永不可由**包**决定 —— 一个把 repoUrl 指向攻击者仓库的包，导入完用户下一次同步就把家目录配置
+ * 推过去。它们不在白名单里（不导出），导入侧另由 `SELF_IMPORT_BLOCKED_RELS` 显式挡下并留 warning。
  *
  * 排除项：sync/sync-history.json（执行记录，属数据非配置）、market/cache/（缓存）、
  * snapshots/（快照）、tmp/ exports/（临时/导出产物）、rollback-points/（回滚点库——磁盘体检
@@ -44,17 +48,22 @@
  * 安全不变量：配置文件本身不含凭据值（同步凭据走 DSH credentials 槽位引用），
  * 且文件类分区不进 SecretScanner（与 pluginFiles/skills 同语义）。
  */
-import type { HostContext } from '../core/types.ts';
+import type { ApplyResult, HostContext, ImportContext, PlanItem } from '../core/types.ts';
+import type { FilesSection } from '../schema/types.ts';
 import type { AutosyncConfig } from '../sync/autosync-config.ts';
 import type { BackupScheduleConfig } from '../sync/backup-schedule-config.ts';
 import type { RecursiveListing } from '../utils/recursive-walk.ts';
 import { sectionMeta } from '../schema/section-registry.ts';
 import { FileCollectionAdapter } from './file-collection.ts';
 
-/** self 分区白名单文件（相对 baseDir，即 $DSH_HOME/dsh-config-manager/）。 */
+/**
+ * self 分区白名单文件（相对 baseDir，即 $DSH_HOME/dsh-config-manager/）。
+ *
+ * `sync/sync-config.json` 与 `sync/sync-autosync.json` **不在其中**（SEC-01）：同步目标与自动同步开关
+ * 属于「目标机自己的决定」，跨机搬运等于让包决定把本机配置推到哪里。白名单只管导出侧；
+ * 导入侧的包内容不受白名单约束，所以另有 `SELF_IMPORT_BLOCKED_RELS` 显式挡下。
+ */
 export const SELF_CONFIG_FILES: readonly string[] = [
-  'sync/sync-config.json',
-  'sync/sync-autosync.json',
   'sync/sync-selection.json',
   'sync/ui-prefs.json',
   'sync/backup-schedule.json',
@@ -64,6 +73,25 @@ export const SELF_CONFIG_FILES: readonly string[] = [
   'exports/.backup-notes.json',
 ];
 
+/**
+ * 导入侧**一律不写盘**的 rel（SEC-01）。
+ *
+ * 与白名单的关系：白名单管「导出带什么」，本清单管「包里有也绝不落地」。两者故意不共用一份
+ * 数组 —— 白名单将来若因别的理由重新收进某个文件，也不该连带解除导入侧的保护。
+ */
+export const SELF_IMPORT_BLOCKED_RELS: readonly string[] = [
+  'sync/sync-config.json',
+  'sync/sync-autosync.json',
+];
+
+/**
+ * 拦截报告项里的**稳定机器码**前缀（`self-import-blocked:<rel>`）。
+ *
+ * 为什么要有码而不是只给文案：文案随语言/措辞变，调用方（报告、日志、将来的自动判定）需要
+ * 一个能逐字比对的判据。
+ */
+export const SELF_IMPORT_BLOCKED_CODE = "self-import-blocked";
+
 /**
  * 调度配置里「运行态字段」的**命名口径**：调度器每轮收尾都会改写的字段名形状
  * （`lastRun*` 一族 + `consecutiveFailures`）。剔除表必须覆盖两个调度配置的并集，
@@ -223,4 +251,43 @@ export class SelfAdapter extends FileCollectionAdapter {
     // 回落原引用（解析失败 / 非对象）：走整文件哈希，且不额外重算包内哈希
     return canonicalizeWithoutRunState(data) ?? data;
   }
+
+  /**
+   * 导入侧拦截（SEC-01）：包里带 `sync/sync-config.json` / `sync/sync-autosync.json` → 改判 Warning。
+   *
+   * 为什么必须在**计划阶段**改判而不是只在 applyItem 里拒绝：这两份文件是「同步目标」本身，
+   * 一个把 repoUrl 指向攻击者仓库的包，导入完用户下一次同步就会把本机配置推过去 —— 而用户
+   * 从来没被问过「要不要换同步目标」。去掉 `target` 后引擎不会为它登记快照、也不会调 applyItem；
+   * 同时留下一项 report 级 warning（带稳定码 `self-import-blocked:<rel>`），让用户看得见
+   * 「包里有这个文件、我没写」，绝不静默。
+   */
+  override async analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]> {
+    const items = await super.analyzeImport(data, ctx);
+    return items.map((item) => {
+      const rel = item.target?.ref;
+      if (rel === undefined || !SELF_IMPORT_BLOCKED_RELS.includes(rel)) return item;
+      const blocked: PlanItem = {
+        id: item.id,
+        kind: 'Warning',
+        adapter: this.id,
+        description: ctx.msg('adapter.selfImportBlocked', { path: rel }),
+        detail: `${SELF_IMPORT_BLOCKED_CODE}:${rel}`,
+        severity: 'warning',
+      };
+      if (item.unitId !== undefined) blocked.unitId = item.unitId;
+      return blocked;
+    });
+  }
+
+  /**
+   * 纵深防御（SEC-01）：即使有人绕过引擎直接把被拦项喂进 applyItem，也一字节都不写。
+   * 报 warning=true（非致命、不触发整体回滚），与计划阶段的判定同源。
+   */
+  override async applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult> {
+    const ref = item.target?.ref;
+    if (ref !== undefined && SELF_IMPORT_BLOCKED_RELS.includes(ref)) {
+      return { ok: false, message: ctx.msg('adapter.selfImportBlocked', { path: ref }), warning: true };
+    }
+    return super.applyItem(item, ctx);
+  }
 }

package/src/client/ConfigManagerSection.tsx

@@ -649,9 +649,6 @@ const navLayoutResult = navWidths === null
               <ImportWizardView
                 api={api}
                 t={t}
-                uiT={uiT}
-                // 向导 → 来源选择：同样是改 Task 入参（面板状态只有一个事实源）
-                onOpenForeignImport={() => { runStore.patch({ task: { ...activeTask, payload: { foreign: true } } }) }}
               />
             ))}
             {activeTask.kind === 'market' && (

package/src/client/common/Icon.tsx

@@ -42,6 +42,7 @@ import PackageCheck from 'lucide-react/dist/esm/icons/package-check.mjs'
 import Pencil from 'lucide-react/dist/esm/icons/pencil.mjs'
 import RefreshCw from 'lucide-react/dist/esm/icons/refresh-cw.mjs'
 import RotateCw from 'lucide-react/dist/esm/icons/rotate-cw.mjs'
+import Plug from 'lucide-react/dist/esm/icons/plug.mjs'
 import Search from 'lucide-react/dist/esm/icons/search.mjs'
 import Trash2 from 'lucide-react/dist/esm/icons/trash-2.mjs'
 import TriangleAlert from 'lucide-react/dist/esm/icons/triangle-alert.mjs'
@@ -63,6 +64,7 @@ const ICONS = {
   clock: Clock,
   history: History,
   about: Info,
+  probe: Plug,
   info: Info,
   lock: Lock,
   message: MessageSquare,
@@ -236,6 +238,7 @@ export const ActivityIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon n
 export const ClockIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="clock" {...p} />
 export const HistoryIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="history" {...p} />
 export const AboutIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="about" {...p} />
+export const ProbeIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="probe" {...p} />
 export const MessageIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="message" {...p} />
 export const PencilIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="pencil" {...p} />
 export const CloseIcon = (p: Omit<IconProps, 'name'>): JSX.Element => <Icon name="close" {...p} />

package/src/client/common/SectionComposition.tsx

@@ -48,8 +48,13 @@ export function SectionComposition({ sections, t, sectionLabel }: SectionComposi
     <div className={css.sectionGrid}>
       {sections.map((s) => {
         const state = s.state ?? 'ready'
+        /* 真·空行降权（2026-11-01）：条目与体积都为 0 的分区（如未启用的 Agent Presets）
+           与有内容的行同权重，会让「这一项什么都没有」读成和「941 条」一样重要。
+           app-screens §13：零值不给状态色，用灰 —— 有内容但 0 条目的行（如 Prompts 0 条 / 26 B）
+           保持正常色，因为它确实带着配置。 */
+        const isEmptyRow = state === 'ready' && s.count === 0 && s.sizeBytes === 0
         return (
-          <div key={s.section} className={css.sectionRow}>
+          <div key={s.section} className={isEmptyRow ? `${css.sectionRow} ${css.sectionRowEmpty}` : css.sectionRow}>
             <span className={css.sectionName}>{sectionLabel?.(s.section) ?? s.section}</span>
             {state === 'ready'
               ? (

package/src/client/common/info-hint-guard.test.ts

@@ -103,11 +103,11 @@ const MOVE_PINS: readonly MovePin[] = [
   { key: 'webdav.usernameHint', file: 'src/client/sync/ChannelConfigDialog.tsx', kind: '输入规则' },
   { key: 'config.saveHint', file: 'src/client/sync/ChannelConfigDialog.tsx', kind: '机制' },
   { key: 'mode.sessionsPickHint', file: 'src/client/sync/SyncSectionPickerDialog.tsx', kind: '机制' },
-  { key: 'mode.pickerHint', file: 'src/client/sync/SyncSectionPickerDialog.tsx', kind: '机制' },
   { key: 'mode.sessionsLimitHint', file: 'src/client/sync/SyncSectionPickerDialog.tsx', kind: '输入规则' },
   { key: 'mode.sectionsHint', file: 'src/client/sync/SyncSectionPickerDialog.tsx', kind: '机制' },
   { key: 'mode.hint', file: 'src/client/sync/SyncPanel.tsx', kind: '机制' },
-  { key: 'mode.persistHint', file: 'src/client/sync/SyncPanel.tsx', kind: '边界' },
+  // 2026-11-01 用户要求：删掉两处「保存/即时生效」ⓘ（弹窗底部与同步页分区行）——
+  // 它们在解释用户无从选择的事，MOVE 台账随之退出 2 条。
   { key: 'channel.openHint', file: 'src/client/sync/SyncChannelEntryCard.tsx', kind: '机制' },
   { key: 'autosync.description', file: 'src/client/sync/AutosyncCard.tsx', kind: '机制' },
   { key: 'autosync.intervalHint', file: 'src/client/sync/AutosyncCard.tsx', kind: '机制' },
@@ -155,7 +155,6 @@ const MOVE_PINS: readonly MovePin[] = [
   { key: 'import.decryptArchive.hint', file: 'src/client/import/import-wizard-steps.tsx', kind: '机制' },
   { key: 'import.conflicts.hint', file: 'src/client/import/import-wizard-steps.tsx', kind: '机制' },
   { key: 'import.paths.hint', file: 'src/client/import/import-wizard-steps.tsx', kind: '机制' },
-  { key: 'foreign.source.hint', file: 'src/client/import/import-wizard-steps.tsx', kind: '机制' },
   { key: 'import.secrets.hint', file: 'src/client/import/import-wizard-steps.tsx', kind: '机制' },
   { key: 'import.picker.hint', file: 'src/client/import/ImportWizardView.tsx', kind: '机制' },
   { key: 'foreign.source.hint', file: 'src/client/import/ForeignImportView.tsx', kind: '机制' },
@@ -385,14 +384,17 @@ function parseInfoHintEntry(rel: string): { zh: string | undefined; en: string |
   return { zh: values[0], en: values[1], count: values.length };
 }
 
-test('t6-1 MOVE：81 个说明键都已收进 ⓘ（逐字复用原键）且不再有可见说明行', () => {
+test('t6-1 MOVE：79 个说明键都已收进 ⓘ（逐字复用原键）且不再有可见说明行', () => {
   const files = readClientSources();
   // 扫描范围自检：客户端源码至少覆盖 t6 涉及的面板目录
   const dirs = new Set(MOVE_PINS.map((p) => p.file.split('/').slice(0, 3).join('/')));
   assert.ok(dirs.size >= 8, 'MOVE 清单必须覆盖全部面板目录（实际 ' + String(dirs.size) + ' 个）');
   // 2026-10-27 文案审计：about.subtitle 是「页面目录式副标题」（插件信息、作者与反馈入口），
   // 页面本身已由卡片表达，随页级标题一并删除 ⇒ MOVE 清单从 82 降到 81（不是删检查项）。
-  assert.ok(MOVE_PINS.length === 81, 'MOVE 清单长度应为 81（实际 ' + String(MOVE_PINS.length) + '）');
+  // 2026-11-01：删掉「改动即时生效并保存」「分区选择已保存到本机」两处 ⓘ（用户要求，
+// 属解释「用户无从选择的事」的废话）⇒ 81 降到 79（不是删检查项）。
+  // 2026-11-01：导入选择页的「从其它 agent 导入」按钮与其 ⓘ 一并移除（首页已有直达入口）⇒ 79 降到 78。
+  assert.ok(MOVE_PINS.length === 78, 'MOVE 清单长度应为 78（实际 ' + String(MOVE_PINS.length) + '）');
   assert.ok(
     MOVE_PINS.filter((p) => p.kind === '输入规则').length >= 5,
     '输入规则类 MOVE 至少 5 处（config.repoUrlHint / webdav.urlHint / mode.sessionsLimitHint / retention.keep*Hint / export.fileNameHint）',