@semiont/make-meaning 0.5.25 → 0.5.26

package/dist/index.d.ts

@@ -330,7 +330,7 @@ declare class Matcher {
      * Context-driven search: multi-source retrieval + composite scoring
      *
      * Retrieval sources:
-     * 1. Name match — graph.searchResources(searchTerm)
+     * 1. Name match — graph.listResources({ search: searchTerm })
      * 2. Entity type match — graph.listResources({ entityTypes })
      * 3. Graph neighborhood — connections from GatheredContext
      *
@@ -1387,6 +1387,14 @@ declare class AnnotationOperations {
 interface ListResourcesFilters {
     search?: string;
     archived?: boolean;
+    entityType?: string;
+    offset?: number;
+    limit?: number;
+}
+interface ListResourcesResult {
+    resources: ResourceDescriptor[];
+    /** Size of the whole match set, not of the returned page. */
+    total: number;
 }
 declare class ResourceContext {
     /**
@@ -1394,17 +1402,20 @@ declare class ResourceContext {
      */
     static getResourceMetadata(resourceId: ResourceId, kb: KnowledgeBase): Promise<ResourceDescriptor | null>;
     /**
-     * List resources, optionally filtered.
+     * List resources, optionally filtered, as one page plus the size of the whole
+     * match set. Every filter is applied before pagination on both paths — a
+     * filter applied afterwards narrows the page rather than the match set, which
+     * is how a search scoped to an entity type can come back empty while hundreds
+     * of resources match.
      *
-     * When `search` is set, delegates to `kb.graph.searchResources`, which runs
-     * the name match in the graph engine instead of scanning every view in JS.
-     * The graph result is then narrowed by `archived` if requested.
+     * When `search` is set, the entire query — filtering, ordering and
+     * pagination — runs inside the graph engine.
      *
-     * When `search` is unset, falls back to scanning all materialized views.
-     * (TODO: also push the listing path through the graph for large KBs.)
+     * When `search` is unset, the materialized views answer instead. They are the
+     * barrier-stamped projection, so an unsearched listing is read-your-writes
+     * where the graph is only eventually consistent.
      */
-    static listResources(filters: ListResourcesFilters | undefined, kb: KnowledgeBase): Promise<ResourceDescriptor[]>;
-    private static sortByDateDesc;
+    static listResources(filters: ListResourcesFilters | undefined, kb: KnowledgeBase): Promise<ListResourcesResult>;
     /**
      * Add content previews to resources (for search results)
      * Retrieves and decodes the first 200 characters of each resource's primary representation
@@ -1540,11 +1551,6 @@ declare class GraphContext {
      * Requires graph traversal - must use graph database
      */
     static getResourceConnections(resourceId: ResourceId, kb: KnowledgeBase): Promise<GraphConnection[]>;
-    /**
-     * Search resources by name (cross-resource query)
-     * Requires full-text search - must use graph database
-     */
-    static searchResources(query: string, kb: KnowledgeBase, limit?: number): Promise<ResourceDescriptor[]>;
     /**
      * Build the unified knowledge graph for a resource's neighborhood:
      * resources AND annotations as typed nodes, typed/directional edges.
@@ -1620,4 +1626,4 @@ declare function generateResourceSummary(resourceName: string, content: string,
 declare function generateReferenceSuggestions(referenceTitle: string, client: InferenceClient, entityType?: string, currentContent?: string): Promise<string[] | null>;
 
 export { AnnotationContext, AnnotationOperations, BACKUP_FORMAT, Browser, CloneTokenManager, FORMAT_VERSION, Gatherer$1 as Gatherer, GraphContext, LLMContext, LocalContentTransport, LocalTransport, Matcher, ResourceContext, ResourceOperations, Smelter, Stower, asBusRequestPrimitive, bootstrapEntityTypes, createKnowledgeBase, createSmelterActorStateUnit, exportBackup, exportLinkedData, generateReferenceSuggestions, generateResourceSummary, importBackup, importLinkedData, isBackupManifest, readEntityTypesProjection, registerAnnotationAssemblyHandler, registerAnnotationLookupHandlers, registerBindUpdateBodyHandler, registerBusHandlers, registerJobCommandHandlers, startMakeMeaning, stopKnowledgeSystem, validateManifestVersion };
-export type { BackupContentReader, BackupEventStoreReader, BackupExporterOptions, BackupImportResult, BackupImporterOptions, BackupManifestHeader, BackupStreamSummary, BuildContextOptions, ContentBlobResolver, CreateAnnotationResult, CreateResourceInput, CreateResourceResult, KnowledgeBase, KnowledgeSystem, LLMContextOptions, LinkedDataContentReader, LinkedDataExporterOptions, LinkedDataImportResult, LinkedDataImporterOptions, LinkedDataViewReader, ListResourcesFilters, LocalTransportConfig, MakeMeaningConfig, MakeMeaningService, ReconcileState, ReconcileSummary, ReplayStats, SmelterActorStateUnit, SmelterActorStateUnitOptions, SmelterEvent, SmelterInput, SmelterTiming, SmelterWorkItem, UpdateAnnotationBodyResult };
+export type { BackupContentReader, BackupEventStoreReader, BackupExporterOptions, BackupImportResult, BackupImporterOptions, BackupManifestHeader, BackupStreamSummary, BuildContextOptions, ContentBlobResolver, CreateAnnotationResult, CreateResourceInput, CreateResourceResult, KnowledgeBase, KnowledgeSystem, LLMContextOptions, LinkedDataContentReader, LinkedDataExporterOptions, LinkedDataImportResult, LinkedDataImporterOptions, LinkedDataViewReader, ListResourcesFilters, ListResourcesResult, LocalTransportConfig, MakeMeaningConfig, MakeMeaningService, ReconcileState, ReconcileSummary, ReplayStats, SmelterActorStateUnit, SmelterActorStateUnitOptions, SmelterEvent, SmelterInput, SmelterTiming, SmelterWorkItem, UpdateAnnotationBodyResult };

package/dist/index.js

@@ -3,7 +3,7 @@ import { FilesystemViewStorage, resolveStorageUri, EventQuery, createEventStore
 import { getResourceEntityTypes, getResourceId, getTargetSource, resourceId, getPrimaryRepresentation, decodeRepresentation, getBodySource, getTargetSelector, deriveViews, getTextPositionSelector, annotationId, errField, userId, generateUuid, getExactText, busRequest, cloneToken, baseMediaType, isSupportedMediaType, capabilitiesOf, didToAgent, assembleAnnotation, jobId, entityType, baseUrl, busLog, BRIDGED_CHANNELS, burstBuffer, textExtractionOf, chunkText, getPrimaryMediaType, extensionForMediaType, applyBodyOperations, softwareToAgent } from '@semiont/core';
 import { recordGatherDegrade, withActorSpan, recordBusEmit, withSpan, SpanKind, registerJobQueueProvider, registerVectorIndexSizeProvider } from '@semiont/observability';
 import { createInferenceClient } from '@semiont/inference';
-import { getGraphDatabase } from '@semiont/graph';
+import { compareByRecencyThenId, getGraphDatabase } from '@semiont/graph';
 import { WorkingTreeStore, createAnchoredTextStore, deriveStorageUri, anchoredTextStoreOverTransport, EXTRACTORS, calculateChecksum } from '@semiont/content';
 import { getEntityTypes, DEFAULT_ENTITY_TYPES } from '@semiont/ontology';
 import { promises } from 'fs';
@@ -9937,13 +9937,6 @@ var GraphContext = class {
   static async getResourceConnections(resourceId10, kb) {
     return kb.graph.getResourceConnections(resourceId10);
   }
-  /**
-   * Search resources by name (cross-resource query)
-   * Requires full-text search - must use graph database
-   */
-  static async searchResources(query, kb, limit) {
-    return kb.graph.searchResources(query, limit);
-  }
   /**
    * Build the unified knowledge graph for a resource's neighborhood:
    * resources AND annotations as typed nodes, typed/directional edges.
@@ -10064,7 +10057,7 @@ Format as a simple list, one suggestion per line.`;
   }
   return response.split("\n").map((line) => line.replace(/^[-*•]\s*/, "").trim()).filter((line) => line.length > 0).slice(0, 3);
 }
