@gmickel/gno 2.3.3 → 2.5.1

package/src/serve/public/pages/Search.tsx

@@ -7,11 +7,12 @@ import {
   SlidersHorizontal,
   XIcon,
 } from "lucide-react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { resolveDepthPolicy } from "../../../core/depth-policy";
 import { normalizeStructuredQueryInput } from "../../../core/structured-query";
 import { Loader } from "../components/ai-elements/loader";
+import { MetadataFilter } from "../components/MetadataFilter";
 import {
   ThoroughnessSelector,
   type Thoroughness,
@@ -37,6 +38,7 @@ import { apiFetch } from "../hooks/use-api";
 import { useDocEvents } from "../hooks/use-doc-events";
 import { useKeyboardShortcuts } from "../hooks/useKeyboardShortcuts";
 import { buildDocDeepLink } from "../lib/deep-links";
+import { parseMetadataFilter } from "../lib/metadata-filter";
 import {
   applyFiltersToUrl,
   parseFiltersFromSearch,
@@ -111,6 +113,7 @@ interface SearchResult {
 interface SearchResponse {
   results: SearchResult[];
   meta: {
+    warnings?: { code: string; message: string }[];
     query: string;
     mode: string;
     totalResults: number;
@@ -152,6 +155,7 @@ export default function Search({ navigate }: PageProps) {
   const [results, setResults] = useState<SearchResult[]>([]);
   const [meta, setMeta] = useState<SearchResponse["meta"] | null>(null);
   const [loading, setLoading] = useState(false);
+  const searchRequest = useRef(0);
   const [error, setError] = useState<string | null>(null);
   const [searched, setSearched] = useState(false);
   const [capabilities, setCapabilities] = useState<ServerCapabilities | null>(
@@ -170,6 +174,7 @@ export default function Search({ navigate }: PageProps) {
       initialFilters.until ||
       initialFilters.category ||
       initialFilters.author ||
+      initialFilters.filter ||
       initialFilters.queryModes.length > 0
     )
   );
@@ -187,6 +192,9 @@ export default function Search({ navigate }: PageProps) {
   const [since, setSince] = useState(initialFilters.since);
   const [until, setUntil] = useState(initialFilters.until);
   const [category, setCategory] = useState(initialFilters.category);
+  const [metadataFilter, setMetadataFilter] = useState(
+    initialFilters.filter ?? ""
+  );
   const [author, setAuthor] = useState(initialFilters.author);
   const [queryModes, setQueryModes] = useState<QueryModeEntry[]>(
     initialFilters.queryModes
@@ -217,6 +225,7 @@ export default function Search({ navigate }: PageProps) {
   useEffect(() => {
     const url = new URL(window.location.href);
     applyFiltersToUrl(url, {
+      filter: metadataFilter,
       collection: selectedCollection,
       intent,
       candidateLimit,
@@ -232,6 +241,7 @@ export default function Search({ navigate }: PageProps) {
     window.history.replaceState({}, "", url.toString());
   }, [
     activeTags,
+    metadataFilter,
     author,
     candidateLimit,
     category,
@@ -319,10 +329,23 @@ export default function Search({ navigate }: PageProps) {
   const handleSearch = useCallback(
     async (e?: React.FormEvent) => {
       e?.preventDefault();
+      const request = ++searchRequest.current;
       if (!query.trim()) {
         return;
       }
+      const parsedFilter = parseMetadataFilter(metadataFilter);
+      if (parsedFilter.error) {
+        setLoading(false);
+        setResults([]);
+        setMeta(null);
+        setError(parsedFilter.error);
+        setShowAdvanced(true);
+        return;
+      }
       if (!structuredQueryState.ok) {
+        setLoading(false);
+        setResults([]);
+        setMeta(null);
         setError(structuredQueryState.error.message);
         return;
       }
@@ -351,6 +374,7 @@ export default function Search({ navigate }: PageProps) {
         limit: 20,
       };
 
+      if (parsedFilter.filter) body.filter = parsedFilter.filter;
       if (selectedCollection) {
         body.collection = selectedCollection;
       }
@@ -400,6 +424,7 @@ export default function Search({ navigate }: PageProps) {
         }
       );
 
+      if (request !== searchRequest.current) return;
       setLoading(false);
       if (fetchError) {
         setError(fetchError);
@@ -412,6 +437,7 @@ export default function Search({ navigate }: PageProps) {
     },
     [
       activeTags,
+      metadataFilter,
       author,
       candidateLimit,
       activePreset,
@@ -438,6 +464,7 @@ export default function Search({ navigate }: PageProps) {
   }, [
     activeTags,
     activePreset,
+    metadataFilter,
     author,
     candidateLimit,
     category,
@@ -477,6 +504,7 @@ export default function Search({ navigate }: PageProps) {
     since ? `since:${since}` : null,
     until ? `until:${until}` : null,
     category.trim() ? `category:${category.trim()}` : null,
+    metadataFilter.trim() ? "custom metadata" : null,
     author.trim() ? `author:${author.trim()}` : null,
     queryModes.length > 0 ? `${queryModes.length} query mode(s)` : null,
   ].filter((pill): pill is string => Boolean(pill));
@@ -493,6 +521,7 @@ export default function Search({ navigate }: PageProps) {
     setUntil("");
     setCategory("");
     setAuthor("");
+    setMetadataFilter("");
     setQueryModes([]);
     setQueryModeText("");
     setQueryModeError(null);
@@ -773,6 +802,11 @@ export default function Search({ navigate }: PageProps) {
                         </div>
                       </div>
 
+                      <MetadataFilter
+                        onChange={setMetadataFilter}
+                        value={metadataFilter}
+                      />
+
                       <div className="flex flex-wrap items-center gap-2">
                         <span className="text-muted-foreground text-xs">
                           Tag match:
@@ -954,6 +988,15 @@ export default function Search({ navigate }: PageProps) {
               </div>
             )}
 
+            {meta?.warnings?.map((warning) => (
+              <p
+                className="mb-3 rounded border border-secondary/30 bg-secondary/10 p-3 text-sm"
+                key={warning.code}
+                role="status"
+              >
+                {warning.message}
+              </p>
+            ))}
             {error && (
               <Card className="mb-6 border-destructive bg-destructive/10">
                 <CardContent className="py-4 text-destructive">

package/src/serve/routes/api.ts

@@ -124,6 +124,11 @@ import {
   parseAndValidateTagFilter,
   validateTag,
 } from "../../core/tags";
+import {
+  metadataPredicateSchema,
+  normalizeMetadataPredicate,
+  type MetadataPredicate,
+} from "../../core/typed-metadata";
 import { validateRelPath } from "../../core/validation";
 import { writeLeasePath } from "../../core/write-lease";
 import {
@@ -287,6 +292,7 @@ export interface SearchRequestBody {
   /** Comma-separated category filters */
   category?: string;
   author?: string;
+  filter?: MetadataPredicate;
   /** Comma-separated tags - filter to docs having ALL (AND) */
   tagsAll?: string;
   /** Comma-separated tags - filter to docs having ANY (OR) */
@@ -308,6 +314,7 @@ export interface QueryRequestBody {
   /** Comma-separated category filters */
   category?: string;
   author?: string;
+  filter?: MetadataPredicate;
   queryModes?: QueryModeInput[];
   noExpand?: boolean;
   noRerank?: boolean;
@@ -339,6 +346,7 @@ export interface AskRequestBody {
   /** Comma-separated category filters */
   category?: string;
   author?: string;
+  filter?: MetadataPredicate;
   maxAnswerTokens?: number;
   verify?: boolean;
   contextBudgetTokens?: number;
@@ -369,6 +377,7 @@ const ASK_REQUEST_KEYS = new Set<keyof AskRequestBody>([
   "until",
   "category",
   "author",
+  "filter",
   "maxAnswerTokens",
   "verify",
   "contextBudgetTokens",
@@ -586,6 +595,29 @@ function errorResponse(
   );
 }
 
+function parseRestMetadataFilter(
+  value: unknown
+):
+  | { ok: true; filter: MetadataPredicate | undefined }
+  | { ok: false; response: Response } {
+  if (value === undefined) return { ok: true, filter: undefined };
+  const parsed = metadataPredicateSchema.safeParse(value);
+  if (!parsed.success) {
+    const issue = parsed.error.issues[0];
+    const path = ["filter", ...(issue?.path ?? [])].join(".");
+    return {
+      ok: false,
+      response: errorResponse(
+        "VALIDATION",
+        `${path}: ${issue?.message ?? "Invalid predicate"}`,
+        400,
+        { field: path }
+      ),
+    };
+  }
+  return { ok: true, filter: normalizeMetadataPredicate(parsed.data) };
+}
+
 function fileRefactorHttpErrorResponse(error: FileRefactorHttpError): Response {
   return errorResponse(error.code, error.message, error.status, error.details);
 }
@@ -2090,6 +2122,8 @@ export async function handleDoc(
     title: doc.title,
     content,
     contentAvailable,
+    typedMetadata: doc.typedMetadata ?? null,
+    metadataError: doc.metadataError ?? null,
     collection: doc.collection,
     relPath,
     tags,
@@ -4194,6 +4228,9 @@ export async function handleSearch(
     ? parseCommaSeparatedValues(body.exclude)
     : undefined;
   const author = body.author?.trim() || undefined;
+  const parsedFilter = parseRestMetadataFilter(body.filter);
+  if (!parsedFilter.ok) return parsedFilter.response;
+  const filter = parsedFilter.filter;
   let projectAffinity: ProjectAffinityScoringInput | undefined;
   try {
     projectAffinity = context
@@ -4221,6 +4258,7 @@ export async function handleSearch(
     until: body.until,
     categories,
     author,
+    filter,
     projectAffinity,
     contentTypeRules: context
       ? normalizeContentTypes(context.config.contentTypes ?? []).rules
@@ -4388,6 +4426,9 @@ export async function handleQuery(
     ? parseCommaSeparatedValues(body.exclude)
     : undefined;
   const author = body.author?.trim() || undefined;
+  const parsedFilter = parseRestMetadataFilter(body.filter);
+  if (!parsedFilter.ok) return parsedFilter.response;
+  const filter = parsedFilter.filter;
   let projectAffinity: ProjectAffinityScoringInput | undefined;
   try {
     projectAffinity = await resolveRemoteProjectAffinity(
@@ -4425,6 +4466,7 @@ export async function handleQuery(
     until: body.until,
     categories,
     author,
+    filter,
     projectAffinity,
     explain: body.explain,
   };
@@ -4603,6 +4645,9 @@ export async function handleQueryDiagnose(
     ? parseCommaSeparatedValues(body.exclude)
     : undefined;
   const author = body.author?.trim() || undefined;
+  const parsedFilter = parseRestMetadataFilter(body.filter);
+  if (!parsedFilter.ok) return parsedFilter.response;
+  const filter = parsedFilter.filter;
   const contentTypeRules = normalizeContentTypes(
     ctx.config.contentTypes ?? []
   ).rules;
@@ -4654,6 +4699,7 @@ export async function handleQueryDiagnose(
       until: body.until,
       categories,
       author,
+      filter,
       projectAffinity,
       contentTypeRules,
       contentTypeRulesFingerprint:
@@ -4847,6 +4893,9 @@ export async function handleAsk(
     ? parseCommaSeparatedValues(body.exclude)
     : undefined;
   const author = body.author?.trim() || undefined;
+  const parsedFilter = parseRestMetadataFilter(body.filter);
+  if (!parsedFilter.ok) return parsedFilter.response;
+  const filter = parsedFilter.filter;
   let projectAffinity: ProjectAffinityScoringInput | undefined;
   try {
     projectAffinity = await resolveRemoteProjectAffinity(
@@ -4885,6 +4934,7 @@ export async function handleAsk(
     until: body.until,
     categories,
     author,
+    filter,
     verify: body.verify,
     contextBudgetTokens: body.contextBudgetTokens,
     contextBudgetBytes: body.contextBudgetBytes,

package/src/serve/server.ts

@@ -1,3 +1,4 @@
+import type { HttpGatewayOverrides } from "../mcp/http-security";
 /**
  * Bun.serve() web server for GNO web UI.
  * Uses Bun's fullstack dev server with HTML imports.
@@ -5,8 +6,6 @@
  *
  * @module src/serve/server
  */
-
-import type { HttpGatewayOverrides } from "../mcp/http-security";
 import type { RequestPeerServer } from "./request-locality";
 import type { ResidentRuntime } from "./resident-runtime";
 import type { ContextHolder } from "./routes/api";
@@ -16,6 +15,7 @@ import {
   resolveHttpGatewayConfig,
 } from "../mcp/http-security";
 import { startBackgroundRuntime } from "./background-runtime";
+import { handleCompiledContext } from "./compiled-context";
 import { handleContextBuild, handleContextVerify } from "./context-capsule";
 import { DocumentEventBus } from "./doc-events";
 import {
@@ -566,6 +566,7 @@ export async function startServer(
         "/collections": spaPageRoute,
         "/connectors": spaPageRoute,
         "/traces": spaPageRoute,
+        "/context/compiled": spaPageRoute,
         "/ask": spaPageRoute,
         "/graph": spaPageRoute,
         "/clipper/pair": spaPageRoute,
@@ -1164,6 +1165,46 @@ export async function startServer(
             );
           },
         },
+        "/api/context/compiled/preview": {
+          POST: async (req: Request, server: RequestPeerServer) => {
+            if (!isRequestAllowed(req, port))
+              return withSecurityHeaders(forbiddenResponse(), isDev);
+            return withSecurityHeaders(
+              await handleResidentRead(
+                runtime as ResidentRuntime,
+                req,
+                (signal) =>
+                  handleCompiledContext(
+                    ctxHolder.current,
+                    new Request(req, { signal }),
+                    { requestIP: () => server.requestIP(req) },
+                    "preview"
+                  )
+              ),
+              isDev
+            );
+          },
+        },
+        "/api/context/compiled/check": {
+          POST: async (req: Request, server: RequestPeerServer) => {
+            if (!isRequestAllowed(req, port))
+              return withSecurityHeaders(forbiddenResponse(), isDev);
+            return withSecurityHeaders(
+              await handleResidentRead(
+                runtime as ResidentRuntime,
+                req,
+                (signal) =>
+                  handleCompiledContext(
+                    ctxHolder.current,
+                    new Request(req, { signal }),
+                    { requestIP: () => server.requestIP(req) },
+                    "check"
+                  )
+              ),
+              isDev
+            );
+          },
+        },
         "/api/context/verify": {
           POST: async (req: Request) => {
             if (!isRequestAllowed(req, port)) {

package/src/serve/spa-production-build.ts

@@ -79,12 +79,13 @@ const contentTypeFor = (path: string): string => {
   return "application/octet-stream";
 };
 
-export const isStandaloneExecutable = (): boolean =>
-  import.meta.path.includes("/$bunfs/") ||
-  import.meta.path.includes("\\$bunfs\\");
+export const isBunfsPath = (path: string): boolean => {
+  const normalized = path.replaceAll("\\", "/");
+  return normalized.includes("/$bunfs/") || normalized.startsWith("B:/~BUN/");
+};
 
-export const isBunfsPath = (path: string): boolean =>
-  path.includes("/$bunfs/") || path.includes("\\$bunfs\\");
+export const isStandaloneExecutable = (): boolean =>
+  isBunfsPath(import.meta.path);
 
 const rewriteProductionHtml = (html: string, jsEntryPath: string): string => {
   const script = `<script type="module" src="/${basename(jsEntryPath)}"></script>`;

package/src/store/migrations/030-typed-metadata.ts

@@ -0,0 +1,13 @@
+import type { Migration } from "./runner";
+
+export const migration: Migration = {
+  version: 30,
+  name: "typed_metadata",
+  up(db): void {
+    db.exec("ALTER TABLE documents ADD COLUMN typed_metadata TEXT");
+    db.exec("ALTER TABLE documents ADD COLUMN metadata_error TEXT");
+  },
+  down(): void {
+    // Derived columns are retained; SQLite rollback must not rewrite source rows.
+  },
+};

package/src/store/migrations/index.ts

@@ -43,6 +43,7 @@ import { migration as m026 } from "./026-file-refactor-recovery-journal";
 import { migration as m027 } from "./027-memory-scopes";
 import { migration as m028 } from "./028-vector-variants";
 import { migration as m029 } from "./029-graph-reference-state";
+import { migration as m030 } from "./030-typed-metadata";
 
 /** All migrations in order */
 export const migrations = [
@@ -75,4 +76,5 @@ export const migrations = [
   m027,
   m028,
   m029,
+  m030,
 ];

package/src/store/sqlite/adapter.ts

@@ -141,6 +141,10 @@ import {
 import { buildWikiBestMatchSubquery } from "../../core/graph-resolver";
 import { buildContentPrefilterNeedles } from "../../core/link-relevance";
 import { normalizeWikiName, stripWikiMdExt } from "../../core/links";
+import {
+  TYPED_METADATA_INGEST_VERSION,
+  typedMetadataSchema,
+} from "../../core/typed-metadata";
 import {
   parseActivationReceipt,
   serializeActivationReceipt,
@@ -665,7 +669,20 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
   async close(): Promise<void> {
     this.fenceForShutdown();
     if (this.db) {
-      this.db.close();
+      try {
+        // Current Bun finalizes all statements and releases Windows handles now.
+        this.db.close(true);
+      } catch (cause) {
+        // Older Bun only finalizes cached statements. Its native SQLITE_BUSY
+        // error has no code field; retain deferred close for that exact case.
+        if (
+          !(cause instanceof Error) ||
+          cause.message !== "database is locked"
+        ) {
+          throw cause;
+        }
+        this.db.close(false);
+      }
       this.db = null;
     }
   }
@@ -1427,6 +1444,30 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
   // Documents
   // ─────────────────────────────────────────────────────────────────────────
 
+  async getTypedMetadataCoverage(
+    options: import("../types").DocumentEligibilityOptions
+  ): Promise<StoreResult<{ pending: number; invalid: number }>> {
+    try {
+      const db = this.ensureOpen();
+      const eligible = buildEligibleDocumentQuery(
+        { ...options, filter: undefined },
+        db
+      );
+      const row = db
+        .query<{ pending: number; invalid: number }, (string | number)[]>(`
+        SELECT COALESCE(SUM(CASE WHEN d.ingest_version IS NULL OR d.ingest_version < ${TYPED_METADATA_INGEST_VERSION} OR (d.typed_metadata IS NULL AND d.metadata_error IS NULL) THEN 1 ELSE 0 END),0) AS pending,
+        COALESCE(SUM(CASE WHEN d.metadata_error IS NOT NULL THEN 1 ELSE 0 END),0) AS invalid
+        FROM documents d WHERE d.mirror_hash IS NOT NULL AND d.id IN (SELECT id FROM (${eligible.sql}))
+      `)
+        .get(...eligible.params);
+      return ok(row ?? { pending: 0, invalid: 0 });
+    } catch (cause) {
+      return err("QUERY_FAILED", "Cannot determine typed metadata coverage", {
+        cause,
+      });
+    }
+  }
+
   async upsertDocument(
     doc: DocumentInput
   ): Promise<StoreResult<UpsertDocumentResult>> {
@@ -1457,13 +1498,13 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
           collection, rel_path, source_hash, source_mime, source_ext,
           source_size, source_mtime, source_ctime, docid, uri, title, mirror_hash,
           converter_id, converter_version, language_hint, content_type, categories,
-          content_type_source, author, frontmatter_date, date_fields,
+          content_type_source, author, frontmatter_date, date_fields, typed_metadata, metadata_error,
           record_key, record_source_path, record_source_locator, record_metadata, record_anchors,
           record_adapter_fingerprint,
           content_type_rules_fingerprint,
           active, indexed_at, last_error_code, last_error_message, last_error_at,
           ingest_version, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, datetime('now'), ?, ?, ?, ?, datetime('now'))
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, datetime('now'), ?, ?, ?, ?, datetime('now'))
         ON CONFLICT(collection, rel_path) DO UPDATE SET
           source_hash = excluded.source_hash,
           source_mime = excluded.source_mime,
@@ -1484,6 +1525,8 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
           author = excluded.author,
           frontmatter_date = excluded.frontmatter_date,
           date_fields = excluded.date_fields,
+          typed_metadata = excluded.typed_metadata,
+          metadata_error = excluded.metadata_error,
           record_key = excluded.record_key,
           record_source_path = excluded.record_source_path,
           record_source_locator = excluded.record_source_locator,
@@ -1521,6 +1564,10 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
             doc.author ?? null,
             doc.frontmatterDate ?? null,
             doc.dateFields ? JSON.stringify(doc.dateFields) : null,
+            doc.typedMetadata
+              ? JSON.stringify(typedMetadataSchema.parse(doc.typedMetadata))
+              : null,
+            doc.metadataError ?? null,
             doc.recordKey ?? null,
             doc.recordSourcePath ?? null,
             doc.recordSourceLocator ?? null,
@@ -2109,6 +2156,7 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
     options: {
       collection?: string;
       activeOnly?: boolean;
+      eligibility?: import("../types").DocumentEligibilityOptions;
     } = {}
   ): Promise<StoreResult<DocumentRow[]>> {
     try {
@@ -2131,7 +2179,7 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
         const batch = uniqueDocids.slice(i, i + SQL_PARAM_LIMIT);
         const placeholders = batch.map(() => "?").join(",");
         const clauses = [`docid IN (${placeholders})`];
-        const params: string[] = [...batch];
+        const params: (string | number)[] = [...batch];
 
         if (options.activeOnly ?? true) {
           clauses.push("active = 1");
@@ -2141,8 +2189,15 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
           params.push(options.collection);
         }
 
+        if (options.eligibility) {
+          const eligible = buildEligibleDocumentQuery(options.eligibility, db);
+          clauses.push(`id IN (SELECT id FROM (${eligible.sql}))`);
+          params.push(...eligible.params);
+        }
         const sql = `SELECT * FROM documents WHERE ${clauses.join(" AND ")} ORDER BY id`;
-        rows.push(...db.query<DbDocumentRow, string[]>(sql).all(...params));
+        rows.push(
+          ...db.query<DbDocumentRow, (string | number)[]>(sql).all(...params)
+        );
       }
 
       return ok(rows.map(mapDocumentRow));
@@ -5960,7 +6015,10 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
       const recentErrors = recentErrorsRow?.count ?? 0;
       const healthy = recentErrors === 0;
 
+      const metadataCoverage = await this.getTypedMetadataCoverage({});
+      if (!metadataCoverage.ok) return metadataCoverage;
       return ok({
+        typedMetadata: metadataCoverage.value,
         version,
         indexName,
         configPath: this.configPath,
@@ -6286,6 +6344,8 @@ interface DbDocumentRow {
   author: string | null;
   frontmatter_date: string | null;
   date_fields: string | null;
+  typed_metadata: string | null;
+  metadata_error: string | null;
   record_key: string | null;
   record_source_path: string | null;
   record_source_locator: string | null;
@@ -6454,6 +6514,10 @@ function mapDocumentRow(row: DbDocumentRow): DocumentRow {
     author: row.author,
     frontmatterDate: row.frontmatter_date,
     dateFields,
+    typedMetadata: row.typed_metadata
+      ? typedMetadataSchema.parse(JSON.parse(row.typed_metadata))
+      : null,
+    metadataError: row.metadata_error,
     recordKey: row.record_key,
     recordSourcePath: row.record_source_path,
     recordSourceLocator: row.record_source_locator,

package/src/store/sqlite/eligibility.ts

@@ -2,7 +2,9 @@ import type { Database } from "bun:sqlite";
 
 import type { DocumentEligibilityOptions } from "../types";
 
+import { TYPED_METADATA_INGEST_VERSION } from "../../core/typed-metadata";
 import { matchesExcludedText } from "../../pipeline/exclude";
+import { compileMetadataPredicate } from "./metadata-predicate";
 
 /** Unbounded owner selection; compose with FTS rowids or chunk mirror ownership
  * before ranking/LIMIT. EXISTS keeps multiple tags/scopes from duplicating owners.
@@ -14,6 +16,16 @@ export function buildEligibleDocumentQuery(
   // Build tag filter conditions using EXISTS subqueries
   const conditions: string[] = ["d.active = 1"];
   const params: (string | number)[] = [];
+  if (options.filter) {
+    const predicate = compileMetadataPredicate(options.filter);
+    conditions.push(
+      "d.ingest_version >= ?",
+      "d.metadata_error IS NULL",
+      "d.typed_metadata IS NOT NULL",
+      predicate.sql
+    );
+    params.push(TYPED_METADATA_INGEST_VERSION, ...predicate.params);
+  }
   if (options.chunkLanguage) {
     conditions.push(
       "EXISTS (SELECT 1 FROM content_chunks lc WHERE lc.mirror_hash = d.mirror_hash AND lc.language = ?)"