@kenz1117/dsh-engram 0.7.6 → 0.7.8

package/lib/index.js

@@ -1,5 +1,5 @@
 import { createHash, randomUUID } from "node:crypto";
-import { createWriteStream, existsSync, mkdirSync, readFileSync, renameSync, statSync } from "node:fs";
+import { createWriteStream, existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { homedir } from "node:os";
@@ -16,6 +16,7 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 */
 /** 合法配置键集合（未知键 loud 失败）。 */
 const CONFIG_KEYS = /* @__PURE__ */ new Set([
+	"legacyMigration",
 	"dbDir",
 	"injectProfile",
 	"profileTopN",
@@ -47,6 +48,7 @@ const INGEST_MODES = /* @__PURE__ */ new Set([
 /** Schemastery 校验面（cordis.yml 读取时校验）。 */
 const Config = z.object({
 	dbDir: z.string(),
+	legacyMigration: z.string(),
 	injectProfile: z.boolean(),
 	profileTopN: z.number().step(1).min(1).max(64),
 	modelCacheDir: z.string(),
@@ -77,6 +79,7 @@ const Config = z.object({
 */
 function resolveConfig(config = {}) {
 	for (const key of Object.keys(config)) if (!CONFIG_KEYS.has(key)) throw new Error(`dsh-engram: unknown config key "${key}"`);
+	if (config.legacyMigration !== void 0 && config.legacyMigration !== "eager" && config.legacyMigration !== "conservative") throw new Error("dsh-engram: legacyMigration must be one of eager|conservative");
 	if (config.ingest !== void 0 && !INGEST_MODES.has(config.ingest)) throw new Error(`dsh-engram: ingest must be one of off|light|eager, got "${String(config.ingest)}"`);
 	if (config.profileTopN !== void 0 && (!Number.isInteger(config.profileTopN) || config.profileTopN < 1 || config.profileTopN > 64)) throw new Error("dsh-engram: profileTopN must be an integer in [1, 64]");
 	const hasProvider = config.provider !== void 0;
@@ -93,6 +96,7 @@ function resolveConfig(config = {}) {
 	const dbDir = config.dbDir ?? join(homedir(), ".dsh", "engram");
 	return {
 		dbDir,
+		legacyMigration: config.legacyMigration ?? "eager",
 		injectProfile: config.injectProfile ?? true,
 		profileTopN: config.profileTopN ?? 8,
 		modelCacheDir: config.modelCacheDir ?? join(dbDir, "models"),
@@ -2511,17 +2515,17 @@ function registerEngramRoutes(ctx, deps) {
 //#region src/project/identity.ts
 /**
 * 项目标识：git origin URL 归一化 → sha256 短哈希分库名；无 git 或无 origin 时
-* 回退 cwd 编码（v0.4 现状算法）。纯文件读（.git/config、worktree 的 gitdir/commondir
+* 回退完整 cwd 哈希。纯文件读（.git/config、worktree 的 gitdir/commondir
 * 指针），不起子进程。启动时负责旧库文件向新标识的 rename 迁移。
 * @module @kenz1117/dsh-engram/project/identity
 */
-/** v0.4 旧命名：cwd 的 hex 编码前 24 位（只覆盖 cwd 前 12 字符，同前缀目录会撞库）。保留仅供迁移识别。 */
+/** v0.4 旧命名：cwd 的 hex 编码前 24 位（只覆盖 cwd 前 12 UTF-8 字节，同前缀目录会撞库）。保留仅供迁移识别。 */
 function legacyProjectDbName(cwd) {
 	return `project-${Buffer.from(cwd).toString("hex").slice(0, 24)}.db`;
 }
 /**
 * 无 git 时的 cwd 命名：cwd 全量 sha256 前 24 位。
-* 旧算法只取 cwd 前 12 字符，`C:\Users\Adm…` 这类同前缀目录会共用同一个库；
+* 旧算法只取 cwd 前 12 UTF-8 字节，`C:\Users\Adm…` 这类同前缀目录会共用同一个库；
 * 新算法对每个目录唯一，启动时把旧库 rename 迁移到新名（见 migrateProjectDb）。
 */
 function cwdProjectDbName(cwd) {
@@ -2611,37 +2615,83 @@ function resolveProjectIdentity(cwd) {
 	const origin = configPath === void 0 ? void 0 : readOriginUrl(configPath);
 	const normalized = origin === void 0 ? void 0 : normalizeOriginUrl(origin);
 	if (normalized === void 0) return {
+		cwd,
 		dbName: cwdProjectDbName(cwd),
 		source: "cwd",
 		legacyDbName
 	};
 	return {
+		cwd,
 		dbName: `project-${createHash("sha256").update(normalized).digest("hex").slice(0, 24)}.db`,
 		source: "origin",
 		legacyDbName
 	};
 }
+function readMigrationPointer(dbDir, identity) {
+	const path = join(dbDir, `${identity.legacyDbName}.migrated-to`);
+	let text;
+	try {
+		text = readFileSync(path, "utf8");
+	} catch (error) {
+		if (error.code === "ENOENT") return void 0;
+		throw error;
+	}
+	const value = JSON.parse(text);
+	if (typeof value !== "object" || value === null || !("migratedTo" in value) || typeof value.migratedTo !== "string" || !/^project-[0-9a-f]{24}\.db$/.test(value.migratedTo) || !("claimedByCwd" in value) || typeof value.claimedByCwd !== "string" || !("claimedAt" in value) || typeof value.claimedAt !== "string" || !Number.isFinite(Date.parse(value.claimedAt))) throw new Error(`dsh-engram: invalid migration pointer ${path}; inspect it manually`);
+	return value;
+}
 /**
-* 旧库迁移：新名库不存在而旧名库存在时同目录 rename（零数据搬运）；两者都存在时
-* 不合并、不动文件，返回 kept-both 由调用方告警。origin 标识（v0.4 cwd 编码 → 仓库
-* 哈希）与 cwd 兜底（截断命名 → 全量哈希）两种升级都走这里。
-*
-* 注意旧 cwd 命名只覆盖前 12 字符：同一前缀下的多个目录可能共用过一个旧库，
-* 迁移只能把库判给先打开它的那个目录，调用方应对 kept-both 与本次迁移都告警。
+* Eager keeps the existing rename policy, recording its ambiguous ownership in JSON.
+* Conservative leaves legacy bytes untouched; the caller may open an empty new store.
+* Coexisting databases are never merged or overwritten. This is not a cross-process lock
+* or an atomic transaction across the rename and sidecar write: stop other hosts first.
 */
-function migrateProjectDb(dbDir, identity) {
+function migrateProjectDb(dbDir, identity, policy = "eager") {
 	if (identity.dbName === identity.legacyDbName) return "none";
 	const next = join(dbDir, identity.dbName);
 	const legacy = join(dbDir, identity.legacyDbName);
 	const hasNext = existsSync(next);
 	const hasLegacy = existsSync(legacy);
 	if (hasNext && hasLegacy) return "kept-both";
+	const pointer = readMigrationPointer(dbDir, identity);
+	if (pointer !== void 0) {
+		if (hasLegacy || pointer.migratedTo !== identity.dbName) return "already-migrated";
+		return "none";
+	}
 	if (!hasNext && hasLegacy) {
+		if (policy === "conservative") return "deferred";
 		renameSync(legacy, next);
+		try {
+			writeFileSync(`${legacy}.migrated-to`, JSON.stringify({
+				migratedTo: identity.dbName,
+				claimedByCwd: identity.cwd,
+				claimedAt: (/* @__PURE__ */ new Date()).toISOString()
+			}) + "\n", {
+				flag: "wx",
+				mode: 384
+			});
+		} catch (error) {
+			throw new Error(`dsh-engram: renamed ${identity.legacyDbName} to ${identity.dbName}, but could not record migration; inspect both paths before retrying`, { cause: error });
+		}
 		return "renamed";
 	}
 	return "none";
 }
+/** Shared guidance for plugin boot and session-cwd migration checks. */
+function migrationWarning(dbDir, identity, outcome) {
+	const names = `旧库 ${identity.legacyDbName}；新库 ${identity.dbName}`;
+	const manual = "人工处理前请停止相关宿主并备份所有数据库及 sidecar；新库可能已写入记忆，请勿直接覆盖，先用 engram_review / engram_export 审核并人工重新归属";
+	switch (outcome) {
+		case "none": return;
+		case "renamed": return `[dsh-engram] 项目记忆库已迁移（${names}），已记录 .migrated-to；旧库可能包含同前缀目录的记忆。${manual}`;
+		case "kept-both": return `[dsh-engram] 新旧项目记忆库并存，未合并或移动（${names}）。${manual}`;
+		case "deferred": return `[dsh-engram] conservative 模式暂缓旧库迁移（${names}）；旧库保持不变，将打开新的空库。${manual}`;
+		case "already-migrated": {
+			const pointer = readMigrationPointer(dbDir, identity);
+			return `[dsh-engram] 旧库已有迁移记录（${names}）：${JSON.stringify(pointer)}；先前迁移的库可能含有当前目录的记忆。${manual}`;
+		}
+	}
+}
 //#endregion
 //#region src/project/registry.ts
 /**
@@ -5993,9 +6043,9 @@ function apply(ctx, config = {}) {
 		mode: 448
 	});
 	const identity = resolveProjectIdentity(process.cwd());
-	const migration = migrateProjectDb(resolved.dbDir, identity);
-	if (migration === "renamed") console.warn(`[dsh-engram] 项目记忆库已从 cwd 命名迁移到 git origin 标识：${identity.dbName}`);
-	else if (migration === "kept-both") console.warn(`[dsh-engram] 检测到新旧两个项目记忆库并存，未合并（保留新库 ${identity.dbName}；旧库 ${identity.legacyDbName} 请人工处理后删除）`);
+	const migration = migrateProjectDb(resolved.dbDir, identity, resolved.legacyMigration);
+	const warning = migrationWarning(resolved.dbDir, identity, migration);
+	if (warning !== void 0) console.warn(warning);
 	const rankBoost = {
 		recencyWeight: resolved.rankRecencyWeight,
 		proofWeight: resolved.rankProofWeight,
@@ -6039,9 +6089,9 @@ function apply(ctx, config = {}) {
 		const cached = cwdDbNames.get(cwd);
 		if (cached !== void 0) return cached;
 		const projectIdentity = resolveProjectIdentity(cwd);
-		const migration = migrateProjectDb(resolved.dbDir, projectIdentity);
-		if (migration === "renamed") console.warn(`[dsh-engram] 项目记忆库已迁移到新标识命名（${cwd} → ${projectIdentity.dbName}）`);
-		else if (migration === "kept-both") console.warn(`[dsh-engram] 检测到新旧项目库并存，未合并（保留新库 ${projectIdentity.dbName}；旧库 ${projectIdentity.legacyDbName} 请人工处理后删除）`);
+		const migration = migrateProjectDb(resolved.dbDir, projectIdentity, resolved.legacyMigration);
+		const warning = migrationWarning(resolved.dbDir, projectIdentity, migration);
+		if (warning !== void 0) console.warn(warning);
 		cwdDbNames.set(cwd, projectIdentity.dbName);
 		return projectIdentity.dbName;
 	};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-engram",
   "description": "Cross-session long-term memory for DeepSeek Harness (memory palace · AGI Architecture Exploration on dsh-market): dual-scope SQLite memory graph, hybrid retrieval, provenance audit, and a knowledge flywheel.",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "icon": "icon.svg",
   "logo": "icon-256.svg",
   "publishConfig": {