@equationalapplications/core-llm-wiki 4.3.0 → 4.5.0

package/dist/index.mjs

@@ -1058,14 +1058,14 @@ After running the migration SQL, restart your application.`
               );
             }
           }
-          const entityScope = this._entityInClause(scoredEntityIds);
+          const mismatchScope = this._entityInClause(entityIds);
           const mismatchedCount = await this.db.getFirstAsync(
             `SELECT COUNT(*) AS cnt FROM ${this.prefix}entries
-             WHERE ${entityScope.clause} AND deleted_at IS NULL
+             WHERE ${mismatchScope.clause} AND deleted_at IS NULL
                AND embedding_blob IS NOT NULL
                AND (CAST(length(embedding_blob) AS INTEGER) % 4 = 0)
                AND (CAST(length(embedding_blob) AS INTEGER) / 4) != ?`,
-            [...entityScope.params, queryVec.length]
+            [...mismatchScope.params, queryVec.length]
           );
           if (mismatchedCount && mismatchedCount.cnt > 0) {
             throw new Error(
@@ -1125,16 +1125,16 @@ After running the migration SQL, restart your application.`
             }
           } else {
             if (useRanker) {
-              const entityScope2 = this._entityInClause(scoredEntityIds);
+              const entityScope = this._entityInClause(scoredEntityIds);
               candidateRows = await this.db.getAllAsync(
-                `SELECT id, entity_id, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope2.clause} AND deleted_at IS NULL`,
-                entityScope2.params
+                `SELECT id, entity_id, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope.clause} AND deleted_at IS NULL`,
+                entityScope.params
               );
             } else {
-              const entityScope2 = this._entityInClause(scoredEntityIds);
+              const entityScope = this._entityInClause(scoredEntityIds);
               candidateRows = await this.db.getAllAsync(
-                `SELECT id, entity_id, embedding_blob, embedding, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope2.clause} AND deleted_at IS NULL`,
-                entityScope2.params
+                `SELECT id, entity_id, embedding_blob, embedding, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope.clause} AND deleted_at IS NULL`,
+                entityScope.params
               );
             }
             if (weight !== void 0 && weight < 1) {
@@ -1153,32 +1153,42 @@ After running the migration SQL, restart your application.`
             const entityCacheKey = entityIds.length === 1 ? entityIds[0] : entityIds.join("\0");
             let scored;
             if (useRanker) {
-              const candidateIds = entityIds.length > 1 || effectivePreFilterLimit !== void 0 ? candidateRows.map((r) => r.id) : void 0;
+              const candidateRowsByEntity = /* @__PURE__ */ new Map();
+              for (const row of candidateRows) {
+                const rows = candidateRowsByEntity.get(row.entity_id) ?? [];
+                rows.push(row);
+                candidateRowsByEntity.set(row.entity_id, rows);
+              }
               try {
-                const oversampledLimit = Math.max(maxResults * 2, maxResults + 50);
-                scored = await this._rankWithVectorRanker({
-                  entityId: entityCacheKey,
-                  queryVec,
-                  candidateIds,
-                  candidateRows,
-                  weight,
-                  miniSearchScores,
-                  limit: oversampledLimit
-                });
-                if (scored.length > 0) {
-                  const scoredIds2 = new Set(scored.map((s) => s.id));
-                  const metaMap = /* @__PURE__ */ new Map();
-                  for (const r of candidateRows) {
-                    if (scoredIds2.has(r.id)) {
-                      metaMap.set(r.id, { updated_at: r.updated_at, access_count: r.access_count });
-                    }
-                  }
-                  scored = scored.map((s) => {
-                    const meta = metaMap.get(s.id);
-                    return { ...s, updated_at: meta?.updated_at ?? null, access_count: meta?.access_count ?? null };
-                  });
-                }
+                const rankerResultsByEntity = await Promise.all(
+                  scoredEntityIds.filter((id) => (candidateRowsByEntity.get(id)?.length ?? 0) > 0).map(async (scopedEntityId) => {
+                    const rowsForEntity = candidateRowsByEntity.get(scopedEntityId) ?? [];
+                    const candidateIds = effectivePreFilterLimit !== void 0 ? rowsForEntity.map((row) => row.id) : void 0;
+                    const ranked = await this._rankWithVectorRanker({
+                      entityId: scopedEntityId,
+                      queryVec,
+                      candidateIds,
+                      candidateRows: rowsForEntity,
+                      weight,
+                      miniSearchScores,
+                      limit: Math.max(maxResults * 2, maxResults + 50)
+                    });
+                    return ranked.map((row) => ({ ...row, entity_id: scopedEntityId }));
+                  })
+                );
+                scored = rankerResultsByEntity.flat();
                 const scoredIds = new Set(scored.map((s) => s.id));
+                const metadataById = new Map(
+                  candidateRows.filter((row) => scoredIds.has(row.id)).map((row) => [row.id, row])
+                );
+                scored = scored.map((row) => {
+                  const metadata = metadataById.get(row.id);
+                  return {
+                    ...row,
+                    updated_at: metadata?.updated_at ?? null,
+                    access_count: metadata?.access_count ?? null
+                  };
+                });
                 const isHybrid = weight !== void 0 && weight < 1;
                 const maxBackfill = isHybrid ? maxResults : Math.max(0, maxResults - scored.length);
                 if (maxBackfill > 0) {
@@ -1326,21 +1336,17 @@ After running the migration SQL, restart your application.`
                   });
                   const keywordOversampledLimit = Math.max(maxResults * 2, maxResults + 50);
                   const topResults = msResults.slice(0, keywordOversampledLimit);
