@shadowforge0/aquifer-memory 1.8.1 → 1.9.0

package/core/memory-recall.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { resolveApplicableRecords } = require('./memory-bootstrap');
+const { assertAllowedScopeRequest } = require('./memory-serving');
 const { hybridRank } = require('./hybrid-rank');
 
 const TYPE_RANK = {
@@ -104,6 +105,7 @@ function isActiveVisible(record, opts = {}) {
 }
 
 function activeScopeKeys(opts = {}) {
+  assertAllowedScopeRequest(opts);
   if (Array.isArray(opts.activeScopePath) && opts.activeScopePath.length > 0) {
     return opts.activeScopePath.map(value => String(value)).filter(Boolean);
   }
@@ -274,6 +276,26 @@ function recallMemoryRecords(records = [], query, opts = {}) {
 }
 
 function createMemoryRecall({ pool, schema, defaultTenantId }) {
+  async function withResolvedScopeKey(opts = {}) {
+    const next = { ...opts };
+    if (!next.scopeId) return next;
+    const tenantId = next.tenantId || defaultTenantId;
+    const result = await pool.query(
+      `SELECT scope_key FROM ${schema}.scopes WHERE tenant_id = $1 AND id = $2 LIMIT 1`,
+      [tenantId, next.scopeId],
+    );
+    const resolvedScopeKey = result.rows?.[0]?.scope_key || null;
+    if (resolvedScopeKey) {
+      next.resolvedScopeKey = resolvedScopeKey;
+      if (!next.activeScopeKey && !next.activeScopePath) {
+        next.activeScopePath = [resolvedScopeKey];
+        next.activeScopeKey = resolvedScopeKey;
+      }
+    }
+    assertAllowedScopeRequest(next);
+    return next;
+  }
+
   function applyCurrentMemoryFilters(where, params, opts = {}) {
     const scopeKeys = activeScopeKeys(opts);
     if (opts.scopeId) {
@@ -295,12 +317,13 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
   }
 
   async function recall(query, opts = {}) {
+    const scopedOpts = await withResolvedScopeKey(opts);
     const q = String(query || '').trim();
     if (!q) throw new Error('memory.recall(query): query must be a non-empty string');
-    const tenantId = opts.tenantId || defaultTenantId;
-    const limit = Math.max(1, Math.min(50, opts.limit || 10));
-    const cfg = (opts.ftsConfig === 'zhcfg' || opts.ftsConfig === 'simple') ? opts.ftsConfig : 'simple';
-    const scopeKeys = activeScopeKeys(opts);
+    const tenantId = scopedOpts.tenantId || defaultTenantId;
+    const limit = Math.max(1, Math.min(50, scopedOpts.limit || 10));
+    const cfg = (scopedOpts.ftsConfig === 'zhcfg' || scopedOpts.ftsConfig === 'simple') ? scopedOpts.ftsConfig : 'simple';
+    const scopeKeys = activeScopeKeys(scopedOpts);
     const fetchLimit = Math.max(limit, Math.min(200, scopeKeys ? limit * 4 : limit));
     const feedbackScoreExpr = feedbackScoreSql(schema);
     const params = [tenantId, q];
@@ -314,7 +337,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
         OR m.context_key ILIKE '%' || $2 || '%'
         OR m.topic_key ILIKE '%' || $2 || '%')`,
     ];
-    applyCurrentMemoryFilters(where, params, opts);
+    applyCurrentMemoryFilters(where, params, scopedOpts);
     params.push(fetchLimit);
     const result = await pool.query(
       `SELECT
@@ -340,7 +363,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       params
     );
     const applicableRows = scopeKeys
-      ? resolveApplicableRecords(result.rows, opts)
+      ? resolveApplicableRecords(result.rows, scopedOpts)
       : result.rows;
     return applicableRows
       .sort(sortRecallRows)
@@ -348,11 +371,12 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
   }
 
   async function recallViaEvidenceItems(query, opts = {}) {
+    const scopedOpts = await withResolvedScopeKey(opts);
     const q = String(query || '').trim();
     if (!q) throw new Error('memory.recall(query): query must be a non-empty string');
-    const tenantId = opts.tenantId || defaultTenantId;
-    const limit = Math.max(1, Math.min(50, opts.limit || 10));
-    const scopeKeys = activeScopeKeys(opts);
+    const tenantId = scopedOpts.tenantId || defaultTenantId;
+    const limit = Math.max(1, Math.min(50, scopedOpts.limit || 10));
+    const scopeKeys = activeScopeKeys(scopedOpts);
     const fetchLimit = Math.max(limit, Math.min(200, scopeKeys ? limit * 4 : limit));
     const feedbackScoreExpr = feedbackScoreSql(schema);
     const params = [tenantId, q];
@@ -361,8 +385,8 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       `m.status = 'active'`,
       `m.visible_in_recall = true`,
     ];
-    applyCurrentMemoryFilters(where, params, opts);
-    const queryVec = vecToStr(opts.queryVec);
+    applyCurrentMemoryFilters(where, params, scopedOpts);
+    const queryVec = vecToStr(scopedOpts.queryVec);
     let vectorScoreExpr = '0';
     let evidencePredicate = `(ei.excerpt_text ILIKE '%' || $2 || '%'
              OR ei.search_tsv @@ plainto_tsquery('simple', $2))`;
@@ -370,7 +394,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       params.push(queryVec);
       const vecPos = params.length;
       vectorScoreExpr = `COALESCE(1.0 - (ei.embedding <=> $${vecPos}::vector), 0)`;
-      evidencePredicate = opts.vectorOnly === true
+      evidencePredicate = scopedOpts.vectorOnly === true
         ? `ei.embedding IS NOT NULL`
         : `(${evidencePredicate} OR ei.embedding IS NOT NULL)`;
     }
@@ -425,7 +449,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       params,
     );
     const applicableRows = scopeKeys
