@wirecat/cli-core 0.381.0 → 0.382.0

package/dist/store/sqlite/messages.js

@@ -7,7 +7,7 @@ import { folded } from "./folded.js";
 import { identityPk } from "./identities.js";
 import { attachments, chats, messageRevisions, messages, messageTranscripts } from "./schema.js";
 import { intoVoiceAttachment } from "./transcripts.js";
-import { json, parsed, toMs } from "./values.js";
+import { DELIVERY, json, parsed, toMs } from "./values.js";
 import { purgeVectorsOf } from "./vectors.js";
 const FIELDS = [
     "threadExternalId",
@@ -120,7 +120,7 @@ export const upsertMessage = (context, key, accountKey, chatKey, message, via, s
     const revived = found?.deletedAt != null && seenAt !== undefined && found.deletedAt < seenAt;
     // A deleted message leaves no text behind, and a sync that still carries it does not bring it back.
     if (found?.deletedAt != null && !revived)
-        return;
+        return false;
     let pk;
     if (!found) {
         pk = Number(statements.insert.get({
@@ -189,6 +189,12 @@ export const upsertMessage = (context, key, accountKey, chatKey, message, via, s
             .set({ starred: message.starred ? 1 : 0 })
             .where(eq(messages.id, pk))
             .run();
+    if (message.delivery !== undefined)
+        orm
+            .update(messages)
+            .set({ delivery: raised(message.delivery) })
+            .where(and(eq(messages.id, pk), eq(messages.outgoing, 1)))
+            .run();
     const root = message.threadRootId ?? message.threadId;
     if (root !== undefined) {
         context.database
@@ -222,6 +228,19 @@ export const upsertMessage = (context, key, accountKey, chatKey, message, via, s
     });
     if (Number(heardFirst) > 0)
         intoVoiceAttachment(context, pk);
+    return !found;
+};
+/**
+ * One more unread for a message from someone else that the store first saw now, sent after the messenger's count was
+ * taken. A chat the messenger never gave a count for is left alone: the store would count its whole history.
+ */
+export const countUnread = ({ database }, chatKey, message) => {
+    if (message.outgoing || message.editedAt !== null)
+        return;
+    database
+        .prepare(`UPDATE chats SET unread_count = unread_count + 1
+         WHERE id = ? AND unread_count IS NOT NULL AND unread_counted_at IS NOT NULL AND unread_counted_at < ?`)
+        .run(chatKey, Date.parse(message.timestamp));
 };
 /**
  * The owner's ruling (NEED-393 A): a deleted message keeps its row, so a later sync cannot bring it
@@ -268,6 +287,14 @@ export const saveStar = ({ orm }, chatKey, messageId, starred) => orm
     .where(and(eq(messages.chatId, chatKey), eq(messages.externalId, messageId), isNull(messages.deletedAt)))
     .returning({ pk: messages.id })
     .all().length > 0;
+const raised = (delivery) => sql `max(coalesce(delivery, 0), ${DELIVERY[delivery]})`;
+/** Answers whether the owner's own message is held. A receipt is for a message the owner sent, so another's keeps none. */
+export const saveDelivery = ({ orm }, chatKey, messageId, delivery) => orm
+    .update(messages)
+    .set({ delivery: raised(delivery) })
+    .where(and(eq(messages.chatId, chatKey), eq(messages.externalId, messageId), eq(messages.outgoing, 1), isNull(messages.deletedAt)))
+    .returning({ pk: messages.id })
+    .all().length > 0;
 export const markDeleted = (context, accountKey, messageIds, chatId, among) => {
     const { orm } = context;
     const chatKey = chatId === undefined ? undefined : findChatPk(context, accountKey, chatId);

package/dist/store/sqlite/migrations.generated.js

@@ -561,5 +561,21 @@ export const GENERATED = [
             "CREATE TABLE `message_reactions` (\n\t`id` integer PRIMARY KEY,\n\t`chat_id` integer NOT NULL,\n\t`message_external_id` text NOT NULL,\n\t`identity_id` integer NOT NULL,\n\t`own` integer NOT NULL,\n\t`reaction` text,\n\t`reacted_at` integer NOT NULL,\n\t`created_at` integer NOT NULL,\n\t`updated_at` integer NOT NULL,\n\tCONSTRAINT `fk_message_reactions_chat_id_chats_id_fk` FOREIGN KEY (`chat_id`) REFERENCES `chats`(`id`),\n\tCONSTRAINT `fk_message_reactions_identity_id_identities_id_fk` FOREIGN KEY (`identity_id`) REFERENCES `identities`(`id`),\n\tCONSTRAINT `message_reactions_chat_id_message_external_id_identity_id_unique` UNIQUE(`chat_id`,`message_external_id`,`identity_id`)\n);",
             "CREATE INDEX `message_reactions_by_identity_id` ON `message_reactions` (`identity_id`);"
         ]
+    },
+    {
+        "name": "20261021221808_version-27-message-delivery",
+        "statements": [
+            "ALTER TABLE `messages` ADD `delivery` integer;"
+        ]
+    },
+    {
+        "name": "20261021224625_version-28-chat-state",
+        "statements": [
+            "ALTER TABLE `chats` ADD `muted` integer;",
+            "ALTER TABLE `chats` ADD `muted_until` integer;",
+            "ALTER TABLE `chats` ADD `archived` integer;",
+            "ALTER TABLE `chats` ADD `marked_unread` integer;",
+            "ALTER TABLE `chats` ADD `unread_counted_at` integer;"
+        ]
     }
 ];

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

@@ -266,6 +266,22 @@ export declare const MESSAGE_FIELDS: {
         identity: undefined;
         generated: undefined;
     }, {}>;
+    delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "messages";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}>;
 };
 export interface MessageRow {
     pk: number;
@@ -286,6 +302,7 @@ export interface MessageRow {
     providerMetadata: string | null;
     mentions: string | null;
     starred: number | null;
+    delivery: number | null;
 }
 export declare const selectMessages: ({ orm }: StoreContext) => Omit<import("drizzle-orm/sqlite-core").SQLiteAsyncSelectBase<"messages", "sync", unknown, {
     pk: import("drizzle-orm/sqlite-core").SQLiteColumn<{
@@ -546,6 +563,22 @@ export declare const selectMessages: ({ orm }: StoreContext) => Omit<import("dri
         identity: undefined;
         generated: undefined;
     }, {}>;
+    delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "messages";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}>;
 }, "partial", Record<"messages", "not-null"> & {
     chats: "not-null";
 } & {
@@ -569,6 +602,7 @@ export declare const selectMessages: ({ orm }: StoreContext) => Omit<import("dri
     providerMetadata: string | null;
     mentions: string | null;
     starred: number | null;
+    delivery: number | null;
 }[], {
     pk: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
@@ -828,6 +862,22 @@ export declare const selectMessages: ({ orm }: StoreContext) => Omit<import("dri
         identity: undefined;
         generated: undefined;
     }, {}>;
+    delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "messages";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}>;
 }>, never>;
 export declare const newestFirst: SQL<unknown>[];
 export declare const before: (sentAt: number, pk: number) => SQL<unknown>;

package/dist/store/sqlite/reads.js

@@ -1,7 +1,7 @@
 import { CliError } from "@wirecat/cli-base";
 import { and, asc, desc, eq, gt, gte, inArray, isNull, lte, or, sql } from "./drizzle/core.js";
 import { attachments, chats, identities, messageRevisions, messages } from "./schema.js";
-import { parsed, present, toIso, toMs } from "./values.js";
+import { deliveryOf, parsed, present, toIso, toMs } from "./values.js";
 /**
  * One flat row for every read, aliased where tables share a column name, so the same mapper serves
  * a plain select and a subquery (`find` per chat).
@@ -25,6 +25,7 @@ export const MESSAGE_FIELDS = {
     providerMetadata: messages.metadata,
     mentions: messages.mentions,
     starred: messages.starred,
+    delivery: messages.delivery,
 };
 export const selectMessages = ({ orm }) => orm
     .select(MESSAGE_FIELDS)
@@ -236,6 +237,7 @@ const toMessage = (row, attachments) => {
         reactions: parsed(row.reactions) ?? null,
         ...present({ providerMetadata: parsed(row.providerMetadata), mentions: parsed(row.mentions) }),
         ...(row.starred === 1 ? { starred: true } : {}),
+        ...present({ delivery: deliveryOf(row.delivery) }),
     };
 };
 /**

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

@@ -2596,6 +2596,86 @@ export declare const chats: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
             identity: undefined;
             generated: undefined;
         }, {}>;
+        muted: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "chats";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        mutedUntil: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "chats";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        archived: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "chats";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        markedUnread: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "chats";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        unreadCountedAt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "chats";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
     };
     dialect: 'sqlite';
 }>;
@@ -3365,6 +3445,22 @@ export declare const messages: import("drizzle-orm/sqlite-core").SQLiteTableWith
             identity: undefined;
             generated: undefined;
         }, {}>;
+        delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: string;
+            tableName: "messages";
+            dataType: "number int53";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
     };
     dialect: 'sqlite';
 }>;

package/dist/store/sqlite/schema.js

@@ -261,6 +261,11 @@ export const chats = sqliteTable("chats", {
     createdAt: integer("created_at").notNull(),
     parentChatId: integer("parent_chat_id").references(() => chats.id),
     scope: text("scope"),
+    muted: integer("muted"),
+    mutedUntil: integer("muted_until"),
+    archived: integer("archived"),
+    markedUnread: integer("marked_unread"),
+    unreadCountedAt: integer("unread_counted_at"),
 }, (table) => [
     unique().on(table.accountId, table.externalId),
     index("chats_by_recency").on(table.accountId, desc(table.lastMessageAt)),
@@ -348,6 +353,7 @@ export const messages = sqliteTable("messages", {
     updatedAt: integer("updated_at").notNull(),
     threadRootId: integer("thread_root_id").references(() => messages.id),
     starred: integer("starred"),
+    delivery: integer("delivery"),
 }, (table) => [
     unique().on(table.chatId, table.externalId),
     index("messages_by_time").on(table.chatId, desc(table.sentAt)),

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

@@ -264,6 +264,22 @@ export declare const newestHits: (context: StoreContext, where: SQL | undefined,
         identity: undefined;
         generated: undefined;
     }, {}>;
+    delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "messages";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}>;
     chatTitle: SQL.Aliased<string | null>;
     provider: SQL.Aliased<string>;
     accountNativeId: SQL.Aliased<string>;
@@ -292,6 +308,7 @@ export declare const newestHits: (context: StoreContext, where: SQL | undefined,
     providerMetadata: string | null;
     mentions: string | null;
     starred: number | null;
+    delivery: number | null;
     chatTitle: string | null;
     provider: string;
     accountNativeId: string;
@@ -554,6 +571,22 @@ export declare const newestHits: (context: StoreContext, where: SQL | undefined,
         identity: undefined;
         generated: undefined;
     }, {}>;
+    delivery: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "messages";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}>;
     chatTitle: SQL.Aliased<string | null>;
     provider: SQL.Aliased<string>;
     accountNativeId: SQL.Aliased<string>;

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

@@ -1,3 +1,4 @@
+import type { Delivery } from "../../domain/models.js";
 export declare const toMs: (iso: string | null | undefined) => number | null;
 export declare const toIso: (ms: unknown) => string | null;
 export declare const json: (value: unknown) => string | null;
@@ -5,3 +6,6 @@ export declare const parsed: <T>(text: unknown) => T | undefined;
 export declare const present: <T extends Record<string, unknown>>(entries: T) => {
     [k: string]: unknown;
 };
+/** `messages.delivery` keeps a level, so a receipt can only raise it. */
+export declare const DELIVERY: Record<Delivery, number>;
+export declare const deliveryOf: (stored: number | null) => Delivery | undefined;

package/dist/store/sqlite/values.js

@@ -8,3 +8,6 @@ export const toIso = (ms) => (typeof ms === "number" ? new Date(ms).toISOString(
 export const json = (value) => (value === undefined ? null : JSON.stringify(value));
 export const parsed = (text) => typeof text === "string" ? JSON.parse(text) : undefined;
 export const present = (entries) => Object.fromEntries(Object.entries(entries).filter(([, value]) => value !== null && value !== undefined));
+/** `messages.delivery` keeps a level, so a receipt can only raise it. */
+export const DELIVERY = { delivered: 1, read: 2 };
+export const deliveryOf = (stored) => stored === DELIVERY.read ? "read" : stored === DELIVERY.delivered ? "delivered" : undefined;

package/package.json

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