@yeaft/webchat-agent 0.1.871 → 0.1.873

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.871",
+  "version": "0.1.873",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/yeaft/init.js

@@ -8,9 +8,10 @@
 import { existsSync, mkdirSync, writeFileSync, accessSync, constants } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
-// NOTE: migrateSessionsV1 is imported by tests directly from
-// './migrate/sessions-v1.js' — not wired into initYeaftDir() yet (Phase 2
-// will activate it once the runtime reads from sessions/).
+// NOTE: migrateSessionsV1 is called at the end of initYeaftDir() to collapse
+// any legacy groups/ + chats/ + memory/{group,chat}/ data into the unified
+// sessions/ layout. Idempotent via sentinel file.
+import { migrateSessionsV1 } from './migrate/sessions-v1.js';
 
 /**
  * Check if an error is a permission error (EACCES or EPERM).
@@ -221,5 +222,20 @@ export function initYeaftDir(dir) {
   // from under the live group/chat code paths. Phase 2 flips the runtime
   // and then hooks `migrateSessionsV1(root)` here.
 
+  // NOTE: sessions-v1 migration runs at end. Fire-and-log: keep
+  // initYeaftDir() sync so existing callers don't break. The migration is
+  // idempotent (sentinel file) so a partial run on crash is safe.
+  Promise.resolve()
+    .then(() => migrateSessionsV1(root))
+    .then((res) => {
+      if (res && res.migrated) {
+        console.log(`[yeaft] session migration complete (${res.moved} dirs moved${res.warnings?.length ? `, ${res.warnings.length} warnings` : ''})`);
+        if (res.warnings?.length) for (const w of res.warnings) console.warn(`[yeaft] migration: ${w}`);
+      }
+    })
+    .catch((err) => {
+      console.warn(`[yeaft] session migration failed (continuing): ${err?.message || err}`);
+    });
+
   return { dir: root, created, writable, warnings };
 }

package/yeaft/migrate/sessions-v1.js

@@ -43,7 +43,7 @@ const SENTINEL = '.session-migration-v1.done';
  * @param {string} yeaftDir
  * @returns {{ migrated: boolean, moved: number, warnings: string[] }}
  */
-export function migrateSessionsV1(yeaftDir) {
+export async function migrateSessionsV1(yeaftDir) {
   const warnings = [];
   if (!yeaftDir || !existsSync(yeaftDir)) {
     return { migrated: false, moved: 0, warnings: ['yeaftDir missing'] };
@@ -172,13 +172,32 @@ export function migrateSessionsV1(yeaftDir) {
     }
   }
 
-  // 6. sentinel
-  //
-  // PHASE 2 TODO: the SQLite FTS index (memory/index-db.js) still has rows
-  // pointing at group/<id> and chat/<id> scopes after this migration. When
-  // Phase 2 activates this migration from initYeaftDir(), it MUST also
-  // delete or rebuild the FTS index so the new session/<id> scopes get
-  // re-indexed. Preflow recall is broken until then.
+  // 6. Rewrite SQLite FTS index scope strings via the shared index-db
+  //    module (which already handles ABI loading). Idempotent: WHERE clause
+  //    skips already-rewritten rows.
+  try {
+    const dbPath = join(memoryRoot, 'index.db');
+    if (existsSync(dbPath)) {
+      const { openSegmentIndex } = await import('../memory/index-db.js');
+      const idx = openSegmentIndex(dbPath);
+      try {
+        const db = idx._db;
+        db.exec("BEGIN");
+        db.exec("UPDATE memory_segments SET scope = REPLACE(scope, 'group/', 'session/') WHERE scope LIKE 'group/%'");
+        db.exec("UPDATE memory_segments SET scope = REPLACE(scope, 'chat/', 'session/') WHERE scope LIKE 'chat/%'");
+        db.exec("COMMIT");
+      } catch (err) {
+        try { idx._db.exec("ROLLBACK"); } catch { /* ignore */ }
+        warnings.push(`FTS scope rewrite failed: ${err.message}`);
+      } finally {
+        try { idx.close(); } catch { /* ignore */ }
+      }
+    }
+  } catch (err) {
+    warnings.push(`FTS rewrite skipped: ${err.message}`);
+  }
+
+  // 7. sentinel
   writeFileSync(sentinel, JSON.stringify({
     version: 1,
     migratedAt: new Date().toISOString(),