@gmickel/gno 1.7.1 → 1.9.0

package/src/pipeline/vsearch.ts

@@ -227,6 +227,8 @@ export async function searchVectorWithEmbedding(
       score,
       uri: doc.uri,
       title: doc.title ?? undefined,
+      contentType: doc.contentType ?? undefined,
+      categories: doc.categories ?? undefined,
       line: chunk.startLine,
       snippet: chunk.text,
       snippetLanguage: chunk.language ?? undefined,
@@ -281,6 +283,8 @@ export async function searchVectorWithEmbedding(
         score,
         uri: doc.uri,
         title: doc.title ?? undefined,
+        contentType: doc.contentType ?? undefined,
+        categories: doc.categories ?? undefined,
         line: chunk.startLine,
         snippet: fullContent ?? chunk.text,
         snippetLanguage: chunk.language ?? undefined,

package/src/sdk/client.ts

@@ -15,6 +15,8 @@ import type { IndexStatus, StoreResult } from "../store/types";
 import type { VectorIndexPort } from "../store/vector";
 import type {
   GnoAskOptions,
+  GnoCaptureOptions,
+  GnoCaptureResult,
   GnoClient,
   GnoCreateFolderOptions,
   GnoCreateFolderResult,
@@ -42,7 +44,18 @@ import {
   getIndexDbPath,
   parseUri,
 } from "../app/constants";
-import { ConfigSchema, loadConfig } from "../config";
+import {
+  ConfigSchema,
+  loadConfig,
+  normalizeConfigContentTypes,
+} from "../config";
+import {
+  buildCaptureReceipt,
+  type CapturePlan,
+  listCaptureDiskRelPaths,
+  planCapture,
+} from "../core/capture";
+import { writeCapturePlanFile } from "../core/capture-write";
 import {
   atomicWrite,
   copyFilePath,
@@ -61,7 +74,11 @@ import { resolveNotePreset } from "../core/note-presets";
 import { extractSections } from "../core/sections";
 import { normalizeStructuredQueryInput } from "../core/structured-query";
 import { parseAndValidateTagFilter } from "../core/tags";
-import { defaultSyncService, type SyncResult } from "../ingestion";
+import {
+  defaultSyncService,
+  type SyncResult,
+  withContentTypeRules,
+} from "../ingestion";
 import { updateFrontmatterTags } from "../ingestion/frontmatter";
 import { LlmAdapter } from "../llm/nodeLlamaCpp/adapter";
 import { resolveDownloadPolicy } from "../llm/policy";
@@ -132,7 +149,7 @@ async function resolveClientState(
         parsed.error.issues[0]?.message ?? "Invalid config"
       );
     }
-    config = parsed.data;
+    config = normalizeConfigContentTypes(parsed.data).config;
     configPath = null;
     configSource = "inline";
   } else {
@@ -686,10 +703,17 @@ class GnoClientImpl implements GnoClient {
   async update(options: GnoUpdateOptions = {}): Promise<SyncResult> {
     this.assertOpen();
     const collections = this.getCollections(options.collection);
-    return defaultSyncService.syncAll(collections, this.store, {
-      gitPull: options.gitPull,
-      runUpdateCmd: true,
-    });
+    return defaultSyncService.syncAll(
+      collections,
+      this.store,
+      withContentTypeRules(
+        {
+          gitPull: options.gitPull,
+          runUpdateCmd: true,
+        },
+        this.config
+      )
+    );
   }
 
   async embed(options: GnoEmbedOptions = {}): Promise<GnoEmbedResult> {
@@ -799,10 +823,13 @@ class GnoClientImpl implements GnoClient {
       collection,
       this.store,
       [plan.relPath],
-      {
-        runUpdateCmd: false,
-        gitPull: false,
-      }
+      withContentTypeRules(
+        {
+          runUpdateCmd: false,
+          gitPull: false,
+        },
+        this.config
+      )
     );
     const syncResult = syncResults[0];
     if (!syncResult || syncResult.status === "error") {
@@ -822,6 +849,109 @@ class GnoClientImpl implements GnoClient {
     };
   }
 
+  async capture(options: GnoCaptureOptions): Promise<GnoCaptureResult> {
+    this.assertOpen();
+    const collection = this.getCollections(options.collection)[0];
+    if (!collection) {
+      throw sdkError(
+        "VALIDATION",
+        `Collection not found: ${options.collection}`
+      );
+    }
+
+    const existingList = await this.store.listDocuments(collection.name);
+    if (!existingList.ok) {
+      throw sdkError("STORE", existingList.error.message, {
+        cause: existingList.error.cause,
+      });
+    }
+    const { overwrite: _unsupportedOverwrite, ...captureOptions } =
+      options as GnoCaptureOptions & { overwrite?: unknown };
+    if (_unsupportedOverwrite !== undefined) {
+      throw sdkError(
+        "VALIDATION",
+        "overwrite is not supported by client.capture(); use collisionPolicy instead"
+      );
+    }
+
+    let plan: CapturePlan;
+    try {
+      plan = planCapture({
+        input: {
+          ...captureOptions,
+          collection: collection.name,
+        },
+        existingRelPaths: existingList.value.map((doc) => doc.relPath),
+        diskRelPaths: await listCaptureDiskRelPaths(collection.path),
+      });
+    } catch (error) {
+      throw sdkError(
+        "VALIDATION",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+
+    const fullPath = `${collection.path}/${plan.relPath}`;
+    if (plan.openedExisting) {
+      const existingDoc = await this.store.getDocument(
+        collection.name,
+        plan.relPath
+      );
+      if (!existingDoc.ok) {
+        throw sdkError("STORE", existingDoc.error.message, {
+          cause: existingDoc.error.cause,
+        });
+      }
+      return buildCaptureReceipt({
+        plan,
+        absPath: fullPath,
+        docid: existingDoc.value?.docid,
+        sync: existingDoc.value
+          ? { status: "completed" }
+          : {
+              status: "skipped",
+              reason: "Existing file is not indexed yet.",
+            },
+      });
+    }
+
+    await mkdir(dirname(fullPath), { recursive: true });
+    await writeCapturePlanFile(plan, fullPath);
+    const syncResults = await defaultSyncService.syncFiles(
+      collection,
+      this.store,
+      [plan.relPath],
+      withContentTypeRules(
+        {
+          runUpdateCmd: false,
+          gitPull: false,
+        },
+        this.config
+      )
+    );
+    const syncResult = syncResults[0];
+    const docResult = await this.store.getDocument(
+      collection.name,
+      plan.relPath
+    );
+    const docid = docResult.ok ? docResult.value?.docid : undefined;
+    return buildCaptureReceipt({
+      plan,
+      absPath: fullPath,
+      docid: syncResult?.docid ?? docid,
+      sync:
+        syncResult?.status === "error"
+          ? {
+              status: "failed",
+              error:
+                syncResult.errorMessage ??
+                syncResult.errorCode ??
+                "Unknown sync error",
+            }
+          : { status: "completed" },
+    });
+  }
+
   async createFolder(
     options: GnoCreateFolderOptions
   ): Promise<GnoCreateFolderResult> {
@@ -878,9 +1008,11 @@ class GnoClientImpl implements GnoClient {
     const currentPath = `${collection.path}/${storedDoc.relPath}`;
     const nextPath = `${collection.path}/${plan.nextRelPath}`;
     await renameFilePath(currentPath, nextPath);
-    await defaultSyncService.syncCollection(collection, this.store, {
-      runUpdateCmd: false,
-    });
+    await defaultSyncService.syncCollection(
+      collection,
+      this.store,
+      withContentTypeRules({ runUpdateCmd: false }, this.config)
+    );
     const linksResult = await this.store.getLinksForDoc(storedDoc.id);
     const backlinksResult = await this.store.getBacklinksForDoc(storedDoc.id);
     if (!linksResult.ok || !backlinksResult.ok) {
@@ -935,9 +1067,11 @@ class GnoClientImpl implements GnoClient {
     const nextPath = `${collection.path}/${plan.nextRelPath}`;
     await mkdir(dirname(nextPath), { recursive: true });
     await renameFilePath(currentPath, nextPath);
-    await defaultSyncService.syncCollection(collection, this.store, {
-      runUpdateCmd: false,
-    });
+    await defaultSyncService.syncCollection(
+      collection,
+      this.store,
+      withContentTypeRules({ runUpdateCmd: false }, this.config)
+    );
     const linksResult = await this.store.getLinksForDoc(storedDoc.id);
     const backlinksResult = await this.store.getBacklinksForDoc(storedDoc.id);
     if (!linksResult.ok || !backlinksResult.ok) {
@@ -1004,9 +1138,11 @@ class GnoClientImpl implements GnoClient {
     const nextPath = `${collection.path}/${plan.nextRelPath}`;
     await mkdir(dirname(nextPath), { recursive: true });
     await copyFilePath(currentPath, nextPath);
-    await defaultSyncService.syncCollection(collection, this.store, {
-      runUpdateCmd: false,
-    });
+    await defaultSyncService.syncCollection(
+      collection,
+      this.store,
+      withContentTypeRules({ runUpdateCmd: false }, this.config)
+    );
     const linksResult = await this.store.getLinksForDoc(storedDoc.id);
     const backlinksResult = await this.store.getBacklinksForDoc(storedDoc.id);
     if (!linksResult.ok || !backlinksResult.ok) {

package/src/sdk/index.ts

@@ -29,6 +29,8 @@ export { GnoSdkError, sdkError } from "./errors";
 export { createGnoClient } from "./client";
 export type {
   GnoAskOptions,
+  GnoCaptureOptions,
+  GnoCaptureResult,
   GnoClient,
   GnoClientInitOptions,
   GnoEmbedOptions,

package/src/sdk/types.ts

@@ -5,6 +5,7 @@
  */
 
 import type { Config } from "../config/types";
+import type { CaptureInput, CaptureReceipt } from "../core/capture";
 import type { NoteCollisionPolicy } from "../core/note-creation";
 import type { NotePresetId } from "../core/note-presets";
 import type { DocumentSection } from "../core/sections";
@@ -130,6 +131,10 @@ export interface GnoCreateNoteResult {
   createdWithSuffix?: boolean;
 }
 
+export interface GnoCaptureOptions extends Omit<CaptureInput, "overwrite"> {}
+
+export type GnoCaptureResult = CaptureReceipt;
+
 export interface GnoCreateFolderOptions {
   collection: string;
   name: string;
@@ -194,6 +199,7 @@ export interface GnoClient {
   update(options?: GnoUpdateOptions): Promise<SyncResult>;
   embed(options?: GnoEmbedOptions): Promise<GnoEmbedResult>;
   index(options?: GnoIndexOptions): Promise<GnoIndexResult>;
+  capture(options: GnoCaptureOptions): Promise<GnoCaptureResult>;
   createNote(options: GnoCreateNoteOptions): Promise<GnoCreateNoteResult>;
   createFolder(options: GnoCreateFolderOptions): Promise<GnoCreateFolderResult>;
   renameNote(options: GnoRenameNoteOptions): Promise<GnoRefactorNoteResult>;

package/src/serve/background-runtime.ts

@@ -11,11 +11,13 @@ import type {
 import { getIndexDbPath } from "../app/constants";
 import {
   ensureDirectories,
+  formatConfigWarnings,
   getConfigPaths,
   isInitialized,
   loadConfig,
 } from "../config";
 import { defaultSyncService } from "../ingestion";
+import { withContentTypeRules } from "../ingestion";
 import { getActivePreset } from "../llm/registry";
 import { SqliteAdapter } from "../store/sqlite/adapter";
 import {
@@ -79,6 +81,7 @@ type BackgroundRuntimeDeps = {
     scheduler: EmbedScheduler | null;
     eventBus?: DocumentEventBus | null;
     callbacks?: CollectionWatchCallbacks;
+    syncOptions?: Parameters<typeof withContentTypeRules>[0];
   }) => CollectionWatchService;
 };
 
@@ -103,6 +106,9 @@ export async function startBackgroundRuntime(
   if (!configResult.ok) {
     return { success: false, error: configResult.error.message };
   }
+  for (const warning of formatConfigWarnings(configResult.warnings)) {
+    console.warn(warning);
+  }
   const config = configResult.value;
 
   if (options.requireCollections && config.collections.length === 0) {
@@ -171,6 +177,7 @@ export async function startBackgroundRuntime(
     scheduler,
     eventBus: options.eventBus ?? null,
     callbacks: options.watchCallbacks,
+    syncOptions: withContentTypeRules({}, config),
   });
   watchService.start();
   ctxHolder.watchService = watchService;
@@ -189,10 +196,17 @@ export async function startBackgroundRuntime(
       eventBus: options.eventBus ?? null,
       watchService,
       async syncAll(syncOptions = {}) {
-        const syncResult = await syncAllService(config.collections, store, {
-          gitPull: syncOptions.gitPull,
-          runUpdateCmd: syncOptions.runUpdateCmd,
-        });
+        const syncResult = await syncAllService(
+          config.collections,
+          store,
+          withContentTypeRules(
+            {
+              gitPull: syncOptions.gitPull,
+              runUpdateCmd: syncOptions.runUpdateCmd,
+            },
+            config
+          )
+        );
 
         let embedResult: EmbedResult | null = null;
         if (syncOptions.triggerEmbed !== false) {

package/src/serve/config-sync.ts

@@ -14,6 +14,7 @@ import {
   type ApplyConfigResult,
   type MutationResult,
 } from "../core/config-mutation";
+import { withContentTypeRules } from "../ingestion";
 
 /**
  * Apply a config mutation atomically with serialization.
@@ -53,7 +54,10 @@ export async function applyConfigChange(
   );
 
   if (result.ok) {
-    ctxHolder.watchService?.updateCollections(ctxHolder.config.collections);
+    ctxHolder.watchService?.updateCollections(
+      ctxHolder.config.collections,
+      withContentTypeRules({}, ctxHolder.config)
+    );
   }
 
   return result;
@@ -78,7 +82,10 @@ export async function applyConfigChangeTyped<T>(
   );
 
   if (result.ok) {
-    ctxHolder.watchService?.updateCollections(ctxHolder.config.collections);
+    ctxHolder.watchService?.updateCollections(
+      ctxHolder.config.collections,
+      withContentTypeRules({}, ctxHolder.config)
+    );
   }
 
   return result;