@gmickel/gno 1.37.0 → 1.38.0

package/src/cli/commands/index-cmd.ts

@@ -5,6 +5,11 @@
  * @module src/cli/commands/indexCmd
  */
 
+import {
+  type CliWriteLeaseOptions,
+  type WriteLeaseContention,
+  withCliWriteLease,
+} from "../../core/write-lease";
 import {
   defaultSyncService,
   type SyncResult,
@@ -15,7 +20,7 @@ import { formatSyncResultLines, initStore } from "./shared";
 /**
  * Options for index command.
  */
-export interface IndexOptions {
+export interface IndexOptions extends CliWriteLeaseOptions {
   /** Override config path */
   configPath?: string;
   /** Index name */
@@ -44,66 +49,80 @@ export type IndexResult =
       success: true;
       syncResult: SyncResult;
       embedSkipped: boolean;
-      embedResult?: { embedded: number; errors: number; duration: number };
+      embedResult?: {
+        embedded: number;
+        errors: number;
+        contentionErrors: number;
+        duration: number;
+      };
     }
-  | { success: false; error: string };
+  | { success: false; error: string; contention?: WriteLeaseContention };
 
 /**
  * Execute gno index command.
  */
 export async function index(options: IndexOptions = {}): Promise<IndexResult> {
-  const initResult = await initStore({
-    configPath: options.configPath,
-    indexName: options.indexName,
-    collection: options.collection,
-  });
-  if (!initResult.ok) {
-    return { success: false, error: initResult.error };
-  }
+  return await withCliWriteLease(options, async () => {
+    const initResult = await initStore({
+      configPath: options.configPath,
+      indexName: options.indexName,
+      collection: options.collection,
+    });
+    if (!initResult.ok) {
+      return { success: false, error: initResult.error };
+    }
 
-  const { store, collections, config } = initResult;
+    const { store, collections, config } = initResult;
 
-  try {
-    // Run sync service (update phase)
-    const syncResult = await defaultSyncService.syncAll(
-      collections,
-      store,
-      withContentTypeRules(
-        {
-          gitPull: options.gitPull,
-          runUpdateCmd: true,
-        },
-        config
-      )
-    );
+    try {
+      // Run sync service (update phase)
+      const syncResult = await defaultSyncService.syncAll(
+        collections,
+        store,
+        withContentTypeRules(
+          {
+            gitPull: options.gitPull,
+            runUpdateCmd: true,
+          },
+          config
+        )
+      );
 
-    // Embedding phase
-    const embedSkipped = options.noEmbed ?? false;
-    let embedResult:
-      | { embedded: number; errors: number; duration: number }
-      | undefined;
+      // Embedding phase
+      const embedSkipped = options.noEmbed ?? false;
+      let embedResult:
+        | {
+            embedded: number;
+            errors: number;
+            contentionErrors: number;
+            duration: number;
+          }
+        | undefined;
 
-    if (!embedSkipped) {
-      const { embed } = await import("./embed");
-      const result = await embed({
-        configPath: options.configPath,
-        indexName: options.indexName,
-        collection: options.collection,
-        verbose: options.verbose,
-      });
-      if (result.success) {
-        embedResult = {
-          embedded: result.embedded,
-          errors: result.errors,
-          duration: result.duration,
-        };
+      if (!embedSkipped) {
+        const { embed } = await import("./embed");
+        const result = await embed({
+          configPath: options.configPath,
+          indexName: options.indexName,
+          collection: options.collection,
+          verbose: options.verbose,
+          skipWriteLease: true,
+        });
+        if (result.success) {
+          embedResult = {
+            embedded: result.embedded,
+            errors: result.errors,
+            contentionErrors: result.contentionErrors,
+            duration: result.duration,
+          };
+        }
       }
-    }
 
-    return { success: true, syncResult, embedSkipped, embedResult };
-  } finally {
-    await store.close();
-  }
+      return { success: true, syncResult, embedSkipped, embedResult };
+    } finally {
+      await store.close();
+    }
+  });
 }
 
 /**
@@ -147,13 +166,18 @@ export function formatIndex(
     lines.push("Embedding skipped (--no-embed)");
   } else if (result.embedResult) {
     lines.push("");
-    const { embedded, errors, duration } = result.embedResult;
+    const { embedded, errors, contentionErrors, duration } = result.embedResult;
     lines.push(
       `Embedded ${embedded.toLocaleString()} chunks in ${formatDuration(duration)}`
     );
     if (errors > 0) {
       lines.push(`${errors.toLocaleString()} chunks failed to embed.`);
     }
+    if (contentionErrors > 0) {
+      lines.push(
+        `${contentionErrors.toLocaleString()} chunks deferred by index contention (SQLITE_BUSY) — not embedding failures. Rerun \`gno embed\` when the other writer finishes.`
+      );
+    }
   }
 
   return lines.join("\n");

package/src/cli/commands/init.ts

@@ -141,7 +141,11 @@ export async function init(options: InitOptions = {}): Promise<InitResult> {
   }
 
   const store = new SqliteAdapter();
-  const opened = await store.open(dbPath, mutation.config.ftsTokenizer);
+  const opened = await store.open(
+    dbPath,
+    mutation.config.ftsTokenizer,
+    mutation.config.busyTimeoutMs
+  );
   if (!opened.ok) {
     return {
       success: false,

package/src/cli/commands/profile-apply.ts

@@ -218,7 +218,11 @@ export async function runProjectProfileApplyCommand(
   try {
     await mkdir(dataDir, { recursive: true });
     store.setConfigPath(configPath);
-    const opened = await store.open(indexPath, startingConfig.ftsTokenizer);
+    const opened = await store.open(
+      indexPath,
+      startingConfig.ftsTokenizer,
+      startingConfig.busyTimeoutMs
+    );
     if (!opened.ok) {
       return {
         result: failedApplyResult("failed", discovery.summary, [

package/src/cli/commands/setup-activation.ts

@@ -409,7 +409,8 @@ export async function setupWithActivation(
     store.setConfigPath(configPath);
     const opened = await store.open(
       getIndexDbPath(indexName),
-      configResult.value.ftsTokenizer
+      configResult.value.ftsTokenizer,
+      configResult.value.busyTimeoutMs
     );
     if (!opened.ok) {
       return withProfileResult(

package/src/cli/commands/setup.ts

@@ -259,7 +259,8 @@ async function executeSetup(
   store.setConfigPath(configPath);
   const opened = await store.open(
     getIndexDbPath(indexName),
-    configResult.value.ftsTokenizer
+    configResult.value.ftsTokenizer,
+    configResult.value.busyTimeoutMs
   );
   if (!opened.ok) {
     await store.close();

package/src/cli/commands/shared.ts

@@ -105,7 +105,11 @@ export async function initStore(
   // Set configPath for status output
   store.setConfigPath(actualConfigPath);
 
-  const openResult = await store.open(dbPath, config.ftsTokenizer);
+  const openResult = await store.open(
+    dbPath,
+    config.ftsTokenizer,
+    config.busyTimeoutMs
+  );
   if (!openResult.ok) {
     return { ok: false, error: openResult.error.message };
   }

package/src/cli/commands/status.ts

@@ -247,7 +247,11 @@ export async function status(
   // Set configPath for status output
   store.setConfigPath(options.configPath ?? paths.configFile);
 
-  const openResult = await store.open(dbPath, config.ftsTokenizer);
+  const openResult = await store.open(
+    dbPath,
+    config.ftsTokenizer,
+    config.busyTimeoutMs
+  );
   if (!openResult.ok) {
     return { success: false, error: openResult.error.message };
   }

package/src/cli/commands/tags.ts

@@ -18,6 +18,8 @@ import { initStore } from "./shared";
 // ─────────────────────────────────────────────────────────────────────────────
 
 export interface TagsListOptions {
+  /** Index name */
+  indexName?: string;
   /** Override config path */
   configPath?: string;
   /** Filter by collection */
@@ -46,6 +48,8 @@ export interface TagsListResponse {
 export interface TagsAddOptions {
   /** Override config path */
   configPath?: string;
+  /** Index name */
+  indexName?: string;
   /** JSON output */
   json?: boolean;
 }
@@ -60,6 +64,8 @@ export type TagsAddResult =
 export interface TagsRmOptions {
   /** Override config path */
   configPath?: string;
+  /** Index name */
+  indexName?: string;
   /** JSON output */
   json?: boolean;
 }
@@ -339,7 +345,10 @@ function removeTagFromFrontmatter(content: string, tag: string): string {
 export async function tagsList(
   options: TagsListOptions = {}
 ): Promise<TagsListResult> {
-  const initResult = await initStore({ configPath: options.configPath });
+  const initResult = await initStore({
+    configPath: options.configPath,
+    indexName: options.indexName,
+  });
   if (!initResult.ok) {
     return { success: false, error: initResult.error };
   }
@@ -394,7 +403,10 @@ export async function tagsAdd(
     };
   }
 
-  const initResult = await initStore({ configPath: options.configPath });
+  const initResult = await initStore({
+    configPath: options.configPath,
+    indexName: options.indexName,
+  });
   if (!initResult.ok) {
     return { success: false, error: initResult.error };
   }
@@ -495,7 +507,10 @@ export async function tagsRm(
 ): Promise<TagsRmResult> {
   const normalized = normalizeTag(tag);
 
-  const initResult = await initStore({ configPath: options.configPath });
+  const initResult = await initStore({
+    configPath: options.configPath,
+    indexName: options.indexName,
+  });
   if (!initResult.ok) {
     return { success: false, error: initResult.error };
   }

package/src/cli/commands/update.ts

@@ -5,6 +5,11 @@
  * @module src/cli/commands/update
  */
 
+import {
+  type CliWriteLeaseOptions,
+  type WriteLeaseContention,
+  withCliWriteLease,
+} from "../../core/write-lease";
 import {
   defaultSyncService,
   type SyncResult,
@@ -15,7 +20,7 @@ import { formatSyncResultLines, initStore } from "./shared";
 /**
  * Options for update command.
  */
-export interface UpdateOptions {
+export interface UpdateOptions extends CliWriteLeaseOptions {
   /** Override config path */
   configPath?: string;
   /** Index name */
@@ -33,7 +38,7 @@ export interface UpdateOptions {
  */
 export type UpdateResult =
   | { success: true; result: SyncResult }
-  | { success: false; error: string };
+  | { success: false; error: string; contention?: WriteLeaseContention };
 
 /**
  * Execute gno update command.
@@ -41,34 +46,36 @@ export type UpdateResult =
 export async function update(
   options: UpdateOptions = {}
 ): Promise<UpdateResult> {
-  const initResult = await initStore({
-    configPath: options.configPath,
-    indexName: options.indexName,
-  });
-  if (!initResult.ok) {
-    return { success: false, error: initResult.error };
-  }
+  return await withCliWriteLease(options, async () => {
+    const initResult = await initStore({
+      configPath: options.configPath,
+      indexName: options.indexName,
+    });
+    if (!initResult.ok) {
+      return { success: false, error: initResult.error };
+    }
 
-  const { store, collections, config } = initResult;
+    const { store, collections, config } = initResult;
 
-  try {
-    // Run sync service
-    const result = await defaultSyncService.syncAll(
-      collections,
-      store,
-      withContentTypeRules(
-        {
-          gitPull: options.gitPull,
-          runUpdateCmd: true,
-        },
-        config
-      )
-    );
+    try {
+      // Run sync service
+      const result = await defaultSyncService.syncAll(
+        collections,
+        store,
+        withContentTypeRules(
+          {
+            gitPull: options.gitPull,
+            runUpdateCmd: true,
+          },
+          config
+        )
+      );
 
-    return { success: true, result };
-  } finally {
-    await store.close();
-  }
+      return { success: true, result };
+    } finally {
+      await store.close();
+    }
+  });
 }
 
 /**

package/src/cli/commands/vec.ts

@@ -20,6 +20,7 @@ import {
 
 export interface VecOptions {
   configPath?: string;
+  indexName?: string;
   json?: boolean;
 }
 
@@ -91,11 +92,15 @@ export async function vecSync(
   const modelUri = preset.embed;
 
   const store = new SqliteAdapter();
-  const dbPath = getIndexDbPath();
+  const dbPath = getIndexDbPath(options.indexName);
   const paths = getConfigPaths();
   store.setConfigPath(paths.configFile);
 
-  const openResult = await store.open(dbPath, config.ftsTokenizer);
+  const openResult = await store.open(
+    dbPath,
+    config.ftsTokenizer,
+    config.busyTimeoutMs
+  );
   if (!openResult.ok) {
     return { success: false, error: openResult.error.message };
   }
@@ -165,11 +170,15 @@ export async function vecRebuild(
   const modelUri = preset.embed;
 
   const store = new SqliteAdapter();
-  const dbPath = getIndexDbPath();
+  const dbPath = getIndexDbPath(options.indexName);
   const paths = getConfigPaths();
   store.setConfigPath(paths.configFile);
 
-  const openResult = await store.open(dbPath, config.ftsTokenizer);
+  const openResult = await store.open(
+    dbPath,
+    config.ftsTokenizer,
+    config.busyTimeoutMs
+  );
   if (!openResult.ok) {
     return { success: false, error: openResult.error.message };
   }

package/src/cli/errors.ts

@@ -1,6 +1,6 @@
 /**
  * CLI error model aligned to spec.
- * Exit codes: 0=success, 1=validation, 2=runtime
+ * Exit codes: 0=success, 1=validation, 2=runtime, 3=not-running, 4=busy/audit-findings, 5=audit-partial
  *
  * @module src/cli/errors
  */
@@ -13,6 +13,7 @@ export type CliErrorCode =
   | "VALIDATION"
   | "RUNTIME"
   | "NOT_RUNNING"
+  | "BUSY"
   | "AUDIT_FINDINGS"
   | "AUDIT_PARTIAL";
 
@@ -74,7 +75,7 @@ export function exitCodeFor(err: CliError): 1 | 2 | 3 | 4 | 5 {
   if (err.code === "NOT_RUNNING") {
     return 3;
   }
-  if (err.code === "AUDIT_FINDINGS") return 4;
+  if (err.code === "BUSY" || err.code === "AUDIT_FINDINGS") return 4;
   if (err.code === "AUDIT_PARTIAL") return 5;
   return 2;
 }