@gmickel/gno 2.3.2 → 2.4.0

package/src/serve/public/lib/metadata-filter.ts

@@ -0,0 +1,28 @@
+import { ZodError } from "zod";
+
+import {
+  normalizeMetadataPredicate,
+  type MetadataPredicate,
+} from "../../../core/typed-metadata";
+
+export function parseMetadataFilter(text: string): {
+  filter?: MetadataPredicate;
+  error?: string;
+} {
+  if (!text.trim()) return {};
+  try {
+    return { filter: normalizeMetadataPredicate(JSON.parse(text)) };
+  } catch (error) {
+    if (error instanceof ZodError) {
+      const issue = error.issues[0];
+      const path = issue?.path.length ? `.${issue.path.join(".")}` : "";
+      return {
+        error: `filter${path}: ${issue?.message ?? "Invalid predicate"}. Check the operator, key, and JSON value type.`,
+      };
+    }
+    return {
+      error:
+        "filter: Invalid JSON. Use quoted strings, finite numbers, booleans, or arrays of one type.",
+    };
+  }
+}

package/src/serve/public/lib/retrieval-filters.ts

@@ -8,6 +8,7 @@ export interface QueryModeEntry {
 }
 
 export interface RetrievalFiltersState {
+  filter?: string;
   collection: string;
   intent: string;
   candidateLimit: string;
@@ -123,6 +124,7 @@ export function parseFiltersFromSearch(
   const tags = parseTagsCsv(tagsAll ?? tagsAny ?? "");
 
   return {
+    filter: params.get("filter") ?? defaults.filter ?? "",
     collection: params.get("collection") ?? defaults.collection ?? "",
     intent: params.get("intent") ?? defaults.intent ?? "",
     candidateLimit:
@@ -151,6 +153,7 @@ export function applyFiltersToUrl(
     }
   };
 
+  setOrDelete("filter", filters.filter ?? "");
   setOrDelete("collection", filters.collection);
   setOrDelete("intent", filters.intent);
   setOrDelete("candidateLimit", filters.candidateLimit);

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

@@ -25,6 +25,7 @@ import {
   type AskVerification,
   AskVerificationPanel,
 } from "../components/AskVerificationPanel";
+import { MetadataFilter } from "../components/MetadataFilter";
 import {
   ThoroughnessSelector,
   type Thoroughness,
@@ -48,6 +49,7 @@ import {
 import { Textarea } from "../components/ui/textarea";
 import { apiFetch } from "../hooks/use-api";
 import { useKeyboardShortcuts } from "../hooks/useKeyboardShortcuts";
+import { parseMetadataFilter } from "../lib/metadata-filter";
 import {
   parseTagsCsv,
   type QueryModeEntry,
@@ -92,6 +94,7 @@ interface AskResponse {
   citations?: Citation[];
   results: SearchResult[];
   meta: {
+    warnings?: { code: string; message: string }[];
     expanded: boolean;
     reranked: boolean;
     vectorsUsed: boolean;
@@ -200,14 +203,21 @@ export default function Ask({ navigate }: PageProps) {
   const [activePreset, setActivePreset] = useState("slim-tuned");
   const [verify, setVerify] = useState(false);
 
-  const [showAdvanced, setShowAdvanced] = useState(false);
-  const [selectedCollection, setSelectedCollection] = useState("");
+  const [showAdvanced, setShowAdvanced] = useState(
+    Boolean(new URLSearchParams(window.location.search).get("filter"))
+  );
+  const [selectedCollection, setSelectedCollection] = useState(
+    new URLSearchParams(window.location.search).get("collection") ?? ""
+  );
   const [intent, setIntent] = useState("");
   const [candidateLimit, setCandidateLimit] = useState("");
   const [exclude, setExclude] = useState("");
   const [since, setSince] = useState("");
   const [until, setUntil] = useState("");
   const [category, setCategory] = useState("");
+  const [metadataFilter, setMetadataFilter] = useState(
+    new URLSearchParams(window.location.search).get("filter") ?? ""
+  );
   const [author, setAuthor] = useState("");
   const [tagMode, setTagMode] = useState<TagMode>("any");
   const [tagsInput, setTagsInput] = useState("");
@@ -255,6 +265,16 @@ export default function Ask({ navigate }: PageProps) {
     void bootstrap();
   }, []);
 
+  useEffect(() => {
+    const url = new URL(window.location.href);
+    if (selectedCollection.trim())
+      url.searchParams.set("collection", selectedCollection.trim());
+    else url.searchParams.delete("collection");
+    if (metadataFilter) url.searchParams.set("filter", metadataFilter);
+    else url.searchParams.delete("filter");
+    window.history.replaceState({}, "", url.toString());
+  }, [metadataFilter, selectedCollection]);
+
   const cycleThoroughness = useCallback(() => {
     setThoroughness((current) => {
       if (!hybridAvailable) {
@@ -262,7 +282,7 @@ export default function Ask({ navigate }: PageProps) {
       }
       const currentIdx = THOROUGHNESS_ORDER.indexOf(current);
       const nextIdx = (currentIdx + 1) % THOROUGHNESS_ORDER.length;
-      return THOROUGHNESS_ORDER[nextIdx];
+      return THOROUGHNESS_ORDER[nextIdx] ?? current;
     });
   }, [hybridAvailable]);
 
@@ -304,12 +324,19 @@ export default function Ask({ navigate }: PageProps) {
       if (!query.trim()) {
         return;
       }
+      const parsedFilter = parseMetadataFilter(metadataFilter);
+      if (parsedFilter.error) {
+        setQueryModeError(parsedFilter.error);
+        setShowAdvanced(true);
+        return;
+      }
       if (!structuredQueryState.ok) {
         setQueryModeError(structuredQueryState.error.message);
         setShowAdvanced(true);
         return;
       }
 
+      setQueryModeError(null);
       const entryId = crypto.randomUUID();
       const currentQuery = query.trim();
 
@@ -334,6 +361,7 @@ export default function Ask({ navigate }: PageProps) {
         verify,
       };
 
+      if (parsedFilter.filter) requestBody.filter = parsedFilter.filter;
       if (selectedCollection) {
         requestBody.collection = selectedCollection;
       }
@@ -393,6 +421,7 @@ export default function Ask({ navigate }: PageProps) {
       );
     },
     [
+      metadataFilter,
       author,
       candidateLimit,
       activePreset,
@@ -428,6 +457,7 @@ export default function Ask({ navigate }: PageProps) {
     setUntil("");
     setCategory("");
     setAuthor("");
+    setMetadataFilter("");
     setTagsInput("");
     setTagMode("any");
     setQueryModes([]);
@@ -454,6 +484,7 @@ export default function Ask({ 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,
     parseTagsCsv(tagsInput).length > 0
       ? `${tagMode}:${parseTagsCsv(tagsInput).join(",")}`
@@ -687,6 +718,11 @@ export default function Ask({ 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:
@@ -857,6 +893,15 @@ export default function Ask({ navigate }: PageProps) {
 
                 {entry.response && (
                   <>
+                    {entry.response.meta.warnings?.map((warning) => (
+                      <p
+                        className="rounded border border-secondary/30 bg-secondary/10 p-3 text-sm"
+                        key={warning.code}
+                        role="status"
+                      >
+                        {warning.message}
+                      </p>
+                    ))}
                     {entry.response.answer && (
                       <div className="prose prose-sm prose-invert max-w-none rounded-lg border border-border/30 bg-card/60 p-5 shadow-[0_0_30px_-10px_hsl(var(--primary)/0.08)]">
                         <p className="whitespace-pre-wrap leading-relaxed">

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

@@ -29,6 +29,7 @@ import {
   useState,
 } from "react";
 
+import type { TypedMetadata } from "../../../core/typed-metadata";
 import type { PdfFallbackReason } from "../lib/pdf";
 
 import {
@@ -167,6 +168,8 @@ interface PageProps {
 }
 
 interface DocData {
+  typedMetadata?: TypedMetadata | null;
+  metadataError?: string | null;
   docid: string;
   uri: string;
   title: string | null;
@@ -1326,12 +1329,41 @@ export default function DocView({ navigate }: PageProps) {
     </nav>
   );
 
+  const storedMetadata =
+    doc?.metadataError ||
+    (doc?.typedMetadata && Object.keys(doc.typedMetadata).length > 0) ? (
+      <section
+        aria-label="Indexed custom metadata"
+        className="space-y-2 border-border/20 border-t px-3 py-3"
+      >
+        <h3 className="font-mono text-muted-foreground text-xs">
+          Indexed custom metadata
+        </h3>
+        {doc.metadataError ? (
+          <p className="break-words text-destructive text-xs" role="alert">
+            {doc.metadataError}. Correct the source and sync again; this
+            document is excluded from custom metadata filters.
+          </p>
+        ) : (
+          <dl className="space-y-1 text-xs">
+            {Object.entries(doc.typedMetadata ?? {}).map(([key, value]) => (
+              <div key={key}>
+                <dt className="break-all text-muted-foreground">{key}</dt>
+                <dd className="break-all font-mono">{JSON.stringify(value)}</dd>
+              </div>
+            ))}
+          </dl>
+        )}
+      </section>
+    ) : null;
+
   /** Left rail — metadata + outline */
   const renderDocumentFactsRail = () => (
     <nav
       aria-label="Document facts"
       className="w-full min-w-0 max-w-full space-y-0 overflow-x-hidden"
     >
+      {storedMetadata}
       {/* Frontmatter + tags */}
       {(hasFrontmatter || showStandaloneTags) && (
         <>
@@ -1623,6 +1655,7 @@ export default function DocView({ navigate }: PageProps) {
           </div>
         </div>
 
+        {storedMetadata}
         {(hasFrontmatter || showStandaloneTags) && (
           <div className="rounded-lg border border-border/40 bg-muted/10 p-2.5">
             {hasFrontmatter && (

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/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,
 ];