@gmickel/gno 0.22.6 → 0.24.0

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

@@ -10,6 +10,7 @@ import {
 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
+import { normalizeStructuredQueryInput } from "../../../core/structured-query";
 import { Loader } from "../components/ai-elements/loader";
 import {
   Source,
@@ -199,6 +200,14 @@ export default function Ask({ navigate }: PageProps) {
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 
   const hybridAvailable = capabilities?.hybrid ?? false;
+  const structuredQueryState = useMemo(
+    () => normalizeStructuredQueryInput(query, queryModes),
+    [query, queryModes]
+  );
+  const structuredQueryError =
+    query.trim().length > 0 && !structuredQueryState.ok
+      ? structuredQueryState.error.message
+      : null;
 
   useEffect(() => {
     async function bootstrap(): Promise<void> {
@@ -270,6 +279,11 @@ export default function Ask({ navigate }: PageProps) {
       if (!query.trim()) {
         return;
       }
+      if (!structuredQueryState.ok) {
+        setQueryModeError(structuredQueryState.error.message);
+        setShowAdvanced(true);
+        return;
+      }
 
       const entryId = crypto.randomUUID();
       const currentQuery = query.trim();
@@ -361,6 +375,7 @@ export default function Ask({ navigate }: PageProps) {
       queryModes,
       selectedCollection,
       since,
+      structuredQueryState,
       tagMode,
       tagsInput,
       thoroughness,
@@ -906,7 +921,7 @@ export default function Ask({ navigate }: PageProps) {
               onKeyDown={handleKeyDown}
               placeholder={
                 answerAvailable
-                  ? "Ask a question about your documents..."
+                  ? "Ask a question about your documents... Use Shift+Enter for structured query documents"
                   : "AI answers not available"
               }
               ref={textareaRef}
@@ -915,13 +930,26 @@ export default function Ask({ navigate }: PageProps) {
             />
             <Button
               className="absolute right-2 bottom-2"
-              disabled={!(query.trim() && answerAvailable)}
+              disabled={
+                !(query.trim() && answerAvailable) ||
+                Boolean(structuredQueryError)
+              }
               size="icon-sm"
               type="submit"
             >
               <CornerDownLeft className="size-4" />
             </Button>
           </div>
+          {structuredQueryError && (
+            <p className="text-destructive text-xs">{structuredQueryError}</p>
+          )}
+          {!structuredQueryError && (
+            <p className="text-muted-foreground/70 text-xs">
+              Press Enter to submit. Use Shift+Enter for multi-line structured
+              query documents with <code>term:</code>, <code>intent:</code>, and{" "}
+              <code>hyde:</code>.
+            </p>
+          )}
         </form>
       </footer>
     </div>

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

@@ -8,6 +8,7 @@ import {
 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 
+import { normalizeStructuredQueryInput } from "../../../core/structured-query";
 import { Loader } from "../components/ai-elements/loader";
 import { TagFacets } from "../components/TagFacets";
 import {
@@ -30,6 +31,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "../components/ui/select";
+import { Textarea } from "../components/ui/textarea";
 import { apiFetch } from "../hooks/use-api";
 import { useKeyboardShortcuts } from "../hooks/useKeyboardShortcuts";
 import {
@@ -187,9 +189,20 @@ export default function Search({ navigate }: PageProps) {
   const [showMobileTags, setShowMobileTags] = useState(false);
 
   const hybridAvailable = capabilities?.hybrid ?? false;
+  const structuredQueryState = useMemo(
+    () => normalizeStructuredQueryInput(query, queryModes),
+    [query, queryModes]
+  );
+  const structuredQueryError =
+    query.trim().length > 0 && !structuredQueryState.ok
+      ? structuredQueryState.error.message
+      : null;
   const forceHybridForModes =
     thoroughness === "fast" &&
-    (queryModes.length > 0 || intent.trim().length > 0);
+    (queryModes.length > 0 ||
+      intent.trim().length > 0 ||
+      (structuredQueryState.ok &&
+        structuredQueryState.value.usedStructuredQuerySyntax));
 
   // Sync URL as filter state changes.
   useEffect(() => {
@@ -294,6 +307,10 @@ export default function Search({ navigate }: PageProps) {
       if (!query.trim()) {
         return;
       }
+      if (!structuredQueryState.ok) {
+        setError(structuredQueryState.error.message);
+        return;
+      }
 
       setLoading(true);
       setError(null);
@@ -302,7 +319,8 @@ export default function Search({ navigate }: PageProps) {
       const useBm25 =
         thoroughness === "fast" &&
         queryModes.length === 0 &&
-        intent.trim().length === 0;
+        intent.trim().length === 0 &&
+        !structuredQueryState.value.usedStructuredQuerySyntax;
       const endpoint = useBm25 ? "/api/search" : "/api/query";
       const body: Record<string, unknown> = {
         query,
@@ -386,6 +404,7 @@ export default function Search({ navigate }: PageProps) {
       queryModes,
       selectedCollection,
       since,
+      structuredQueryState,
       tagMode,
       thoroughness,
       until,
@@ -448,6 +467,13 @@ export default function Search({ navigate }: PageProps) {
     setQueryModeError(null);
   };
 
+  const handleQueryKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    if (e.key === "Enter" && !e.shiftKey) {
+      e.preventDefault();
+      void handleSearch();
+    }
+  };
+
   return (
     <div className="min-h-screen">
       <header className="glass sticky top-0 z-10 border-border/50 border-b">
@@ -482,17 +508,19 @@ export default function Search({ navigate }: PageProps) {
                 <div className="pointer-events-none absolute -inset-[1px] rounded-lg bg-gradient-to-r from-primary/50 via-primary to-primary/50 opacity-0 blur-sm transition-opacity duration-300 group-focus-within:opacity-100" />
                 <div className="relative">
                   <SearchIcon className="absolute top-1/2 left-4 size-5 -translate-y-1/2 text-muted-foreground transition-colors duration-200 group-focus-within:text-primary" />
-                  <Input
+                  <Textarea
                     autoFocus
-                    className="border-border/50 bg-card py-6 pr-4 pl-12 text-lg transition-all duration-200 focus:border-primary focus:bg-card/80 focus:shadow-[0_0_20px_-5px_hsl(var(--primary)/0.3)]"
+                    className="min-h-[72px] resize-y border-border/50 bg-card pt-5 pr-20 pb-4 pl-12 text-base transition-all duration-200 focus:border-primary focus:bg-card/80 focus:shadow-[0_0_20px_-5px_hsl(var(--primary)/0.3)]"
                     onChange={(e) => setQuery(e.target.value)}
-                    placeholder="Search your documents..."
-                    type="text"
+                    onKeyDown={handleQueryKeyDown}
+                    placeholder="Search your documents... Use Shift+Enter for structured query documents"
                     value={query}
                   />
                   <Button
                     className="absolute top-1/2 right-2 -translate-y-1/2"
-                    disabled={loading || !query.trim()}
+                    disabled={
+                      loading || !query.trim() || Boolean(structuredQueryError)
+                    }
                     size="sm"
                     type="submit"
                   >
@@ -501,6 +529,18 @@ export default function Search({ navigate }: PageProps) {
                 </div>
               </div>
 
+              {structuredQueryError && (
+                <p className="text-destructive text-xs">
+                  {structuredQueryError}
+                </p>
+              )}
+
+              <p className="text-muted-foreground/70 text-xs">
+                Press Enter to search. Use Shift+Enter for multi-line structured
+                query documents with <code>term:</code>, <code>intent:</code>,
+                and <code>hyde:</code>.
+              </p>
+
               <div className="flex flex-wrap items-center gap-4">
                 <ThoroughnessSelector
                   disabled={

package/src/serve/routes/api.ts

@@ -18,6 +18,7 @@ import type { EmbedScheduler } from "../embed-scheduler";
 import { modelsPull } from "../../cli/commands/models/pull";
 import { addCollection, removeCollection } from "../../collection";
 import { atomicWrite } from "../../core/file-ops";
+import { normalizeStructuredQueryInput } from "../../core/structured-query";
 import {
   normalizeTag,
   parseAndValidateTagFilter,
@@ -32,6 +33,7 @@ import {
   processAnswerResult,
 } from "../../pipeline/answer";
 import { searchHybrid } from "../../pipeline/hybrid";
+import { validateQueryModes } from "../../pipeline/query-modes";
 import { searchBm25 } from "../../pipeline/search";
 import { applyConfigChange } from "../config-sync";
 import {
@@ -242,7 +244,38 @@ function parseQueryModesInput(value: unknown): {
     queryModes.push({ mode, text: text.trim() });
   }
 
-  return { queryModes };
+  const validated = validateQueryModes(queryModes);
+  if (!validated.ok) {
+    return {
+      error: errorResponse("VALIDATION", validated.error.message),
+    };
+  }
+
+  return { queryModes: validated.value };
+}
+
+function normalizeStructuredQueryBody(
+  query: string,
+  queryModes: QueryModeInput[] | undefined
+): {
+  query?: string;
+  queryModes?: QueryModeInput[];
+  error?: Response;
+} {
+  const normalized = normalizeStructuredQueryInput(query, queryModes ?? []);
+  if (!normalized.ok) {
+    return {
+      error: errorResponse("VALIDATION", normalized.error.message),
+    };
+  }
+
+  return {
+    query: normalized.value.query,
+    queryModes:
+      normalized.value.queryModes.length > 0
+        ? normalized.value.queryModes
+        : undefined,
+  };
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -1137,8 +1170,8 @@ export async function handleSearch(
     return errorResponse("VALIDATION", "Missing or invalid query");
   }
 
-  const query = body.query.trim();
-  if (!query) {
+  const rawQuery = body.query.trim();
+  if (!rawQuery) {
     return errorResponse("VALIDATION", "Query cannot be empty");
   }
 
@@ -1237,7 +1270,7 @@ export async function handleSearch(
     author,
   };
 
-  const result = await searchBm25(store, query, options);
+  const result = await searchBm25(store, rawQuery, options);
 
   if (!result.ok) {
     return errorResponse("RUNTIME", result.error.message, 500);
@@ -1266,8 +1299,8 @@ export async function handleQuery(
     return errorResponse("VALIDATION", "Missing or invalid query");
   }
 
-  const query = body.query.trim();
-  if (!query) {
+  const rawQuery = body.query.trim();
+  if (!rawQuery) {
     return errorResponse("VALIDATION", "Query cannot be empty");
   }
 
@@ -1333,6 +1366,16 @@ export async function handleQuery(
     return queryModesError;
   }
 
+  const {
+    query,
+    queryModes: normalizedQueryModes,
+    error: structuredQueryError,
+  } = normalizeStructuredQueryBody(rawQuery, queryModes);
+  if (structuredQueryError) {
+    return structuredQueryError;
+  }
+  const normalizedQuery = query ?? rawQuery;
+
   // Parse tag filters
   let tagsAll: string[] | undefined;
   let tagsAny: string[] | undefined;
@@ -1376,7 +1419,7 @@ export async function handleQuery(
       genPort: ctx.genPort,
       rerankPort: ctx.rerankPort,
     },
-    query,
+    normalizedQuery,
     {
       limit: Math.min(body.limit ?? 20, 50),
       minScore: body.minScore,
@@ -1388,7 +1431,7 @@ export async function handleQuery(
           ? Math.min(body.candidateLimit, 100)
           : undefined,
       exclude,
-      queryModes,
+      queryModes: normalizedQueryModes,
       noExpand: body.noExpand,
       noRerank: body.noRerank,
       tagsAll,
@@ -1427,8 +1470,8 @@ export async function handleAsk(
     return errorResponse("VALIDATION", "Missing or invalid query");
   }
 
-  const query = body.query.trim();
-  if (!query) {
+  const rawQuery = body.query.trim();
+  if (!rawQuery) {
     return errorResponse("VALIDATION", "Query cannot be empty");
   }
 
@@ -1486,6 +1529,16 @@ export async function handleAsk(
     return queryModesError;
   }
 
+  const {
+    query,
+    queryModes: normalizedQueryModes,
+    error: structuredQueryError,
+  } = normalizeStructuredQueryBody(rawQuery, queryModes);
+  if (structuredQueryError) {
+    return structuredQueryError;
+  }
+  const normalizedQuery = query ?? rawQuery;
+
   if (body.tagsAll) {
     try {
       tagsAll = parseAndValidateTagFilter(body.tagsAll);
@@ -1528,7 +1581,7 @@ export async function handleAsk(
       genPort: ctx.genPort,
       rerankPort: ctx.rerankPort,
     },
-    query,
+    normalizedQuery,
     {
       limit,
       collection: body.collection,
@@ -1541,7 +1594,7 @@ export async function handleAsk(
           ? Math.min(body.candidateLimit, 100)
           : undefined,
       exclude,
-      queryModes,
+      queryModes: normalizedQueryModes,
       tagsAll,
       tagsAny,
       since: body.since,
@@ -1567,7 +1620,7 @@ export async function handleAsk(
     const maxTokens = body.maxAnswerTokens ?? 512;
     const rawResult = await generateGroundedAnswer(
       { genPort: ctx.genPort, store: ctx.store },
-      query,
+      normalizedQuery,
       results,
       maxTokens
     );
@@ -1582,7 +1635,7 @@ export async function handleAsk(
   }
 
   const askResult: AskResult = {
-    query,
+    query: normalizedQuery,
     mode: searchResult.value.meta.vectorsUsed ? "hybrid" : "bm25_only",
     queryLanguage: searchResult.value.meta.queryLanguage ?? "und",
     answer,