@gmickel/gno 2.9.0 → 2.9.1

package/README.md

@@ -139,7 +139,7 @@ See the [guide](docs/COMPILED-CONTEXT.md).
 
 <!-- public-truth:current-version -->
 
-> Current source version: **v2.9.0**. See [CHANGELOG.md](./CHANGELOG.md).
+> Current source version: **v2.9.1**. See [CHANGELOG.md](./CHANGELOG.md).
 
 <!-- /public-truth -->
 

package/browser-extension/artifacts/gno-browser-clipper-v2.9.1.zip.sha256

@@ -0,0 +1 @@
+f58e51eea9d0b35a61ef55574882c4be8002ed2fdc29966a3cd1bd7c84350e3c  gno-browser-clipper-v2.9.1.zip

package/browser-extension/dist/manifest.json

@@ -21,5 +21,5 @@
   "content_security_policy": {
     "extension_pages": "script-src 'self'; object-src 'none'; connect-src http://127.0.0.1:*"
   },
-  "version": "2.9.0"
+  "version": "2.9.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gmickel/gno",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Local semantic search for your documents. Index Markdown, PDF, and Office files with hybrid BM25 + vector search.",
   "keywords": [
     "embeddings",

package/src/serve/watch-reconciliation-shared.ts

@@ -42,9 +42,20 @@ export const WATCHER_MAX_DIRTY_HINTS = 4_096;
 /** Cap on application-write suppression history entries. */
 export const WATCHER_MAX_SUPPRESSION_ENTRIES = 4_096;
 
-/** Bounded retry delay after failed classification/sync. */
+/** Retry delay after the first failed classification/sync of a collection. */
 export const WATCHER_RETRY_BACKOFF_MS = 500;
 
+/** Ceiling for the retry delay while a collection keeps failing. */
+export const WATCHER_MAX_RETRY_BACKOFF_MS = 5 * 60_000;
+
+/** Delay before the retry that follows `failures` consecutive failed flushes. */
+export function watcherRetryDelayMs(failures: number): number {
+  return Math.min(
+    WATCHER_RETRY_BACKOFF_MS * 2 ** Math.max(0, failures - 1),
+    WATCHER_MAX_RETRY_BACKOFF_MS
+  );
+}
+
 /** Retry delay while another writer holds the shared writer lease. */
 export const WATCHER_LEASE_RETRY_MS = 5_000;
 

package/src/serve/watch-reconciliation.ts

@@ -28,6 +28,7 @@ export {
   WATCHER_MAX_DIRTY_HINTS,
   WATCHER_MAX_EXACT_PATHS,
   WATCHER_MAX_FLUSH_DELAY_MS,
+  WATCHER_MAX_RETRY_BACKOFF_MS,
   WATCHER_MAX_SUPPRESSION_ENTRIES,
   WATCHER_RETRY_BACKOFF_MS,
   addToCappedSet,
@@ -39,6 +40,7 @@ export {
   mergeSyncPathBatch,
   pruneSuppressionMap,
   successfulChangedPaths,
+  watcherRetryDelayMs,
   widenVanishedExactPaths,
   type ClassificationResult,
   type ExactPathKind,

package/src/serve/watch-service-events.ts

@@ -12,8 +12,8 @@ import type { Collection } from "../config/types";
 import {
   WATCHER_FLUSH_DEBOUNCE_MS,
   WATCHER_MAX_FLUSH_DELAY_MS,
-  WATCHER_RETRY_BACKOFF_MS,
   classifyWatcherFilename,
+  watcherRetryDelayMs,
 } from "./watch-reconciliation";
 import {
   applyPendingForceFlags,
@@ -25,6 +25,12 @@ import {
   type PendingForceFlags,
 } from "./watch-service-state";
 
+/**
+ * Why an explicit retry timer is armed: "backoff" after a failed flush, "fixed"
+ * for an explicit delay such as writer-lease contention (R3: stays at 5 s).
+ */
+export type WatcherRetryKind = "backoff" | "fixed";
+
 export interface WatchEventHost {
   disposed: () => boolean;
   findCollection: (collectionName: string) => Collection | undefined;
@@ -45,8 +51,12 @@ export interface WatchQueueHost {
   pendingByCollection: Map<string, CollectionPending>;
   flushDeadlineAt: Map<string, number>;
   timers: Map<string, ReturnType<typeof setTimeout>>;
-  /** Collections with an explicit retry timer; finally must not bypass. */
-  retryScheduled: Set<string>;
+  /** Collections with an explicit retry timer, by kind; finally must not bypass. */
+  retryScheduled: Map<string, WatcherRetryKind>;
+  /** Consecutive failed flushes per collection; cleared by a successful flush. */
+  retryFailures: Map<string, number>;
+  /** Collections with watcher events queued since their last flush took its work. */
+  freshEvents: Set<string>;
   snapshotReady: Map<string, boolean>;
   inFlightSyncs: Set<Promise<void>>;
   runFlush: (collectionName: string) => Promise<void>;
@@ -105,6 +115,7 @@ export function enqueueExactPath(
     collectionName,
     queueExactPath(pending, relPath, host.maxExactPaths)
   );
+  host.freshEvents.add(collectionName);
   scheduleFlush(host, collectionName);
 }
 
@@ -123,6 +134,7 @@ export function enqueueDirtyHint(
     collectionName,
     queueDirtyHint(pending, hint, host.maxDirtyHints)
   );
+  host.freshEvents.add(collectionName);
   scheduleFlush(host, collectionName);
 }
 
@@ -152,9 +164,17 @@ export function scheduleFlush(
   if (host.disposed()) {
     return;
   }
-  // Explicit retry owns the single timer; do not replace it with debounce.
-  if (host.retryScheduled.has(collectionName)) {
-    return;
+  const retryKind = host.retryScheduled.get(collectionName);
+  if (retryKind !== undefined) {
+    // Explicit retry owns the single timer; do not replace it with debounce.
+    if (retryKind === "fixed" || !host.freshEvents.has(collectionName)) {
+      return;
+    }
+    // A fresh event never waits out a failure backoff: drop the retry timer and
+    // flush on the normal debounce. The failure count stays until a flush succeeds.
+    // A fixed (lease) retry keeps its timer so a held lease is not probed per event.
+    host.retryScheduled.delete(collectionName);
+    host.flushDeadlineAt.delete(collectionName);
   }
   const schedule = computeFlushDelay({
     nowMs: host.clock(),
@@ -213,6 +233,8 @@ export function startFlush(host: WatchQueueHost, collectionName: string): void {
  * Re-arm pending work after a file-level failure with retry backoff.
  * At most one retry timer per collection; finally must not startFlush while set.
  * forceFallback/overflow survive until forced classification + sync succeed.
+ * Without an explicit delay, each consecutive failure doubles the wait (capped),
+ * so work that fails the same way every time cannot spin the resident.
  */
 export function requeueAfterFailure(
   host: WatchQueueHost,
@@ -220,7 +242,7 @@ export function requeueAfterFailure(
   exact: string[],
   dirty: string[],
   forceFlags?: PendingForceFlags,
-  delayMs = WATCHER_RETRY_BACKOFF_MS
+  delayMs?: number
 ): void {
   queueWithoutSchedule(host, collectionName, exact, dirty, forceFlags);
   if (host.disposed()) {
@@ -230,7 +252,19 @@ export function requeueAfterFailure(
     // Pending already merged; existing retry timer remains the sole attempt.
     return;
   }
-  host.retryScheduled.add(collectionName);
+  host.retryScheduled.set(
+    collectionName,
+    delayMs === undefined ? "backoff" : "fixed"
+  );
+  let retryDelayMs = delayMs;
+  if (retryDelayMs === undefined) {
+    const failures = (host.retryFailures.get(collectionName) ?? 0) + 1;
+    host.retryFailures.set(collectionName, failures);
+    // Events that arrived while the failed flush ran flush on the debounce.
+    retryDelayMs = host.freshEvents.has(collectionName)
+      ? host.flushDebounceMs
+      : watcherRetryDelayMs(failures);
+  }
   const existingTimer = host.timers.get(collectionName);
   if (existingTimer) {
     clearTimeout(existingTimer);
@@ -242,7 +276,7 @@ export function requeueAfterFailure(
       host.timers.delete(collectionName);
       host.retryScheduled.delete(collectionName);
       startFlush(host, collectionName);
-    }, delayMs)
+    }, retryDelayMs)
   );
 }
 

package/src/serve/watch-service-hosts.ts

@@ -8,7 +8,11 @@ import type { FSWatcher } from "node:fs";
 
 import type { Collection } from "../config/types";
 import type { SyncOptions } from "../ingestion";
-import type { WatchEventHost, WatchQueueHost } from "./watch-service-events";
+import type {
+  WatchEventHost,
+  WatchQueueHost,
+  WatcherRetryKind,
+} from "./watch-service-events";
 import type { WatchLifecycleHost } from "./watch-service-lifecycle";
 import type { CollectionPending } from "./watch-service-state";
 import type { WatcherSnapshot } from "./watch-snapshot";
@@ -46,7 +50,9 @@ export interface WatchServiceHostState {
   maxDirtyHints: number;
   flushDeadlineAt: Map<string, number>;
   timers: Map<string, ReturnType<typeof setTimeout>>;
-  retryScheduled: Set<string>;
+  retryScheduled: Map<string, WatcherRetryKind>;
+  retryFailures: Map<string, number>;
+  freshEvents: Set<string>;
   inFlightSyncs: Set<Promise<void>>;
   runFlush: (collectionName: string) => Promise<void>;
 }
@@ -71,6 +77,8 @@ export function buildLifecycleHost(
     snapshotInit: state.snapshotInit,
     syncing: state.syncing,
     pendingByCollection: state.pendingByCollection,
+    retryFailures: state.retryFailures,
+    freshEvents: state.freshEvents,
     clearCollectionRuntimeState: state.clearCollectionRuntimeState,
     beginSnapshotInit: state.beginSnapshotInit,
     watchFactory: state.watchFactory,
@@ -102,6 +110,8 @@ export function buildQueueHost(state: WatchServiceHostState): WatchQueueHost {
     flushDeadlineAt: state.flushDeadlineAt,
     timers: state.timers,
     retryScheduled: state.retryScheduled,
+    retryFailures: state.retryFailures,
+    freshEvents: state.freshEvents,
     snapshotReady: state.snapshotReady,
     inFlightSyncs: state.inFlightSyncs,
     runFlush: state.runFlush,

package/src/serve/watch-service-lifecycle.ts

@@ -38,6 +38,10 @@ export interface WatchLifecycleHost {
    * forceFallback + durable generation reconcile so a new baseline cannot absorb it.
    */
   pendingByCollection: Map<string, CollectionPending>;
+  /** Consecutive failed flushes per collection (failure backoff input). */
+  retryFailures: Map<string, number>;
+  /** Collections whose queued work is new user action, not a failure retry. */
+  freshEvents: Set<string>;
   clearCollectionRuntimeState: (collectionName: string) => void;
   beginSnapshotInit: (collection: Collection) => void;
   watchFactory: (
@@ -186,6 +190,10 @@ export function applyCollectionUpdate(
         pending.forceFallback = true;
       }
       host.pendingByCollection.set(collection.name, pending);
+      // A config edit is user action that may fix the failure cause: it must
+      // not wait out an armed failure backoff, and the count starts over.
+      host.freshEvents.add(collection.name);
+      host.retryFailures.delete(collection.name);
     }
     if (host.watchers.has(collection.name)) {
       host.beginSnapshotInit(collection);

package/src/serve/watch-service-run-flush.ts

@@ -10,7 +10,7 @@ import { normalize } from "node:path";
 import type { Collection } from "../config/types";
 import type { CollectionSyncResult, SyncOptions } from "../ingestion";
 import type { SqliteAdapter } from "../store/sqlite/adapter";
-import type { WatchQueueHost } from "./watch-service-events";
+import type { WatchQueueHost, WatcherRetryKind } from "./watch-service-events";
 import type { CollectionPending } from "./watch-service-state";
 import type { WatcherSnapshot, WatcherSnapshotFs } from "./watch-snapshot";
 
@@ -36,7 +36,7 @@ export interface RunFlushContext {
   pendingByCollection: Map<string, CollectionPending>;
   flushDeadlineAt: Map<string, number>;
   syncing: Set<string>;
-  retryScheduled: Set<string>;
+  retryScheduled: Map<string, WatcherRetryKind>;
   collectionGenerations: Map<string, number>;
   snapshots: Map<string, WatcherSnapshot>;
   snapshotReady: Map<string, boolean>;
@@ -125,6 +125,7 @@ export async function runOwnedCollectionFlush(
   }
 
   // Events that arrived while the lease was being taken join this flush.
+  ctx.queueHost.freshEvents.delete(collectionName);
   const taken = takePending(
     ctx.pendingByCollection.get(collectionName) ?? pending
   );
@@ -148,6 +149,9 @@ export async function runOwnedCollectionFlush(
     );
   };
 
+  // A flush can requeue failed work (e.g. a dirty classification error) and
+  // still settle as synced/idle; that must not reset the failure backoff.
+  let requeuedFailure = false;
   try {
     const outcome = await flushCollectionOnce({
       collection,
@@ -218,6 +222,7 @@ export async function runOwnedCollectionFlush(
         if (!stillOwner()) {
           return;
         }
+        requeuedFailure = true;
         requeueAfterFailure(
           ctx.queueHost,
           collectionName,
@@ -236,6 +241,12 @@ export async function runOwnedCollectionFlush(
         requeueGenerationReconcile(ctx.queueHost, collectionName);
       },
     });
+    if (
+      (outcome.status === "synced" || outcome.status === "idle") &&
+      !requeuedFailure
+    ) {
+      ctx.queueHost.retryFailures.delete(collectionName);
+    }
     if (
       outcome.status === "failed" &&
       outcome.error &&

package/src/serve/watch-service.ts

@@ -15,6 +15,7 @@ import type { CollectionSyncResult, SyncOptions } from "../ingestion";
 import type { SqliteAdapter } from "../store/sqlite/adapter";
 import type { DocumentEvent, DocumentEventBus } from "./doc-events";
 import type { EmbedScheduler } from "./embed-scheduler";
+import type { WatcherRetryKind } from "./watch-service-events";
 import type {
   WatcherSnapshot,
   WatcherSnapshotBuildResult,
@@ -126,7 +127,9 @@ export class CollectionWatchService {
   readonly #pendingByCollection = new Map<string, CollectionPending>();
   readonly #timers = new Map<string, ReturnType<typeof setTimeout>>();
   readonly #flushDeadlineAt = new Map<string, number>();
-  readonly #retryScheduled = new Set<string>();
+  readonly #retryScheduled = new Map<string, WatcherRetryKind>();
+  readonly #retryFailures = new Map<string, number>();
+  readonly #freshEvents = new Set<string>();
   readonly #syncing = new Set<string>();
   readonly #inFlightSyncs = new Set<Promise<void>>();
   readonly #suppressedPaths = new Map<string, number>();
@@ -216,6 +219,8 @@ export class CollectionWatchService {
     this.#timers.clear();
     this.#flushDeadlineAt.clear();
     this.#retryScheduled.clear();
+    this.#retryFailures.clear();
+    this.#freshEvents.clear();
     this.#watchers.clear();
     this.#watchRoots.clear();
     this.#collectionGenerations.clear();
@@ -303,6 +308,8 @@ export class CollectionWatchService {
       flushDeadlineAt: this.#flushDeadlineAt,
       timers: this.#timers,
       retryScheduled: this.#retryScheduled,
+      retryFailures: this.#retryFailures,
+      freshEvents: this.#freshEvents,
       inFlightSyncs: this.#inFlightSyncs,
       runFlush: (name) => this.#flushCollection(name),
     };
@@ -316,6 +323,8 @@ export class CollectionWatchService {
     this.#snapshotInit.delete(collectionName);
     this.#flushDeadlineAt.delete(collectionName);
     this.#retryScheduled.delete(collectionName);
+    this.#retryFailures.delete(collectionName);
+    this.#freshEvents.delete(collectionName);
     const timer = this.#timers.get(collectionName);
     if (timer) {
       clearTimeout(timer);

package/browser-extension/artifacts/gno-browser-clipper-v2.9.0.zip.sha256

@@ -1 +0,0 @@
-2d8fa6721fe305e2fd70450405e255900d028b187c884bbf74f29a3a33d27d3c  gno-browser-clipper-v2.9.0.zip