@wirecat/cli-core 0.509.0 → 0.510.0

package/CHANGELOG.md

@@ -7,6 +7,16 @@ shape of this file.
 
 ## Unreleased
 
+## 0.510.0 — 31.10.2026
+
+### Fixed
+
+- **`search events --backend both` marks a repeating event the provider also found.** The stored search shows a series
+  as one hit, while a provider such as Google answers the series and each moved occurrence apart, so 0.508.0 left the
+  stored hit without `server` and listed the provider's copies again below it. A provider hit is now matched through
+  its stored copy's series, and the stored hit takes `server` once.
+- **`search events --help`** says what `--backend both` does in words ("ask both").
+
 ## 0.509.0 — 31.10.2026
 
 ### Changed — may break callers

package/dist/calendar/cli/index.js

@@ -226,7 +226,7 @@ const addCalendarCommandsDefinition = (program, deps) => {
     const search = example(annotate(searches.command("events"), { effects: deps.serverSearch ? LOCAL_OR_REMOTE_READ : LOCAL_READ })
         .description(deps.serverSearch
         ? "find stored events by words, and by meaning when its model is downloaded; with --backend server, ask " +
-            "the provider instead, with --backend both, both"
+            "the provider instead, or with --backend both, ask both"
         : "find stored events by words, and by meaning when its model is downloaded")
         .argument("<query...>", "what to find in titles, descriptions, places and attendees"), "search events roadmap planning --json", ...(deps.serverSearch
         ? ["search events --backend server quarterly review", "search events --backend both quarterly review"]

package/dist/calendar/server-search.d.ts

@@ -35,7 +35,8 @@ type ServerFound = Awaited<ReturnType<typeof serverSearchAnswer>>;
 /**
  * `--backend both`: the stored search's hits in its own order, each one the provider also found marked `server`, then
  * what only the provider found, earliest first. One page and no cursor: the two sides rank and page differently.
- * A provider hit is matched by its stored copy, so an occurrence the store keeps under another id shows twice.
+ * A provider hit is matched through its stored copy: a series, or any of its occurrences, to the stored hit of that
+ * series. A provider hit the store does not hold is listed on its own.
  */
 export declare const bothSearchAnswer: (store: EventStore, accountId: number, archived: EventsFound, served: ServerFound, limit: number) => Promise<{
     query: string;

package/dist/calendar/server-search.js

@@ -39,24 +39,34 @@ export const serverSearchAnswer = async (source, store, { accountId, account, qu
     hits.sort((a, b) => (a.starts_at ?? "").localeCompare(b.starts_at ?? ""));
     return { query, by: "server", hits: hits.slice(0, limit), has_more: more || hits.length > limit };
 };
+/** As the stored search groups hits: the occurrences of one series are one hit. */
+const groupOf = (eventId, eventSeriesId) => eventSeriesId !== null ? `s${eventSeriesId}` : eventId !== null ? `e${eventId}` : undefined;
 /**
  * `--backend both`: the stored search's hits in its own order, each one the provider also found marked `server`, then
  * what only the provider found, earliest first. One page and no cursor: the two sides rank and page differently.
- * A provider hit is matched by its stored copy, so an occurrence the store keeps under another id shows twice.
+ * A provider hit is matched through its stored copy: a series, or any of its occurrences, to the stored hit of that
+ * series. A provider hit the store does not hold is listed on its own.
  */
 export const bothSearchAnswer = async (store, accountId, archived, served, limit) => {
     const calendars = new Map((await store.calendars(accountId)).map((calendar) => [calendar.externalId, calendar]));
     const hits = archived.hits.map((hit) => ({ ...hit }));
-    const byRef = new Map(hits.map((hit) => [hit.ref, hit]));
+    const byGroup = new Map();
+    for (const hit of hits) {
+        const details = await store.event(Number(hit.ref.slice("event:".length)));
+        const group = details && groupOf(details.event.id, details.event.eventSeriesId);
+        if (group)
+            byGroup.set(group, hit);
+    }
     const onlyServer = [];
     for (const hit of served.hits) {
         const calendar = calendars.get(hit.calendar);
         const entry = calendar ? await store.entry(calendar.id, hit.external_id) : null;
-        const held = entry?.eventId == null ? undefined : byRef.get(`event:${entry.eventId}`);
-        if (held)
-            held.found_by = [...held.found_by, "server"];
-        else
+        const group = entry ? groupOf(entry.eventId, entry.eventSeriesId) : undefined;
+        const held = group === undefined ? undefined : byGroup.get(group);
+        if (!held)
             onlyServer.push(hit);
+        else if (!held.found_by.includes("server"))
+            held.found_by = [...held.found_by, "server"];
     }
     const merged = [...hits, ...onlyServer];
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirecat/cli-core",
-  "version": "0.509.0",
+  "version": "0.510.0",
   "description": "The messenger-neutral half of a messaging CLI: domain model, message locators, rendering, name resolution, the SQLite seam, the command skeleton and shared read commands, the send guard, run records and the message store",
   "license": "Apache-2.0",
   "author": "Viacheslav Ptsarev",