-var ResourceContext = class _ResourceContext {
+var ResourceContext = class {
   /**
    * Get resource metadata from view storage
    */
@@ -10076,38 +10069,34 @@ var ResourceContext = class _ResourceContext {
     return view.resource;
   }
   /**
-   * List resources, optionally filtered.
+   * List resources, optionally filtered, as one page plus the size of the whole
+   * match set. Every filter is applied before pagination on both paths — a
+   * filter applied afterwards narrows the page rather than the match set, which
+   * is how a search scoped to an entity type can come back empty while hundreds
+   * of resources match.
    *
-   * When `search` is set, delegates to `kb.graph.searchResources`, which runs
-   * the name match in the graph engine instead of scanning every view in JS.
-   * The graph result is then narrowed by `archived` if requested.
+   * When `search` is set, the entire query — filtering, ordering and
+   * pagination — runs inside the graph engine.
    *
-   * When `search` is unset, falls back to scanning all materialized views.
-   * (TODO: also push the listing path through the graph for large KBs.)
+   * When `search` is unset, the materialized views answer instead. They are the
+   * barrier-stamped projection, so an unsearched listing is read-your-writes
+   * where the graph is only eventually consistent.
    */
   static async listResources(filters, kb) {
-    if (filters?.search) {
-      const matches = await kb.graph.searchResources(filters.search);
-      const filtered = filters.archived !== void 0 ? matches.filter((doc) => doc.archived === filters.archived) : matches;
-      return _ResourceContext.sortByDateDesc(filtered);
+    const { search: rawSearch, archived, entityType: entityType2, offset = 0, limit = 50 } = filters ?? {};
+    const search = rawSearch?.trim() || void 0;
+    if (search) {
+      return kb.graph.listResources({
+        search,
+        archived,
+        entityTypes: entityType2 ? [entityType2] : void 0,
+        offset,
+        limit
+      });
     }
     const allViews = await kb.views.getAll();
-    const resources = [];
-    for (const view of allViews) {
-      const doc = view.resource;
-      if (filters?.archived !== void 0 && doc.archived !== filters.archived) {
-        continue;
-      }
-      resources.push(doc);
-    }
-    return _ResourceContext.sortByDateDesc(resources);
-  }
-  static sortByDateDesc(resources) {
-    return [...resources].sort((a, b) => {
-      const aTime = a.dateCreated ? new Date(a.dateCreated).getTime() : 0;
-      const bTime = b.dateCreated ? new Date(b.dateCreated).getTime() : 0;
-      return bTime - aTime;
-    });
+    const matches = allViews.map((view) => view.resource).filter((doc) => archived === void 0 || doc.archived === archived).filter((doc) => !entityType2 || getResourceEntityTypes(doc).includes(entityType2)).sort(compareByRecencyThenId);
+    return { resources: matches.slice(offset, offset + limit), total: matches.length };
   }
   /**
    * Add content previews to resources (for search results)
@@ -10885,7 +10874,7 @@ var Matcher = class {
    * Context-driven search: multi-source retrieval + composite scoring
    *
    * Retrieval sources:
-   * 1. Name match — graph.searchResources(searchTerm)
+   * 1. Name match — graph.listResources({ search: searchTerm })
    * 2. Entity type match — graph.listResources({ entityTypes })
    * 3. Graph neighborhood — connections from GatheredContext
    *
@@ -10901,7 +10890,7 @@ var Matcher = class {
     const views = deriveViews(context.graph, mainResourceId);
     const connections = views.connections;
     const [nameMatches, entityTypeMatches, semanticMatches] = await Promise.all([
-      this.kb.graph.searchResources(searchTerm),
+      this.kb.graph.listResources({ search: searchTerm, limit: 20 }).then((r) => r.resources),
       annotationEntityTypes.length > 0 ? this.kb.graph.listResources({ entityTypes: annotationEntityTypes, limit: 50 }).then((r) => r.resources) : Promise.resolve([]),
       // 4. Semantic match — vector similarity search (if vectors configured)
       this.searchVectors(searchTerm)
@@ -11835,22 +11824,21 @@ var Browser = class {
   }
   async handleBrowseResources(event) {
     try {
-      let filteredDocs = await ResourceContext.listResources({
-        search: event.search,
-        archived: event.archived
-      }, this.kb);
-      if (event.entityType) {
-        filteredDocs = filteredDocs.filter((doc) => getResourceEntityTypes(doc).includes(event.entityType));
-      }
       const offset = event.offset ?? 0;
       const limit = event.limit ?? 50;
-      const paginatedDocs = filteredDocs.slice(offset, offset + limit);
-      const formattedDocs = event.search ? await ResourceContext.addContentPreviews(paginatedDocs, this.kb) : paginatedDocs;
+      const { resources, total } = await ResourceContext.listResources({
+        search: event.search,
+        archived: event.archived,
+        entityType: event.entityType,
+        offset,
+        limit
+      }, this.kb);
+      const formattedDocs = event.search ? await ResourceContext.addContentPreviews(resources, this.kb) : resources;
       this.eventBus.get("browse:resources-result").next({
         correlationId: event.correlationId,
         response: {
           resources: formattedDocs,
-          total: filteredDocs.length,
+          total,
           offset,
           limit
         }