@gmickel/gno 1.17.0 → 1.19.0

package/src/cli/commands/vsearch.ts

@@ -5,8 +5,18 @@
  * @module src/cli/commands/vsearch
  */
 
+import type {
+  RetrievalTraceSession,
+  RetrievalTraceSurfaceMetadata,
+} from "../../core/retrieval-trace-session";
+import type { EmbeddingPort } from "../../llm/types";
 import type { SearchOptions, SearchResults } from "../../pipeline/types";
 
+import {
+  finishRetrievalTraceAfterError,
+  retrievalTraceFilters,
+  startRetrievalTraceRequest,
+} from "../../core/retrieval-trace-request";
 import { LlmAdapter } from "../../llm/nodeLlamaCpp/adapter";
 import { resolveModelUri } from "../../llm/registry";
 import { formatQueryForEmbedding } from "../../pipeline/contextual";
@@ -47,7 +57,11 @@ export type VsearchCommandOptions = SearchOptions & {
 };
 
 export type VsearchResult =
-  | { success: true; data: SearchResults }
+  | {
+      success: true;
+      data: SearchResults;
+      metadata?: RetrievalTraceSurfaceMetadata;
+    }
   | { success: false; error: string };
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -78,6 +92,8 @@ export async function vsearch(
   }
 
   const { store, config } = initResult;
+  let embedPort: EmbeddingPort | null = null;
+  let traceSession: RetrievalTraceSession | undefined;
 
   try {
     // Get model URI from preset
@@ -87,67 +103,74 @@ export async function vsearch(
       options.model,
       options.collection
     );
+    const traceStart = await startRetrievalTraceRequest({
+      store,
+      config,
+      query,
+      filters: retrievalTraceFilters({ ...options, limit }),
+      pipeline: "vector",
+      indexName: options.indexName,
+      modelUris: [modelUri],
+    });
+    if (!traceStart.ok) {
+      return { success: false, error: traceStart.error.message };
+    }
+    traceSession = traceStart.value ?? undefined;
 
     // Create LLM adapter for embeddings
     const llm = new LlmAdapter(config);
     const embedResult = await llm.createEmbeddingPort(modelUri);
     if (!embedResult.ok) {
+      await traceSession?.finish("failed");
       return { success: false, error: embedResult.error.message };
     }
 
-    const embedPort = embedResult.value;
-
-    try {
-      // Embed query with contextual formatting (also determines dimensions)
-      const queryEmbedResult = await embedPort.embed(
-        formatQueryForEmbedding(query, embedPort.modelUri)
-      );
-      if (!queryEmbedResult.ok) {
-        return { success: false, error: queryEmbedResult.error.message };
-      }
-      const queryEmbedding = new Float32Array(queryEmbedResult.value);
-      const dimensions = queryEmbedding.length;
-
-      // Create vector index port
-      const db = store.getRawDb();
-      const vectorResult = await createVectorIndexPort(db, {
-        model: modelUri,
-        dimensions,
-      });
-
-      if (!vectorResult.ok) {
-        return { success: false, error: vectorResult.error.message };
-      }
-
-      const vectorIndex = vectorResult.value;
-
-      const deps: VectorSearchDeps = {
-        store,
-        vectorIndex,
-        embedPort,
-        config,
-      };
-
-      // Pass pre-computed embedding to avoid double-embed
-      const result = await searchVectorWithEmbedding(
-        deps,
-        query,
-        queryEmbedding,
-        { ...options, limit }
-      );
-
-      if (!result.ok) {
-        return { success: false, error: result.error.message };
-      }
-
-      return {
-        success: true,
-        data: decorateSearchResultsForIndex(result.value, options.indexName),
-      };
-    } finally {
-      await embedPort.dispose();
+    embedPort = embedResult.value;
+    const queryEmbedResult = await embedPort.embed(
+      formatQueryForEmbedding(query, embedPort.modelUri)
+    );
+    if (!queryEmbedResult.ok) {
+      await traceSession?.finish("failed");
+      return { success: false, error: queryEmbedResult.error.message };
     }
+    const queryEmbedding = new Float32Array(queryEmbedResult.value);
+    const vectorResult = await createVectorIndexPort(store.getRawDb(), {
+      model: modelUri,
+      dimensions: queryEmbedding.length,
+    });
+    if (!vectorResult.ok) {
+      await traceSession?.finish("failed");
+      return { success: false, error: vectorResult.error.message };
+    }
+    const deps: VectorSearchDeps = {
+      store,
+      vectorIndex: vectorResult.value,
+      embedPort,
+      config,
+    };
+    const result = await searchVectorWithEmbedding(
+      deps,
+      query,
+      queryEmbedding,
+      { ...options, limit, traceSession }
+    );
+    if (!result.ok) {
+      await traceSession?.finish("failed");
+      return { success: false, error: result.error.message };
+    }
+    return {
+      success: true,
+      data: decorateSearchResultsForIndex(result.value, options.indexName),
+      metadata: traceSession?.metadata(),
+    };
+  } catch (cause) {
+    await finishRetrievalTraceAfterError(traceSession, cause);
+    return {
+      success: false,
+      error: cause instanceof Error ? cause.message : "Vector search failed",
+    };
   } finally {
+    await embedPort?.dispose();
     await store.close();
   }
 }
