mslxdff 0.1.203 → 0.1.207

package/src/state/memory.js

@@ -1,162 +1,162 @@
-/**
- * memory Store adapter — 零 IO 的 Store 第二实现，证明 Store seam 真实。
- * 与 fileStore（src/state/store.js）共享同一 merge 语义与冷/热分层，
- * 仅将 persist 层替换为 Map<file, {json, mtimeMs}>，不触 `node:fs`。
- * 用于 `—test-concurrency>1` 并行与单测快速路径。
- */
-import { mergeState, COLD_WINS } from "./merge.js";
-import { clone } from "../compat.js";
-
-const memCache = new Map(); // file -> { data, dirty, timer, mtimeMs }
-const memDisk = new Map(); // file -> { obj, mtimeMs }
-
-function getEntry(file) {
-  let e = memCache.get(file);
-  if (!e) {
-    e = { data: null, dirty: false, timer: null, mtimeMs: 0 };
-    memCache.set(file, e);
-  }
-  return e;
-}
-
-function loadFromDiskMem(file) {
-  const v = memDisk.get(file);
-  return v ? clone(v.obj) : {};
-}
-function getMtimeMem(file) {
-  const v = memDisk.get(file);
-  return v ? v.mtimeMs : 0;
-}
-function atomicWriteSyncMem(file, data) {
-  const now = Date.now();
-  // ensure monotonic mtime
-  const prev = memDisk.get(file)?.mtimeMs || 0;
-  const mtime = now <= prev ? prev + 1 : now;
-  memDisk.set(file, { obj: clone(data), mtimeMs: mtime });
-  return mtime;
-}
-
-function readState(file) {
-  const e = getEntry(file);
-  if (e.data !== null) {
-    const mtime = getMtimeMem(file);
-    if (mtime === e.mtimeMs) return e.data;
-    if (e.dirty) {
-      const disk = loadFromDiskMem(file);
-      const merged = mergeState(disk || {}, e.data);
-      e.data = merged;
-      e.mtimeMs = mtime;
-      return e.data;
-    }
-  }
-  const disk = loadFromDiskMem(file);
-  e.data = disk && typeof disk === "object" ? clone(disk) : {};
-  e.mtimeMs = getMtimeMem(file) || Date.now();
-  e.dirty = false;
-  return e.data;
-}
-
-function writeStateImmediate(file, patch) {
-  const e = getEntry(file);
-  const base = e.data !== null ? e.data : readState(file);
-  const merged = { ...base, ...patch };
-  e.data = merged;
-  e.dirty = false;
-  if (e.timer) { clearTimeout(e.timer); e.timer = null; }
-  e.mtimeMs = atomicWriteSyncMem(file, merged);
-  return merged;
-}
-
-function writeStateDeferred(file, patch) {
-  const e = getEntry(file);
-  const base = e.data !== null ? e.data : readState(file);
-  const merged = { ...base, ...patch };
-  e.data = merged;
-  e.dirty = true;
-  // 内存版无需定时刷盘，延迟写即 dirty，下次 flush 或 read 时合并
-  return merged;
-}
-
-export function flushStateSync(file) {
-  const e = memCache.get(file);
-  if (!e || !e.dirty || !e.data) return;
-  e.mtimeMs = atomicWriteSyncMem(file || "mem://default", e.data);
-  e.dirty = false;
-  if (e.timer) { clearTimeout(e.timer); e.timer = null; }
-}
-
-export function clearStateCache(file) {
-  if (file) memCache.delete(file);
-  else memCache.clear();
-}
-
-// ---- domain 工厂（复用 schemas 的 normalize 逻辑，但闭包于 memory store） ----
-// 为保持零依赖，memory 侧直接内联必要的 normalize（如 normalizeAllowedModel）
-// 此处仅暴露与 fileStore 对等的最小子集用于测试 seam；完整 facade 可按需扩展
-
-const WORKBUDDY_DEFAULT_BASE_URL = "https://copilot.tencent.com";
-function normalizeAllowedModel(model, providerId) {
-  let s = String(model || "").trim();
-  if (!s) return "";
-  const idx = s.indexOf("/");
-  if (idx > 0 && s.slice(0, idx).toLowerCase() === String(providerId || "").toLowerCase()) s = s.slice(idx + 1);
-  return s;
-}
-function defaultStateFileMem(file) { return file || "mem://default"; }
-
-export function createMemoryState(file = "mem://default") {
-  const f = defaultStateFileMem(file);
-  return {
-    loadModelErrors: () => {
-      const v = readState(f).modelErrors;
-      return v && typeof v === "object" && !Array.isArray(v) ? clone(v) : {};
-    },
-    saveModelErrors: (errors) => { writeStateDeferred(f, { modelErrors: clone(errors) }); return errors; },
-    loadModelLatencies: () => {
-      const v = readState(f).modelLatencies;
-      return v && typeof v === "object" && !Array.isArray(v) ? clone(v) : {};
-    },
-    saveModelLatencies: (v) => { writeStateDeferred(f, { modelLatencies: clone(v) }); return v; },
-    loadProviderKeys: (id) => {
-      const keys = readState(f).providerKeys;
-      const v = keys && typeof keys === "object" ? keys[id] : undefined;
-      if (typeof v === "string") return v.trim() ? [v.trim()] : [];
-      if (Array.isArray(v)) return [...new Set(v.filter((x) => typeof x === "string" && x.trim().length))];
-      return [];
-    },
-    saveProviderKeys: (id, list) => {
-      const keys = { ...(readState(f).providerKeys || {}) };
-      const clean = [...new Set((Array.isArray(list) ? list : []).map((k) => String(k || "").trim()).filter(Boolean))];
-      if (clean.length) keys[id] = clean; else delete keys[id];
-      writeStateImmediate(f, { providerKeys: keys });
-      return clean;
-    },
-    loadProviderAllowedModels: (id) => {
-      const cfg = readState(f).providerConfigs?.[id];
-      if (cfg && Array.isArray(cfg.allowedModels)) return [...cfg.allowedModels].map((m) => normalizeAllowedModel(m, id)).filter(Boolean);
-      return [];
-    },
-    saveProviderAllowedModels: (id, list) => {
-      const clean = [...new Set((Array.isArray(list) ? list : []).map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
-      const configs = { ...(readState(f).providerConfigs || {}) };
-      const cur = configs[id] || {};
-      configs[id] = { ...cur, allowedModels: clean };
-      if (!clean.length) delete configs[id].allowedModels;
-      if (!configs[id].baseUrl && !(configs[id].keys||[]).length && !(configs[id].allowedModels||[]).length) delete configs[id];
-      writeStateImmediate(f, { providerConfigs: configs });
-      return clean;
-    },
-    loadPeers: () => {
-      const v = readState(f).peers;
-      return Array.isArray(v) ? clone(v) : [];
-    },
-    savePeers: (peers) => { writeStateImmediate(f, { peers: clone(peers) }); return peers; },
-    flushSync: () => flushStateSync(f),
-    clear: () => clearStateCache(f),
-    _memDisk: memDisk,
-    _memCache: memCache,
-  };
-}
-
-// 单例 memory facade（便于直接 import 使用）
-export const memoryState = createMemoryState("mem://default");
+/**
+ * memory Store adapter — 零 IO 的 Store 第二实现，证明 Store seam 真实。
+ * 与 fileStore（src/state/store.js）共享同一 merge 语义与冷/热分层，
+ * 仅将 persist 层替换为 Map<file, {json, mtimeMs}>，不触 `node:fs`。
+ * 用于 `—test-concurrency>1` 并行与单测快速路径。
+ */
+import { mergeState, COLD_WINS } from "./merge.js";
+import { clone } from "../compat.js";
+
+const memCache = new Map(); // file -> { data, dirty, timer, mtimeMs }
+const memDisk = new Map(); // file -> { obj, mtimeMs }
+
+function getEntry(file) {
+  let e = memCache.get(file);
+  if (!e) {
+    e = { data: null, dirty: false, timer: null, mtimeMs: 0 };
+    memCache.set(file, e);
+  }
+  return e;
+}
+
+function loadFromDiskMem(file) {
+  const v = memDisk.get(file);
+  return v ? clone(v.obj) : {};
+}
+function getMtimeMem(file) {
+  const v = memDisk.get(file);
+  return v ? v.mtimeMs : 0;
+}
+function atomicWriteSyncMem(file, data) {
+  const now = Date.now();
+  // ensure monotonic mtime
+  const prev = memDisk.get(file)?.mtimeMs || 0;
+  const mtime = now <= prev ? prev + 1 : now;
+  memDisk.set(file, { obj: clone(data), mtimeMs: mtime });
+  return mtime;
+}
+
+function readState(file) {
+  const e = getEntry(file);
+  if (e.data !== null) {
+    const mtime = getMtimeMem(file);
+    if (mtime === e.mtimeMs) return e.data;
+    if (e.dirty) {
+      const disk = loadFromDiskMem(file);
+      const merged = mergeState(disk || {}, e.data);
+      e.data = merged;
+      e.mtimeMs = mtime;
+      return e.data;
+    }
+  }
+  const disk = loadFromDiskMem(file);
+  e.data = disk && typeof disk === "object" ? clone(disk) : {};
+  e.mtimeMs = getMtimeMem(file) || Date.now();
+  e.dirty = false;
+  return e.data;
+}
+
+function writeStateImmediate(file, patch) {
+  const e = getEntry(file);
+  const base = e.data !== null ? e.data : readState(file);
+  const merged = { ...base, ...patch };
+  e.data = merged;
+  e.dirty = false;
+  if (e.timer) { clearTimeout(e.timer); e.timer = null; }
+  e.mtimeMs = atomicWriteSyncMem(file, merged);
+  return merged;
+}
+
+function writeStateDeferred(file, patch) {
+  const e = getEntry(file);
+  const base = e.data !== null ? e.data : readState(file);
+  const merged = { ...base, ...patch };
+  e.data = merged;
+  e.dirty = true;
+  // 内存版无需定时刷盘，延迟写即 dirty，下次 flush 或 read 时合并
+  return merged;
+}
+
+export function flushStateSync(file) {
+  const e = memCache.get(file);
+  if (!e || !e.dirty || !e.data) return;
+  e.mtimeMs = atomicWriteSyncMem(file || "mem://default", e.data);
+  e.dirty = false;
+  if (e.timer) { clearTimeout(e.timer); e.timer = null; }
+}
+
+export function clearStateCache(file) {
+  if (file) memCache.delete(file);
+  else memCache.clear();
+}
+
+// ---- domain 工厂（复用 schemas 的 normalize 逻辑，但闭包于 memory store） ----
+// 为保持零依赖，memory 侧直接内联必要的 normalize（如 normalizeAllowedModel）
+// 此处仅暴露与 fileStore 对等的最小子集用于测试 seam；完整 facade 可按需扩展
+
+const WORKBUDDY_DEFAULT_BASE_URL = "https://copilot.tencent.com";
+function normalizeAllowedModel(model, providerId) {
+  let s = String(model || "").trim();
+  if (!s) return "";
+  const idx = s.indexOf("/");
+  if (idx > 0 && s.slice(0, idx).toLowerCase() === String(providerId || "").toLowerCase()) s = s.slice(idx + 1);
+  return s;
+}
+function defaultStateFileMem(file) { return file || "mem://default"; }
+
+export function createMemoryState(file = "mem://default") {
+  const f = defaultStateFileMem(file);
+  return {
+    loadModelErrors: () => {
+      const v = readState(f).modelErrors;
+      return v && typeof v === "object" && !Array.isArray(v) ? clone(v) : {};
+    },
+    saveModelErrors: (errors) => { writeStateDeferred(f, { modelErrors: clone(errors) }); return errors; },
+    loadModelLatencies: () => {
+      const v = readState(f).modelLatencies;
+      return v && typeof v === "object" && !Array.isArray(v) ? clone(v) : {};
+    },
+    saveModelLatencies: (v) => { writeStateDeferred(f, { modelLatencies: clone(v) }); return v; },
+    loadProviderKeys: (id) => {
+      const keys = readState(f).providerKeys;
+      const v = keys && typeof keys === "object" ? keys[id] : undefined;
+      if (typeof v === "string") return v.trim() ? [v.trim()] : [];
+      if (Array.isArray(v)) return [...new Set(v.filter((x) => typeof x === "string" && x.trim().length))];
+      return [];
+    },
+    saveProviderKeys: (id, list) => {
+      const keys = { ...(readState(f).providerKeys || {}) };
+      const clean = [...new Set((Array.isArray(list) ? list : []).map((k) => String(k || "").trim()).filter(Boolean))];
+      if (clean.length) keys[id] = clean; else delete keys[id];
+      writeStateImmediate(f, { providerKeys: keys });
+      return clean;
+    },
+    loadProviderAllowedModels: (id) => {
+      const cfg = readState(f).providerConfigs?.[id];
+      if (cfg && Array.isArray(cfg.allowedModels)) return [...cfg.allowedModels].map((m) => normalizeAllowedModel(m, id)).filter(Boolean);
+      return [];
+    },
+    saveProviderAllowedModels: (id, list) => {
+      const clean = [...new Set((Array.isArray(list) ? list : []).map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
+      const configs = { ...(readState(f).providerConfigs || {}) };
+      const cur = configs[id] || {};
+      configs[id] = { ...cur, allowedModels: clean };
+      if (!clean.length) delete configs[id].allowedModels;
+      if (!configs[id].baseUrl && !(configs[id].keys||[]).length && !(configs[id].allowedModels||[]).length) delete configs[id];
+      writeStateImmediate(f, { providerConfigs: configs });
+      return clean;
+    },
+    loadPeers: () => {
+      const v = readState(f).peers;
+      return Array.isArray(v) ? clone(v) : [];
+    },
+    savePeers: (peers) => { writeStateImmediate(f, { peers: clone(peers) }); return peers; },
+    flushSync: () => flushStateSync(f),
+    clear: () => clearStateCache(f),
+    _memDisk: memDisk,
+    _memCache: memCache,
+  };
+}
+
+// 单例 memory facade（便于直接 import 使用）
+export const memoryState = createMemoryState("mem://default");

package/src/state/merge.js

@@ -1,25 +1,25 @@
-/**
- * merge 深模块：COLD_WINS + mergeState 纯函数
- * 供 store.js 与 memory.js 同源，避免复制
- */
-export const COLD_WINS = new Set([
-  "providerConfigs",
-  "providerKeys",
-  "port",
-  "token",
-  "preferredModel",
-  "modelPicks",
-  "peers",
-  "groups",
-  "groupsJoined",
-  "bans",
-  "createdAt",
-]);
-
-export function mergeState(disk, mem) {
-  const merged = { ...disk, ...mem };
-  for (const k of COLD_WINS) {
-    if (disk[k] !== undefined) merged[k] = disk[k];
-  }
-  return merged;
-}
+/**
+ * merge 深模块：COLD_WINS + mergeState 纯函数
+ * 供 store.js 与 memory.js 同源，避免复制
+ */
+export const COLD_WINS = new Set([
+  "providerConfigs",
+  "providerKeys",
+  "port",
+  "token",
+  "preferredModel",
+  "modelPicks",
+  "peers",
+  "groups",
+  "groupsJoined",
+  "bans",
+  "createdAt",
+]);
+
+export function mergeState(disk, mem) {
+  const merged = { ...disk, ...mem };
+  for (const k of COLD_WINS) {
+    if (disk[k] !== undefined) merged[k] = disk[k];
+  }
+  return merged;
+}

package/src/state/migrations/cline-unify.js

@@ -1,94 +1,94 @@
-/**
- * 幂等状态迁移：把遗留 id 的 cline 配置合并进 `cline` 并删除旧键（供应商 id 统一）。
- * 见 .scratch/cline-unify/SPEC.md §4.5；语义：keys 去重 + 剔除 sk_ 旧式 key、allowlist 求并、baseUrl 收敛为根。
- * 绝不触碰 modelPicks / modelErrors / modelLatencies（旧 clinebot/* 键交给既有 prune --orphans）。
- */
-import { chmodSync, copyFileSync, existsSync } from "node:fs";
-import { defaultStateFile, readState, writeStateImmediate } from "../store.js";
-import { normalizeAllowedModel, normalizeEndpointPath } from "../provider-config.js";
-import { appendEvent } from "../../logs.js";
-
-export const CLINE_DEFAULT_BASE_URL = "https://api.cline.bot";
-export const LEGACY_CLINE_IDS = ["clinebot", "cline-bot"];
-
-/**
- * cline 的 chat URL = `baseUrl` + `loadProviderChatPath()`；而 loadProviderChatPath 缺省**恒**返回
- * `/chat/completions`（src/providers/cline/index.js 里那个按 `/api/v1` 智能兜底的 defaultChat 是死代码，
- * 永远轮不到它生效）。所以 baseUrl 必须自带 `/api/v1`，否则会拼成 `https://api.cline.bot/chat/completions`
- * → 上游 404（2026-09-20 端到端实测）。只对 cline 官方域补全，自定义/代理 baseUrl 不做猜测。
- */
-export function normalizeClineBaseUrl(u) {
-  const s = String(u || "").trim().replace(/\/+$/, "");
-  if (!s) return `${CLINE_DEFAULT_BASE_URL}/api/v1`;
-  if (/\/api\/v1$/i.test(s)) return s;
-  if (/^https?:\/\/api\.cline\.bot$/i.test(s)) return `${s}/api/v1`;
-  return s;
-}
-
-function uniq(list) { return [...new Set(list)]; }
-function strList(v) { return Array.isArray(v) ? v.map((x) => String(x || "").trim()).filter(Boolean) : []; }
-// sk_ 旧式 API key（D3：cline 只认 refreshToken，数据层剔除）
-function isLegacySkKey(k) { return /^sk[-_]/i.test(k); }
-
-/** 合并后的 cline 配置：只重建 cline 自己的字段，不吸收旧 id 的 allowAnyModels（避免意外放宽安全默认） */
-function mergeConfig(cl, bot) {
-  const next = {
-    baseUrl: normalizeClineBaseUrl(cl.baseUrl || bot.baseUrl),
-    keys: uniq([...strList(cl.keys), ...strList(bot.keys)]).filter((k) => !isLegacySkKey(k)),
-    allowedModels: uniq([...strList(cl.allowedModels), ...strList(bot.allowedModels)]
-      .map((m) => normalizeAllowedModel(m, "cline")).filter(Boolean)),
-  };
-  if (Array.isArray(cl.auths) && cl.auths.length) next.auths = cl.auths;
-  if (typeof cl.allowAnyModels === "boolean") next.allowAnyModels = cl.allowAnyModels;
-  const modelsPath = normalizeEndpointPath(cl.modelsPath || bot.modelsPath || "");
-  if (modelsPath) next.modelsPath = modelsPath;
-  const chatPath = normalizeEndpointPath(cl.chatPath || bot.chatPath || "");
-  if (chatPath) next.chatPath = chatPath;
-  return next;
-}
-
-/** 备份到同目录 state.json.bak-<ISO时间戳>，权限收紧 0600（含凭据，绝不外泄） */
-function backupState(file, now = new Date()) {
-  const stamp = now.toISOString().replace(/[:.]/g, "-");
-  const target = `${file}.bak-${stamp}`;
-  copyFileSync(file, target);
-  try { chmodSync(target, 0o600); } catch {}
-  return target;
-}
-
-/**
- * @param {{file?:string, dryRun?:boolean, backup?:boolean}} opts
- * @returns {{applied:boolean, changed:boolean, reason?:string, before?:object, after?:object, backup?:string}}
- *   `applied` 仅在真正落盘时为 true；before/after 只含计数，绝不含凭据明文。
- */
-export function clineUnifyMigration({ file = defaultStateFile(), dryRun = false, backup = true } = {}) {
-  const configs = readState(file).providerConfigs || {};
-  const legacyId = LEGACY_CLINE_IDS.find((pid) => configs[pid] && typeof configs[pid] === "object");
-  if (!legacyId) return { applied: false, changed: false, reason: "no legacy cline id" };
-  const bot = configs[legacyId];
-  const cl = configs.cline && typeof configs.cline === "object" ? configs.cline : {};
-  const next = mergeConfig(cl, bot);
-  const before = {
-    keys: strList(cl.keys).length + strList(bot.keys).length,
-    allowedModels: uniq([...strList(cl.allowedModels), ...strList(bot.allowedModels)]).length,
-  };
-  const after = { keys: next.keys.length, allowedModels: next.allowedModels.length };
-  if (dryRun) return { applied: false, changed: true, reason: "dry-run", before, after };
-  let backupPath = null;
-  if (backup) {
-    try { if (existsSync(file)) backupPath = backupState(file); } catch {}
-  }
-  const merged = { ...configs, cline: next };
-  for (const pid of LEGACY_CLINE_IDS) delete merged[pid];
-  writeStateImmediate(file, { providerConfigs: merged });
-  try {
-    appendEvent({
-      type: "cline-unify-migrated",
-      from: legacyId,
-      keys: after.keys,
-      allowedModels: after.allowedModels,
-      backup: backupPath ? backupPath.replace(/\\/g, "/").split("/").pop() : null,
-    });
-  } catch {}
-  return { applied: true, changed: true, reason: `merged ${legacyId}`, before, after, ...(backupPath ? { backup: backupPath } : {}) };
-}
+/**
+ * 幂等状态迁移：把遗留 id 的 cline 配置合并进 `cline` 并删除旧键（供应商 id 统一）。
+ * 见 .scratch/cline-unify/SPEC.md §4.5；语义：keys 去重 + 剔除 sk_ 旧式 key、allowlist 求并、baseUrl 收敛为根。
+ * 绝不触碰 modelPicks / modelErrors / modelLatencies（旧 clinebot/* 键交给既有 prune --orphans）。
+ */
+import { chmodSync, copyFileSync, existsSync } from "node:fs";
+import { defaultStateFile, readState, writeStateImmediate } from "../store.js";
+import { normalizeAllowedModel, normalizeEndpointPath } from "../provider-config.js";
+import { appendEvent } from "../../logs.js";
+
+export const CLINE_DEFAULT_BASE_URL = "https://api.cline.bot";
+export const LEGACY_CLINE_IDS = ["clinebot", "cline-bot"];
+
+/**
+ * cline 的 chat URL = `baseUrl` + `loadProviderChatPath()`；而 loadProviderChatPath 缺省**恒**返回
+ * `/chat/completions`（src/providers/cline/index.js 里那个按 `/api/v1` 智能兜底的 defaultChat 是死代码，
+ * 永远轮不到它生效）。所以 baseUrl 必须自带 `/api/v1`，否则会拼成 `https://api.cline.bot/chat/completions`
+ * → 上游 404（2026-09-20 端到端实测）。只对 cline 官方域补全，自定义/代理 baseUrl 不做猜测。
+ */
+export function normalizeClineBaseUrl(u) {
+  const s = String(u || "").trim().replace(/\/+$/, "");
+  if (!s) return `${CLINE_DEFAULT_BASE_URL}/api/v1`;
+  if (/\/api\/v1$/i.test(s)) return s;
+  if (/^https?:\/\/api\.cline\.bot$/i.test(s)) return `${s}/api/v1`;
+  return s;
+}
+
+function uniq(list) { return [...new Set(list)]; }
+function strList(v) { return Array.isArray(v) ? v.map((x) => String(x || "").trim()).filter(Boolean) : []; }
+// sk_ 旧式 API key（D3：cline 只认 refreshToken，数据层剔除）
+function isLegacySkKey(k) { return /^sk[-_]/i.test(k); }
+
+/** 合并后的 cline 配置：只重建 cline 自己的字段，不吸收旧 id 的 allowAnyModels（避免意外放宽安全默认） */
+function mergeConfig(cl, bot) {
+  const next = {
+    baseUrl: normalizeClineBaseUrl(cl.baseUrl || bot.baseUrl),
+    keys: uniq([...strList(cl.keys), ...strList(bot.keys)]).filter((k) => !isLegacySkKey(k)),
+    allowedModels: uniq([...strList(cl.allowedModels), ...strList(bot.allowedModels)]
+      .map((m) => normalizeAllowedModel(m, "cline")).filter(Boolean)),
+  };
+  if (Array.isArray(cl.auths) && cl.auths.length) next.auths = cl.auths;
+  if (typeof cl.allowAnyModels === "boolean") next.allowAnyModels = cl.allowAnyModels;
+  const modelsPath = normalizeEndpointPath(cl.modelsPath || bot.modelsPath || "");
+  if (modelsPath) next.modelsPath = modelsPath;
+  const chatPath = normalizeEndpointPath(cl.chatPath || bot.chatPath || "");
+  if (chatPath) next.chatPath = chatPath;
+  return next;
+}
+
+/** 备份到同目录 state.json.bak-<ISO时间戳>，权限收紧 0600（含凭据，绝不外泄） */
+function backupState(file, now = new Date()) {
+  const stamp = now.toISOString().replace(/[:.]/g, "-");
+  const target = `${file}.bak-${stamp}`;
+  copyFileSync(file, target);
+  try { chmodSync(target, 0o600); } catch {}
+  return target;
+}
+
+/**
+ * @param {{file?:string, dryRun?:boolean, backup?:boolean}} opts
+ * @returns {{applied:boolean, changed:boolean, reason?:string, before?:object, after?:object, backup?:string}}
+ *   `applied` 仅在真正落盘时为 true；before/after 只含计数，绝不含凭据明文。
+ */
+export function clineUnifyMigration({ file = defaultStateFile(), dryRun = false, backup = true } = {}) {
+  const configs = readState(file).providerConfigs || {};
+  const legacyId = LEGACY_CLINE_IDS.find((pid) => configs[pid] && typeof configs[pid] === "object");
+  if (!legacyId) return { applied: false, changed: false, reason: "no legacy cline id" };
+  const bot = configs[legacyId];
+  const cl = configs.cline && typeof configs.cline === "object" ? configs.cline : {};
+  const next = mergeConfig(cl, bot);
+  const before = {
+    keys: strList(cl.keys).length + strList(bot.keys).length,
+    allowedModels: uniq([...strList(cl.allowedModels), ...strList(bot.allowedModels)]).length,
+  };
+  const after = { keys: next.keys.length, allowedModels: next.allowedModels.length };
+  if (dryRun) return { applied: false, changed: true, reason: "dry-run", before, after };
+  let backupPath = null;
+  if (backup) {
+    try { if (existsSync(file)) backupPath = backupState(file); } catch {}
+  }
+  const merged = { ...configs, cline: next };
+  for (const pid of LEGACY_CLINE_IDS) delete merged[pid];
+  writeStateImmediate(file, { providerConfigs: merged });
+  try {
+    appendEvent({
+      type: "cline-unify-migrated",
+      from: legacyId,
+      keys: after.keys,
+      allowedModels: after.allowedModels,
+      backup: backupPath ? backupPath.replace(/\\/g, "/").split("/").pop() : null,
+    });
+  } catch {}
+  return { applied: true, changed: true, reason: `merged ${legacyId}`, before, after, ...(backupPath ? { backup: backupPath } : {}) };
+}

package/src/state/migrations.js

@@ -1,33 +1,33 @@
-/**
- * 状态迁移运行器：按注册顺序执行（每个迁移自身幂等），供 daemon bootstrap
- * （src/runtime/providers-setup.js，实例化任何 provider 之前）与 CLI 单点调用。
- * 失败只收集不抛出：迁移不该拖垮 daemon 启动。
- */
-import { defaultStateFile } from "./store.js";
-import { clineUnifyMigration } from "./migrations/cline-unify.js";
-
-export const STATE_MIGRATIONS = [
-  { id: "cline-unify", run: (opts) => clineUnifyMigration(opts) },
-];
-
-/**
- * @param {{file?:string, dryRun?:boolean, backup?:boolean}} opts
- * @returns {Promise<{applied:string[], skipped:string[], errors:object[], details:object}>}
- */
-export async function runStateMigrations({ file = defaultStateFile(), dryRun = false, backup = true } = {}) {
-  const applied = [];
-  const skipped = [];
-  const errors = [];
-  const details = {};
-  for (const m of STATE_MIGRATIONS) {
-    try {
-      const r = await m.run({ file, dryRun, backup });
-      details[m.id] = r;
-      if (r?.applied) applied.push(m.id);
-      else skipped.push(m.id);
-    } catch (err) {
-      errors.push({ id: m.id, error: String(err?.message || err) });
-    }
-  }
-  return { applied, skipped, errors, details };
-}
+/**
+ * 状态迁移运行器：按注册顺序执行（每个迁移自身幂等），供 daemon bootstrap
+ * （src/runtime/providers-setup.js，实例化任何 provider 之前）与 CLI 单点调用。
+ * 失败只收集不抛出：迁移不该拖垮 daemon 启动。
+ */
+import { defaultStateFile } from "./store.js";
+import { clineUnifyMigration } from "./migrations/cline-unify.js";
+
+export const STATE_MIGRATIONS = [
+  { id: "cline-unify", run: (opts) => clineUnifyMigration(opts) },
+];
+
+/**
+ * @param {{file?:string, dryRun?:boolean, backup?:boolean}} opts
+ * @returns {Promise<{applied:string[], skipped:string[], errors:object[], details:object}>}
+ */
+export async function runStateMigrations({ file = defaultStateFile(), dryRun = false, backup = true } = {}) {
+  const applied = [];
+  const skipped = [];
+  const errors = [];
+  const details = {};
+  for (const m of STATE_MIGRATIONS) {
+    try {
+      const r = await m.run({ file, dryRun, backup });
+      details[m.id] = r;
+      if (r?.applied) applied.push(m.id);
+      else skipped.push(m.id);
+    } catch (err) {
+      errors.push({ id: m.id, error: String(err?.message || err) });
+    }
+  }
+  return { applied, skipped, errors, details };
+}