@wirecat/cli-core 0.350.0 → 0.352.0

package/CHANGELOG.md

@@ -7,6 +7,38 @@ shape of this file.
 
 ## Unreleased
 
+## 0.352.0 — 19.10.2026
+
+### Changed — may break callers
+
+- **A saved chat keeps its membership when the update leaves it out**: `saveChats`, `Delta.chats` and
+  `HistoryBatch.chats` no longer take a "left" mark off a chat that comes without `membershipState`. So a late
+  community notice for a group the owner left no longer marks it rejoined. A value sets the membership; `null`
+  (newly allowed on `ChatUpdate`) clears it. A page of the adapter's `chats`, complete or not, still rejoins the
+  chats it names, through `markChatsLeft` (now also takes the mark off the chats its complete list names) or the new
+  `rejoinChats`; other states such as "archived" are kept. A client that saves its own chat list must call
+  `rejoinChats(key, ids)` for a list that is not complete, or a chat the owner rejoined stays hidden from stored
+  reads until the next complete one. **max-cli must do this in the bump that takes this version**: in
+  `rememberChats` (`src/record.ts`), `else await db.chats.rejoinChats(key, ids)`; without it a chat rejoined while
+  the session list is cut stays "left", is hidden from `max chats list`, and `archive clear --left` deletes it.
+  A caller that learns of a rejoin any other way sends `membershipState: null`.
+
+### Added
+
+- **`ChatsStore.rejoinChats(key, ids)`** takes the "left" mark off the chats a messenger's chat list names, from any
+  page of it, and says how many.
+
+## 0.351.0 — 19.10.2026
+
+### Added
+
+- **`findEvidenceMentions(vocabulary, result, { exclude })`** names the existing projects, tags and topics whose
+  name, key or alias appears in a `gatherProjectEvidence` result's excerpts and their neighbours, each match cited
+  and marked when the term belongs to more than one entry; a vocabulary over its budget is skipped, not fatal. The
+  project matcher behind `createMeetingProjectCandidateReader` is the same code (`matchVocabularyTerms`).
+- **`storedNeighbours(store)`**: the neighbours port for chat messages and mail; a mail hit carries the emails
+  before and after it in its thread. `storedMessageNeighbours` returns nothing for a mail reference.
+
 ## 0.350.0 — 19.10.2026
 
 ### Added

package/dist/cli/messenger/stored.js