-      ? resolveApplicableRecords(result.rows, opts)
+      ? resolveApplicableRecords(result.rows, scopedOpts)
       : result.rows;
     return applicableRows
       .sort(sortRecallRows)
@@ -433,11 +457,12 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
   }
 
   async function recallViaMemoryEmbeddings(queryVec, opts = {}) {
+    const scopedOpts = await withResolvedScopeKey(opts);
     const vector = vecToStr(queryVec);
     if (!vector) return [];
-    const tenantId = opts.tenantId || defaultTenantId;
-    const limit = Math.max(1, Math.min(50, opts.limit || 10));
-    const scopeKeys = activeScopeKeys(opts);
+    const tenantId = scopedOpts.tenantId || defaultTenantId;
+    const limit = Math.max(1, Math.min(50, scopedOpts.limit || 10));
+    const scopeKeys = activeScopeKeys(scopedOpts);
     const fetchLimit = Math.max(limit, Math.min(200, scopeKeys ? limit * 4 : limit));
     const feedbackScoreExpr = feedbackScoreSql(schema);
     const params = [tenantId, vector];
@@ -447,7 +472,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       `m.visible_in_recall = true`,
       `m.embedding IS NOT NULL`,
     ];
-    applyCurrentMemoryFilters(where, params, opts);
+    applyCurrentMemoryFilters(where, params, scopedOpts);
     params.push(fetchLimit);
     const result = await pool.query(
       `SELECT
@@ -473,7 +498,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       params,
     );
     const applicableRows = scopeKeys
-      ? resolveApplicableRecords(result.rows, opts)
+      ? resolveApplicableRecords(result.rows, scopedOpts)
       : result.rows;
     return applicableRows
       .sort(sortRecallRows)
@@ -481,11 +506,12 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
   }
 
   async function recallViaLinkedSummaryEmbeddings(queryVec, opts = {}) {
+    const scopedOpts = await withResolvedScopeKey(opts);
     const vector = vecToStr(queryVec);
     if (!vector) return [];
-    const tenantId = opts.tenantId || defaultTenantId;
-    const limit = Math.max(1, Math.min(50, opts.limit || 10));
-    const scopeKeys = activeScopeKeys(opts);
+    const tenantId = scopedOpts.tenantId || defaultTenantId;
+    const limit = Math.max(1, Math.min(50, scopedOpts.limit || 10));
+    const scopeKeys = activeScopeKeys(scopedOpts);
     const fetchLimit = Math.max(limit, Math.min(200, scopeKeys ? limit * 4 : limit));
     const feedbackScoreExpr = feedbackScoreSql(schema);
     const params = [tenantId, vector];
@@ -494,7 +520,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       `m.status = 'active'`,
       `m.visible_in_recall = true`,
     ];
-    applyCurrentMemoryFilters(where, params, opts);
+    applyCurrentMemoryFilters(where, params, scopedOpts);
     params.push(fetchLimit);
     const result = await pool.query(
       `WITH eligible_memories AS (
@@ -543,7 +569,7 @@ function createMemoryRecall({ pool, schema, defaultTenantId }) {
       params,
     );
     const applicableRows = scopeKeys
-      ? resolveApplicableRecords(result.rows, opts)
+      ? resolveApplicableRecords(result.rows, scopedOpts)
       : result.rows;
     return applicableRows
       .sort(sortRecallRows)

package/core/memory-records.js

@@ -2,6 +2,7 @@
 
 const crypto = require('crypto');
 const { resolveApplicableRecords } = require('./memory-bootstrap');
+const { assertAllowedScopeRequest } = require('./memory-serving');
 
 function requireField(obj, field) {
   if (!obj || obj[field] === undefined || obj[field] === null || obj[field] === '') {
@@ -773,17 +774,27 @@ function createMemoryRecords({ pool, schema, defaultTenantId, inTransaction = fa
     const tenantId = input.tenantId || defaultTenantId;
     let activeScopePath = normalizeScopePath(input.activeScopePath, input.activeScopeKey);
     let activeScopeKey = input.activeScopeKey || activeScopePath[activeScopePath.length - 1] || null;
-    if (input.scopeId && !input.activeScopeKey && !input.activeScopePath) {
+    let resolvedScopeKey = null;
+    if (input.scopeId) {
       const scopeResult = await pool.query(
         `SELECT scope_key FROM ${scopes} WHERE tenant_id = $1 AND id = $2 LIMIT 1`,
         [tenantId, input.scopeId],
       );
-      const scopedKey = scopeResult.rows[0]?.scope_key || null;
-      if (scopedKey) {
-        activeScopePath = [scopedKey];
-        activeScopeKey = scopedKey;
+      resolvedScopeKey = scopeResult.rows[0]?.scope_key || null;
+      if (resolvedScopeKey && !input.activeScopeKey && !input.activeScopePath) {
+        activeScopePath = [resolvedScopeKey];
+        activeScopeKey = resolvedScopeKey;
       }
     }
+    assertAllowedScopeRequest({
+      ...input,
+      activeScopeKey,
+      activeScopePath,
+      resolvedScopeKey,
+    });
+    if (input.includeEvidenceRefs === true && input.operator !== true && input.internal !== true) {
+      throw new Error('memory.current includeEvidenceRefs requires operator=true or internal=true');
+    }
     const limit = Math.max(1, Math.min(100, input.limit || 50));
     const fetchLimit = Math.max(limit + 1, Math.min(200, Math.max(limit * 4, 40)));
     const asOf = input.asOf || new Date().toISOString();