@@ -194,7 +217,6 @@ export function formatVsearch(
         })
       : `Error: ${result.error}`;
   }
-
   const formatOpts: FormatOptions = {
     format: getFormatType(options),
     full: options.full,

package/src/cli/detach.ts

@@ -20,9 +20,12 @@ import { mkdir, stat, unlink } from "node:fs/promises";
 // node:path — no Bun path utils.
 import { dirname, join } from "node:path";
 
+import type { ResidentStatus } from "../serve/status-model";
+
 import { VERSION, resolveDirs } from "../app/constants";
 import { toAbsolutePath } from "../config/paths";
 import { atomicWrite } from "../core/file-ops";
+import { isResidentStatus } from "../serve/resident-status";
 import { CliError } from "./errors";
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -63,6 +66,7 @@ export interface ProcessStatus {
   version: string | null;
   started_at: string | null;
   uptime_seconds: number | null;
+  resident: ResidentStatus | null;
   pid_file: string;
   log_file: string;
   log_size_bytes: number | null;
@@ -424,7 +428,7 @@ export interface SpawnDetachedOptions {
    * self-contained executable like a single `.mjs` file).
    */
   entryScript?: string | null;
-  /** Optional port to embed in the pid-file payload (serve only). */
+  /** Optional resident HTTP port to embed in the pid-file payload. */
   port?: number | null;
   /** Working directory for the child. Defaults to `process.cwd()`. */
   cwd?: string;
@@ -736,6 +740,23 @@ export interface StatusOptions {
   logFile: string;
   /** Clock override for deterministic tests. Defaults to `Date.now`. */
   now?: () => number;
+  fetchResidentStatus?: (port: number) => Promise<ResidentStatus | null>;
+}
+
+async function fetchResidentStatus(
+  port: number
+): Promise<ResidentStatus | null> {
+  try {
+    const response = await fetch(
+      `http://127.0.0.1:${port}/api/resident/status`,
+      { signal: AbortSignal.timeout(500) }
+    );
+    if (!response.ok) return null;
+    const body: unknown = await response.json();
+    return isResidentStatus(body) ? body : null;
+  } catch {
+    return null;
+  }
 }
 
 /**
@@ -765,6 +786,7 @@ export async function statusProcess(
       version: null,
       started_at: null,
       uptime_seconds: null,
+      resident: null,
       pid_file: options.pidFile,
       log_file: options.logFile,
       log_size_bytes: logSize,
@@ -789,33 +811,28 @@ export async function statusProcess(
     ? Math.max(0, Math.floor((now() - Date.parse(payload.started_at)) / 1000))
     : null;
 
-  // Schema invariant: a live serve must report a numeric port. If the pid-file
-  // is missing one somehow, fall back to not-running rather than lying.
-  const portForRunningServe =
-    running && effectiveKind === "serve"
-      ? typeof payload.port === "number"
-        ? payload.port
-        : null
-      : running && effectiveKind === "daemon"
-        ? null
-        : (payload.port ?? null);
-
-  const runningFinal =
-    running && !(effectiveKind === "serve" && portForRunningServe === null);
+  // Both resident modes expose an HTTP listener. If a live pid-file is
+  // missing its port, fall back to not-running rather than claiming a gateway
+  // that clients cannot locate.
+  const portForRunningProcess =
+    running && typeof payload.port === "number" ? payload.port : null;
+  const runningFinal = running && portForRunningProcess !== null;
+  const resident =
+    runningFinal && portForRunningProcess !== null
+      ? await (options.fetchResidentStatus ?? fetchResidentStatus)(
+          portForRunningProcess
+        )
+      : null;
 
   return {
     running: runningFinal,
     pid: payload.pid,
-    port:
-      runningFinal && effectiveKind === "serve"
-        ? portForRunningServe
-        : effectiveKind === "daemon"
-          ? null
-          : (payload.port ?? null),
+    port: runningFinal ? portForRunningProcess : (payload.port ?? null),
     cmd: effectiveKind,
     version: payload.version,
     started_at: payload.started_at,
     uptime_seconds: runningFinal ? uptimeSeconds : null,
+    resident,
     pid_file: options.pidFile,
     log_file: options.logFile,
     log_size_bytes: logSize,