@@ -186,8 +186,11 @@ export const stored = (messenger, { account, store, warn, events, pending, annou
                     const complete = window.offset === 0 && !page.hasMore && page.items.length > 0;
                     await save("chats.list", async (opened) => {
                         await opened.chats.saveChats(account, page.items);
+                        const ids = page.items.map((chat) => chat.id);
                         if (complete)
-                            await opened.chats.markChatsLeft(account, page.items.map((chat) => chat.id));
+                            await opened.chats.markChatsLeft(account, ids);
+                        else
+                            await opened.chats.rejoinChats(account, ids);
                     });
                     return page;
                 },

package/dist/domain/models.d.ts

@@ -47,11 +47,13 @@ export interface Chat {
     providerMetadata?: ProviderMetadata;
 }
 /**
- * A chat as an adapter saves it. A `title`, `unreadCount`, `lastMessageAt` or `participantsCount` left out keeps the
- * stored value; `null` stores none. So a push that knows only some of them, such as a notice that a group left its
- * community, leaves the rest out.
+ * A chat as an adapter saves it. A `title`, `unreadCount`, `lastMessageAt`, `participantsCount` or `membershipState`
+ * left out keeps the stored value; `null` stores none. So a push that knows only some of them, such as a notice that
+ * a group left its community, leaves the rest out.
  */
-export type ChatUpdate = Omit<Chat, KeptFields> & Partial<Pick<Chat, KeptFields>>;
+export type ChatUpdate = Omit<Chat, KeptFields | "membershipState"> & Partial<Pick<Chat, KeptFields>> & {
+    membershipState?: MembershipState | null;
+};
 type KeptFields = "title" | "unreadCount" | "lastMessageAt" | "participantsCount";
 /** A group's switches; `null` where the messenger does not say, or has no such switch. */
 export interface GroupSettings {

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

@@ -5,7 +5,9 @@ export { type DownloadedModel, downloadImageModel, downloadTextModel, type Model
 export type { ProjectEvidenceItem, ProjectGathering, ProjectGatheringPorts, ProjectGatheringStop, ProjectIndexCatchUp, ProjectSourceFetcher, } from "./project-gathering.js";
 export { gatherProjectEvidence } from "./project-gathering.js";
 export type { ProjectNeighbour, ProjectNeighbourReader } from "./project-gathering-around.js";
-export { storedMessageNeighbours } from "./project-gathering-around.js";
+export { storedMessageNeighbours, storedNeighbours } from "./project-gathering-around.js";
+export type { EvidenceMention, EvidenceMentions } from "./project-gathering-mentions.js";
+export { findEvidenceMentions } from "./project-gathering-mentions.js";
 export type { ProjectFetchState, ProjectGatheringBudgets, ProjectGatheringRequest, ProjectLane, ProjectLaneKind, ProjectUnitState, } from "./project-gathering-request.js";
 import { type AccountService } from "./account.js";
 import { type AdminService } from "./admin.js";

package/dist/services/index.js

@@ -2,7 +2,8 @@ import { botCheckService } from "../botcheck/service.js";
 export { createContextEvidenceReader } from "./context-evidence.js";
 export { downloadImageModel, downloadTextModel, } from "./model-downloads.js";
 export { gatherProjectEvidence } from "./project-gathering.js";
-export { storedMessageNeighbours } from "./project-gathering-around.js";
+export { storedMessageNeighbours, storedNeighbours } from "./project-gathering-around.js";
+export { findEvidenceMentions } from "./project-gathering-mentions.js";
 import { accountService } from "./account.js";
 import { adminService } from "./admin.js";
 import { adminStatisticsService } from "./admin-statistics.js";

package/dist/services/meeting-project-candidate-matching.d.ts

@@ -1,5 +1,24 @@
 import type { MeetingProjectCandidateInput } from "../meetings/index.js";
 import type { VocabularyCatalog } from "../store/index.js";
+type Entry = VocabularyCatalog["entries"][number];
+export type VocabularyTerm = {
+    name: string;
+    kind: "canonical" | "key" | "alias";
+    aliasId?: string;
+};
+/** Every entry whose name, key or alias stands as whole words in a text, at most 20 matches an entry. */
+export declare const matchVocabularyTerms: <S>(catalog: VocabularyCatalog, texts: readonly {
+    text: string;
+    source: S;
+}[]) => {
+    entry: Entry;
+    matches: {
+        term: VocabularyTerm;
+        source: S;
+        ambiguous: boolean;
+    }[];
+    omitted: number;
+}[];
 export declare const matchProjectCandidates: (catalog: VocabularyCatalog, input: MeetingProjectCandidateInput) => {
     project: {
         reference: string;
@@ -10,3 +29,4 @@ export declare const matchProjectCandidates: (catalog: VocabularyCatalog, input:
     matches: import("../meetings/project-candidates.js").MeetingProjectCandidateMatch[];
     omittedMatches: number;
 }[];
+export {};

package/dist/services/meeting-project-candidate-matching.js

@@ -5,7 +5,8 @@ const termsOf = (entry) => [
     ...(entry.key ? [{ name: entry.key, kind: "key" }] : []),
     ...entry.aliases.map((alias) => ({ name: alias.name, kind: "alias", aliasId: alias.id })),
 ];
-export const matchProjectCandidates = (catalog, input) => {
+/** Every entry whose name, key or alias stands as whole words in a text, at most 20 matches an entry. */
+export const matchVocabularyTerms = (catalog, texts) => {
     const owners = new Map();
     for (const entry of catalog.entries)
         for (const term of termsOf(entry)) {
@@ -14,29 +15,11 @@ export const matchProjectCandidates = (catalog, input) => {
             ids.add(entry.id);
             owners.set(key, ids);
         }
-    const sources = [
-        ...(input.title === undefined
-            ? []
-            : [
-                {
-                    text: normalizedText(input.title),
-                    source: { kind: "metadata-title", reference: input.reference, fingerprint: null, revision: null },
-                },
-            ]),
-        ...(input.cues ?? []).map((cue) => ({
-            text: normalizedText(cue.text),
-            source: {
-                kind: "transcript",
-                reference: cue.reference,
-                fingerprint: cue.fingerprint,
-                revision: cue.revision,
-            },
-        })),
-    ];
+    const sources = texts.map(({ text, source }) => ({ text: normalizedText(text), source }));
     const result = [];
     for (const entry of catalog.entries) {
         const matches = [];
-        let omittedMatches = 0;
+        let omitted = 0;
         const seen = new Set();
         for (const term of termsOf(entry)) {
             const normalized = normalizeVocabularyName(term.name);
@@ -48,18 +31,37 @@ export const matchProjectCandidates = (catalog, input) => {
                 if (!pattern.test(text))
                     continue;
                 if (matches.length === 20) {
-                    omittedMatches++;
+                    omitted++;
                     continue;
                 }
                 matches.push({ term, source, ambiguous: (owners.get(normalized)?.size ?? 0) > 1 });
             }
         }
         if (matches.length)
-            result.push({
-                project: { reference: `project:${entry.id}`, id: entry.id, name: entry.name, key: entry.key },
-                matches,
-                omittedMatches,
-            });
+            result.push({ entry, matches, omitted });
     }
-    return result.sort((a, b) => Number(a.project.id) - Number(b.project.id));
+    return result.sort((a, b) => Number(a.entry.id) - Number(b.entry.id));
 };
+export const matchProjectCandidates = (catalog, input) => matchVocabularyTerms(catalog, [
+    ...(input.title === undefined
+        ? []
+        : [
+            {
+                text: input.title,
+                source: { kind: "metadata-title", reference: input.reference, fingerprint: null, revision: null },
+            },
+        ]),
+    ...(input.cues ?? []).map((cue) => ({
+        text: cue.text,
+        source: {
+            kind: "transcript",
+            reference: cue.reference,
+            fingerprint: cue.fingerprint,
+            revision: cue.revision,
+        },
+    })),
+]).map(({ entry, matches, omitted }) => ({
+    project: { reference: `project:${entry.id}`, id: entry.id, name: entry.name, key: entry.key },
+    matches: matches.map(({ term, source, ambiguous }) => ({ term, source, ambiguous })),
+    omittedMatches: omitted,
+}));

package/dist/services/project-gathering-around.d.ts

@@ -1,3 +1,4 @@
+import type { MessageStore } from "../store/index.js";
 import type { MessagesStore } from "../store/messages.js";
 export interface ProjectNeighbour {
     ref: string;
@@ -6,7 +7,7 @@ export interface ProjectNeighbour {
     text: string;
     found: boolean;
 }
-/** The stored messages next to a hit in its chat, oldest first, without the hit itself. */
+/** The stored messages or emails next to a hit, oldest first, without the hit itself. */
 export interface ProjectNeighbourReader {
     around(ref: string, window: {
         before: number;
@@ -35,3 +36,5 @@ export declare const attachNeighbours: (items: {
     remaining: () => number;
     charge: (bytes: number) => void;
 }, known: (ref: string) => boolean, signal?: AbortSignal) => Promise<void>;
+/** Chat messages next to a hit in its chat, and the emails before and after a mail hit in its thread. */
+export declare const storedNeighbours: (store: Pick<MessageStore, "messages" | "mail" | "accounts">) => ProjectNeighbourReader;

package/dist/services/project-gathering-around.js

@@ -4,6 +4,8 @@ import { excerpt } from "./excerpt.js";
 export const storedMessageNeighbours = (messages) => ({
     async around(ref, window) {
         const at = parseLocator(ref);
+        if (at.provider === "email")
+            return [];
         const rows = await messages.around({ provider: at.provider, account: at.account }, at.chat, at.message, window);
         return rows
             .filter((row) => !row.anchor)
@@ -23,7 +25,7 @@ export const attachNeighbours = async (items, reader, window, budget, known, sig
     if (!reader || window.before + window.after === 0)
         return;
     for (const item of items) {
-        if (item.kind !== "message")
+        if (item.kind !== "message" && item.kind !== "mail")
             continue;
         if (budget.remaining() <= 0) {
             item.around = null;
@@ -55,3 +57,32 @@ export const attachNeighbours = async (items, reader, window, budget, known, sig
         }
     }
 };
+/** Chat messages next to a hit in its chat, and the emails before and after a mail hit in its thread. */
+export const storedNeighbours = (store) => {
+    const messages = storedMessageNeighbours(store.messages);
+    return {
+        async around(ref, window) {
+            const at = parseLocator(ref);
+            if (at.provider !== "email")
+                return messages.around(ref, window);
+            const account = await store.accounts.storedAccount({ provider: at.provider, account: at.account });
+            const email = await store.mail.email(account.id, at.message);
+            if (!email)
+                throw new CliError("not_found", "the hit's email is no longer stored");
+            const thread = await store.mail.thread(email.emailThreadId);
+            const emails = thread?.emails ?? [];
+            const index = emails.findIndex((one) => one.id === email.id);
+            if (index < 0)
+                return [];
+            return [
+                ...emails.slice(Math.max(0, index - window.before), index),
+                ...emails.slice(index + 1, index + 1 + window.after),
+            ].map((one) => ({
+                ref: formatLocator({ ...at, message: one.externalId }),
+                at: one.sentAt ?? one.receivedAt ?? 0,
+                sender: one.fromName ?? one.fromAddress,
+                text: [one.subject, one.bodyText ?? one.snippet].filter(Boolean).join(" — "),
+            }));
+        },
+    };
+};

package/dist/services/project-gathering-mentions.d.ts

@@ -0,0 +1,44 @@
+import type { VocabularyKind, VocabularyStore } from "../store/index.js";
+import { type VocabularyTerm } from "./meeting-project-candidate-matching.js";
+import type { ProjectGathering } from "./project-gathering.js";
+export interface EvidenceMention {
+    target: {
+        kind: VocabularyKind;
+        id: string;
+        reference: string;
+        name: string;
+        key: string | null;
+    };
+    matches: {
+        term: VocabularyTerm;
+        ambiguous: boolean;
+        reference: string;
+        in: "hit" | "around";
+    }[];
+    omittedMatches: number;
+}
+export interface EvidenceMentions {
+    kind: "evidence_mentions";
+    association: "unconfirmed-literal-evidence";
+    items: EvidenceMention[];
+    vocabularyFingerprints: Partial<Record<VocabularyKind, string>>;
+    coverage: {
+        texts: "returned-excerpts";
+        matching: "unicode-normalized-literal-word-boundaries";
+        hasMore: boolean;
+        skipped: {
+            kind: VocabularyKind;
+            code: string;
+            reason: string | null;
+        }[];
+    };
+}
+/**
+ * Which existing projects, tags and topics the returned excerpts and their neighbours name. A name is evidence to
+ * review, never membership; the gathered project itself is left out.
+ */
+export declare const findEvidenceMentions: (vocabulary: Pick<VocabularyStore, "vocabulary">, gathering: Pick<ProjectGathering, "items">, options?: {
+    exclude?: string | null;
+    limit?: number;
+    signal?: AbortSignal;
+}) => Promise<EvidenceMentions>;

package/dist/services/project-gathering-mentions.js

@@ -0,0 +1,60 @@
+import { CliError } from "@wirecat/cli-base";
+import { matchVocabularyTerms } from "./meeting-project-candidate-matching.js";
+const KINDS = ["project", "tag", "topic"];
+/**
+ * Which existing projects, tags and topics the returned excerpts and their neighbours name. A name is evidence to
+ * review, never membership; the gathered project itself is left out.
+ */
+export const findEvidenceMentions = async (vocabulary, gathering, options = {}) => {
+    if (typeof vocabulary?.vocabulary !== "function")
+        throw new CliError("configuration_error", "evidence mentions need the store's vocabulary");
+    const limit = options.limit ?? 50;
+    if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200)
+        throw new CliError("validation_error", "limit must be a whole number from 1 to 200", { param: "limit" });
+    const texts = gathering.items.flatMap((item) => [
+        { text: `${item.title ?? ""} ${item.text}`, source: { reference: item.ref, in: "hit" } },
+        ...(item.around ?? []).map((one) => ({ text: one.text, source: { reference: one.ref, in: "around" } })),
+    ]);
+    const items = [];
+    const vocabularyFingerprints = {};
+    const skipped = [];
+    for (const kind of KINDS) {
+        options.signal?.throwIfAborted();
+        let catalog;
+        try {
+            catalog = await vocabulary.vocabulary({ kind, signal: options.signal });
+        }
+        catch (error) {
+            options.signal?.throwIfAborted();
+            if (!(error instanceof CliError))
+                throw error;
+            const reason = error.details?.reason;
+            skipped.push({ kind, code: error.code, reason: typeof reason === "string" ? reason : null });
+            continue;
+        }
+        vocabularyFingerprints[kind] = catalog.fingerprint;
+        for (const { entry, matches, omitted } of matchVocabularyTerms(catalog, texts)) {
+            const reference = `${kind}:${entry.id}`;
+            if (reference === options.exclude)
+                continue;
+            items.push({
+                target: { kind, id: entry.id, reference, name: entry.name, key: entry.key },
+                matches: matches.map(({ term, source, ambiguous }) => ({ term, ambiguous, ...source })),
+                omittedMatches: omitted,
+            });
+        }
+    }
+    items.sort((a, b) => b.matches.length - a.matches.length);
+    return {
+        kind: "evidence_mentions",
+        association: "unconfirmed-literal-evidence",
+        items: items.slice(0, limit),
+        vocabularyFingerprints,
+        coverage: {
+            texts: "returned-excerpts",
+            matching: "unicode-normalized-literal-word-boundaries",
+            hasMore: items.length > limit,
+            skipped,
+        },
+    };
+};

package/dist/store/chats.d.ts

@@ -17,11 +17,16 @@ export interface ChatsStore {
     /** The chats a person is in, newest first — as far as the saved member lists go. */
     chatsWith(key: AccountKey, memberId: Id): Promise<Chat[]>;
     /**
-     * Given every chat the account is in, marks the rest `left` and says how many it marked. Only
-     * ever from a complete list: a page or a cut list says nothing about the chats it leaves out.
+     * Given every chat the account is in, marks the rest `left`, takes the mark off those it names, and says how many
+     * it marked. Only ever from a complete list: a page or a cut list says nothing about the chats it leaves out.
      * Remembers when, so a search can say the store knows the account's whole chat list.
      */
     markChatsLeft(key: AccountKey, present: Id[]): Promise<number>;
+    /**
+     * Takes the `left` mark off the chats a messenger's own chat list names, from any page of it: the list holds only
+     * chats the account is in. Other states are kept. Says how many it took the mark off.
+     */
+    rejoinChats(key: AccountKey, present: Id[]): Promise<number>;
     /**
      * The chat the messenger now names `to` instead of `from`: renamed, or merged into the chat already stored as
      * `to`. Replaying it changes nothing.

package/dist/store/chats.js

@@ -39,6 +39,10 @@ export const chatsStoreOver = (context) => {
             });
             return marked;
         },
+        rejoinChats: async (key, present) => {
+            const accountKey = findAccountPk(key);
+            return accountKey === undefined ? 0 : write(database, () => chatQueries.rejoin(context, accountKey, present));
+        },
         rekeyChat: async (key, from, to) => {
             const accountKey = findAccountPk(key);
             if (accountKey === undefined)

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

@@ -11,8 +11,13 @@ export declare const upsertChat: (context: StoreContext, accountKey: number, cha
 /** Replaces who is in the chat, whole. */
 export declare const writeMembers: (context: StoreContext, key: AccountKey, accountKey: number, chatId: Id, memberIds: Id[]) => void;
 export declare const members: ({ orm }: StoreContext, chatKey: number) => Member[];
-/** Marks this account's chats that `present` does not name; only ever given a complete list. */
-export declare const markLeft: ({ orm }: StoreContext, accountKey: number, present: Id[]) => number;
+/** Takes the left mark off the chats `present` names; any other state is kept. Answers how many. */
+export declare const rejoin: ({ orm }: StoreContext, accountKey: number, present: Id[]) => number;
+/**
+ * Marks this account's chats that `present` does not name, and rejoins those it names. Only ever given a complete
+ * list. Answers how many it marked.
+ */
+export declare const markLeft: (context: StoreContext, accountKey: number, present: Id[]) => number;
 /** The chats marked left, and how many messages they hold. */
 export declare const leftChats: ({ orm }: StoreContext, accountKey: number) => {
     pks: number[];

package/dist/store/sqlite/chats.js

@@ -65,9 +65,7 @@ export const upsertChat = (context, accountKey, chat) => {
             ...(chat.lastMessageAt === undefined ? {} : { lastMessageAt: sql `excluded.last_message_at` }),
             ...(chat.participantsCount === undefined ? {} : { participantsCount: sql `excluded.participants_count` }),
             metadata: sql `excluded.metadata`,
-            // A chat the list names again has been rejoined; any other state it had is kept.
-            membershipState: sql `CASE WHEN excluded.membership_state IS NOT NULL THEN excluded.membership_state
-          WHEN ${chats.membershipState} = 'left' THEN NULL ELSE ${chats.membershipState} END`,
+            ...(chat.membershipState === undefined ? {} : { membershipState: sql `excluded.membership_state` }),
             updatedAt: sql `excluded.updated_at`,
         },
     })
@@ -113,13 +111,27 @@ export const members = ({ orm }, chatKey) => orm
     .all();
 const byRecency = [sql `${chats.lastMessageAt} DESC NULLS LAST`, chats.id];
 const notLeft = sql `${chats.membershipState} IS NOT 'left'`;
-/** Marks this account's chats that `present` does not name; only ever given a complete list. */
-export const markLeft = ({ orm }, accountKey, present) => orm
+const named = (present) => sql `${chats.externalId} IN (SELECT value FROM json_each(${JSON.stringify(present)}))`;
+/** Takes the left mark off the chats `present` names; any other state is kept. Answers how many. */
+export const rejoin = ({ orm }, accountKey, present) => orm
     .update(chats)
-    .set({ membershipState: "left" })
-    .where(and(eq(chats.accountId, accountKey), notLeft, sql `${chats.externalId} NOT IN (SELECT value FROM json_each(${JSON.stringify(present)}))`))
+    .set({ membershipState: null })
+    .where(and(eq(chats.accountId, accountKey), eq(chats.membershipState, "left"), named(present)))
     .returning({ pk: chats.id })
     .all().length;
+/**
+ * Marks this account's chats that `present` does not name, and rejoins those it names. Only ever given a complete
+ * list. Answers how many it marked.
+ */
+export const markLeft = (context, accountKey, present) => {
+    rejoin(context, accountKey, present);
+    return context.orm
+        .update(chats)
+        .set({ membershipState: "left" })
+        .where(and(eq(chats.accountId, accountKey), notLeft, sql `NOT (${named(present)})`))
+        .returning({ pk: chats.id })
+        .all().length;
+};
 /** The chats marked left, and how many messages they hold. */
 export const leftChats = ({ orm }, accountKey) => {
     const pks = orm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirecat/cli-core",
-  "version": "0.350.0",
+  "version": "0.352.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",