@wirecat/cli-core 0.419.0 → 0.421.0

package/dist/store/sqlite/tag-creation.js

@@ -12,11 +12,11 @@ const folded = (name) => {
 /** Includes both label kinds and aliases: a narrower preview must not hide a collision. */
 export const tagCreationReview = ({ database }, name, kind) => {
     const metadata = database
-        .prepare("SELECT count(*) AS count,coalesce(sum(length(CAST(name AS BLOB))),0) AS bytes FROM tags")
+        .prepare("SELECT count(*) AS count,coalesce(sum(length(CAST(name AS BLOB))),0) AS bytes FROM canonical_tags")
         .get();
     const aliasMetadata = database
         .prepare("SELECT count(*) AS count,coalesce(sum(length(CAST(a.name AS BLOB))),0) AS bytes FROM aliases a " +
-        "JOIN tags t ON t.id=a.aliasable_id WHERE a.aliasable_type='tag' AND a.account_id IS NULL")
+        "JOIN canonical_tags t ON t.id=a.aliasable_id WHERE a.aliasable_type='tag' AND a.account_id IS NULL")
         .get();
     if (Number(metadata?.count ?? 0) > 5000 ||
         Number(aliasMetadata?.count ?? 0) > 100000 ||
@@ -24,9 +24,11 @@ export const tagCreationReview = ({ database }, name, kind) => {
         throw new CliError("validation_error", "label creation review exceeds its metadata budget", {
             reason: "tag-review.over-budget",
         });
-    const rows = database.prepare("SELECT id,name,kind FROM tags ORDER BY id").all();
+    const rows = database
+        .prepare("SELECT t.id,t.name,t.kind,r.canonical_id,r.name AS canonical_name FROM canonical_tags t JOIN resolved_tags r ON r.id=t.id ORDER BY t.id")
+        .all();
     const aliases = database
-        .prepare("SELECT a.id,a.aliasable_id,a.name FROM aliases a JOIN tags t ON t.id=a.aliasable_id " +
+        .prepare("SELECT a.id,a.aliasable_id,a.name FROM aliases a JOIN canonical_tags t ON t.id=a.aliasable_id " +
         "WHERE a.aliasable_type='tag' AND a.account_id IS NULL ORDER BY a.id")
         .all();
     const names = new Map();
@@ -36,14 +38,21 @@ export const tagCreationReview = ({ database }, name, kind) => {
         values.push(String(alias.name));
         names.set(id, values);
     }
-    const candidates = rows
+    const scored = rows
         .map((row) => ({
-        id: String(row.id),
-        name: String(row.name),
+        id: String(row.canonical_id),
+        name: String(row.canonical_name),
         kind: row.kind,
         similarity: Math.max(...[String(row.name), ...(names.get(Number(row.id)) ?? [])].map((value) => folded(value) === null ? 0 : vocabularySimilarity(name, value))),
     }))
-        .filter((entry) => entry.similarity >= 0.65)
+        .filter((entry) => entry.similarity >= 0.65);
+    const grouped = new Map();
+    for (const entry of scored) {
+        const held = grouped.get(entry.id);
+        if (!held || entry.similarity > held.similarity)
+            grouped.set(entry.id, entry);
+    }
+    const candidates = [...grouped.values()]
         .sort((a, b) => b.similarity - a.similarity || Number(a.id) - Number(b.id))
         .slice(0, 10);
     return {

package/dist/store/sqlite/tag-resolution.d.ts

@@ -0,0 +1,5 @@
+import { type TagRedirectSnapshot } from "../../domain/tag-redirects.js";
+import type { CacheDatabase } from "../driver.js";
+export declare const tagCanonicalId: (database: CacheDatabase, id: number) => number;
+export declare const tagMemberIds: (database: CacheDatabase, id: number) => number[];
+export declare const tagRedirectSnapshot: (database: CacheDatabase) => TagRedirectSnapshot;

package/dist/store/sqlite/tag-resolution.js

@@ -0,0 +1,33 @@
+import { CliError } from "@wirecat/cli-base";
+import { createTagRedirectIndex } from "../../domain/tag-redirects.js";
+export const tagCanonicalId = (database, id) => {
+    const row = database.prepare("SELECT canonical_id FROM resolved_tags WHERE id=?").get(id);
+    if (!row)
+        throw new CliError("not_found", "the selected tag is unavailable");
+    return Number(row.canonical_id);
+};
+export const tagMemberIds = (database, id) => {
+    const canonical = tagCanonicalId(database, id);
+    return database
+        .prepare("SELECT ? AS id UNION ALL SELECT source_id AS id FROM tag_redirects WHERE survivor_id=? ORDER BY id")
+        .all(canonical, canonical)
+        .map((row) => Number(row.id));
+};
+export const tagRedirectSnapshot = (database) => {
+    const tags = database.prepare("SELECT id FROM canonical_tags WHERE kind='tag' ORDER BY id LIMIT 4097").all();
+    const redirects = database
+        .prepare("SELECT source_id,survivor_id FROM tag_redirects ORDER BY source_id LIMIT 4097")
+        .all();
+    if (tags.length > 4096 || redirects.length > 4096)
+        throw new CliError("validation_error", "tag consolidation exceeds the complete graph budget of 4096 rows");
+    const snapshot = {
+        complete: true,
+        tags: tags.map((row) => ({ id: String(row.id), kind: "tag" })),
+        redirects: redirects.map((row) => ({ sourceId: String(row.source_id), survivorId: String(row.survivor_id) })),
+    };
+    createTagRedirectIndex(snapshot);
+    const sources = new Set(snapshot.redirects.map((row) => row.sourceId));
+    if (snapshot.redirects.some((row) => sources.has(row.survivorId)))
+        throw new CliError("configuration_error", "tag redirects must point directly to a canonical tag");
+    return snapshot;
+};

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

@@ -75,7 +75,7 @@ export declare const createTag: (context: StoreContext, name: string, kind: TagK
 export declare const ensureTag: (context: StoreContext, name: string) => TagRow;
 /** The tags it did not have before, in the order given; a tag the owner adds becomes the owner's. */
 export declare const addTags: (context: StoreContext, thing: Thing, tags: string[], source?: TaggingSource, author?: Actor) => string[];
-/** The tags it had, in the order given. A chat's keyword claim stays apart from the owner's own tag. */
+/** An explicit removal withdraws the effective label, restricted to the requested origin when supplied. */
 export declare const removeTags: ({ database }: StoreContext, thing: Thing, tags: string[], source?: "manual" | "auto") => string[];
 export interface Label {
     tag: string;
@@ -83,6 +83,8 @@ export interface Label {
     origin: "file" | "owner";
 }
 /** A thing's tags by name, with whether only a file states each. */
+/** A tagging of something still there: a deleted document keeps its tags but is not counted or listed by them. */
+export declare const liveTagging: (alias: string) => string;
 export declare const labelsOf: (database: CacheDatabase, thing: Thing, tag?: string) => Label[];
 /**
  * Marks one topic as the thing's main one, or clears it with `null`: the topic is tagged on it if it was

package/dist/store/sqlite/tags.js

@@ -2,6 +2,7 @@ import { CliError } from "@wirecat/cli-base";
 import { formatLocator } from "../../domain/locator.js";
 import { normalizeVocabularyName } from "../../domain/vocabulary.js";
 import { guardTagCreation } from "./tag-creation.js";
+import { tagMemberIds } from "./tag-resolution.js";
 import { inboxKey, taskAccountOf } from "./task-keys.js";
 import { emailOf, emailThreadOf, taskRowOf } from "./things.js";
 import { toIso } from "./values.js";
@@ -53,7 +54,9 @@ export const targetThing = ({ database }, key, target) => {
     return { type: TAGGABLE[target.type], id: Number(found.id) };
 };
 export const tagNamed = (database, name) => {
-    const row = database.prepare("SELECT id, name, kind FROM tags WHERE name = ?").get(name);
+    const row = database
+        .prepare("SELECT r.canonical_id AS id,r.name,r.kind FROM canonical_tags t JOIN resolved_tags r ON r.id=t.id WHERE t.name=?")
+        .get(name);
     return row ? { id: Number(row.id), name: String(row.name), kind: row.kind } : undefined;
 };
 /** An explicit alias reuses its target; similarity never chooses a canonical label. */
@@ -62,17 +65,18 @@ export const canonicalTagNamed = (database, name) => {
     // createTag stores the name as given, so "Projects/Acme" must be found again by its folded form.
     const foldedNamed = () => {
         const rows = database
-            .prepare("SELECT id, name, kind FROM tags WHERE lower(name) = lower(?) LIMIT 3")
+            .prepare("SELECT r.canonical_id AS id,r.name,r.kind,t.name AS original_name FROM canonical_tags t JOIN resolved_tags r ON r.id=t.id WHERE lower(t.name)=lower(?) LIMIT 4097")
             .all(normalized)
-            .filter((row) => normalizeVocabularyName(String(row.name)) === normalized);
-        if (rows.length > 1)
+            .filter((row) => normalizeVocabularyName(String(row.original_name)) === normalized);
+        const unique = [...new Map(rows.map((row) => [Number(row.id), row])).values()];
+        if (unique.length > 1)
             throw new CliError("configuration_error", "the label name has conflicting canonical targets");
-        const row = rows[0];
+        const row = unique[0];
         return row ? { id: Number(row.id), name: String(row.name), kind: row.kind } : undefined;
     };
     const direct = tagNamed(database, normalized) ?? foldedNamed();
     const aliases = database
-        .prepare("SELECT DISTINCT t.id,t.name,t.kind FROM aliases a JOIN tags t ON t.id=a.aliasable_id " +
+        .prepare("SELECT DISTINCT t.canonical_id AS id,t.name,t.kind FROM aliases a JOIN resolved_tags t ON t.id=a.aliasable_id " +
         "WHERE a.aliasable_type='tag' AND a.account_id IS NULL AND a.name_folded=? LIMIT 2")
         .all(normalized);
     if (aliases.length > 1 || (direct && aliases.some((row) => Number(row.id) !== direct.id)))
@@ -97,7 +101,9 @@ export const createTag = (context, name, kind, by, options = {}) => {
         throw new CliError("validation_error", held.kind === kind ? `the ${kind} "${name}" exists` : `"${name}" is a ${held.kind}; one name is never both`, { reason: held.kind === kind ? "tag_exists" : "tag_name_clash" });
     guardTagCreation(context, name, kind, by, options);
     const at = now();
-    database.prepare("INSERT INTO tags (name, kind, created_at, updated_at) VALUES (?, ?, ?, ?)").run(name, kind, at, at);
+    database
+        .prepare("INSERT INTO canonical_tags (name, kind, created_at, updated_at) VALUES (?, ?, ?, ?)")
+        .run(name, kind, at, at);
     return tagNamed(database, name);
 };
 /** The tag of that name, made as a plain tag when no tag or topic holds the name yet. */
@@ -113,51 +119,64 @@ export const addTags = (context, thing, tags, source = "owner", author) => {
     const at = now();
     return tags.filter((name) => {
         const tag = ensureTag(context, name);
+        const held = database
+            .prepare("SELECT source,author_type,author_id FROM taggings WHERE tag_id IN (SELECT ? UNION ALL SELECT source_id FROM tag_redirects WHERE survivor_id=?) AND taggable_type=? AND taggable_id=?")
+            .all(tag.id, tag.id, thing.type, thing.id);
+        if (held.some((row) => row.source === source && row.author_type === (author?.type ?? null) && row.author_id === (author?.id ?? null)))
+            return false;
         const added = insert.run(tag.id, thing.type, thing.id, source, author?.type ?? null, author?.id ?? null, at, at).changes > 0;
         if (!added && source === "owner")
             claim.run(at, tag.id, thing.type, thing.id);
-        return added;
+        return added && held.length === 0;
     });
 };
-const sourceOf = (database, thing, tagId) => database
-    .prepare("SELECT source FROM taggings WHERE tag_id=? AND taggable_type=? AND taggable_id=?")
-    .get(tagId, thing.type, thing.id)?.source;
-/** The tags it had, in the order given. A chat's keyword claim stays apart from the owner's own tag. */
+/** An explicit removal withdraws the effective label, restricted to the requested origin when supplied. */
 export const removeTags = ({ database }, thing, tags, source) => {
     const remove = database.prepare("DELETE FROM taggings WHERE tag_id=? AND taggable_type=? AND taggable_id=?");
     return tags.filter((name) => {
         const tag = canonicalTagNamed(database, name);
         if (!tag)
             return false;
-        const held = sourceOf(database, thing, tag.id);
-        const automatic = thing.type === "chat" &&
-            database.prepare("SELECT 1 AS held FROM auto_tag_claims WHERE chat_id=? AND tag_id=?").get(thing.id, tag.id);
-        if (source === "manual") {
-            if (held !== "owner")
-                return false;
-            if (automatic)
+        let changed = false;
+        for (const id of tagMemberIds(database, tag.id)) {
+            const held = database
+                .prepare("SELECT source FROM taggings WHERE tag_id=? AND taggable_type=? AND taggable_id=?")
+                .get(id, thing.type, thing.id);
+            const automatic = thing.type === "chat" &&
                 database
-                    .prepare("UPDATE taggings SET source='auto' WHERE tag_id=? AND taggable_type=? AND taggable_id=?")
-                    .run(tag.id, thing.type, thing.id);
+                    .prepare("SELECT 1 AS held FROM canonical_auto_tag_claims WHERE chat_id=? AND tag_id=?")
+                    .get(thing.id, id);
+            if (source === "manual") {
+                if (held?.source !== "owner")
+                    continue;
+                if (automatic)
+                    database
+                        .prepare("UPDATE taggings SET source='auto' WHERE tag_id=? AND taggable_type=? AND taggable_id=?")
+                        .run(id, thing.type, thing.id);
+                else
+                    remove.run(id, thing.type, thing.id);
+                changed = true;
+                continue;
+            }
+            if (automatic) {
+                database.prepare("DELETE FROM canonical_auto_tag_claims WHERE chat_id=? AND tag_id=?").run(thing.id, id);
+                changed = true;
+            }
+            if (source === "auto") {
+                if (held?.source === "auto")
+                    changed = remove.run(id, thing.type, thing.id).changes > 0 || changed;
+            }
             else
-                remove.run(tag.id, thing.type, thing.id);
-            return true;
-        }
-        if (thing.type === "chat")
-            database.prepare("DELETE FROM auto_tag_claims WHERE chat_id=? AND tag_id=?").run(thing.id, tag.id);
-        if (source === "auto") {
-            if (!automatic)
-                return false;
-            if (held !== "owner")
-                remove.run(tag.id, thing.type, thing.id);
-            return true;
+                changed = remove.run(id, thing.type, thing.id).changes > 0 || changed;
         }
-        return remove.run(tag.id, thing.type, thing.id).changes > 0;
+        return changed;
     });
 };
 /** A thing's tags by name, with whether only a file states each. */
+/** A tagging of something still there: a deleted document keeps its tags but is not counted or listed by them. */
+export const liveTagging = (alias) => `NOT (${alias}.taggable_type = 'document' AND EXISTS (SELECT 1 FROM documents dt WHERE dt.id = ${alias}.taggable_id AND dt.deleted_at IS NOT NULL))`;
 export const labelsOf = (database, thing, tag) => database
-    .prepare(`SELECT t.name, g.source FROM taggings g JOIN tags t ON t.id = g.tag_id WHERE g.taggable_type=? AND g.taggable_id=?${tag === undefined ? "" : " AND t.name = ?"} ORDER BY t.name`)
+    .prepare(`SELECT t.name,CASE WHEN min(g.source)='file' AND max(g.source)='file' THEN 'file' ELSE 'owner' END AS source FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id WHERE g.taggable_type=? AND g.taggable_id=?${tag === undefined ? "" : " AND t.name = ?"} GROUP BY t.canonical_id ORDER BY t.name`)
     .all(thing.type, thing.id, ...(tag === undefined ? [] : [tag]))
     .map((row) => ({ tag: String(row.name), origin: row.source === "file" ? "file" : "owner" }));
 /**
@@ -181,45 +200,46 @@ export const setMainTopic = (context, thing, topic) => {
         .run(at, tag.id, thing.type, thing.id);
 };
 export const tagsOf = ({ database }, key, filter) => {
-    const tagged = filter.tag === undefined ? "" : " AND t.name=?";
+    const selectedTag = filter.tag === undefined ? undefined : (canonicalTagNamed(database, filter.tag)?.id ?? -1);
+    const tagged = selectedTag === undefined ? "" : " AND t.canonical_id=(SELECT canonical_id FROM resolved_tags WHERE id=?)";
     const parts = [
         {
             type: "chat",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, c.external_id AS chat_id, c.title AS chat_title, " +
-                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, NULL AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN chats c ON c.id=g.taggable_id " +
+                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, NULL AS task_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN chats c ON c.id=g.taggable_id " +
                 "JOIN accounts a ON a.id=c.account_id WHERE g.taggable_type='chat' AND a.provider=? AND a.external_id=?",
             params: [key.provider, key.account],
         },
         {
             type: "contact",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, NULL AS chat_id, NULL AS chat_title, " +
-                "i.external_id AS person_id, i.name AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, NULL AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN identities i ON i.id=g.taggable_id " +
+                "i.external_id AS person_id, i.name AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, NULL AS task_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN identities i ON i.id=g.taggable_id " +
                 "WHERE g.taggable_type='identity' AND i.provider=?",
             params: [key.provider],
         },
         {
             type: "message",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, c.external_id AS chat_id, c.title AS chat_title, " +
-                "NULL AS person_id, NULL AS name, m.external_id AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, NULL AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN messages m ON m.id=g.taggable_id JOIN chats c ON c.id=m.chat_id " +
+                "NULL AS person_id, NULL AS name, m.external_id AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, NULL AS task_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN messages m ON m.id=g.taggable_id JOIN chats c ON c.id=m.chat_id " +
                 "JOIN accounts a ON a.id=c.account_id WHERE g.taggable_type='message' AND a.provider=? AND a.external_id=?",
             params: [key.provider, key.account],
         },
         {
             type: "chat",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, th.external_id AS chat_id, th.subject AS chat_title, " +
-                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, NULL AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN email_threads th ON th.id=g.taggable_id " +
+                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, NULL AS task_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN email_threads th ON th.id=g.taggable_id " +
                 "JOIN accounts a ON a.id=th.account_id WHERE g.taggable_type='email_thread' AND a.provider=? AND a.external_id=?",
             params: [key.provider, key.account],
         },
         {
             type: "message",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, th.external_id AS chat_id, th.subject AS chat_title, " +
-                "NULL AS person_id, NULL AS name, e.external_id AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, NULL AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN emails e ON e.id=g.taggable_id " +
+                "NULL AS person_id, NULL AS name, e.external_id AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, NULL AS task_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN emails e ON e.id=g.taggable_id " +
                 "JOIN email_threads th ON th.id=e.email_thread_id JOIN accounts a ON a.id=e.account_id " +
                 "WHERE g.taggable_type='email' AND e.deleted_at IS NULL AND a.provider=? AND a.external_id=?",
             params: [key.provider, key.account],
@@ -227,9 +247,9 @@ export const tagsOf = ({ database }, key, filter) => {
         {
             type: "task",
             sql: "SELECT t.name AS tag, g.taggable_type AS type, g.created_at, NULL AS chat_id, k.title AS chat_title, " +
-                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.id AS tag_id, " +
+                "NULL AS person_id, NULL AS name, NULL AS message_id, g.source, g.taggable_id AS target_id, t.canonical_id AS tag_id, " +
                 "COALESCE(k.package_id, k.key) AS task_id " +
-                "FROM taggings g JOIN tags t ON t.id=g.tag_id JOIN tasks k ON k.id=g.taggable_id JOIN projects p ON p.id=k.project_id " +
+                "FROM taggings g JOIN resolved_tags t ON t.id=g.tag_id JOIN tasks k ON k.id=g.taggable_id JOIN projects p ON p.id=k.project_id " +
                 "WHERE g.taggable_type='task' AND k.deleted_at IS NULL AND p.key=?",
             params: [inboxKey(`${key.provider}:${key.account}`)],
         },
@@ -243,13 +263,13 @@ export const tagsOf = ({ database }, key, filter) => {
             : [{ sql: filter.source === "auto" ? "x.auto = 1" : "(x.auto = 0 OR x.source = 'owner')", params: [] }]),
     ];
     const rows = database
-        .prepare("SELECT * FROM (SELECT u.*, CASE u.type WHEN 'identity' THEN 'contact' WHEN 'email_thread' THEN 'chat' " +
+        .prepare("SELECT * FROM (SELECT tag,type,min(created_at) AS created_at,chat_id,chat_title,person_id,name,message_id,CASE WHEN max(source='owner') THEN 'owner' ELSE min(source) END AS source,target_id,tag_id,task_id,tag_type,max(auto) AS auto FROM (SELECT u.*, CASE u.type WHEN 'identity' THEN 'contact' WHEN 'email_thread' THEN 'chat' " +
         "WHEN 'email' THEN 'message' ELSE u.type END AS tag_type, (u.type = 'chat' AND EXISTS (SELECT 1 FROM " +
-        `auto_tag_claims ac WHERE ac.chat_id = u.target_id AND ac.tag_id = u.tag_id)) AS auto FROM (${union}) u) x ` +
+        `canonical_auto_tag_claims ac JOIN resolved_tags rt ON rt.id=ac.tag_id WHERE ac.chat_id = u.target_id AND rt.canonical_id = u.tag_id)) AS auto FROM (${union}) u) GROUP BY tag,type,target_id) x ` +
         `WHERE ${where.length === 0 ? "1" : where.map(({ sql }) => `(${sql})`).join(" AND ")} ` +
         "ORDER BY x.tag, x.type, x.created_at, x.chat_id, x.person_id, x.message_id" +
         (filter.window ? " LIMIT ? OFFSET ?" : ""))
-        .all(...chosen.flatMap(({ params }) => (filter.tag === undefined ? params : [...params, filter.tag])), ...where.flatMap(({ params }) => params), ...(filter.window ? [filter.window.limit, filter.window.offset] : []));
+        .all(...chosen.flatMap(({ params }) => (selectedTag === undefined ? params : [...params, selectedTag])), ...where.flatMap(({ params }) => params), ...(filter.window ? [filter.window.limit, filter.window.offset] : []));
     const result = rows.map((row) => {
         const type = TAG_TYPE[String(row.type)];
         const chatId = row.chat_id == null ? undefined : String(row.chat_id);

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

@@ -23,6 +23,8 @@ export interface StoreTaskStore extends Omit<Required<TaskStore>, "reviewDuplica
     unlistedCategories(): Promise<UnlistedCategory[]>;
     /** What the task package calls a task — its id, or a key like `IN1A2B3C4D-3` — as the row's `tasks.id`. */
     rowOf(id: string): number | undefined;
+    /** A canonical/alias-aware label predicate for the task query's `t` row. */
+    tagWhere(name: string): Promise<Where>;
     /** One account's tasks a list query keeps, oldest first, each with its title and last change. */
     query(account: string, where: Where | undefined, window: {
         limit: number;

package/dist/store/sqlite/tasks.js

@@ -4,6 +4,7 @@ import { taskCategoriesReader } from "../shared-config.js";
 import { actorOfOrigin, originOfActor } from "./actors.js";
 import { folded } from "./folded.js";
 import { linkKind } from "./link-kinds.js";
+import { canonicalTagNamed } from "./tags.js";
 import { taskSimilarityOver } from "./task-candidates.js";
 import { savedTaskCategories, saveTaskCategories, storeTaskCategories, unlistedTaskCategories, } from "./task-category-settings.js";
 import { CLEAR_SUGGESTION, closeSuggestionOf, SUGGESTION_COLUMNS } from "./task-close.js";
@@ -11,7 +12,7 @@ import { taskCloseOver } from "./task-close-store.js";
 import { inboxKey, typedKey } from "./task-keys.js";
 import { taskPairsOver } from "./task-pairs.js";
 import { taskRowOf, thingOf } from "./things.js";
-import { write } from "./transaction.js";
+import { read, write } from "./transaction.js";
 import { recordTaskEvent, workTasksOver } from "./work-tasks.js";
 export { inboxKey, linkInbox, taskAccountOf } from "./task-keys.js";
 export { taskIdOf, taskRowOf } from "./things.js";
@@ -95,6 +96,10 @@ export const taskStoreOver = (context) => {
         categoriesFile: () => context.sharedConfig,
         saveCategories: async (categories) => write(database, () => saveTaskCategories(database, categories, now())),
         unlistedCategories: async () => unlistedTaskCategories(database, listOf()),
+        tagWhere: async (name) => read(database, () => ({
+            sql: "EXISTS (SELECT 1 FROM taggings g JOIN resolved_tags r ON r.id=g.tag_id WHERE g.taggable_type='task' AND g.taggable_id=t.id AND r.canonical_id=(SELECT canonical_id FROM resolved_tags WHERE id=?))",
+            params: [canonicalTagNamed(database, name)?.id ?? -1],
+        })),
         query: async (account, where, { limit, offset }) => {
             const project = inbox(account, false);
             if (project === undefined)

package/dist/store/sqlite/things.js

@@ -1,4 +1,5 @@
 import { formatLocator } from "../../domain/locator.js";
+import { filesAccountSql } from "../../domain/providers.js";
 import { canonicalReference, formatReference, parseReference } from "../../domain/references.js";
 import { canonicalMeetingReference, formatMeetingReference, parseMeetingReference } from "../../meetings/index.js";
 import { ENTITY_TABLES, isEntityType } from "./entity-types.js";
@@ -72,7 +73,7 @@ export const thingOf = (database, reference) => {
             const id = storeId(parsed.id);
             return id === undefined
                 ? undefined
-                : found("account", database.prepare("SELECT id FROM accounts WHERE id = ? AND provider = 'folder'").get(id));
+                : found("account", database.prepare(`SELECT id FROM accounts WHERE id = ? AND ${filesAccountSql()}`).get(id));
         }
         case "task": {
             const id = taskRowOf(database, parsed.id);

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

@@ -8,6 +8,7 @@ export interface VocabularyTarget {
 export interface VocabularyAlias {
     id: string;
     name: string;
+    retained?: true;
 }
 export interface VocabularyEntry extends VocabularyTarget {
     name: string;

package/dist/store/sqlite/vocabulary.js

@@ -4,6 +4,7 @@ import { normalizeTag } from "../../domain/tags.js";
 import { normalizeVocabularyName, vocabularySimilarity } from "../../domain/vocabulary.js";
 import { tagConsolidationStoreOver } from "./tag-consolidation.js";
 import { tagCreationReview } from "./tag-creation.js";
+import { liveTagging } from "./tags.js";
 import { read, write } from "./transaction.js";
 const kinds = ["project", "tag", "topic"];
 const cancelled = (signal) => {
@@ -40,7 +41,7 @@ export const vocabularyStoreOver = (context) => {
         const projects = options.kind === undefined || options.kind === "project";
         const tags = options.kind !== "project";
         const whereProjects = "account_id IS NULL AND deleted_at IS NULL AND (? IS NULL OR scope=?)";
-        const whereTags = "(? IS NULL OR kind=?)";
+        const whereTags = "(? IS NULL OR kind=?) AND id=canonical_id";
         const tagKind = options.kind === "project" ? null : (options.kind ?? null);
         const metadata = [];
         if (projects)
@@ -49,7 +50,7 @@ export const vocabularyStoreOver = (context) => {
                 .all(options.scope ?? null, options.scope ?? null, maxEntries + 1));
         if (tags)
             metadata.push(...database
-                .prepare(`SELECT kind,id,length(CAST(name AS BLOB)) AS bytes FROM tags WHERE ${whereTags} LIMIT ?`)
+                .prepare(`SELECT kind,id,length(CAST(name AS BLOB)) AS bytes FROM resolved_tags WHERE ${whereTags} LIMIT ?`)
                 .all(tagKind, tagKind, maxEntries + 1));
         if (metadata.length > maxEntries)
             throw new CliError("validation_error", "vocabulary exceeds the selected entry budget", {
@@ -57,7 +58,7 @@ export const vocabularyStoreOver = (context) => {
             });
         const aliasSelection = "a.account_id IS NULL AND ((? AND a.aliasable_type='project' AND EXISTS " +
             "(SELECT 1 FROM projects p WHERE p.id=a.aliasable_id AND p.account_id IS NULL AND p.deleted_at IS NULL AND (? IS NULL OR p.scope=?))) " +
-            "OR (? AND a.aliasable_type='tag' AND EXISTS (SELECT 1 FROM tags t WHERE t.id=a.aliasable_id AND (? IS NULL OR t.kind=?))))";
+            "OR (? AND a.aliasable_type='tag' AND EXISTS (SELECT 1 FROM resolved_tags t WHERE t.id=a.aliasable_id AND (? IS NULL OR t.kind=?))))";
         const aliasParams = [
             Number(projects),
             options.scope ?? null,
@@ -71,11 +72,26 @@ export const vocabularyStoreOver = (context) => {
             .get(...aliasParams);
         if (Number(aliases?.count ?? 0) > maxEntries * 20)
             throw new CliError("validation_error", "vocabulary aliases exceed the selected entry budget");
-        const bytes = metadata.reduce((total, row) => total + Number(row.bytes), 0) + Number(aliases?.bytes ?? 0);
+        const retainedWhere = "t.id<>r.canonical_id AND (? IS NULL OR t.kind=?)";
+        const retainedMetadata = tags
+            ? database
+                .prepare(`SELECT count(*) AS count,coalesce(sum(length(CAST(t.name AS BLOB))),0) AS bytes FROM canonical_tags t JOIN resolved_tags r ON r.id=t.id WHERE ${retainedWhere}`)
+                .get(tagKind, tagKind)
+            : undefined;
+        if (Number(retainedMetadata?.count ?? 0) > maxEntries)
+            throw new CliError("validation_error", "retained tag names exceed the selected entry budget");
+        const bytes = metadata.reduce((total, row) => total + Number(row.bytes), 0) +
+            Number(aliases?.bytes ?? 0) +
+            Number(retainedMetadata?.bytes ?? 0);
         if (bytes > maxReadBytes)
             throw new CliError("validation_error", "vocabulary exceeds the selected input byte budget", {
                 reason: "vocabulary.over-byte-budget",
             });
+        const retained = tags
+            ? database
+                .prepare(`SELECT t.id,t.name,r.canonical_id FROM canonical_tags t JOIN resolved_tags r ON r.id=t.id WHERE ${retainedWhere} ORDER BY t.id LIMIT ?`)
+                .all(tagKind, tagKind, maxEntries + 1)
+            : [];
         const entries = [];
         if (projects)
             entries.push(...database
@@ -92,7 +108,7 @@ export const vocabularyStoreOver = (context) => {
             })));
         if (tags)
             entries.push(...database
-                .prepare(`SELECT t.id,t.name,t.kind,(SELECT count(*) FROM taggings g WHERE g.tag_id=t.id)+(SELECT count(*) FROM links l WHERE l.to_type='tag' AND l.to_id=t.id AND l.kind='labelled') AS uses FROM tags t WHERE ${whereTags} ORDER BY id`)
+                .prepare(`SELECT t.id,t.name,t.kind,(SELECT count(*) FROM (SELECT DISTINCT g.taggable_type,g.taggable_id FROM taggings g JOIN resolved_tags r ON r.id=g.tag_id WHERE r.canonical_id=t.id AND ${liveTagging("g")}))+(SELECT count(*) FROM (SELECT DISTINCT l.from_type,l.from_id,l.anchor FROM links l JOIN resolved_tags r ON r.id=l.to_id WHERE l.to_type='tag' AND r.canonical_id=t.id AND l.kind='labelled')) AS uses FROM resolved_tags t WHERE ${whereTags} ORDER BY id`)
                 .all(tagKind, tagKind)
                 .map((row) => ({
                 kind: row.kind,
@@ -105,11 +121,15 @@ export const vocabularyStoreOver = (context) => {
             })));
         const byTarget = new Map(entries.map((entry) => [`${entry.kind === "project" ? "project" : "tag"}:${entry.id}`, entry]));
         for (const row of database
-            .prepare(`SELECT a.id,a.aliasable_type,a.aliasable_id,a.name FROM aliases a WHERE ${aliasSelection} ORDER BY a.id`)
+            .prepare(`SELECT a.id,a.aliasable_type,CASE WHEN a.aliasable_type='tag' THEN (SELECT canonical_id FROM resolved_tags WHERE id=a.aliasable_id) ELSE a.aliasable_id END AS aliasable_id,a.name FROM aliases a WHERE ${aliasSelection} ORDER BY a.id`)
             .all(...aliasParams))
             byTarget
                 .get(`${row.aliasable_type}:${row.aliasable_id}`)
                 ?.aliases.push({ id: String(row.id), name: String(row.name) });
+        for (const row of retained)
+            byTarget
+                .get(`tag:${row.canonical_id}`)
+                ?.aliases.push({ id: `tag:${row.id}`, name: String(row.name), retained: true });
         cancelled(options.signal);
         return {
             entries,
@@ -253,13 +273,15 @@ export const vocabularyStoreOver = (context) => {
         removeVocabularyAlias: async (target, aliasId, options = {}) => write(database, () => {
             const current = writable(options);
             const entry = targetEntry(current, target);
+            if (entry.aliases.some((alias) => alias.id === aliasId && alias.retained))
+                throw new CliError("validation_error", "aliasId names a retained tag name; its original record cannot be removed as an alias");
             idOf(aliasId);
             const held = entry.aliases.find((alias) => alias.id === aliasId);
             if (!held)
                 return { target: { kind: entry.kind, id: entry.id }, alias: null, changed: false };
             database
-                .prepare("DELETE FROM aliases WHERE id=? AND aliasable_type=? AND aliasable_id=? AND account_id IS NULL")
-                .run(idOf(aliasId), target.kind === "project" ? "project" : "tag", idOf(target.id));
+                .prepare("DELETE FROM aliases WHERE id=? AND aliasable_type=? AND (aliasable_id=? OR (aliasable_type='tag' AND aliasable_id IN (SELECT id FROM resolved_tags WHERE canonical_id=?))) AND account_id IS NULL")
+                .run(idOf(aliasId), target.kind === "project" ? "project" : "tag", idOf(target.id), idOf(target.id));
             cancelled(options.signal);
             return { target: { kind: entry.kind, id: entry.id }, alias: held, changed: true };
         }),

package/dist/store/store.d.ts

@@ -1,4 +1,5 @@
 import type { ContextEvidenceReader, ContextIndex, ContextRecordReader } from "../context/evidence.js";
+import type { EventStore } from "../meetings/index.js";
 import { type AccountStore } from "./account-store.js";
 import { type AccountsStore } from "./accounts.js";
 import { type AttachmentsStore } from "./attachments.js";
@@ -20,6 +21,7 @@ import { type BotUpdateStore } from "./sqlite/bot-updates.js";
 import { type CatalogStore } from "./sqlite/catalog.js";
 import { type MailStore } from "./sqlite/emails.js";
 import { type FactsStore } from "./sqlite/facts.js";
+import { type FilesStore } from "./sqlite/files.js";
 import { type InvolvementStore } from "./sqlite/involvements.js";
 import { type KnowledgeStore } from "./sqlite/knowledge.js";
 import { type MeetingVectors } from "./sqlite/meeting-vectors.js";
@@ -79,6 +81,10 @@ export interface MessageStore {
     /** Notes, the links between anything and anything, and the owner's organisations and projects. */
     readonly notes: NotesStore;
     readonly catalog: CatalogStore;
+    /** Where each document is kept: its files, their folders and paths. */
+    readonly files: FilesStore;
+    /** Calendars and their entries, the source records of events: the `EventStore` a calendar CLI writes through. */
+    readonly calendar: EventStore;
     /** Choices that hold until replaced, each with its evidence. */
     readonly meetingFindings: MeetingFindingsStore;
     /** Cited facts and follow-ups about one project from stored messages, mail and documents, for review. */

package/dist/store/store.js

@@ -15,11 +15,13 @@ import * as accounts from "./sqlite/accounts.js";
 import { agentActionsStoreOver } from "./sqlite/agent-actions.js";
 import * as attachmentTexts from "./sqlite/attachment-texts.js";
 import { botUpdateStoreOver } from "./sqlite/bot-updates.js";
+import { eventStoreOver } from "./sqlite/calendar.js";
 import { catalogStoreOver } from "./sqlite/catalog.js";
 import { contextEvidenceOver, contextIndexOver, contextRecordsOver } from "./sqlite/context-evidence.js";
 import { mailStoreOver } from "./sqlite/emails.js";
 import { evidenceFindingsStoreOver } from "./sqlite/evidence-findings.js";
 import { factsStoreOver } from "./sqlite/facts.js";
+import { filesStoreOver } from "./sqlite/files.js";
 import { involvementStoreOver } from "./sqlite/involvements.js";
 import { knowledgeStoreOver } from "./sqlite/knowledge.js";
 import { logPruner } from "./sqlite/log-pruning.js";
@@ -96,6 +98,8 @@ const storeOver = (context) => {
     const knowledge = once(() => knowledgeStoreOver(context));
     const notes = once(() => ({ ...notesStoreOver(context), ...noteSearchOver(context) }));
     const catalog = once(() => catalogStoreOver(context));
+    const files = once(() => filesStoreOver(context));
+    const calendar = once(() => eventStoreOver(context));
     const meetingFindings = once(() => meetingFindingsStoreOver(context));
     const evidenceFindings = once(() => evidenceFindingsStoreOver(context));
     const facts = once(() => factsStoreOver(context));
@@ -183,6 +187,12 @@ const storeOver = (context) => {
         get catalog() {
             return catalog();
         },
+        get files() {
+            return files();
+        },
+        get calendar() {
+            return calendar();
+        },
         get meetingFindings() {
             return meetingFindings();
         },

package/dist/store/tags.js

@@ -1,5 +1,5 @@
 import * as tagQueries from "./sqlite/tags.js";
-import { write } from "./sqlite/transaction.js";
+import { read, write } from "./sqlite/transaction.js";
 export const tagsStoreOver = (context) => {
     const { database } = context;
     return {
@@ -17,6 +17,6 @@ export const tagsStoreOver = (context) => {
             });
             return removed;
         },
-        tags: async (key, filter = {}) => tagQueries.tagsOf(context, key, filter),
+        tags: async (key, filter = {}) => read(database, () => tagQueries.tagsOf(context, key, filter)),
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirecat/cli-core",
-  "version": "0.419.0",
+  "version": "0.421.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",
@@ -214,6 +214,7 @@
     "@types/pngjs": "6.0.5",
     "@vitest/coverage-v8": "^5.0.2",
     "@wirecat/cli-base": "0.53.0",
+    "@wirecat/cli-core-legacy-tags": "npm:@wirecat/cli-core@0.414.0",
     "commander": "15.0.0",
     "cspell": "10.3.6",
     "drizzle-kit": "1.0.0-rc.4",