refactor: Extract meilisearch as a plugin

19 files changed, 422 insertions, 82 deletions

diff --git a/packages/plugins-search-meilisearch/.oxlintrc.json b/packages/plugins-search-meilisearch/.oxlintrc.json
new file mode 100644
index 00000000..79ba0255
--- /dev/null
+++ b/packages/plugins-search-meilisearch/.oxlintrc.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../../node_modules/oxlint/configuration_schema.json",
+  "extends": [
+    "../../tooling/oxlint/oxlint-base.json"
+  ],
+  "env": {
+    "builtin": true,
+    "commonjs": true
+  },
+  "ignorePatterns": [
+    "**/*.config.js",
+    "**/*.config.cjs",
+    "**/.eslintrc.cjs",
+    "**/.next",
+    "**/dist",
+    "**/build",
+    "**/pnpm-lock.yaml"
+  ]
+}
diff --git a/packages/plugins-search-meilisearch/index.ts b/packages/plugins-search-meilisearch/index.ts
new file mode 100644
index 00000000..3496d52f
--- /dev/null
+++ b/packages/plugins-search-meilisearch/index.ts
@@ -0,0 +1,12 @@
+// Auto-register the MeiliSearch provider when this package is imported
+import { PluginManager, PluginType } from "@karakeep/shared/plugins";
+
+import { MeiliSearchProvider } from "./src";
+
+if (MeiliSearchProvider.isConfigured()) {
+  PluginManager.register({
+    type: PluginType.Search,
+    name: "MeiliSearch",
+    provider: new MeiliSearchProvider(),
+  });
+}
diff --git a/packages/plugins-search-meilisearch/package.json b/packages/plugins-search-meilisearch/package.json
new file mode 100644
index 00000000..3bc9db80
--- /dev/null
+++ b/packages/plugins-search-meilisearch/package.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "name": "@karakeep/plugins-search-meilisearch",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "format": "prettier . --ignore-path ../../.prettierignore",
+    "format:fix": "prettier . --write --ignore-path ../../.prettierignore",
+    "lint": "oxlint .",
+    "lint:fix": "oxlint . --fix",
+    "test": "vitest"
+  },
+  "dependencies": {
+    "@karakeep/shared": "workspace:*",
+    "meilisearch": "^0.45.0"
+  },
+  "devDependencies": {
+    "@karakeep/prettier-config": "workspace:^0.1.0",
+    "@karakeep/tsconfig": "workspace:^0.1.0",
+    "vite-tsconfig-paths": "^4.3.1",
+    "vitest": "^3.2.4"
+  },
+  "prettier": "@karakeep/prettier-config"
+}
diff --git a/packages/plugins-search-meilisearch/src/env.ts b/packages/plugins-search-meilisearch/src/env.ts
new file mode 100644
index 00000000..c06fdd55
--- /dev/null
+++ b/packages/plugins-search-meilisearch/src/env.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const envConfig = z
+  .object({
+    MEILI_ADDR: z.string().optional(),
+    MEILI_MASTER_KEY: z.string().default(""),
+  })
+  .parse(process.env);
diff --git a/packages/plugins-search-meilisearch/src/index.ts b/packages/plugins-search-meilisearch/src/index.ts
new file mode 100644
index 00000000..6153a9c4
--- /dev/null
+++ b/packages/plugins-search-meilisearch/src/index.ts
@@ -0,0 +1,174 @@
+import type { Index } from "meilisearch";
+import { MeiliSearch } from "meilisearch";
+
+import type {
+  BookmarkSearchDocument,
+  SearchIndexClient,
+  SearchOptions,
+  SearchResponse,
+} from "@karakeep/shared/search";
+import { PluginProvider } from "@karakeep/shared/plugins";
+
+import { envConfig } from "./env";
+
+class MeiliSearchIndexClient implements SearchIndexClient {
+  constructor(private index: Index<BookmarkSearchDocument>) {}
+
+  async addDocuments(documents: BookmarkSearchDocument[]): Promise<void> {
+    const task = await this.index.addDocuments(documents, {
+      primaryKey: "id",
+    });
+    await this.index.waitForTask(task.taskUid);
+    const taskResult = await this.index.getTask(task.taskUid);
+    if (taskResult.error) {
+      throw new Error(
+        `MeiliSearch add documents failed: ${taskResult.error.message}`,
+      );
+    }
+  }
+
+  async updateDocuments(documents: BookmarkSearchDocument[]): Promise<void> {
+    const task = await this.index.updateDocuments(documents, {
+      primaryKey: "id",
+    });
+    await this.index.waitForTask(task.taskUid);
+    const taskResult = await this.index.getTask(task.taskUid);
+    if (taskResult.error) {
+      throw new Error(
+        `MeiliSearch update documents failed: ${taskResult.error.message}`,
+      );
+    }
+  }
+
+  async deleteDocument(id: string): Promise<void> {
+    const task = await this.index.deleteDocument(id);
+    await this.index.waitForTask(task.taskUid);
+    const taskResult = await this.index.getTask(task.taskUid);
+    if (taskResult.error) {
+      throw new Error(
+        `MeiliSearch delete document failed: ${taskResult.error.message}`,
+      );
+    }
+  }
+
+  async deleteDocuments(ids: string[]): Promise<void> {
+    const task = await this.index.deleteDocuments(ids);
+    await this.index.waitForTask(task.taskUid);
+    const taskResult = await this.index.getTask(task.taskUid);
+    if (taskResult.error) {
+      throw new Error(
+        `MeiliSearch delete documents failed: ${taskResult.error.message}`,
+      );
+    }
+  }
+
+  async search(options: SearchOptions): Promise<SearchResponse> {
+    const result = await this.index.search(options.query, {
+      filter: options.filter,
+      limit: options.limit,
+      offset: options.offset,
+      sort: options.sort,
+    });
+
+    return {
+      hits: result.hits.map((hit) => ({
+        id: hit.id,
+        score: hit._rankingScore,
+      })),
+      totalHits: result.estimatedTotalHits ?? 0,
+      processingTimeMs: result.processingTimeMs,
+    };
+  }
+
+  async clearIndex(): Promise<void> {
+    const task = await this.index.deleteAllDocuments();
+    await this.index.waitForTask(task.taskUid);
+    const taskResult = await this.index.getTask(task.taskUid);
+    if (taskResult.error) {
+      throw new Error(
+        `MeiliSearch clear index failed: ${taskResult.error.message}`,
+      );
+    }
+  }
+}
+
+export class MeiliSearchProvider implements PluginProvider<SearchIndexClient> {
+  private client: MeiliSearch | undefined;
+  private indexClient: SearchIndexClient | undefined;
+  private readonly indexName = "bookmarks";
+
+  constructor() {
+    if (MeiliSearchProvider.isConfigured()) {
+      this.client = new MeiliSearch({
+        host: envConfig.MEILI_ADDR!,
+        apiKey: envConfig.MEILI_MASTER_KEY,
+      });
+    }
+  }
+
+  static isConfigured(): boolean {
+    return !!envConfig.MEILI_ADDR;
+  }
+
+  async getClient(): Promise<SearchIndexClient | null> {
+    if (this.indexClient) {
+      return this.indexClient;
+    }
+
+    if (!this.client) {
+      return null;
+    }
+
+    const indices = await this.client.getIndexes();
+    let indexFound = indices.results.find((i) => i.uid === this.indexName);
+
+    if (!indexFound) {
+      const idx = await this.client.createIndex(this.indexName, {
+        primaryKey: "id",
+      });
+      await this.client.waitForTask(idx.taskUid);
+      indexFound = await this.client.getIndex<BookmarkSearchDocument>(
+        this.indexName,
+      );
+    }
+
+    await this.configureIndex(indexFound);
+    this.indexClient = new MeiliSearchIndexClient(indexFound);
+    return this.indexClient;
+  }
+
+  private async configureIndex(
+    index: Index<BookmarkSearchDocument>,
+  ): Promise<void> {
+    const desiredFilterableAttributes = ["id", "userId"].sort();
+    const desiredSortableAttributes = ["createdAt"].sort();
+
+    const settings = await index.getSettings();
+
+    if (
+      JSON.stringify(settings.filterableAttributes?.sort()) !==
+      JSON.stringify(desiredFilterableAttributes)
+    ) {
+      console.log(
+        `[meilisearch] Updating desired filterable attributes to ${desiredFilterableAttributes} from ${settings.filterableAttributes}`,
+      );
+      const taskId = await index.updateFilterableAttributes(
+        desiredFilterableAttributes,
+      );
+      await this.client!.waitForTask(taskId.taskUid);
+    }
+
+    if (
+      JSON.stringify(settings.sortableAttributes?.sort()) !==
+      JSON.stringify(desiredSortableAttributes)
+    ) {
+      console.log(
+        `[meilisearch] Updating desired sortable attributes to ${desiredSortableAttributes} from ${settings.sortableAttributes}`,
+      );
+      const taskId = await index.updateSortableAttributes(
+        desiredSortableAttributes,
+      );
+      await this.client!.waitForTask(taskId.taskUid);
+    }
+  }
+}
diff --git a/packages/plugins-search-meilisearch/tsconfig.json b/packages/plugins-search-meilisearch/tsconfig.json
new file mode 100644
index 00000000..a795b96a
--- /dev/null
+++ b/packages/plugins-search-meilisearch/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@karakeep/tsconfig/node.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
+  }
+}
diff --git a/packages/shared-server/.oxlintrc.json b/packages/shared-server/.oxlintrc.json
new file mode 100644
index 00000000..79ba0255
--- /dev/null
+++ b/packages/shared-server/.oxlintrc.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../../node_modules/oxlint/configuration_schema.json",
+  "extends": [
+    "../../tooling/oxlint/oxlint-base.json"
+  ],
+  "env": {
+    "builtin": true,
+    "commonjs": true
+  },
+  "ignorePatterns": [
+    "**/*.config.js",
+    "**/*.config.cjs",
+    "**/.eslintrc.cjs",
+    "**/.next",
+    "**/dist",
+    "**/build",
+    "**/pnpm-lock.yaml"
+  ]
+}
diff --git a/packages/shared-server/index.ts b/packages/shared-server/index.ts
new file mode 100644
index 00000000..3bd16e17
--- /dev/null
+++ b/packages/shared-server/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/packages/shared-server/package.json b/packages/shared-server/package.json
new file mode 100644
index 00000000..8ac98e21
--- /dev/null
+++ b/packages/shared-server/package.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "name": "@karakeep/shared-server",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "@karakeep/plugins-search-meilisearch": "workspace:^0.1.0",
+    "@karakeep/shared": "workspace:^0.1.0"
+  },
+  "devDependencies": {
+    "@karakeep/prettier-config": "workspace:^0.1.0",
+    "@karakeep/tsconfig": "workspace:^0.1.0"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
+    "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+    "lint": "oxlint .",
+    "lint:fix": "oxlint . --fix",
+    "test": "vitest"
+  },
+  "main": "index.ts",
+  "exports": {
+    ".": "./index.ts"
+  },
+  "prettier": "@karakeep/prettier-config"
+}
diff --git a/packages/shared-server/src/index.ts b/packages/shared-server/src/index.ts
new file mode 100644
index 00000000..a17576ad
--- /dev/null
+++ b/packages/shared-server/src/index.ts
@@ -0,0 +1 @@
+export { loadAllPlugins } from "./plugins";
diff --git a/packages/shared-server/src/plugins.ts b/packages/shared-server/src/plugins.ts
new file mode 100644
index 00000000..86a0b344
--- /dev/null
+++ b/packages/shared-server/src/plugins.ts
@@ -0,0 +1,12 @@
+import { PluginManager } from "@karakeep/shared/plugins";
+
+let pluginsLoaded = false;
+export async function loadAllPlugins() {
+  if (pluginsLoaded) {
+    return;
+  }
+  // Load plugins here. Order of plugin loading matter.
+  await import("@karakeep/plugins-search-meilisearch");
+  PluginManager.logAllPlugins();
+  pluginsLoaded = true;
+}
diff --git a/packages/shared-server/tsconfig.json b/packages/shared-server/tsconfig.json
new file mode 100644
index 00000000..9bb09964
--- /dev/null
+++ b/packages/shared-server/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@karakeep/tsconfig/node.json",
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "rootDir": "src/",
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
+  },
+}
diff --git a/packages/shared/config.ts b/packages/shared/config.ts
index 8a41f6b5..a71014f0 100644
--- a/packages/shared/config.ts
+++ b/packages/shared/config.ts
@@ -76,8 +76,6 @@ const allEnv = z.object({
     .default("")
     .transform((t) => t.split("%%").filter((a) => a)),
   CRAWLER_SCREENSHOT_TIMEOUT_SEC: z.coerce.number().default(5),
-  MEILI_ADDR: z.string().optional(),
-  MEILI_MASTER_KEY: z.string().default(""),
   LOG_LEVEL: z.string().default("debug"),
   DEMO_MODE: stringBool("false"),
   DEMO_MODE_EMAIL: z.string().optional(),
@@ -231,12 +229,6 @@ const serverConfigSchema = allEnv
       },
       search: {
         numWorkers: val.SEARCH_NUM_WORKERS,
-        meilisearch: val.MEILI_ADDR
-          ? {
-              address: val.MEILI_ADDR,
-              key: val.MEILI_MASTER_KEY,
-            }
-          : undefined,
       },
       logLevel: val.LOG_LEVEL,
       demoMode: val.DEMO_MODE
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 70859911..a0e6d2e8 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -10,7 +10,6 @@
     "html-to-text": "^9.0.5",
     "js-tiktoken": "^1.0.20",
     "liteque": "^0.5.0",
-    "meilisearch": "^0.37.0",
     "nodemailer": "^7.0.4",
     "ollama": "^0.5.14",
     "openai": "^4.86.1",
diff --git a/packages/shared/plugins.ts b/packages/shared/plugins.ts
new file mode 100644
index 00000000..2ce5826a
--- /dev/null
+++ b/packages/shared/plugins.ts
@@ -0,0 +1,64 @@
+// Implementation inspired from Outline
+
+import logger from "./logger";
+import { SearchIndexClient } from "./search";
+
+export enum PluginType {
+  Search = "search",
+}
+
+interface PluginTypeMap {
+  [PluginType.Search]: SearchIndexClient;
+}
+
+export interface TPlugin<T extends PluginType> {
+  type: T;
+  name: string;
+  provider: PluginProvider<PluginTypeMap[T]>;
+}
+
+export interface PluginProvider<T> {
+  getClient(): Promise<T | null>;
+}
+
+export class PluginManager {
+  private static providers = new Map<PluginType, TPlugin<PluginType>[]>();
+
+  static register<T extends PluginType>(plugin: TPlugin<T>): void {
+    const p = PluginManager.providers.get(plugin.type);
+    if (!p) {
+      PluginManager.providers.set(plugin.type, [plugin]);
+      return;
+    }
+    p.push(plugin);
+  }
+
+  static async getClient<T extends PluginType>(
+    type: T,
+  ): Promise<PluginTypeMap[T] | null> {
+    const provider = PluginManager.providers.get(type);
+    if (!provider) {
+      return null;
+    }
+    return await provider[provider.length - 1].provider.getClient();
+  }
+
+  static isRegistered<T extends PluginType>(type: T): boolean {
+    return !!PluginManager.providers.get(type);
+  }
+
+  static logAllPlugins() {
+    logger.info("Plugins (Last one wins):");
+    for (const type of Object.values(PluginType)) {
+      logger.info(`  ${type}:`);
+      const plugins = PluginManager.providers.get(type);
+      if (!plugins) {
+        logger.info("    - None");
+        continue;
+      }
+      for (const plugin of plugins) {
+        logger.info(`    - ${plugin.name}`);
+      }
+    }
+  }
+}
diff --git a/packages/shared/search.ts b/packages/shared/search.ts
index 2c6904b2..2afc9763 100644
--- a/packages/shared/search.ts
+++ b/packages/shared/search.ts
@@ -1,10 +1,8 @@
-import type { Index } from "meilisearch";
-import { MeiliSearch } from "meilisearch";
 import { z } from "zod";
 
-import serverConfig from "./config";
+import { PluginManager, PluginType } from "./plugins";
 
-export const zBookmarkIdxSchema = z.object({
+export const zBookmarkSearchDocument = z.object({
   id: z.string(),
   userId: z.string(),
   url: z.string().nullish(),
@@ -24,68 +22,36 @@ export const zBookmarkIdxSchema = z.object({
   dateModified: z.date().nullish(),
 });
 
-export type ZBookmarkIdx = z.infer<typeof zBookmarkIdxSchema>;
+export type BookmarkSearchDocument = z.infer<typeof zBookmarkSearchDocument>;
 
-let searchClient: MeiliSearch | undefined;
-
-if (serverConfig.search.meilisearch) {
-  searchClient = new MeiliSearch({
-    host: serverConfig.search.meilisearch.address,
-    apiKey: serverConfig.search.meilisearch.key,
-  });
+export interface SearchResult {
+  id: string;
+  score?: number;
 }
 
-const BOOKMARKS_IDX_NAME = "bookmarks";
-
-let idxClient: Index<ZBookmarkIdx> | undefined;
-
-export async function getSearchIdxClient(): Promise<Index<ZBookmarkIdx> | null> {
-  if (idxClient) {
-    return idxClient;
-  }
-  if (!searchClient) {
-    return null;
-  }
-
-  const indicies = await searchClient.getIndexes();
-  let idxFound = indicies.results.find((i) => i.uid == BOOKMARKS_IDX_NAME);
-  if (!idxFound) {
-    const idx = await searchClient.createIndex(BOOKMARKS_IDX_NAME, {
-      primaryKey: "id",
-    });
-    await searchClient.waitForTask(idx.taskUid);
-    idxFound = await searchClient.getIndex<ZBookmarkIdx>(BOOKMARKS_IDX_NAME);
-  }
+export interface SearchOptions {
+  query: string;
+  filter?: string[];
+  limit?: number;
+  offset?: number;
+  sort?: string[];
+}
 
-  const desiredFilterableAttributes = ["id", "userId"].sort();
-  const desiredSortableAttributes = ["createdAt"].sort();
+export interface SearchResponse {
+  hits: SearchResult[];
+  totalHits: number;
+  processingTimeMs: number;
+}
 
-  const settings = await idxFound.getSettings();
-  if (
-    JSON.stringify(settings.filterableAttributes?.sort()) !=
-    JSON.stringify(desiredFilterableAttributes)
-  ) {
-    console.log(
-      `[meilisearch] Updating desired filterable attributes to ${desiredFilterableAttributes} from ${settings.filterableAttributes}`,
-    );
-    const taskId = await idxFound.updateFilterableAttributes(
-      desiredFilterableAttributes,
-    );
-    await searchClient.waitForTask(taskId.taskUid);
-  }
+export interface SearchIndexClient {
+  addDocuments(documents: BookmarkSearchDocument[]): Promise<void>;
+  updateDocuments(documents: BookmarkSearchDocument[]): Promise<void>;
+  deleteDocument(id: string): Promise<void>;
+  deleteDocuments(ids: string[]): Promise<void>;
+  search(options: SearchOptions): Promise<SearchResponse>;
+  clearIndex(): Promise<void>;
+}
 
-  if (
-    JSON.stringify(settings.sortableAttributes?.sort()) !=
-    JSON.stringify(desiredSortableAttributes)
-  ) {
-    console.log(
-      `[meilisearch] Updating desired sortable attributes to ${desiredSortableAttributes} from ${settings.sortableAttributes}`,
-    );
-    const taskId = await idxFound.updateSortableAttributes(
-      desiredSortableAttributes,
-    );
-    await searchClient.waitForTask(taskId.taskUid);
-  }
-  idxClient = idxFound;
-  return idxFound;
+export async function getSearchClient(): Promise<SearchIndexClient | null> {
+  return PluginManager.getClient(PluginType.Search);
 }
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index 8054e7c5..1da46e9a 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@karakeep/db": "workspace:*",
+    "@karakeep/plugins-search-meilisearch": "workspace:*",
     "@karakeep/shared": "workspace:*",
     "@trpc/server": "^11.4.3",
     "bcryptjs": "^2.4.3",
diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts
index 9fd77f1d..1b069b9e 100644
--- a/packages/trpc/routers/admin.ts
+++ b/packages/trpc/routers/admin.ts
@@ -14,7 +14,7 @@ import {
   VideoWorkerQueue,
   WebhookQueue,
 } from "@karakeep/shared/queues";
-import { getSearchIdxClient } from "@karakeep/shared/search";
+import { getSearchClient } from "@karakeep/shared/search";
 import {
   resetPasswordSchema,
   updateUserSchema,
@@ -219,8 +219,8 @@ export const adminAppRouter = router({
       );
     }),
   reindexAllBookmarks: adminProcedure.mutation(async ({ ctx }) => {
-    const searchIdx = await getSearchIdxClient();
-    await searchIdx?.deleteAllDocuments();
+    const searchIdx = await getSearchClient();
+    await searchIdx?.clearIndex();
     const bookmarkIds = await ctx.db.query.bookmarks.findMany({
       columns: {
         id: true,
diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index 9aa9ec1e..298f0961 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -38,7 +38,7 @@ import {
   triggerSearchReindex,
   triggerWebhook,
 } from "@karakeep/shared/queues";
-import { getSearchIdxClient } from "@karakeep/shared/search";
+import { getSearchClient } from "@karakeep/shared/search";
 import { parseSearchQuery } from "@karakeep/shared/searchQueryParser";
 import {
   BookmarkTypes,
@@ -761,7 +761,7 @@ export const bookmarksAppRouter = router({
         input.limit = DEFAULT_NUM_BOOKMARKS_PER_PAGE;
       }
       const sortOrder = input.sortOrder || "relevance";
-      const client = await getSearchIdxClient();
+      const client = await getSearchClient();
       if (!client) {
         throw new TRPCError({
           code: "INTERNAL_SERVER_ERROR",
@@ -788,10 +788,9 @@ export const bookmarksAppRouter = router({
        */
       const createdAtSortOrder = sortOrder === "relevance" ? "desc" : sortOrder;
 
-      const resp = await client.search(parsedQuery.text, {
+      const resp = await client.search({
+        query: parsedQuery.text,
         filter,
-        showRankingScore: true,
-        attributesToRetrieve: ["id"],
         sort: [`createdAt:${createdAtSortOrder}`],
         limit: input.limit,
         ...(input.cursor
@@ -805,7 +804,7 @@ export const bookmarksAppRouter = router({
         return { bookmarks: [], nextCursor: null };
       }
       const idToRank = resp.hits.reduce<Record<string, number>>((acc, r) => {
-        acc[r.id] = r._rankingScore!;
+        acc[r.id] = r.score || 0;
         return acc;
       }, {});
       const results = await ctx.db.query.bookmarks.findMany({
@@ -846,11 +845,11 @@ export const bookmarksAppRouter = router({
           results.map((b) => toZodSchema(b, input.includeContent)),
         ),
         nextCursor:
-          resp.hits.length + resp.offset >= resp.estimatedTotalHits
+          resp.hits.length + (input.cursor?.offset || 0) >= resp.totalHits
             ? null
             : {
                 ver: 1 as const,
-                offset: resp.hits.length + resp.offset,
+                offset: resp.hits.length + (input.cursor?.offset || 0),
               },
       };
     }),