cortico-world-memory 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-memory",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "description": "Cortico World 扩展：五层记忆（事实库/知识库/反思/人格/档案）+ 三级记忆底座 + Hybrid Recall 向量混合检索（移植自 E:/qq_bot 的记忆系统与 memory_server 向量 sidecar，qq_bot 源码零改动）。",
   "license": "MIT",

package/src/backend.ts

@@ -10,7 +10,7 @@
  *  SQLite 驱动优先级:先试 `better-sqlite3`(原生,若已安装),缺失则回退 Node 内置
  *  `node:sqlite`(v24+ 自带,零安装)。两者 API 兼容(.prepare().get()/.run()、.exec())。
  */
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 
 export type BackendKind = 'json' | 'sqlite';
@@ -164,3 +164,69 @@ export async function createBackend(kind: BackendKind, dataDir: string, log?: Lo
   log?.('[memory] 存储后端=json');
   return new JsonBackend(dataDir);
 }
+
+/**
+ * 只读打开 memory.db,导出 KV 行为 Map<stem, obj>。供「切回 JSON」时回填用。
+ * 优先 better-sqlite3,缺失则回退 Node 内置 node:sqlite(本环境走这条)。
+ */
+export async function readSqliteData(dataDir: string, stems: readonly string[]): Promise<Map<string, unknown>> {
+  const dbFile = join(dataDir, 'memory.db');
+  if (!existsSync(dbFile)) return new Map();
+  let db: any;
+  try {
+    const mod: any = await import('better-sqlite3');
+    const Database = mod.default ?? mod;
+    db = new Database(dbFile, { readonly: true });
+  } catch {
+    const { DatabaseSync } = await import('node:sqlite');
+    db = new DatabaseSync(dbFile, { readOnly: true });
+  }
+  const out = new Map<string, unknown>();
+  try {
+    let rows: any[];
+    if (stems.length) {
+      const ph = stems.map(() => '?').join(',');
+      rows = db.prepare(`SELECT name, data FROM kv WHERE name IN (${ph})`).all(...stems);
+    } else {
+      rows = db.prepare('SELECT name, data FROM kv').all();
+    }
+    for (const r of rows) {
+      try { out.set(r.name, JSON.parse(r.data)); } catch { /* 跳过损坏行 */ }
+    }
+  } finally {
+    try { db.close(); } catch { /* ignore */ }
+  }
+  return out;
+}
+
+/**
+ * 切回 JSON 时,若 memory.db 存在且其中数据比对应 JSON 文件更新,回填到 JSON 文件,
+ * 消除 json↔sqlite 切换的数据不对称(此前 sqlite→json 会丢 SQLite 期间的写入)。
+ * 返回回填的 store 数量。仅当 JSON 缺文件或比 DB 更旧时才覆盖,避免冲掉用户在 JSON 上的后续手动编辑。
+ */
+export async function backfillSqliteToJson(dataDir: string, log?: LogFn): Promise<number> {
+  const dbFile = join(dataDir, 'memory.db');
+  if (!existsSync(dbFile)) return 0;
+  let fromSqlite: Map<string, unknown>;
+  try {
+    fromSqlite = await readSqliteData(dataDir, ALL_STEMS);
+  } catch (e: any) {
+    log?.(`[memory] 读 SQLite 失败,跳过回填: ${e?.message ?? e}`);
+    return 0;
+  }
+  if (!fromSqlite.size) return 0;
+  const json = new JsonBackend(dataDir);
+  let filled = 0;
+  const dbMtime = statSync(dbFile).mtimeMs;
+  for (const stem of ALL_STEMS) {
+    if (!fromSqlite.has(stem)) continue;
+    const jsonFile = join(dataDir, stem + '.json');
+    const jsonMtime = existsSync(jsonFile) ? statSync(jsonFile).mtimeMs : 0;
+    if (jsonMtime === 0 || dbMtime > jsonMtime) {
+      json.writeJson(stem, fromSqlite.get(stem));
+      filled++;
+    }
+  }
+  if (filled) log?.(`[memory] 已从 SQLite 回填 ${filled} 个 store 到 JSON(不丢切换期间写入)`);
+  return filled;
+}

package/src/config.ts

@@ -98,7 +98,7 @@ export const MEMORY_CONFIG_GROUP: ConfigGroup = {
       'worlds.memory.embeddingTimeoutMs': { type: 'number', title: 'Sidecar 超时(ms)', description: 'qq_bot 向量模型首载慢,默认 3 分钟。' },
       'worlds.memory.storageBackend': {
         type: 'string', title: '存储后端', enum: ['json', 'sqlite'], 'x-hot': false,
-        description: 'json=原生 JSON 文件(默认);sqlite=单库 KV(自动 better-sqlite3→node:sqlite 回退)。切 sqlite 首次自动迁移旧 JSON。改后须点「重启」生效。',
+        description: 'json=原生 JSON 文件(默认);sqlite=单库 KV(自动 better-sqlite3→node:sqlite 回退)。切 sqlite 首次自动迁移旧 JSON;切回 json 若 memory.db 数据更新会自动回填,不丢切换期间写入。改后须点「重启」生效。',
       },
     },
   },

package/src/world.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from 'node:fs';
+import { readFileSync, statSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import type { World, WorldHost, ToolDef, ToolTag, EventEnvelope } from 'cortico/core/types.ts';
 import type { WorldContext } from 'cortico/world.ts';
@@ -12,7 +12,7 @@ import { KnowledgeStore } from './knowledge-store.ts';
 import { ReflectionStore } from './reflection-store.ts';
 import { PersonaStore } from './persona-store.ts';
 import { ProfileStore } from './profile-store.ts';
-import { createBackend, StoreBackend, ALL_STEMS } from './backend.ts';
+import { createBackend, StoreBackend, ALL_STEMS, backfillSqliteToJson } from './backend.ts';
 import { buildEventText, buildView, promptVars } from './observe.ts';
 
 const ENV_PROMPT_FILE = fileURLToPath(new URL('./ENV_PROMPT.md', import.meta.url));
@@ -126,8 +126,13 @@ export class MemoryWorld implements World {
     this.host = host;
     const ctxData = this.ctx.dataDir;
     const dataDir = typeof ctxData === 'string' && ctxData ? ctxData : '.';
-    this.backend = await createBackend(this.cfg.storageBackend ?? 'json', dataDir, (m) => host.log.info(m));
-    this.backend.migrateFromJson(ALL_STEMS); // 首次切 sqlite 自动迁移旧 JSON
+    const kind = this.cfg.storageBackend ?? 'json';
+    this.backend = await createBackend(kind, dataDir, (m) => host.log.info(m));
+    if (kind === 'sqlite') {
+      this.backend.migrateFromJson(ALL_STEMS); // json→sqlite:首次自动迁移旧 JSON
+    } else {
+      await backfillSqliteToJson(dataDir, (m) => host.log.info(m)); // sqlite→json:回填较新数据,消除切换丢写
+    }
     this.mem = new MemoryBase(dataDir, this.cfg.maxHistory, this.backend);
     this.vectors = new VectorStore(dataDir, this.backend);
     this.facts = new FactStore(dataDir, this.backend);