@gmickel/gno 2.12.2 → 2.13.0

package/src/mcp/tools/query.ts

@@ -44,17 +44,23 @@ import {
 } from "../../core/typed-metadata";
 import { LlmAdapter } from "../../llm/nodeLlamaCpp/adapter";
 import { resolveDownloadPolicy } from "../../llm/policy";
-import { getActivePreset, resolveModelUri } from "../../llm/registry";
+import {
+  getActivePreset,
+  modelCollectionForList,
+  resolveModelUri,
+} from "../../llm/registry";
 import { diagnoseQueryTarget } from "../../pipeline/diagnose";
 import { type HybridSearchDeps, searchHybrid } from "../../pipeline/hybrid";
 import { createLazyVectorIndex } from "../../store/vector/lazy";
 import { appendRetrievalWarnings } from "../retrieval-warnings";
+import { requestCollections } from "./collection-scope";
 import { normalizeTagFilters, runTool, type ToolResult } from "./index";
 
 interface QueryInput {
   query: string;
   projectHints?: string[];
   collection?: string;
+  collections?: string[];
   limit?: number;
   minScore?: number;
   lang?: string;
@@ -198,6 +204,7 @@ export function handleQuery(
           throw new Error(`Collection not found: ${args.collection}`);
         }
       }
+      const collections = requestCollections(args, ctx);
 
       const normalizedInput = normalizeStructuredQueryInput(
         args.query,
@@ -219,11 +226,14 @@ export function handleQuery(
       let rerankPort: RerankPort | null = null;
       let vectorIndex: VectorIndexPort | null = null;
       let traceSession: RetrievalTraceSession | undefined;
+      const modelCollection = (type: "embed" | "expand" | "rerank") =>
+        args.collection ??
+        modelCollectionForList(ctx.config, type, collections);
       const embedUri = resolveModelUri(
         ctx.config,
         "embed",
         undefined,
-        args.collection
+        modelCollection("embed")
       );
       const hasStructuredModes = Boolean(queryModes?.length);
       const depthPolicy = resolveDepthPolicy({
@@ -242,15 +252,26 @@ export function handleQuery(
       );
       const expandUri =
         !noExpand && !hasStructuredModes
-          ? resolveModelUri(ctx.config, "expand", undefined, args.collection)
+          ? resolveModelUri(
+              ctx.config,
+              "expand",
+              undefined,
+              modelCollection("expand")
+            )
           : undefined;
       const rerankUri = !noRerank
-        ? resolveModelUri(ctx.config, "rerank", undefined, args.collection)
+        ? resolveModelUri(
+            ctx.config,
+            "rerank",
+            undefined,
+            modelCollection("rerank")
+          )
         : undefined;
       const options = {
         limit: args.limit ?? 5,
         minScore: args.minScore,
         collection: args.collection,
+        collections,
         queryLanguageHint: args.lang,
         intent: args.intent,
         candidateLimit: depthPolicy.candidateLimit,
@@ -289,9 +310,9 @@ export function handleQuery(
         if (!traceStart.ok) throw new Error(traceStart.error.message);
         traceSession = traceStart.value ?? undefined;
         const llm = ctx.getModelAdapter?.() ?? new LlmAdapter(ctx.config);
-        const egressCollections = args.collection
-          ? [args.collection]
-          : ("all" as const);
+        const egressCollections =
+          collections ??
+          (args.collection ? [args.collection] : ("all" as const));
 
         // Resolve download policy from env (MCP has no CLI flags)
         const policy = resolveDownloadPolicy(process.env, {});

package/src/mcp/tools/search.ts

@@ -25,12 +25,14 @@ import {
 } from "../../core/typed-metadata";
 import { searchBm25 } from "../../pipeline/search";
 import { appendRetrievalWarnings } from "../retrieval-warnings";
+import { requestCollections } from "./collection-scope";
 import { normalizeTagFilters, runTool, type ToolResult } from "./index";
 
 interface SearchInput {
   query: string;
   projectHints?: string[];
   collection?: string;
+  collections?: string[];
   limit?: number;
   minScore?: number;
   lang?: string;
@@ -123,6 +125,7 @@ export function handleSearch(
           throw new Error(`Collection not found: ${args.collection}`);
         }
       }
+      const collections = requestCollections(args, ctx);
 
       const projectAffinity = await resolveRemoteProjectAffinity(
         ctx.config,
@@ -132,6 +135,7 @@ export function handleSearch(
         limit: args.limit ?? 5,
         minScore: args.minScore,
         collection: args.collection,
+        collections,
         lang: args.lang,
         intent: args.intent,
         exclude: args.exclude,

package/src/mcp/tools/sync.ts

@@ -9,9 +9,9 @@ import type { CollectionSyncResult, SyncResult } from "../../ingestion";
 import type { ToolContext } from "../server";
 
 import { MCP_ERRORS } from "../../core/errors";
-import { acquireWriteLock, type WriteLockHandle } from "../../core/file-lock";
 import { JobError } from "../../core/job-manager";
 import { recordContentMutation } from "../../core/mutation-generations";
+import { resolveReindexScope } from "../../core/reindex-paths";
 import { normalizeCollectionName } from "../../core/validation";
 import { defaultSyncService, withContentTypeRules } from "../../ingestion";
 import { enforceSyncCommandEgress } from "../sync-egress";
@@ -21,12 +21,14 @@ interface SyncInput {
   collection?: string;
   gitPull?: boolean;
   runUpdateCmd?: boolean;
+  paths?: string[];
 }
 
 interface SyncResultOutput {
   jobId: string;
   collections: string[];
-  status: "started";
+  status: "started" | "queued";
+  paths?: string[];
   options: {
     gitPull: boolean;
     runUpdateCmd: boolean;
@@ -38,6 +40,7 @@ function formatSyncResult(result: SyncResultOutput): string {
   lines.push(`Job: ${result.jobId}`);
   lines.push(`Status: ${result.status}`);
   lines.push(`Collections: ${result.collections.join(", ") || "(none)"}`);
+  if (result.paths) lines.push(`Paths: ${result.paths.join(", ")}`);
   lines.push(`Git pull: ${result.options.gitPull ? "yes" : "no"}`);
   lines.push(`Run update cmd: ${result.options.runUpdateCmd ? "yes" : "no"}`);
   return lines.join("\n");
@@ -77,73 +80,82 @@ export function handleSync(
         throw new Error("Write tools disabled. Start MCP with --enable-write.");
       }
 
-      let lock: WriteLockHandle | null = null;
-      let handedOff = false;
+      const requestedCollection = args.collection?.trim();
+      const collection = requestedCollection
+        ? resolveCollection(requestedCollection, ctx.collections)
+        : null;
 
-      try {
-        lock = await acquireWriteLock(ctx.writeLockPath);
-        if (!lock) {
-          throw new Error(
-            `${MCP_ERRORS.LOCKED.code}: ${MCP_ERRORS.LOCKED.message}`
-          );
-        }
-
-        const requestedCollection = args.collection?.trim();
-        const collection = requestedCollection
-          ? resolveCollection(requestedCollection, ctx.collections)
-          : null;
-
-        if (requestedCollection && !collection) {
-          throw new Error(
-            `${MCP_ERRORS.NOT_FOUND.code}: Collection not found: ${requestedCollection}`
-          );
-        }
-
-        const collections = collection
-          ? [collection.name]
-          : ctx.collections.map((entry) => entry.name);
-
-        const options = withContentTypeRules(
-          {
-            gitPull: args.gitPull ?? false,
-            runUpdateCmd: args.runUpdateCmd ?? false,
-          },
-          ctx.config
+      if (requestedCollection && !collection) {
+        throw new Error(
+          `${MCP_ERRORS.NOT_FOUND.code}: Collection not found: ${requestedCollection}`
         );
-        enforceSyncCommandEgress(ctx, {
-          collectionNames: collections,
-          gitPull: options.gitPull,
-          runUpdateCmd: options.runUpdateCmd,
-        });
+      }
 
-        const jobId = await ctx.jobManager.startJobWithLock(
-          "sync",
-          lock,
-          async () => {
+      const collections = collection
+        ? [collection.name]
+        : ctx.collections.map((entry) => entry.name);
+
+      const options = withContentTypeRules(
+        {
+          gitPull: args.gitPull ?? false,
+          runUpdateCmd: args.runUpdateCmd ?? false,
+        },
+        ctx.config
+      );
+      const paths = await resolveReindexScope(collection, args.paths, options);
+      enforceSyncCommandEgress(ctx, {
+        collectionNames: collections,
+        gitPull: options.gitPull,
+        runUpdateCmd: options.runUpdateCmd,
+      });
+
+      // Captured now: a queued pass runs after this call's context is gone.
+      const config = ctx.config;
+      const allCollections = ctx.collections;
+      try {
+        const accepted = await ctx.jobManager.submitReindex({
+          type: "sync",
+          collection: collection?.name ?? null,
+          paths,
+          options: {
+            gitPull: options.gitPull ?? false,
+            runUpdateCmd: options.runUpdateCmd ?? false,
+          },
+          run: async (scope) => {
+            const passOptions = withContentTypeRules(
+              { ...scope.options },
+              config
+            );
             const result = collection
               ? wrapSingleSync(
-                  await defaultSyncService.syncCollection(
-                    collection,
-                    ctx.store,
-                    options
-                  )
+                  scope.paths
+                    ? await defaultSyncService.syncPaths(
+                        collection,
+                        ctx.store,
+                        scope.paths,
+                        passOptions
+                      )
+                    : await defaultSyncService.syncCollection(
+                        collection,
+                        ctx.store,
+                        passOptions
+                      )
                 )
               : await defaultSyncService.syncAll(
-                  ctx.collections,
+                  allCollections,
                   ctx.store,
-                  options
+                  passOptions
                 );
             recordContentMutation(result, ctx.markContentMutation);
-            return result;
-          }
-        );
-
-        handedOff = true;
+            return { kind: "sync" as const, value: result };
+          },
+        });
 
         const result: SyncResultOutput = {
-          jobId,
+          jobId: accepted.jobId,
           collections,
-          status: "started",
+          status: accepted.status === "running" ? "started" : "queued",
+          ...(paths ? { paths } : {}),
           options: {
             gitPull: options.gitPull ?? false,
             runUpdateCmd: options.runUpdateCmd ?? false,
@@ -156,10 +168,6 @@ export function handleSync(
           throw new Error(`${error.code}: ${error.message}`);
         }
         throw error;
-      } finally {
-        if (lock && !handedOff) {
-          await lock.release();
-        }
       }
     },
     formatSyncResult

package/src/mcp/tools/vsearch.ts

@@ -28,7 +28,7 @@ import {
 } from "../../core/typed-metadata";
 import { LlmAdapter } from "../../llm/nodeLlamaCpp/adapter";
 import { resolveDownloadPolicy } from "../../llm/policy";
-import { resolveModelUri } from "../../llm/registry";
+import { modelCollectionForList, resolveModelUri } from "../../llm/registry";
 import { formatQueryForEmbedding } from "../../pipeline/contextual";
 import {
   searchVectorWithEmbedding,
@@ -36,12 +36,14 @@ import {
 } from "../../pipeline/vsearch";
 import { createVectorIndexPort } from "../../store/vector";
 import { appendRetrievalWarnings } from "../retrieval-warnings";
+import { requestCollections } from "./collection-scope";
 import { normalizeTagFilters, runTool, type ToolResult } from "./index";
 
 interface VsearchInput {
   query: string;
   projectHints?: string[];
   collection?: string;
+  collections?: string[];
   limit?: number;
   minScore?: number;
   lang?: string;
@@ -137,13 +139,15 @@ export function handleVsearch(
           throw new Error(`Collection not found: ${args.collection}`);
         }
       }
+      const collections = requestCollections(args, ctx);
 
       // Get model from active preset
       const modelUri = resolveModelUri(
         ctx.config,
         "embed",
         undefined,
-        args.collection
+        args.collection ??
+          modelCollectionForList(ctx.config, "embed", collections)
       );
       const projectAffinity = await resolveRemoteProjectAffinity(
         ctx.config,
@@ -153,6 +157,7 @@ export function handleVsearch(
         limit: args.limit ?? 5,
         minScore: args.minScore,
         collection: args.collection,
+        collections,
         intent: args.intent,
         exclude: args.exclude,
         since: args.since,
@@ -192,7 +197,8 @@ export function handleVsearch(
         // Create LLM adapter for embeddings
         const llm = ctx.getModelAdapter?.() ?? new LlmAdapter(ctx.config);
         const embedResult = await llm.createEmbeddingPort(modelUri, {
-          egressCollections: args.collection ? [args.collection] : "all",
+          egressCollections:
+            collections ?? (args.collection ? [args.collection] : "all"),
           policy,
           onProgress: (progress) => downloadProgress("embed", progress),
         });

package/src/pipeline/filters.ts

@@ -25,13 +25,27 @@ export interface QueryFilterEvaluation {
  * not replace complete ownership lineage or change ranking/deduplication.
  * Managed-memory scopes/supersession must already be enforced by the store.
  */
+/** True when `collection` falls outside the request's collection scope. */
+function outsideCollectionScope(
+  scope: Pick<HybridSearchOptions, "collection" | "collections">,
+  collection: string
+): boolean {
+  if (scope.collection && collection !== scope.collection) return true;
+  return (
+    scope.collections !== undefined && !scope.collections.includes(collection)
+  );
+}
+
 export async function evaluateRetrievalEligibility(
   store: StorePort,
   query: string,
   doc: DocumentRow | undefined,
   chunks: ChunkRow[] | undefined,
   options: HybridSearchOptions,
-  callerScope?: Pick<HybridSearchOptions, "collection" | "retrievalScope">
+  callerScope?: Pick<
+    HybridSearchOptions,
+    "collection" | "collections" | "retrievalScope"
+  >
 ): Promise<QueryFilterEvaluation & { chunks: ChunkRow[] }> {
   if (!doc || !chunks || !doc.mirrorHash) {
     return { matches: false, reasons: ["metadata"], chunks: [] };
@@ -40,7 +54,7 @@ export async function evaluateRetrievalEligibility(
   if (!doc.active) reasons.push("inactive");
   const sourcePath = doc.recordSourcePath ?? doc.relPath;
   for (const scope of [callerScope, options]) {
-    if (scope?.collection && doc.collection !== scope.collection) {
+    if (scope && outsideCollectionScope(scope, doc.collection)) {
       reasons.push("collection");
     }
     if (scope?.retrievalScope) {
@@ -98,7 +112,7 @@ export function evaluateDocumentChunkFilters(
     options.until
   );
 
-  if (options.collection && doc.collection !== options.collection) {
+  if (outsideCollectionScope(options, doc.collection)) {
     reasons.push("collection");
   }
   if (!isWithinTemporalRange(doc.sourceMtime, temporalRange)) {
@@ -219,6 +233,7 @@ export async function typedMetadataWarnings(
   const range = resolveTemporalRange(query, options.since, options.until);
   const result = await store.getTypedMetadataCoverage({
     collection: options.collection,
+    collections: options.collections,
     relPathPrefix: options.retrievalScope?.relPathPrefix,
     allowedMirrorHashes: options.retrievalScope?.allowedMirrorHashes,
     chunkLanguage: options.lang,

package/src/pipeline/graph-retrieval.ts

@@ -304,6 +304,7 @@ export async function expandGraphCandidates(
     seedHashes,
     {
       collection: options.collection,
+      collections: options.collections,
       activeOnly: true,
     }
   );

package/src/pipeline/hybrid.ts

@@ -150,6 +150,7 @@ async function checkBm25Strength(
   query: string,
   options?: {
     collection?: string;
+    collections?: string[];
     lang?: string;
     tagsAll?: string[];
     tagsAny?: string[];
@@ -168,6 +169,7 @@ async function checkBm25Strength(
   const result = await store.searchFts(query, {
     limit: 5,
     collection: options?.collection,
+    collections: options?.collections,
     relPathPrefix: options?.relPathPrefix,
     language: options?.lang,
     chunkLanguage: options?.lang,
@@ -225,6 +227,7 @@ async function searchFtsChunks(
   options: {
     limit: number;
     collection?: string;
+    collections?: string[];
     lang?: string;
     tagsAll?: string[];
     tagsAny?: string[];
@@ -243,6 +246,7 @@ async function searchFtsChunks(
   const result = await store.searchFts(query, {
     limit: options.limit,
     collection: options.collection,
+    collections: options.collections,
     relPathPrefix: options.relPathPrefix,
     language: options.lang,
     chunkLanguage: options.lang,
@@ -500,6 +504,7 @@ async function searchHybridWithHydration(
       ? false
       : await checkBm25Strength(store, query, {
           collection: options.collection,
+          collections: options.collections,
           lang: options.lang,
           memoryScopesAny: options.memoryFilter?.scopes,
           excludeSuperseded: options.memoryFilter?.excludeSuperseded,
@@ -550,6 +555,7 @@ async function searchHybridWithHydration(
 
   const vectorEligibility: VectorSearchOptions["eligibility"] = {
     collection: options.collection,
+    collections: options.collections,
     memoryScopesAny: options.memoryFilter?.scopes,
     excludeSuperseded: options.memoryFilter?.excludeSuperseded,
     relPathPrefix: options.retrievalScope?.relPathPrefix,
@@ -575,6 +581,7 @@ async function searchHybridWithHydration(
     exclude: options.exclude,
     allowedMirrorHashes: options.retrievalScope?.allowedMirrorHashes,
     collection: options.collection,
+    collections: options.collections,
     lang: options.lang,
     tagsAll: options.tagsAll,
     tagsAny: options.tagsAny,
@@ -615,6 +622,7 @@ async function searchHybridWithHydration(
           exclude: options.exclude,
           allowedMirrorHashes: options.retrievalScope?.allowedMirrorHashes,
           collection: options.collection,
+          collections: options.collections,
           lang: options.lang,
           tagsAll: options.tagsAll,
           tagsAny: options.tagsAny,
@@ -806,7 +814,7 @@ async function searchHybridWithHydration(
     fusedCandidates,
     {
       collection: options.collection,
-      collections: options.graphCollections,
+      collections: options.graphCollections ?? options.collections,
       includeSimilar: vectorAvailable,
       eligibility: vectorEligibility,
       limit,
@@ -879,6 +887,7 @@ async function searchHybridWithHydration(
         [...new Set(fusedCandidates.map((candidate) => candidate.mirrorHash))],
         {
           collection: options.collection,
+          collections: options.collections,
           activeOnly: true,
         }
       );
@@ -991,6 +1000,7 @@ async function searchHybridWithHydration(
       [...neededHashes],
       {
         collection: options.collection,
+        collections: options.collections,
         activeOnly: true,
       }
     );
@@ -1374,7 +1384,9 @@ async function searchHybridWithHydration(
     {
       ownershipHashes: [...neededHashes],
       ownershipDocuments:
-        options.collection === undefined ? documents : undefined,
+        options.collection === undefined && options.collections === undefined
+          ? documents
+          : undefined,
       collections: collectionsResult.ok ? collectionsResult.value : undefined,
     }
   );
@@ -1394,6 +1406,7 @@ async function searchHybridWithHydration(
       intent: options.intent,
       exclude: options.exclude,
       collection: options.collection,
+      collections: options.collections,
       lang: options.lang,
       since: temporalRange.since,
       until: temporalRange.until,

package/src/pipeline/hydration.ts

@@ -142,13 +142,18 @@ export class RequestHydration {
     const store = this.store;
     if (!store) return err("QUERY_FAILED", "Hydration request released");
     // Capture caller-owned options before any asynchronous read. Collection
-    // and activity are part of the lookup identity; titles never key by hash.
-    const scope = { ...options };
+    // scope and activity are part of the lookup identity; titles never key by
+    // hash.
+    const scope = {
+      ...options,
+      collections: options?.collections ? [...options.collections] : undefined,
+    };
     // Cache the exact lookup, retaining the adapter's ordering (including SQL
     // batch boundaries). Regrouping by content hash would reorder documents.
     const requested = [...hashes];
     const identity = JSON.stringify([
       scope.collection ?? null,
+      scope.collections ?? null,
       scope.activeOnly ?? null,
       requested,
     ]);

package/src/pipeline/owner-fusion.ts

@@ -30,6 +30,7 @@ export async function resolveFusionOwners(
   ];
   const documents = await hydration.getDocumentsByMirrorHashes(hashes, {
     collection: options.collection,
+    collections: options.collections,
     activeOnly: true,
   });
   const chunks = await hydration.getChunksBatch(hashes);

package/src/pipeline/search.ts

@@ -341,6 +341,7 @@ export async function searchBm25(
   const ftsResult = await store.searchFts(query, {
     limit: retrievalLimit,
     collection: options.collection,
+    collections: options.collections,
     allowedMirrorHashes: options.retrievalScope?.allowedMirrorHashes,
     exclude: options.exclude,
     relPathPrefix: options.retrievalScope?.relPathPrefix,
@@ -621,6 +622,7 @@ export async function searchBm25(
       intent: options.intent,
       exclude: options.exclude,
       collection: options.collection,
+      collections: options.collections,
       lang: options.lang,
       since: temporalRange.since,
       until: temporalRange.until,

package/src/pipeline/types.ts

@@ -114,6 +114,8 @@ export interface SearchMeta {
   totalResults: number;
   intent?: string;
   collection?: string;
+  /** Normalized collection allowlist; present only when the request set one. */
+  collections?: string[];
   lang?: string;
   /** Detected/overridden query language for prompt selection (typically BCP-47; may be user-provided via --lang) */
   queryLanguage?: string;
@@ -193,6 +195,11 @@ export interface SearchOptions extends InferenceOptions {
   minScore?: number;
   /** Filter by collection */
   collection?: string;
+  /**
+   * Filter to documents in ANY of these collections, before candidate limits.
+   * Never combined with `collection`; surfaces reject that pairing.
+   */
+  collections?: string[];
   /**
    * Internal graph allowlist for a request partitioned into one retrieval per
    * collection (Context Capsules, replay): graph neighbours may come from any

package/src/pipeline/vsearch.ts

@@ -176,6 +176,7 @@ async function searchVectorWithEmbeddingOwned(
         excludeMetadata: true,
         semanticMetadata: true,
         collection: options.collection,
+        collections: options.collections,
         memoryScopesAny: options.memoryFilter?.scopes,
         excludeSuperseded: options.memoryFilter?.excludeSuperseded,
         relPathPrefix: options.retrievalScope?.relPathPrefix,
@@ -215,6 +216,7 @@ async function searchVectorWithEmbeddingOwned(
   const { documents: docsByMirrorHash, ownershipDocuments } =
     await buildDocumentMap(store, {
       collection: options.collection,
+      collections: options.collections,
       relPathPrefix: options.retrievalScope?.relPathPrefix,
       tagsAll: options.tagsAll,
       tagsAny: options.tagsAny,
@@ -547,6 +549,7 @@ async function searchVectorWithEmbeddingOwned(
       intent: options.intent,
       exclude: options.exclude,
       collection: options.collection,
+      collections: options.collections,
       lang: options.lang,
       since: temporalRange.since,
       until: temporalRange.until,
@@ -666,6 +669,7 @@ interface DocumentInfo {
 
 interface DocumentMapOptions {
   collection?: string;
+  collections?: string[];
   relPathPrefix?: string;
   tagsAll?: string[];
   tagsAny?: string[];
@@ -718,11 +722,12 @@ async function buildDocumentMap(
   const ownershipDocuments = options.mirrorHashes
     ? docs.value.filter((d) => d.mirrorHash)
     : docs.value.filter((d) => d.mirrorHash && d.active);
-  const activeDocs = options.collection
-    ? ownershipDocuments.filter(
-        (document) => document.collection === options.collection
-      )
-    : ownershipDocuments;
+  const activeDocs = ownershipDocuments.filter(
+    (document) =>
+      (!options.collection || document.collection === options.collection) &&
+      (options.collections === undefined ||
+        options.collections.includes(document.collection))
+  );
   const temporalRange: TemporalRange = {
     since: options.since,
     until: options.until,