dsh-config-manager 0.2.0 → 0.2.1

package/lib/index.d.ts

@@ -77,7 +77,7 @@ export declare const name = "config-manager";
 /** Services required before the engine can mount (present in every profile). */
 export declare const inject: string[];
 /** Plugin version, kept in sync with package.json ("version"). */
-export declare const PLUGIN_VERSION = "0.2.0";
+export declare const PLUGIN_VERSION = "0.2.1";
 /**
  * Star 引导弹窗指向的 GitHub 仓库（用户引导点 Star 的目标）。
  * 与 package.json 的 repository 字段保持一致；界面不可改（硬编码，参照

package/lib/index.js

@@ -136,7 +136,7 @@ export const name = 'config-manager';
 /** Services required before the engine can mount (present in every profile). */
 export const inject = ['settings', 'credentials'];
 /** Plugin version, kept in sync with package.json ("version"). */
-export const PLUGIN_VERSION = '0.2.0';
+export const PLUGIN_VERSION = '0.2.1';
 /** Plugin own package name — excluded from its own exported plugins list. */
 const PLUGIN_NAME = 'dsh-config-manager';
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-config-manager",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "description": "Backup, restore, export, import, migrate and sync your DeepSeek Harness (DSH) configuration: settings, plugins, MCP servers, skills, agent presets and workspaces. One-click migration to another machine. DSH 配置一键备份、恢复、导出、导入、迁移与同步插件。",
   "icon": "./icon.svg",

package/src/adapters/self.test.ts

@@ -284,4 +284,58 @@ test('self: 运行态改写不改变分区 hash（自动同步不再每轮误判
   await src.fs.writeFile(rel, Buffer.from(config({ lastRunAt: '2026-10-25T12:02:00.000Z' }, 'https://y/repo.git'), 'utf8'));
   const third = await adapter.export(src, { includeSecrets: false });
   assert.notEqual(hashSection(third.data), hashSection(second.data), '真实配置变化必须让分区 hash 变化');
+});
+
+/**
+ * issue #119 回归：跳过码翻转不得改变分区 hash。
+ *
+ * 现场（0.2.0 / macOS desktop / git 通道 + 自动同步 60s 远端轮询）：配置一字未改，远端仓库
+ * 每分钟多 1~2 个 commit，15 分钟 24 个。根因 = 调度器「跳过」轮写
+ * lastRunSkipReason='upToDate'（冲突轮写 'conflict' + lastRunSkipCount），而「真推」轮收尾
+ * 又把它们清空（toChannelPayload 空值不写）；两个字段不在剔除表里 → 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'));
+  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'));
+  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'));
+  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');
+  assert.ok(!payload.includes('lastRunSkip'), '导出载荷不含跳过码：远端不该接收本机执行记录');
+  assert.ok(payload.includes('"repoUrl":"https://x/repo.git"'), '配置本体仍在载荷里');
+
+  // 同一份远端载荷回灌本机（本机多出跳过码）→ 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'));
+  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'));
+  items = await adapter.analyzeImport(pushRound.data, makeImportContext(dst, sections));
+  assert.equal(items[0]?.kind, 'Conflict', '真实配置变化必须仍判 Conflict');
 });

package/src/adapters/self.ts

@@ -45,6 +45,8 @@
  * 且文件类分区不进 SecretScanner（与 pluginFiles/skills 同语义）。
  */
 import type { HostContext } from '../core/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';
@@ -62,13 +64,48 @@ export const SELF_CONFIG_FILES: readonly string[] = [
   'exports/.backup-notes.json',
 ];
 
+/**
+ * 调度配置里「运行态字段」的**命名口径**：调度器每轮收尾都会改写的字段名形状
+ * （`lastRun*` 一族 + `consecutiveFailures`）。剔除表必须覆盖两个调度配置的并集，
+ * 少一个都会让 self 分区的 hashSection 每轮翻新（issue #119）。
+ */
+type RunStateKeyOf<T> = {
+  [K in keyof T]-?: K extends 'consecutiveFailures' | `lastRun${string}` ? K : never;
+}[keyof T];
+
+type SchedulerRunStateKey = RunStateKeyOf<AutosyncConfig> | RunStateKeyOf<BackupScheduleConfig>;
+
 /**
  * 调度配置里的**运行态字段**：每次执行收尾都会被调度器改写，不属于「配置身份」。
  * 仅比对时剔除（见 comparableContent）；写盘仍写完整文件。
+ *
+ * 逐项列全而不是靠前缀过滤：前缀过滤会把**将来**新增的运行态字段静默吞掉（看不见的假 Skip），
+ * 漏列则让 hash 每轮翻新（issue #119）。所以列全 + 下面的穷尽断言，让编译器守住漂移。
  */
-const VOLATILE_RUN_STATE_KEYS: ReadonlySet<string> = new Set([
-  'lastRunAt', 'lastRunStatus', 'lastRunMessage', 'lastRunHistoryId', 'consecutiveFailures',
-]);
+const VOLATILE_RUN_STATE_KEY_LIST = [
+  'lastRunAt',
+  'lastRunStatus',
+  'lastRunMessage',
+  'lastRunHistoryId',
+  'consecutiveFailures',
+  // issue #119：跳过码每轮在「写入 / 清空」之间翻转，与 lastRunAt 同性质，漏剔即每轮真推快照
+  'lastRunSkipReason',
+  'lastRunSkipCount',
+] as const satisfies readonly SchedulerRunStateKey[];
+
+const VOLATILE_RUN_STATE_KEYS: ReadonlySet<string> = new Set(VOLATILE_RUN_STATE_KEY_LIST);
+
+/**
+ * 编译期穷尽断言（零运行时开销）：`AutosyncConfig` / `BackupScheduleConfig` 将来新增任何
+ * `lastRun*` 字段而没进上表时，`Exclude` 不再是 `never`，**这一行 typecheck 报错**。
+ * 只写 `satisfies keyof T` 挡不住「新增字段忘了加」——那正是 issue #119 的失效模式。
+ */
+type AssertExhaustive<T extends never> = T;
+
+/** 见 AssertExhaustive 的注释；导出只为让断言参与类型检查（无需被引用）。 */
+export type SchedulerRunStateKeysExhaustive = AssertExhaustive<
+  Exclude<SchedulerRunStateKey, (typeof VOLATILE_RUN_STATE_KEY_LIST)[number]>
+>;
 
 /** 含运行态字段的调度配置（相对 baseDir）。 */
 const SCHEDULER_CONFIG_RELS: ReadonlySet<string> = new Set([

package/src/index.ts

@@ -180,7 +180,7 @@ export const name = 'config-manager'
 export const inject = ['settings', 'credentials']
 
 /** Plugin version, kept in sync with package.json ("version"). */
-export const PLUGIN_VERSION = '0.2.0'
+export const PLUGIN_VERSION = '0.2.1'
 
 /** Plugin own package name — excluded from its own exported plugins list. */
 const PLUGIN_NAME = 'dsh-config-manager'