@wirecat/cli-core 0.394.0 → 0.395.0

package/dist/meetings/cli/search.js

@@ -35,7 +35,7 @@ export const createMeetingSearchCommand = (program) => {
     const command = search
         .command("meetings")
         .description("find words in stored meetings, indexing new ones first")
-        .argument("<query>", 'words, OR, (groups), -word, "a phrase", "a b"~N (within N lines), exact:word, from:"Name" (who said the line); a word also matches its other forms and spellings speech recognition garbled')
+        .argument("<query>", 'words, OR, (groups), -word, "a phrase", "a b"~N (within N lines), exact:word, from:"Name" (who said the line); date>=30d, project:, tag:, topic: choose meetings; a word also matches its other forms and spellings speech recognition garbled')
         .option("--meeting-id <id>", "only this stored meeting", integer)
         .option("--identity-id <id>", "meetings with this participant identity; does not say who spoke a hit", integer)
         .option("--person-id <id>", "meetings with a participant linked to this person", integer)

package/dist/meetings/hit-query.d.ts

@@ -1,8 +1,18 @@
 import { type QueryAst } from "@wirecat/cli-base/query";
+import type { MeetingHitSearchRequest } from "./search-store.js";
 /** A transcript line holds a sentence or two; further than this is a different part of the meeting. */
 export declare const MOST_LINES_APART = 20;
 /** The messages query language over meeting text: the same fields, a narrower set of operators. */
 export declare const MEETING_HIT_QUERY: import("@wirecat/cli-base/query").QueryRegistry;
+/**
+ * `budget project:RES date>=30d` → the words, and the meetings to look in as filters. A meeting field must be
+ * joined to the words with AND and given once, in the query or as an option. Text the language refuses is left as
+ * typed, for the caller's own error or for a search by meaning.
+ */
+export declare const liftMeetingFields: (query: string, request: MeetingHitSearchRequest, now?: number) => {
+    query: string;
+    request: MeetingHitSearchRequest;
+};
 /** What a person typed: the CLI, MCP and batch queries. */
 export declare const parseMeetingQuery: (query: string) => QueryAst;
 /**

package/dist/meetings/hit-query.js

@@ -1,4 +1,5 @@
-import { defineQuery, parseLucene, queryError, validateQuery, } from "@wirecat/cli-base/query";
+import { CliError } from "@wirecat/cli-base";
+import { dateRange, defineQuery, parseLucene, queryError, timezoneOf, validateQuery, } from "@wirecat/cli-base/query";
 const context = {
     command: "search meetings",
     guide: "https://github.com/WireCatLabs/cli-core/blob/main/docs/search/query-language.md#встречи",
@@ -40,6 +41,89 @@ export const MEETING_HIT_QUERY = defineQuery({
         },
     ],
 });
+/** Fields that choose meetings rather than lines: lifted out of the query into the search's own filters. */
+const MEETING_FIELDS = defineQuery({
+    entity: "meeting_hit",
+    backend: "sql",
+    fields: [
+        ...MEETING_HIT_QUERY.fields,
+        {
+            name: "date",
+            type: "time",
+            operators: ["term", "range"],
+            example: "date>=30d",
+            relation: "meetings that started then; the same as --since-time and --until-time",
+        },
+        ...["project", "tag", "topic"].map((name) => ({
+            name,
+            type: "kw",
+            operators: words,
+            example: `${name}:"Example name"`,
+            relation: `meetings in this ${name}, by name or alias; the same as --${name}`,
+        })),
+    ],
+});
+const LIFTED = new Set(["date", "project", "tag", "topic"]);
+/**
+ * `budget project:RES date>=30d` → the words, and the meetings to look in as filters. A meeting field must be
+ * joined to the words with AND and given once, in the query or as an option. Text the language refuses is left as
+ * typed, for the caller's own error or for a search by meaning.
+ */
+export const liftMeetingFields = (query, request, now) => {
+    let ast;
+    try {
+        ast = validateQuery(parseLucene(query, { defaultField: "text", proximity: true, ...context }), MEETING_FIELDS, context);
+    }
+    catch (error) {
+        if (error instanceof CliError)
+            return { query, request };
+        throw error;
+    }
+    const top = ast.root.kind === "boolean" ? ast.root.clauses : [{ occur: "must", node: ast.root }];
+    const lifted = top.filter((clause) => clause.node.kind === "predicate" && LIFTED.has(clause.node.field));
+    const misplaced = (node, nested) => node.kind === "predicate"
+        ? nested && LIFTED.has(node.field)
+            ? node
+            : undefined
+        : node.clauses.map((clause) => misplaced(clause.node, true)).find(Boolean);
+    const wrong = lifted.find((clause) => clause.occur !== "must")?.node ??
+        top.map((clause) => (clause.node.kind === "boolean" ? misplaced(clause.node, true) : undefined)).find(Boolean);
+    if (wrong)
+        queryError("query.unsupported-field", wrong.span, `${wrong.field}: chooses meetings; join it to the words with AND, outside OR, NOT and groups`, context);
+    if (!lifted.length)
+        return { query, request };
+    const next = { ...request };
+    const once = (name, flag) => {
+        if (next[name] !== undefined)
+            throw new CliError("validation_error", `give ${flag.replace(/^--/, "")} once: as ${flag} or in the query`);
+    };
+    for (const { node } of lifted) {
+        if (node.field === "date") {
+            once("since", "--since-time");
+            once("until", "--until-time");
+            const range = dateRange(node.value, node.operator === "range" ? (node.upper ?? "*") : node.value, node.lower_inclusive !== false, node.upper_inclusive !== false, timezoneOf(), node.span, now);
+            if (range.lower !== undefined)
+                next.since = range.lower + (range.lower_inclusive ? 0 : 1);
+            if (range.upper !== undefined)
+                next.until = range.upper - (range.upper_inclusive ? 0 : 1);
+        }
+        else {
+            const field = node.field;
+            once(field, `--${field}`);
+            next[field] = node.value;
+        }
+    }
+    let rest = query;
+    for (const { node } of [...lifted].sort((a, b) => b.node.span.start - a.node.span.start))
+        rest = `${rest.slice(0, node.span.start)}${rest.slice(node.span.end)}`;
+    rest = rest
+        .replace(/^(?:\s*AND\b)+|(?:\bAND\s*)+$/g, "")
+        .replace(/\bAND(\s+AND\b)+/g, "AND")
+        .trim();
+    if (!rest)
+        throw new CliError("validation_error", "give words to find besides date:, project:, tag: and topic:");
+    return { query: rest, request: next };
+};
 /** What a person typed: the CLI, MCP and batch queries. */
 export const parseMeetingQuery = (query) => validateQuery(parseLucene(query, { defaultField: "text", proximity: true, ...context }), MEETING_HIT_QUERY, context);
 /**

package/dist/meetings/index.d.ts

@@ -6,7 +6,7 @@ export { linkEvent } from "./events.js";
 export { exportMeeting, type MeetingExport, type MeetingExportFormat, type MeetingExportOptions, serializeVtt, } from "./export.js";
 export { type FindingEvidence, type FindingOutcome, findingHash, MEETING_FINDINGS_KIND, type MeetingFactFinding, type MeetingFinding, type MeetingFindingsInput, type MeetingFindingsReceipt, type MeetingTaskFinding, meetingFindingFingerprint, validateMeetingFindings, } from "./findings.js";
 export { type Finding, type FindingsInput, type FindingsReceipt, type FindingsRules, findingFingerprint, validateFindings, } from "./findings-rules.js";
-export { MEETING_HIT_QUERY, meetingWordsQuery, parseMeetingQuery } from "./hit-query.js";
+export { liftMeetingFields, MEETING_HIT_QUERY, meetingWordsQuery, parseMeetingQuery } from "./hit-query.js";
 export { type ImportFile, importFiles } from "./import.js";
 export { MEETING_ISSUES, MEETING_QUERY, type MeetingIssue, type MeetingItem, type MeetingOwner, meeting, meetingIssuesOf, meetingItem, } from "./item.js";
 export { CHAT_MESSAGES_READ, type MeetingChatLine, type MeetingChatLinesInput, type MeetingChatLinesStore, } from "./links.js";

package/dist/meetings/index.js

@@ -4,7 +4,7 @@ export { linkEvent } from "./events.js";
 export { exportMeeting, serializeVtt, } from "./export.js";
 export { findingHash, MEETING_FINDINGS_KIND, meetingFindingFingerprint, validateMeetingFindings, } from "./findings.js";
 export { findingFingerprint, validateFindings, } from "./findings-rules.js";
-export { MEETING_HIT_QUERY, meetingWordsQuery, parseMeetingQuery } from "./hit-query.js";
+export { liftMeetingFields, MEETING_HIT_QUERY, meetingWordsQuery, parseMeetingQuery } from "./hit-query.js";
 export { importFiles } from "./import.js";
 export { MEETING_ISSUES, MEETING_QUERY, meeting, meetingIssuesOf, meetingItem, } from "./item.js";
 export { CHAT_MESSAGES_READ, } from "./links.js";

package/dist/meetings/mcp/index.d.ts

@@ -38,7 +38,6 @@ export declare const meetingTools: ({
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -54,11 +53,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -76,11 +75,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -102,6 +101,7 @@ export declare const meetingTools: ({
                 minimum: number;
             };
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
@@ -188,7 +188,6 @@ export declare const meetingTools: ({
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -204,11 +203,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -226,11 +225,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -252,6 +251,7 @@ export declare const meetingTools: ({
                 minimum: number;
             };
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
@@ -338,7 +338,6 @@ export declare const meetingTools: ({
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -354,11 +353,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -376,11 +375,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -402,6 +401,7 @@ export declare const meetingTools: ({
                 minimum: number;
             };
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
@@ -488,7 +488,6 @@ export declare const meetingTools: ({
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -504,11 +503,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -526,11 +525,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -552,6 +551,7 @@ export declare const meetingTools: ({
                 minimum: number;
             };
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
@@ -638,7 +638,6 @@ export declare const meetingTools: ({
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -654,11 +653,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -676,11 +675,11 @@ export declare const meetingTools: ({
             format?: undefined;
             transcript_id?: undefined;
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;
         } | {
-            limit?: undefined;
             event_id?: undefined;
             series_id?: undefined;
             page?: undefined;
@@ -702,6 +701,7 @@ export declare const meetingTools: ({
                 minimum: number;
             };
             query?: undefined;
+            limit?: undefined;
             scan_limit?: undefined;
             max_read_bytes?: undefined;
             cursor?: undefined;

package/dist/services/index.d.ts

@@ -69,6 +69,7 @@ export { type MeetingLink, type MeetingLinksRequest, readMeetingLinks } from "./
 export { createMeetingProjectCandidateReader } from "./meeting-project-candidates.js";
 export { readMeetingProjectDiscovery } from "./meeting-project-discovery.js";
 export { type MeetingReviewRequest, readMeetingReview } from "./meeting-review.js";
+export { type MeetingSearchesService, type MeetingSearchParams, meetingSearchesService, type SavedMeetingSearch, } from "./meeting-searches.js";
 export { type MeetingStatsRequest, readMeetingStats } from "./meeting-stats.js";
 export { chatIdIn, storedChatId } from "./message-resolution.js";
 export type { AroundWindow, FoundMessage, ListWindow, MessagesService, MessageTarget, Pinned, Reacted, SearchFound, SearchQuery, SendRequest, Starred, } from "./messages.js";
@@ -88,8 +89,8 @@ export type { RankedRow, RankingFound, RankingQuery, RankingsService } from "./r
 export { rankingsService } from "./rankings.js";
 export type { SearchParams } from "./search-record.js";
 export { searchRecordOf } from "./search-record.js";
-export type { ResolvedSearch, SearchesService } from "./searches.js";
-export { searchesService } from "./searches.js";
+export type { ResolvedSearch, SavedSearchItem, SearchesService } from "./searches.js";
+export { savedSearchItem, searchesService } from "./searches.js";
 export type { TagsAdded, TagsRemoved, TagsService, TagTargetInput, TagTargetView } from "./tags.js";
 export { tagsService } from "./tags.js";
 export type { ClosedTask, TaskCard, TaskItem, TaskList, TaskListRequest, TasksService, TaskView, } from "./tasks.js";

package/dist/services/index.js

@@ -50,6 +50,7 @@ export { readMeetingLinks } from "./meeting-links.js";
 export { createMeetingProjectCandidateReader } from "./meeting-project-candidates.js";
 export { readMeetingProjectDiscovery } from "./meeting-project-discovery.js";
 export { readMeetingReview } from "./meeting-review.js";
+export { meetingSearchesService, } from "./meeting-searches.js";
 export { readMeetingStats } from "./meeting-stats.js";
 export { chatIdIn, storedChatId } from "./message-resolution.js";
 export { DELETE_AT_ONCE, messagesService } from "./messages.js";
@@ -61,7 +62,7 @@ export { PREPARE_BYTES, personPreparation } from "./person-preparation.js";
 export { personTimeline, SCOPES, TIMELINE_ITEMS, TIMELINE_MAX } from "./person-timeline.js";
 export { rankingsService } from "./rankings.js";
 export { searchRecordOf } from "./search-record.js";
-export { searchesService } from "./searches.js";
+export { savedSearchItem, searchesService } from "./searches.js";
 export { tagsService } from "./tags.js";
 export { closedStateOf, taskStateOf, tasksService, taskTypeOf, taskView } from "./tasks.js";
 export { topicsService } from "./topics.js";

package/dist/services/meeting-combined.d.ts

@@ -38,7 +38,7 @@ export interface MeetingCombinedHit {
  */
 export declare const searchMeetingsCombined: (store: Pick<MessageStore, "meetings" | "meetingVectors"> & {
     knowledge?: MessageStore["knowledge"];
-}, embedder: MeetingEmbedder, query: string, request: MeetingCombinedRequest) => Promise<{
+}, embedder: MeetingEmbedder, typed: string, request: MeetingCombinedRequest) => Promise<{
     items: {
         /** A transcript line to cite: the best word hit in the passage, else the passage's first line. */
         ref: string;

package/dist/services/meeting-combined.js

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { CliError } from "@wirecat/cli-base";
 import { meaningFloor } from "../embeddings/models.js";
-import { formatMeetingReference, parseMeetingReference, } from "../meetings/index.js";
+import { formatMeetingReference, liftMeetingFields, parseMeetingReference, } from "../meetings/index.js";
 import { questionTerms } from "../search/question-plan.js";
 import { refreshMeetingIndex, resolveMeetingSelection } from "./meeting-hit-search.js";
 import { validateVector } from "./meeting-semantic.js";
@@ -27,8 +27,9 @@ const cursorOf = (value, key) => {
  * («что решили по цене?») searches its content words; other text is the meeting query language. A word hit inside
  * a passage the meaning search found joins it, so one discussion found both ways ranks first.
  */
-export const searchMeetingsCombined = async (store, embedder, query, request) => {
-    const { maxChunks, maxRows, maxTextBytes, ...words } = request;
+export const searchMeetingsCombined = async (store, embedder, typed, request) => {
+    const { maxChunks, maxRows, maxTextBytes, ...chosen } = request;
+    const { query, request: words } = liftMeetingFields(typed, chosen);
     const { input, selection } = await resolveMeetingSelection(store, words);
     const { after, limit = 20, maxReadBytes, ...filters } = input;
     const terms = questionTerms(query);

package/dist/services/meeting-hit-search.d.ts

@@ -1,4 +1,4 @@
-import type { MeetingHitSearchRequest } from "../meetings/index.js";
+import { type MeetingHitSearchRequest } from "../meetings/index.js";
 import type { VocabularyKind } from "../store/index.js";
 import type { MessageStore } from "../store/store.js";
 export type { MeetingHitSearchRequest } from "../meetings/index.js";

package/dist/services/meeting-hit-search.js

@@ -1,4 +1,5 @@
 import { CliError } from "@wirecat/cli-base";
+import { liftMeetingFields } from "../meetings/index.js";
 /** Each batch commits on its own, so a search cut short by its deadline keeps the progress it made. */
 export const refreshMeetingIndex = async (meetings, accountId, signal) => {
     let before = Number.POSITIVE_INFINITY;
@@ -54,10 +55,11 @@ export const resolveMeetingSelection = async (store, request) => {
     return { input, selection };
 };
 export const searchMeetingHits = async (store, query, request, options = {}) => {
-    const { input, selection } = await resolveMeetingSelection(store, request);
+    const lifted = liftMeetingFields(query, request);
+    const { input, selection } = await resolveMeetingSelection(store, lifted.request);
     if (options.refreshIndex !== false)
         await refreshMeetingIndex(store.meetings, input.accountId, input.signal);
-    const result = await store.meetings.searchHits(query, input);
+    const result = await store.meetings.searchHits(lifted.query, input);
     input.signal?.throwIfAborted();
     return { ...result, selection };
 };

package/dist/services/meeting-searches.d.ts

@@ -0,0 +1,25 @@
+import type { SearchesStore, StoredSearch } from "../store/store.js";
+/** A meeting search as `search meetings` takes it: the query and the options typed with it, already checked. */
+export interface MeetingSearchParams {
+    query: string;
+    options: Readonly<Record<string, string | number | boolean>>;
+}
+export interface SavedMeetingSearch extends MeetingSearchParams {
+    id: string;
+    name: string | null;
+}
+export interface MeetingSearchesService {
+    create(name: string, params: MeetingSearchParams, options?: {
+        replace?: boolean;
+    }): Promise<StoredSearch>;
+    list(): Promise<StoredSearch[]>;
+    show(reference: string): Promise<StoredSearch>;
+    delete(reference: string): Promise<StoredSearch>;
+    /** `--saved`: the stored query and options, counted as one more run. */
+    run(reference: string): Promise<SavedMeetingSearch>;
+}
+/**
+ * Saved meeting searches, in the table every CLI on the store shares: only rows of their own kind are listed, and a
+ * saved message search is refused by name rather than run as a meeting one.
+ */
+export declare const meetingSearchesService: (searches: () => Promise<SearchesStore>) => MeetingSearchesService;

package/dist/services/meeting-searches.js

@@ -0,0 +1,35 @@
+import { CliError, singleLine } from "@wirecat/cli-base";
+import { searchRecordOf } from "./search-record.js";
+import { nameOf } from "./searches.js";
+const KIND = ["meetings-search"];
+/**
+ * Saved meeting searches, in the table every CLI on the store shares: only rows of their own kind are listed, and a
+ * saved message search is refused by name rather than run as a meeting one.
+ */
+export const meetingSearchesService = (searches) => {
+    const found = async (reference) => {
+        const search = await (await searches()).storedSearch(reference.trim().toLowerCase());
+        if (!search)
+            throw new CliError("not_found", `no saved search "${singleLine(reference)}"`);
+        if (search.command !== "meetings-search")
+            throw new CliError("validation_error", `"${singleLine(reference)}" is a saved search of messages, not meetings`, {
+                reason: "search.kind",
+                command: search.command,
+            });
+        return search;
+    };
+    const record = ({ query, options }) => searchRecordOf("meetings-search", { ...options, text: query });
+    return {
+        create: async (name, params, { replace = false } = {}) => (await searches()).saveSearch(nameOf(name), record(params), { replace }),
+        list: async () => (await searches()).savedSearches(KIND),
+        show: found,
+        delete: async (reference) => (await searches()).deleteSearch((await found(reference)).id),
+        run: async (reference) => {
+            const search = await found(reference);
+            const { text, ...options } = search.params;
+            const query = { query: String(text ?? ""), options };
+            await (await searches()).recordSearch(record(query), { saved: search.id });
+            return { id: search.id, name: search.name, ...query };
+        },
+    };
+};

package/dist/services/search-record.d.ts

@@ -21,4 +21,4 @@ export interface SearchParams extends RankingInput {
     by?: StatsGrouping;
 }
 /** One run or one saved search as the store keeps it; the same parameters always give the same text. */
-export declare const searchRecordOf: (command: SearchCommand, params: SearchParams) => SearchRecord;
+export declare const searchRecordOf: (command: SearchCommand, params: SearchParams | Readonly<Record<string, unknown>>) => SearchRecord;

package/dist/services/searches.d.ts

@@ -33,4 +33,5 @@ export interface SearchesService {
      */
     resolve(reference: string, typed: SearchParams): Promise<ResolvedSearch>;
 }
+export declare const nameOf: (value: string) => string;
 export declare const searchesService: (deps: ServiceDeps) => SearchesService;

package/dist/services/searches.js

@@ -17,8 +17,16 @@ export const savedSearchItem = (one) => ({
     last_run_at: one.lastRunAt,
     runs: one.runs,
 });
+/** What the messenger commands run; the table is shared, and another CLI's rows are not theirs to list or run. */
+const MESSAGE_SEARCH_COMMANDS = [
+    "search",
+    "stats",
+    "message-top",
+    "author-top",
+    "admin-statistics",
+];
 const NAME = /^[a-z0-9][a-z0-9-]{0,63}$/;
-const nameOf = (value) => {
+export const nameOf = (value) => {
     const name = value.trim().toLowerCase();
     if (!NAME.test(name) || /^\d+$/.test(name))
         throw new CliError("validation_error", `"${singleLine(value)}" cannot name a saved search — use up to 64 letters a–z, digits and hyphens, not only digits`, { reason: "name.invalid" });
@@ -63,6 +71,11 @@ export const searchesService = (deps) => {
         const search = await store.searches.storedSearch(reference.trim().toLowerCase());
         if (!search)
             throw new CliError("not_found", `no saved search or run "${singleLine(reference)}"`);
+        if (!MESSAGE_SEARCH_COMMANDS.includes(search.command))
+            throw new CliError("validation_error", `"${singleLine(reference)}" is a saved meeting search, not one of messages`, {
+                reason: "search.kind",
+                command: search.command,
+            });
         return search;
     };
     return {
@@ -87,13 +100,13 @@ export const searchesService = (deps) => {
             });
         }),
         show: (reference) => inStore((store) => found(store, reference)),
-        list: () => inStore((store) => store.searches.savedSearches()),
+        list: () => inStore((store) => store.searches.savedSearches(MESSAGE_SEARCH_COMMANDS)),
         history: (limit, offset = 0) => inStore(async (store) => {
-            const rows = await store.searches.searchHistory(limit, offset);
+            const rows = await store.searches.searchHistory(limit, offset, MESSAGE_SEARCH_COMMANDS);
             return { items: rows.slice(0, limit), has_more: rows.length > limit };
         }),
         delete: (reference) => inStore(async (store) => store.searches.deleteSearch((await found(store, reference)).id)),
-        clear: () => inStore(async (store) => ({ cleared: await store.searches.clearSearchHistory() })),
+        clear: () => inStore(async (store) => ({ cleared: await store.searches.clearSearchHistory(MESSAGE_SEARCH_COMMANDS) })),
         resolve: (reference, { text: words, ...typed }) => inStore(async (store) => {
             const search = await found(store, reference);
             const stored = search.params;

package/dist/store/searches.d.ts

@@ -1,5 +1,5 @@
 import type { StoreContext } from "./sqlite/open.js";
-import type { SearchRecord, StoredSearch } from "./sqlite/searches.js";
+import type { SearchCommand, SearchRecord, StoredSearch } from "./sqlite/searches.js";
 export interface SearchesStore {
     /** One run of a search or stats; the same unnamed run again counts on its row. `saved` is the saved search it ran. */
     recordSearch(run: SearchRecord, options?: {
@@ -11,11 +11,12 @@ export interface SearchesStore {
     }): Promise<StoredSearch>;
     /** A saved search by name, or any row by id. */
     storedSearch(reference: string): Promise<StoredSearch | undefined>;
-    savedSearches(): Promise<StoredSearch[]>;
+    /** `commands`: only rows of these kinds; the table is shared by every CLI on the store. */
+    savedSearches(commands?: readonly SearchCommand[]): Promise<StoredSearch[]>;
     /** Runs, newest first, one more than `limit` when there are more. */
-    searchHistory(limit: number, offset?: number): Promise<StoredSearch[]>;
+    searchHistory(limit: number, offset?: number, commands?: readonly SearchCommand[]): Promise<StoredSearch[]>;
     deleteSearch(reference: string): Promise<StoredSearch>;
     /** Drops the unnamed runs; answers how many. */
-    clearSearchHistory(): Promise<number>;
+    clearSearchHistory(commands?: readonly SearchCommand[]): Promise<number>;
 }
 export declare const searchesStoreOver: (context: StoreContext) => SearchesStore;

package/dist/store/searches.js

@@ -8,15 +8,15 @@ export const searchesStoreOver = (context) => {
             return write(database, () => searchRecords.saveSearch(context, name, search, replace));
         },
         storedSearch: async (reference) => searchRecords.findSearch(context, reference),
-        savedSearches: async () => searchRecords.savedSearches(context),
-        searchHistory: async (limit, offset) => searchRecords.searchHistory(context, limit, offset),
+        savedSearches: async (commands) => searchRecords.savedSearches(context, commands),
+        searchHistory: async (limit, offset, commands) => searchRecords.searchHistory(context, limit, offset, commands),
         deleteSearch: async (reference) => {
             return write(database, () => searchRecords.deleteSearch(context, reference));
         },
-        clearSearchHistory: async () => {
+        clearSearchHistory: async (commands) => {
             let cleared = 0;
             write(database, () => {
-                cleared = searchRecords.clearHistory(context);
+                cleared = searchRecords.clearHistory(context, commands);
             });
             return cleared;
         },

package/dist/store/sqlite/searches.d.ts

@@ -1,7 +1,7 @@
 import type { StoreContext } from "./open.js";
 /** Unnamed runs kept, newest first; a saved search is never pruned. */
 export declare const HISTORY_KEPT = 1000;
-export type SearchCommand = "search" | "stats" | "message-top" | "author-top" | "admin-statistics";
+export type SearchCommand = "search" | "stats" | "message-top" | "author-top" | "admin-statistics" | "meetings-search";
 /** What one run or one saved search is: `params` as canonical JSON, so the same run is the same text. */
 export interface SearchRecord {
     command: SearchCommand;
@@ -26,9 +26,9 @@ export declare const recordRun: ({ database, now }: StoreContext, run: SearchRec
 export declare const findSearch: ({ database }: StoreContext, reference: string) => StoredSearch | undefined;
 /** A name already taken is refused unless `replace`, which starts it afresh: new parameters, no runs. */
 export declare const saveSearch: (context: StoreContext, name: string, search: SearchRecord, replace: boolean) => StoredSearch;
-export declare const savedSearches: ({ database }: StoreContext) => StoredSearch[];
+export declare const savedSearches: ({ database }: StoreContext, commands?: readonly SearchCommand[]) => StoredSearch[];
 /** Runs, newest first: unnamed ones and saved searches that have run. One more than `limit` says there are more. */
-export declare const searchHistory: ({ database }: StoreContext, limit: number, offset?: number) => StoredSearch[];
+export declare const searchHistory: ({ database }: StoreContext, limit: number, offset?: number, commands?: readonly SearchCommand[]) => StoredSearch[];
 export declare const deleteSearch: (context: StoreContext, reference: string) => StoredSearch;
 /** Unnamed runs only; saved searches stay. */
-export declare const clearHistory: ({ database }: StoreContext) => number;
+export declare const clearHistory: ({ database }: StoreContext, commands?: readonly SearchCommand[]) => number;