-                  const resultIds = new Set(topResults.map((r) => r.id));
-                  const candidateMap = /* @__PURE__ */ new Map();
-                  for (const r of candidateRows) {
-                    if (resultIds.has(r.id)) {
-                      candidateMap.set(r.id, { entity_id: r.entity_id, updated_at: r.updated_at, access_count: r.access_count });
-                    }
-                  }
-                  scored = topResults.map((r) => {
-                    const meta = candidateMap.get(r.id);
+                  const topResultIds = new Set(topResults.map((r) => r.id));
+                  const candidateMap = new Map(candidateRows.filter((r) => topResultIds.has(r.id)).map((row) => [row.id, row]));
+                  scored = topResults.map((result) => {
+                    const metadata = candidateMap.get(result.id);
+                    const entityForScore = metadata?.entity_id ?? result.entity_id ?? "";
                     return {
-                      id: r.id,
-                      entity_id: meta?.entity_id ?? r.entity_id,
-                      score: r.score ?? 0,
-                      access_count: meta?.access_count ?? null,
-                      updated_at: meta?.updated_at ?? null
+                      id: result.id,
+                      entity_id: entityForScore,
+                      score: result.score ?? 0,
+                      access_count: metadata?.access_count ?? null,
+                      updated_at: metadata?.updated_at ?? null
                     };
                   });
                 } else {
@@ -2781,16 +2787,20 @@ function scoreFactFor(fact, weights, now) {
   const recencyDecay = Math.exp(-ageDays / 30);
   return confW * weights.confidence + Math.log(1 + fact.access_count) * weights.accessCount + recencyDecay * weights.recency;
 }
-function renderFactMarkdown(fact, includeConfidence, includeTags) {
+function renderFactMarkdown(fact, includeConfidence, includeTags, includeEntityIds, score) {
   const confPart = includeConfidence ? ` (${fact.confidence})` : "";
   const tagPart = includeTags && fact.tags.length > 0 ? ` [${fact.tags.join(", ")}]` : "";
-  return `- **${fact.title}**${confPart}${tagPart}
+  const sourcePart = includeEntityIds ? ` {entity_id=${fact.entity_id}}` : "";
+  const scorePart = score !== void 0 ? ` {score=${score.toFixed(4)}}` : "";
+  return `- **${fact.title}**${confPart}${tagPart}${sourcePart}${scorePart}
   ${fact.body.replace(/\n/g, "\n  ")}`;
 }
-function renderFactPlain(fact, includeConfidence, includeTags) {
+function renderFactPlain(fact, includeConfidence, includeTags, includeEntityIds, score) {
   const confPart = includeConfidence ? ` (${fact.confidence})` : "";
   const tagPart = includeTags && fact.tags.length > 0 ? ` [${fact.tags.join(", ")}]` : "";
-  return `${fact.title}${confPart}${tagPart}: ${fact.body}`;
+  const sourcePart = includeEntityIds ? ` {entity_id=${fact.entity_id}}` : "";
+  const scorePart = score !== void 0 ? ` {score=${score.toFixed(4)}}` : "";
+  return `${fact.title}${confPart}${tagPart}${sourcePart}${scorePart}: ${fact.body}`;
 }
 function renderTaskMarkdown(task) {
   return `- [P${task.priority}] ${task.description.replace(/\n/g, "\n  ")} (${task.status})`;
@@ -2814,6 +2824,8 @@ function formatContext(bundle, options) {
     maxEvents: options?.maxEvents ?? 10,
     includeConfidence: options?.includeConfidence ?? true,
     includeTags: options?.includeTags ?? true,
+    includeEntityIds: options?.includeEntityIds ?? false,
+    includeFactScores: options?.includeFactScores ?? false,
     factWeights: {
       confidence: options?.factWeights?.confidence ?? 1,
       accessCount: options?.factWeights?.accessCount ?? 0.3,
@@ -2825,7 +2837,7 @@ function formatContext(bundle, options) {
   validateMaxOption(opts.maxEvents, "maxEvents");
   const weights = opts.factWeights;
   const now = Date.now();
-  const sortedFacts = [...bundle.facts].sort((a, b) => scoreFactFor(b, weights, now) - scoreFactFor(a, weights, now)).slice(0, opts.maxFacts);
+  const sortedFacts = bundle.factScores ? [...bundle.facts].slice(0, opts.maxFacts) : [...bundle.facts].sort((a, b) => scoreFactFor(b, weights, now) - scoreFactFor(a, weights, now)).slice(0, opts.maxFacts);
   const sortedTasks = [...bundle.tasks].sort((a, b) => b.priority - a.priority || a.created_at - b.created_at).slice(0, opts.maxTasks);
   const sortedEvents = [...bundle.events].sort((a, b) => b.created_at - a.created_at).slice(0, opts.maxEvents);
   if (sortedFacts.length === 0 && sortedTasks.length === 0 && sortedEvents.length === 0) {
@@ -2839,7 +2851,7 @@ function formatContext(bundle, options) {
       lines.push("");
       lines.push("### Known Facts");
       for (const fact of sortedFacts) {
-        lines.push(renderFactMarkdown(fact, opts.includeConfidence, opts.includeTags));
+        lines.push(renderFactMarkdown(fact, opts.includeConfidence, opts.includeTags, opts.includeEntityIds, opts.includeFactScores ? bundle.factScores?.[fact.id] : void 0));
       }
     }
     if (sortedTasks.length > 0) {
@@ -2860,7 +2872,7 @@ function formatContext(bundle, options) {
     if (sortedFacts.length > 0) {
       lines.push("KNOWN FACTS:");
       for (const fact of sortedFacts) {
-        lines.push(renderFactPlain(fact, opts.includeConfidence, opts.includeTags));
+        lines.push(renderFactPlain(fact, opts.includeConfidence, opts.includeTags, opts.includeEntityIds, opts.includeFactScores ? bundle.factScores?.[fact.id] : void 0));
       }
     }
     if (sortedTasks.length > 0) {
@@ -2979,11 +2991,50 @@ function formatMemoryDump(dump) {
   };
 }
 
+// src/librarianPrompt.ts
+var DEFAULT_LIBRARIAN_SYNTHESIS_PROMPT = `You are a careful memory synthesis assistant.
+Use only the retrieved context when answering the request.
+Preserve source provenance when facts come from different entity namespaces.
+
+Request:
+{{query}}
+
+Retrieved context:
+{{context}}
+
+Open tasks:
+{{tasks}}`;
+function hydrateLibrarianPrompt(template, variables) {
+  return template.replace(/\{\{(context|tasks|query)\}\}/g, (_, key) => variables[key]);
+}
+function validateLibrarianPromptTemplate(template, options) {
+  if (!options.custom) return [];
+  const warnings = [];
+  if (!template.includes("{{context}}")) {
+    warnings.push("Custom Librarian systemPrompt omits {{context}}; retrieved memory will not be injected.");
+  }
+  if (!template.includes("{{query}}")) {
+    warnings.push("Custom Librarian systemPrompt omits {{query}}; the original request will not be injected.");
+  }
+  if (options.taskCount > 0 && !template.includes("{{tasks}}")) {
+    warnings.push("Custom Librarian systemPrompt omits {{tasks}} while retrieved tasks are available.");
+  }
+  return warnings;
+}
+function mapLibrarianOptionsToReadOptions(options) {
+  const readOptions = {};
+  if (options.entityWeights !== void 0) readOptions.tierWeights = options.entityWeights;
+  if (options.includeZeroWeightEntities !== void 0) {
+    readOptions.includeZeroWeightEntities = options.includeZeroWeightEntities;
+  }
+  return readOptions;
+}
+
 // src/index.ts
 function createWiki(db, options) {
   return new WikiMemory(db, options);
 }
 
-export { PrunePartialFailureError, WikiBusyError, WikiMemory, createWiki, formatContext, formatMemoryDump, parseEmbedding };
+export { DEFAULT_LIBRARIAN_SYNTHESIS_PROMPT, PrunePartialFailureError, WikiBusyError, WikiMemory, createWiki, formatContext, formatMemoryDump, hydrateLibrarianPrompt, mapLibrarianOptionsToReadOptions, parseEmbedding, validateLibrarianPromptTemplate };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map