@shadowforge0/aquifer-memory 1.0.2 → 1.0.3

package/core/aquifer.js

@@ -187,21 +187,30 @@ function createAquifer(config) {
     // --- lifecycle ---
 
     async migrate() {
-      // 1. Run base DDL
-      const baseSql = loadSql('001-base.sql', schema);
-      await pool.query(baseSql);
-
-      // 2. If entities enabled, run entity DDL
-      if (entitiesEnabled) {
-        const entitySql = loadSql('002-entities.sql', schema);
-        await pool.query(entitySql);
-      }
+      // Advisory lock prevents concurrent migrations across processes.
+      // Lock key is derived from schema name to allow parallel migration
+      // of different schemas in the same database.
+      const lockKey = Buffer.from(`aquifer:${schema}`).reduce((h, b) => (h * 31 + b) & 0x7fffffff, 0);
+      await pool.query('SELECT pg_advisory_lock($1)', [lockKey]);
+      try {
+        // 1. Run base DDL
+        const baseSql = loadSql('001-base.sql', schema);
+        await pool.query(baseSql);
+
+        // 2. If entities enabled, run entity DDL
+        if (entitiesEnabled) {
+          const entitySql = loadSql('002-entities.sql', schema);
+          await pool.query(entitySql);
+        }
 
-      // 3. Trust + feedback (always, not gated by entities)
-      const trustSql = loadSql('003-trust-feedback.sql', schema);
-      await pool.query(trustSql);
+        // 3. Trust + feedback (always, not gated by entities)
+        const trustSql = loadSql('003-trust-feedback.sql', schema);
+        await pool.query(trustSql);
 
-      migrated = true;
+        migrated = true;
+      } finally {
+        await pool.query('SELECT pg_advisory_unlock($1)', [lockKey]).catch(() => {});
+      }
     },
 
     async close() {

package/core/entity.js

@@ -222,27 +222,41 @@ async function upsertEntityRelations(pool, {
 }) {
   if (!pairs || pairs.length === 0) return { upserted: 0 };
   const ts = occurredAt || new Date().toISOString();
-  let upserted = 0;
 
+  // Filter and normalize pairs
+  const validPairs = [];
   for (const { srcEntityId, dstEntityId } of pairs) {
     if (!srcEntityId || !dstEntityId || srcEntityId === dstEntityId) continue;
+    validPairs.push({
+      lo: Math.min(srcEntityId, dstEntityId),
+      hi: Math.max(srcEntityId, dstEntityId),
+    });
+  }
 
-    const lo = Math.min(srcEntityId, dstEntityId);
-    const hi = Math.max(srcEntityId, dstEntityId);
-
-    await pool.query(
-      `INSERT INTO ${qi(schema)}.entity_relations
-        (src_entity_id, dst_entity_id, co_occurrence_count, first_seen_at, last_seen_at)
-      VALUES ($1, $2, 1, $3, $3)
-      ON CONFLICT (src_entity_id, dst_entity_id) DO UPDATE SET
-        co_occurrence_count = ${qi(schema)}.entity_relations.co_occurrence_count + 1,
-        last_seen_at        = GREATEST(${qi(schema)}.entity_relations.last_seen_at, EXCLUDED.last_seen_at)`,
-      [lo, hi, ts]
-    );
-    upserted++;
+  if (validPairs.length === 0) return { upserted: 0 };
+
+  // Batch insert: multi-row VALUES
+  const COLS_PER_ROW = 3;
+  const valueClauses = [];
+  const params = [];
+
+  for (const { lo, hi } of validPairs) {
+    const off = params.length;
+    params.push(lo, hi, ts);
+    valueClauses.push(`($${off+1}, $${off+2}, 1, $${off+3}, $${off+3})`);
   }
 
-  return { upserted };
+  await pool.query(
+    `INSERT INTO ${qi(schema)}.entity_relations
+      (src_entity_id, dst_entity_id, co_occurrence_count, first_seen_at, last_seen_at)
+    VALUES ${valueClauses.join(',\n')}
+    ON CONFLICT (src_entity_id, dst_entity_id) DO UPDATE SET
+      co_occurrence_count = ${qi(schema)}.entity_relations.co_occurrence_count + 1,
+      last_seen_at        = GREATEST(${qi(schema)}.entity_relations.last_seen_at, EXCLUDED.last_seen_at)`,
+    params
+  );
+
+  return { upserted: validPairs.length };
 }
 
 // ---------------------------------------------------------------------------

package/core/storage.js

@@ -360,32 +360,45 @@ async function upsertTurnEmbeddings(pool, sessionRowId, {
     throw new Error(`turns.length (${turns.length}) !== vectors.length (${vectors.length})`);
   }
 
+  // Batch insert: build multi-row VALUES clause
+  const COLS_PER_ROW = 10;
+  const valueClauses = [];
+  const params = [];
+
   for (let i = 0; i < turns.length; i++) {
     const t = turns[i];
     const vec = vectors[i];
     if (!vec) continue;
 
     const contentHash = crypto.createHash('sha256').update(t.text).digest('hex').slice(0, 16);
-    await pool.query(
-      `INSERT INTO ${qi(schema)}.turn_embeddings
-        (session_row_id, tenant_id, session_id, agent_id, source,
-         turn_index, message_index, role, content_text, content_hash, embedding)
-      VALUES ($1,$2,$3,$4,$5,$6,$7,'user',$8,$9,$10::vector)
-      ON CONFLICT (session_row_id, message_index) DO UPDATE SET
-        content_text = EXCLUDED.content_text,
-        content_hash = EXCLUDED.content_hash,
-        embedding = CASE
-          WHEN ${qi(schema)}.turn_embeddings.content_hash = EXCLUDED.content_hash
-          THEN ${qi(schema)}.turn_embeddings.embedding
-          ELSE EXCLUDED.embedding
-        END`,
-      [
-        sessionRowId, tenantId, sessionId, agentId, source || null,
-        t.turnIndex, t.messageIndex,
-        t.text, contentHash, vecToStr(vec),
-      ]
+    const off = params.length;
+    params.push(
+      sessionRowId, tenantId, sessionId, agentId, source || null,
+      t.turnIndex, t.messageIndex,
+      t.text, contentHash, vecToStr(vec),
+    );
+    valueClauses.push(
+      `($${off+1},$${off+2},$${off+3},$${off+4},$${off+5},$${off+6},$${off+7},'user',$${off+8},$${off+9},$${off+10}::vector)`
     );
   }
+
+  if (valueClauses.length === 0) return;
+
+  await pool.query(
+    `INSERT INTO ${qi(schema)}.turn_embeddings
+      (session_row_id, tenant_id, session_id, agent_id, source,
+       turn_index, message_index, role, content_text, content_hash, embedding)
+    VALUES ${valueClauses.join(',\n')}
+    ON CONFLICT (session_row_id, message_index) DO UPDATE SET
+      content_text = EXCLUDED.content_text,
+      content_hash = EXCLUDED.content_hash,
+      embedding = CASE
+        WHEN ${qi(schema)}.turn_embeddings.content_hash = EXCLUDED.content_hash
+        THEN ${qi(schema)}.turn_embeddings.embedding
+        ELSE EXCLUDED.embedding
+      END`,
+    params
+  );
 }
 
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadowforge0/aquifer-memory",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "PG-native long-term memory for AI agents. Turn-level embedding, hybrid RRF ranking, optional knowledge graph. MCP server, CLI, and library API.",
   "main": "index.js",
   "files": [