@zvec/zvec-grep 0.1.6 → 0.1.8

package/dist/engine/service/structure-enrichment.js

@@ -2,18 +2,18 @@ import { readFile, stat } from "node:fs/promises";
 import { relative } from "node:path";
 import { extract } from "../extraction/index.js";
 import { detectFileType } from "../file-type.js";
+import { resolveMaxFileSizeBytes } from "../file-size-policy.js";
 import { normalizePath, toDisplayPath } from "../utils/path.js";
 import { sha256Text } from "../utils/hash.js";
 export const RG_STRUCTURE_ENRICH_FILE_LIMIT = 100;
 const STRUCTURE_ENRICH_FILE_ID_NAMESPACE = "__rg_structure__";
-const STRUCTURE_ENRICH_MAX_FILE_SIZE_BYTES = 1 * 1024 * 1024;
-export async function enrichLexicalItemsWithStructure(root, items, fileLimit = RG_STRUCTURE_ENRICH_FILE_LIMIT) {
+export async function enrichLexicalItemsWithStructure(root, items, fileLimit = RG_STRUCTURE_ENRICH_FILE_LIMIT, maxFileSizeBytes) {
     const matchedFiles = uniqueLexicalFilePaths(items);
     const selectedFiles = new Set(matchedFiles.slice(0, fileLimit));
     const fragmentsByFile = new Map();
     let parsedFiles = 0;
     for (const absolutePath of selectedFiles) {
-        const fragments = await parseStructuralFragments(root, absolutePath);
+        const fragments = await parseStructuralFragments(root, absolutePath, maxFileSizeBytes);
         fragmentsByFile.set(absolutePath, fragments);
         if (fragments !== null) {
             parsedFiles++;
@@ -79,9 +79,9 @@ function uniqueLexicalFilePaths(items) {
     }
     return paths;
 }
-async function parseStructuralFragments(root, absolutePath) {
+async function parseStructuralFragments(root, absolutePath, maxFileSizeBytes) {
     try {
-        const file = await fileInfoForStructure(root, absolutePath);
+        const file = await fileInfoForStructure(root, absolutePath, maxFileSizeBytes);
         if (!file) {
             return null;
         }
@@ -102,18 +102,18 @@ async function parseStructuralFragments(root, absolutePath) {
 function isStructuralFragment(fragment) {
     return (fragment.metadata?.kind === "code" || fragment.metadata?.kind === "markdown");
 }
-async function fileInfoForStructure(root, absolutePath) {
+async function fileInfoForStructure(root, absolutePath, maxFileSizeBytes) {
     const info = await stat(absolutePath).catch(() => null);
-    if (!info ||
-        !info.isFile() ||
-        info.size <= 0 ||
-        info.size > STRUCTURE_ENRICH_MAX_FILE_SIZE_BYTES) {
+    if (!info || !info.isFile() || info.size <= 0) {
         return null;
     }
     const detected = detectFileType(absolutePath);
     if (!detected || !isStructurallyEnrichableFile(detected)) {
         return null;
     }
+    if (info.size > resolveMaxFileSizeBytes(detected.kind, maxFileSizeBytes)) {
+        return null;
+    }
     return {
         id: makeStructureFileId(absolutePath),
         absolutePath: normalizePath(absolutePath),

package/dist/engine/service/structure-enrichment.js.map

@@ -1 +1 @@
-{"version":3,"file":"structure-enrichment.js","sourceRoot":"","sources":["../../../src/engine/service/structure-enrichment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structure-enrichment.js","sourceRoot":"","sources":["../../../src/engine/service/structure-enrichment.ts"],"names":[],"mappings":"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"}

package/dist/engine/service/types.d.ts

@@ -11,7 +11,6 @@ export type CreateZvecGrepOptions = {
     endpoint?: string;
     modelCacheDir?: string;
     device?: "auto" | "cpu" | "metal" | "vulkan" | "cuda";
-    defaultEmbedding?: boolean;
     authorizationSigningKeyPath?: string;
 };
 export type ZvecGrepIndexOptions = {
@@ -137,6 +136,12 @@ export type ZvecGrepContextItem = {
     selectionReason?: ZvecGrepContextSelectionReason;
     coverageGroup?: string;
 };
+export type ZvecGrepContextGroupResult = {
+    id: string;
+    query: string;
+    role: "primary" | "supplemental";
+    items: ZvecGrepContextItem[];
+};
 export type ZvecGrepContextWorkspaceIndex = {
     id: string;
     name: string;
@@ -189,6 +194,8 @@ export type ZvecGrepContextResult = {
     coverage: ZvecGrepContextCoverage;
     workspaceIndex?: ZvecGrepContextWorkspaceIndex;
     items: ZvecGrepContextItem[];
+    /** Per-query-group recall lists before cross-group deduplication and reranking. */
+    groupResults?: ZvecGrepContextGroupResult[];
     diagnostics: ZvecGrepContextDiagnostics;
 };
 export type ZvecGrep = {

package/dist/engine/service/workspace-index.d.ts

@@ -1,14 +1,16 @@
 import type { EmbeddingModel } from "../models/index.js";
 import type { WorkspaceIndexEmbeddingSchema, WorkspaceIndexStatus, WorkspaceIndexInfo, IndexOptions, IndexResult, SearchPlan, SearchPlanResult } from "../types.js";
+export type WorkspaceIndexOptions = {
+    mode: "read" | "write";
+    embeddingModel?: EmbeddingModel;
+};
 export declare class WorkspaceIndex {
     readonly info: WorkspaceIndexInfo;
-    private readonly embeddingModel?;
-    private readonly readOnly;
-    private readonly fileStorePath;
     private readonly storage;
     private readonly embedding;
+    private readonly embeddingModel?;
     private closed;
-    constructor(info: WorkspaceIndexInfo, embeddingModel?: EmbeddingModel | undefined, readOnly?: boolean, fileStorePath?: string);
+    constructor(info: WorkspaceIndexInfo, options: WorkspaceIndexOptions);
     get name(): string;
     index(options?: IndexOptions): Promise<IndexResult>;
     status(): Promise<WorkspaceIndexStatus>;

package/dist/engine/service/workspace-index.js

@@ -1,35 +1,41 @@
-import { join } from "node:path";
 import { workspaceIndexDetail, detail, EngineError, errorDetails, } from "../errors.js";
 import { getWorkspaceIndexStatus, indexWorkspace, indexWorkspacePaths, } from "../pipeline/indexing/index.js";
 import { searchWorkspaceIndex } from "../pipeline/search/index.js";
-import { ZvecWorkspaceIndexStorage } from "../storage/zvec.js";
+import { createWorkspaceIndexStorage, } from "../storage/index.js";
 import { CURRENT_INDEX_VERSION } from "../types.js";
-const FILES_ZVEC = "files.zvec";
 export class WorkspaceIndex {
     info;
-    embeddingModel;
-    readOnly;
-    fileStorePath;
     storage;
     embedding;
+    embeddingModel;
     closed = false;
-    constructor(info, embeddingModel, readOnly = false, fileStorePath = join(info.path, FILES_ZVEC)) {
+    constructor(info, options) {
         this.info = info;
-        this.embeddingModel = embeddingModel;
-        this.readOnly = readOnly;
-        this.fileStorePath = fileStorePath;
+        this.embeddingModel = options.embeddingModel;
         this.embedding = requireWorkspaceIndexEmbedding(info, "open");
         this.validateIndexVersion();
         if (this.embeddingModel) {
             this.validateEmbeddingSchema(this.embeddingModel);
         }
-        this.storage = new ZvecWorkspaceIndexStorage(info.path, this.embedding, this.fileStorePath, readOnly);
+        if (options.mode === "write") {
+            this.storage = createWorkspaceIndexStorage({
+                storagePath: info.path,
+                readOnly: false,
+                embedding: this.embedding,
+            });
+        }
+        else {
+            this.storage = createWorkspaceIndexStorage({
+                storagePath: info.path,
+                readOnly: true,
+            });
+        }
     }
     get name() {
         return this.info.name;
     }
     index(options = {}) {
-        if (this.readOnly) {
+        if (this.storage.readOnly) {
             throw new EngineError("Cannot update a read-only workspace index", {
                 code: "ZVEC_GREP.ENGINE.WORKSPACE_INDEX.READ_ONLY",
                 context: workspaceIndexOperationDetails(this.name, "index"),

package/dist/engine/service/workspace-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-index.js","sourceRoot":"","sources":["../../../src/engine/service/workspace-index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-index.js","sourceRoot":"","sources":["../../../src/engine/service/workspace-index.ts"],"names":[],"mappings":"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"}

package/dist/engine/service/zvec-grep.js

@@ -9,7 +9,7 @@ import { CURRENT_INDEX_VERSION } from "../types.js";
 import { indexStatusNeedsRefresh } from "../index-status.js";
 import { workspaceIndexInfoFromManifest, CURRENT_MANIFEST_VERSION, readWorkspaceManifest, writeWorkspaceManifest, } from "../manifest.js";
 import { validateRootPaths } from "../pipeline/indexing/root-paths.js";
-import { findNearestWorkspace, hasWorkspaceIndex, resetWorkspaceIndexStorage, resolveZvecGrepRoot, workspaceHome, workspaceIndexLocation, } from "./root.js";
+import { findNearestWorkspace, hasWorkspaceIndex, resetWorkspaceIndex, resolveZvecGrepRoot, workspaceHome, workspaceIndexLocation, } from "./root.js";
 import { runRgSearch } from "./lexical.js";
 import { defaultHome, normalizePath } from "../utils/path.js";
 import { acquireReadWriteLock, assertNoWriteLock, } from "../utils/lock.js";
@@ -20,7 +20,7 @@ import { remoteEmbeddingAuthorizationGuard } from "../../authorization/operation
 import { RemoteEmbeddingAuthorizationStore } from "../../authorization/store.js";
 const DEFAULT_CONTEXT_LIMIT = 10;
 const DEFAULT_CONTEXT_TOTAL_LIMIT = 30;
-const DEFAULT_LOCAL_EMBEDDING = "local/embeddinggemma-300m";
+const DEFAULT_LOCAL_EMBEDDING = "local/potion-code-16m-v2";
 const PROVIDER_API_KEY_IDENTITY_SECRET = randomBytes(32);
 const MAX_RECOVERED_EMBEDDING_MODELS = 4;
 export async function createZvecGrep(options = {}) {
@@ -40,7 +40,10 @@ export function openWorkspaceReadSession(startRoot, embeddingModel) {
     if (!isWorkspaceIndexed(info) || !hasWorkspaceIndex(location)) {
         throw workspaceIndexMissingError(location.root, info.indexPolicy ?? "enabled");
     }
-    const workspaceIndex = new WorkspaceIndex(info, embeddingModel, true, location.filesPath);
+    const workspaceIndex = new WorkspaceIndex(info, {
+        mode: "read",
+        embeddingModel,
+    });
     let closed = false;
     return {
         root: location.root,
@@ -122,14 +125,18 @@ class ZvecGrepService {
                     follow: options.follow,
                 });
                 if (options.rebuild || !isWorkspaceIndexed(existing)) {
-                    resetWorkspaceIndexStorage(location);
+                    resetWorkspaceIndex(location);
                 }
                 const existingAfterRebuild = options.rebuild ? null : existing;
                 if (isWorkspaceIndexed(existingAfterRebuild)) {
                     assertWorkspaceEmbeddingMatchesCurrentModel(existingAfterRebuild, embeddingModel, "zg index --rebuild");
                 }
-                const manifest = prepareWorkspaceManifest(location, existingAfterRebuild, rootPaths, embeddingModel, existingRuntime);
-                const workspaceIndex = new WorkspaceIndex(manifest, embeddingModel, false, location.filesPath);
+                const embeddingRuntime = embeddingRuntimeAfterIndex(existing, existingRuntime, embeddingModel, effectiveRuntime, this.options);
+                const manifest = prepareWorkspaceManifest(location, existingAfterRebuild, rootPaths, embeddingModel, embeddingRuntime);
+                const workspaceIndex = new WorkspaceIndex(manifest, {
+                    mode: "write",
+                    embeddingModel,
+                });
                 writeWorkspaceManifest(location.home, manifest);
                 try {
                     const releaseWriterContext = options.onWriterContext?.((contextOptions) => this.contextFromWriterWorkspaceIndex(root, workspaceIndex, contextOptions));
@@ -143,7 +150,7 @@ class ZvecGrepService {
                         });
                         writeWorkspaceManifest(location.home, {
                             ...manifest,
-                            embeddingRuntime: embeddingRuntimeAfterSuccessfulIndex(existing, existingRuntime, embeddingModel, effectiveRuntime, this.options),
+                            embeddingRuntime,
                             updatedTime: Date.now(),
                         });
                         return result;
@@ -151,7 +158,7 @@ class ZvecGrepService {
                     catch (error) {
                         writeWorkspaceManifest(location.home, {
                             ...manifest,
-                            embeddingRuntime: existingRuntime,
+                            embeddingRuntime,
                             updatedTime: Date.now(),
                         });
                         throw error;
@@ -179,7 +186,7 @@ class ZvecGrepService {
                 return false;
             }
             return await withHomeWriteLock(location.home, "index.drop", async () => {
-                resetWorkspaceIndexStorage(location);
+                resetWorkspaceIndex(location);
                 return true;
             });
         }
@@ -310,7 +317,7 @@ class ZvecGrepService {
                 code: "ZVEC_GREP.ENGINE.MANIFEST.NOT_FOUND",
             });
         }
-        const workspaceIndex = this.openWorkspaceIndexForSearch(info, request, location, info.embeddingRuntime);
+        const workspaceIndex = this.openWorkspaceIndexForSearch(info, request, info.embeddingRuntime);
         try {
             return await contextFromOpenWorkspaceIndex({
                 root: location.root,
@@ -350,7 +357,10 @@ class ZvecGrepService {
                 const embeddingModel = this.embeddingModelForIndex(existing, "context.refresh", workspaceRuntime);
                 assertWorkspaceEndpointMatchesCurrentRuntime(existing, workspaceRuntime, effectiveEmbeddingRuntime(this.options, embeddingModel, workspaceRuntime), "zg index --endpoint <url> --rebuild");
                 assertWorkspaceEmbeddingMatchesCurrentModel(existing, embeddingModel, "zg index --rebuild");
-                const workspaceIndex = new WorkspaceIndex(existing, embeddingModel, false, location.filesPath);
+                const workspaceIndex = new WorkspaceIndex(existing, {
+                    mode: "write",
+                    embeddingModel,
+                });
                 try {
                     const result = await workspaceIndex.index({
                         embeddingConcurrency: options.embeddingConcurrency,
@@ -413,7 +423,7 @@ class ZvecGrepService {
                 cause,
             });
         }
-        const structuralEnrichment = await timings.time("structure_enrichment", () => enrichLexicalItemsWithStructure(root, rgResult.items));
+        const structuralEnrichment = await timings.time("structure_enrichment", () => enrichLexicalItemsWithStructure(root, rgResult.items, undefined, options.maxFileSizeBytes));
         const items = dedupeAndRerankContextItems(structuralEnrichment.items);
         const emptyReason = items.length === 0 ? rgEmptyReason(rgResult.diagnostics) : undefined;
         return {
@@ -431,8 +441,11 @@ class ZvecGrepService {
             },
         };
     }
-    openWorkspaceIndexForSearch(info, request, location, workspaceRuntime) {
-        return new WorkspaceIndex(info, this.embeddingModelForSearch(indexedEmbeddingSchema(info), request, workspaceRuntime, info), true, location.filesPath);
+    openWorkspaceIndexForSearch(info, request, workspaceRuntime) {
+        return new WorkspaceIndex(info, {
+            mode: "read",
+            embeddingModel: this.embeddingModelForSearch(indexedEmbeddingSchema(info), request, workspaceRuntime, info),
+        });
     }
     embeddingModelForSearch(schema, request, workspaceRuntime, info) {
         if (!request.routes.some((route) => route.mode === "vector")) {
@@ -459,9 +472,7 @@ class ZvecGrepService {
         const reference = resolveEmbeddingReference({
             explicit: this.options.embedding,
             globalDefault: config.defaults?.embedding,
-            fallback: this.options.defaultEmbedding === true
-                ? DEFAULT_LOCAL_EMBEDDING
-                : undefined,
+            fallback: DEFAULT_LOCAL_EMBEDDING,
         });
         const referenceIdentity = reference
             ? parseEmbeddingModelReference(reference)
@@ -545,7 +556,7 @@ class ZvecGrepService {
                 context: errorDetails([
                     detail("operation", operation),
                     detail("hint", `Pass "--embedding <model>", set ZVEC_GREP_EMBEDDING, or configure defaults.embedding in ${globalConfigPath()}. Existing indexes can run "zg index" without --embedding to reuse the stored schema.`),
-                    detail("examples", "local/embeddinggemma-300m, qwen/text-embedding-v4"),
+                    detail("examples", "local/potion-code-16m-v2, qwen/text-embedding-v4"),
                 ]),
             });
         }
@@ -593,7 +604,8 @@ async function contextFromOpenWorkspaceIndex(input) {
         input.timings.addEntries(search.timings);
         searches.push(search);
     }
-    const items = selectAndRankContextItems(searches.flatMap((search, index) => searchPlanToContextItems(search, input.root, groups[index])), groups.filter((group) => group.role === "primary").map((group) => group.id));
+    const groupItems = searches.map((search, index) => searchPlanToContextItems(search, input.root, groups[index]));
+    const items = selectAndRankContextItems(groupItems.flat(), groups.filter((group) => group.role === "primary").map((group) => group.id));
     return {
         query: input.request.displayQuery,
         root: input.root,
@@ -605,6 +617,12 @@ async function contextFromOpenWorkspaceIndex(input) {
             path: input.workspaceIndex.info.path,
         },
         items,
+        groupResults: groups.map((group, index) => ({
+            id: group.id,
+            query: group.query,
+            role: group.role,
+            items: groupItems[index] ?? [],
+        })),
         diagnostics: {
             emptyReason: items.length === 0 ? "no_matches" : undefined,
             index: {
@@ -850,7 +868,7 @@ async function workspaceIndexStatus(info, location) {
         !hasWorkspaceIndex(location)) {
         return null;
     }
-    const workspaceIndex = new WorkspaceIndex(info, undefined, true, location.filesPath);
+    const workspaceIndex = new WorkspaceIndex(info, { mode: "read" });
     try {
         return await workspaceIndex.status();
     }
@@ -962,7 +980,7 @@ function runtimeForModelProvider(existing, model, workspaceRuntime) {
         ? {}
         : workspaceRuntime;
 }
-function embeddingRuntimeAfterSuccessfulIndex(existing, existingRuntime, model, effectiveRuntime, explicit) {
+function embeddingRuntimeAfterIndex(existing, existingRuntime, model, effectiveRuntime, explicit) {
     const sameProvider = isWorkspaceIndexed(existing) &&
         existing.embedding.provider === model.info.provider;
     const apiKey = model.info.provider === "local"
@@ -1152,7 +1170,7 @@ function searchPlanToContextItems(result, root, group) {
         };
     });
 }
-const DEFAULT_CONTEXT_DETAIL_LIMIT = 6;
+const DEFAULT_CONTEXT_PRIORITY_LIMIT = 6;
 const CONTEXT_GROUP_RRF_K = 60;
 function selectAndRankContextItems(items, coverageGroupIds) {
     const deduped = new Map();
@@ -1169,9 +1187,9 @@ function selectAndRankContextItems(items, coverageGroupIds) {
     const candidates = [...deduped.values()];
     const globallyRanked = [...candidates].sort(compareContextGlobalRank);
     const selected = new Set();
-    const detailed = [];
+    const prioritized = [];
     for (const groupId of coverageGroupIds) {
-        if (detailed.length >= DEFAULT_CONTEXT_DETAIL_LIMIT) {
+        if (prioritized.length >= DEFAULT_CONTEXT_PRIORITY_LIMIT) {
             break;
         }
         const candidate = candidates
@@ -1182,14 +1200,14 @@ function selectAndRankContextItems(items, coverageGroupIds) {
             continue;
         }
         selected.add(contextItemDedupeKey(candidate));
-        detailed.push({
+        prioritized.push({
             ...candidate,
             selectionReason: "coverage",
             coverageGroup: groupId,
         });
     }
     for (const candidate of globallyRanked) {
-        if (detailed.length >= DEFAULT_CONTEXT_DETAIL_LIMIT) {
+        if (prioritized.length >= DEFAULT_CONTEXT_PRIORITY_LIMIT) {
             break;
         }
         const key = contextItemDedupeKey(candidate);
@@ -1197,14 +1215,14 @@ function selectAndRankContextItems(items, coverageGroupIds) {
             continue;
         }
         selected.add(key);
-        detailed.push({
+        prioritized.push({
             ...candidate,
             selectionReason: "global_fill",
             coverageGroup: undefined,
         });
     }
-    const additional = globallyRanked.filter((item) => !selected.has(contextItemDedupeKey(item)));
-    return [...detailed, ...additional].map((item, index) => ({
+    const unprioritized = globallyRanked.filter((item) => !selected.has(contextItemDedupeKey(item)));
+    return [...prioritized, ...unprioritized].map((item, index) => ({
         ...item,
         rank: index + 1,
     }));