clavarium 0.2.375-next.1 → 0.2.378-next.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "clavarium",
-  "version": "0.2.375-next.1",
+  "version": "0.2.378-next.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.2.375-next.1",
+      "version": "0.2.378-next.1",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clavarium",
-  "version": "0.2.375-next.1",
+  "version": "0.2.378-next.1",
   "license": "MIT",
   "type": "module",
   "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",

package/server/main.mjs

@@ -718,6 +718,8 @@ export async function startHome({ port, host, dataDir, mntDir = dataDir, gitRese
         } });
     rooms.boxesBound(boxes.all());
     rooms.refresh();
+    /* A Tether call held for an AI at work for a room: said in that room too, closed there once decided (tethers.mjs). */
+    tethers.rooms = { held: (name, event) => rooms.held(name, event), closed: (ids, event) => rooms.closed(ids, event) };
     /* FEATURES (features.mjs): read from what the modules say, never a secret's value. The remote screen and the
        catalogue are slow to ask: kept a while, and never waited for long. */
     const screenNow = cached(() => meshcentral.status().catch(() => null), 60_000);

package/server/rooms.mjs

@@ -30,6 +30,11 @@ export const HOPS_MAX = 8;
 /* How long an AI given a message is said to be thinking, at most (it may never answer). */
 export const THINKING_MS = 10 * 60_000;
 const KINDS = ['person', 'ai', 'box'];
+/* A ROOM'S OWN LINES (a Tether call held for one of its AIs, and what closes it): the kinds, their level, at most kept. */
+const LINE_LEVELS = Object.freeze({ 'tether-demande': 'needs-you', 'tether-done': 'trace' });
+const LEVELS = ['needs-you', 'news', 'trace'];
+const LINE_ACTION = /^[a-z]{1,20}(:[a-z0-9][a-z0-9._-]{0,63})?$/;
+export const ROOM_LINES_MAX = 50;
 /* A FILE THE PERSON ATTACHES IN A ROOM (06-11: a room carries what the chat carries): kept in the room's own folder
    (rooms/<id>/attached/<uuid>/<name>), named in its thread by ROOM_FILE's path; a copy goes to each AI the message
    goes to, attached in its own chat as the person attaches one there (talk.attach) -- never to the others. */
@@ -56,6 +61,11 @@ const nameOf = (v) => String(v ?? '').replace(/\s+/g, ' ').trim().slice(0, ROOM_
    a secret never passes from one AI to another through a room. */
 export const masked = (text) => { const str = String(text ?? ''); const hits = scan(str); if (!hits.length) return str; let out = ''; let last = 0; for (const h of hits) { out += str.slice(last, h.start) + '••••••'; last = h.end; } return out + str.slice(last); };
 
+/* Every text of a line masked (a card's title, facts, quote...: plain data, words of the screen and their values) --
+   never a button's id nor a word's key. */
+const maskedAll = (v, depth = 0) => (typeof v === 'string' ? masked(v) : depth > 8 || v === null || typeof v !== 'object' ? v
+    : Array.isArray(v) ? v.map((x) => maskedAll(x, depth + 1)) : Object.fromEntries(Object.entries(v).map(([k, x]) => [k, k === 'id' || k === 'k' ? x : maskedAll(x, depth + 1)])));
+
 /* A sign as the cards draw it (web/kit.js hueOf, initialOf): the same name, the same letter and colour. */
 export const lookOf = (name) => { const text = String(name ?? ''); let h = 0; for (const ch of text) h = (h * 31 + ch.codePointAt(0)) >>> 0; return { initial: ([...text.trim()][0] ?? '?').toUpperCase(), hue: h % 360 }; };
 
@@ -171,6 +181,10 @@ export class Rooms {
         if (options?.seen !== false) { const list = this.#all(); const r = list.find((x) => x.id === id); if (r) { r.seen = this.#now().toISOString(); this.#file.set(list); } }
         const thinking = this.#thinkingOf(id, members); const doing = this.#doingOf(id, members);
         const messages = (read.messages ?? []).map((m) => this.#opened(m, members)).map((m) => (typeof m.text === 'string' && m.text.includes('@{') ? { ...m, text: named(m.text) } : m));
+        /* Its lines (a Tether call of one of its AIs, held): among its messages, where they happened -- those of the time read. */
+        const from = read.window?.more > 0 ? String(messages[0]?.at ?? '') : '';
+        const lines = (Array.isArray(room.lines) ? room.lines : []).filter((l) => String(l.at) >= from).map((l) => ({ from: 'system', kind: 'system', choices: [], ...l }));
+        if (lines.length) { messages.push(...lines); messages.sort((a, b) => String(a.at).localeCompare(String(b.at))); }
         /* The files of the thread (shown, cited): each as the message that has it opens it; one nobody opens here, not listed. */
         const opens = new Map(); for (const m of messages) for (const f of [...(m.refs ?? []), ...(m.files ?? []), ...(m.open ? [m] : [])]) if (f.path && f.open) opens.set(f.path, f.open);
         const files = Array.isArray(read.files) ? read.files.map((f) => (String(f.open ?? '').startsWith(CITE) ? (opens.has(f.path) ? { ...f, open: opens.get(f.path) } : null) : f)).filter(Boolean) : read.files;
@@ -387,6 +401,41 @@ export class Rooms {
         return copies;
     }
 
+    /* A TETHER CALL HELD FOR AN AI AT WORK FOR A ROOM (07-11): an AI given a message of the room and not done with it
+       asks the person to allow a call -- its card goes in that room's thread too (and each room it works for), the
+       same line its own chat has (talk.event's shape: Accept / Refuse, Parley's request card), named by the AI.
+       Kept apart from the thread (the room's `lines`, ROOM_LINES_MAX), read among its messages; masked as any line
+       of a room. Gives the rooms it went to: what is said once it is decided goes there (closed). */
+    held(conversation, event) {
+        const list = this.#all(); const now = Date.now(); const ids = [];
+        for (const r of list) {
+            const on = this.#thinking.get(r.id);
+            const me = on && this.#shown(r).find((m) => m.kind === 'ai' && m.ref === conversation && on.has(m.id) && now - on.get(m.id).at < THINKING_MS);
+            if (!me) continue;
+            const request = event?.request && typeof event.request === 'object' ? { ...event.request, sub: [me.name, ...(Array.isArray(event.request.sub) ? event.request.sub : event.request.sub ? [event.request.sub] : [])].slice(0, 4) } : undefined;
+            const text = event?.text && typeof event.text === 'object' ? event.text : `${me.name}: ${String(event?.text ?? '')}`;
+            if (this.#line(r, { ...event, text, ...(request ? { request } : {}) })) ids.push(r.id);
+        }
+        if (ids.length) this.#file.set(list);
+        return ids;
+    }
+    /* What closes it (a 'tether-done' carrying its id), in the rooms its card went to. */
+    closed(ids, event) {
+        const list = this.#all(); let any = false;
+        for (const r of list) if ((Array.isArray(ids) ? ids : []).includes(r.id) && this.#line(r, event)) any = true;
+        if (any) this.#file.set(list);
+    }
+    #line(room, { kind, text, level, tone, topic, brief, actions, request, outcome } = {}) {
+        if (!Object.hasOwn(LINE_LEVELS, kind)) return null;
+        const kept = { id: randomUUID(), at: this.#now().toISOString(), event: kind, text: maskedAll(text), level: LEVELS.includes(level) ? level : LINE_LEVELS[kind],
+            ...(tone === 'warn' || tone === 'bad' ? { tone } : {}), ...(topic ? { topic: maskedAll(topic) } : {}), ...(typeof brief === 'string' && brief ? { brief: brief.slice(0, 60) } : {}),
+            actions: (Array.isArray(actions) ? actions : []).filter((a) => typeof a === 'string' && LINE_ACTION.test(a)).slice(0, 4),
+            ...(request && typeof request === 'object' && JSON.stringify(request).length <= 8000 ? { request: maskedAll(request) } : {}),
+            ...(typeof outcome === 'string' && outcome ? { outcome: outcome.slice(0, 20) } : {}) };
+        room.lines = [...(Array.isArray(room.lines) ? room.lines : []), kept].slice(-ROOM_LINES_MAX);
+        return kept;
+    }
+
     /* Each conversation told the rooms it is in, and who is there. */
     #tellConversations(list) {
         const shown = list.map((r) => ({ ...r, members: this.#shown(r) }));

package/server/settingswords.mjs

@@ -40,15 +40,15 @@ export const SETTINGS_WORDS_FR = {
     'set-backup-now': 'Exporter · importer', 'set-git-key': '1 clé git', 'set-git-keys': '{n} clés git', 'set-restart': 'redémarrer',
     'set-logs-now': 'Clavarium, machines, système',
     'set-dict-backup': 'Secours en service', 'set-dict-expired': 'Clé expirée', 'set-dict-with-backup': 'avec secours', 'set-dict-server': 'réglée sur le serveur',
-    'set-attached': '{n} joints', 'set-secret': '1 secret', 'set-secrets': '{n} secrets', 'set-offline': 'hors ligne',
+    'set-offline': 'hors ligne',
     'set-device': '1 appareil', 'set-devices': '{n} appareils', 'set-no-device': 'Aucun appareil', 'set-chat': 'Chat',
     'set-wakeups-on': '{on} sur {n} actifs', 'set-asleep': 'En veille', 'set-not-looked': 'Pas encore regardée',
     'set-running-well': 'En marche · rien d\'anormal', 'set-conv-advanced': 'Archiver · remettre à neuf · supprimer',
     /* New asset, one box (05-11, step 3): one verb per gesture -- Créer, Attacher, Terminé. */
-    'set-na-new': 'Nouvel asset', 'set-na-attach': 'Attacher', 'set-na-there': 'Déjà là', 'set-na-or-new': 'ou un nouveau',
+    'set-na-new': 'Nouvel asset', 'set-na-there': 'Déjà là', 'set-na-or-new': 'ou un nouveau',
     'set-na-step-kind': 'Type', 'set-na-step-set': 'Réglage', 'set-na-step-made': 'Créé', 'set-na-back': 'Retour',
-    'set-na-will': 'Sera relié à {name}', 'set-na-level': 'Ce qu\'il pourra faire', 'set-na-read': 'Lecture', 'set-na-write': 'Écriture',
-    'set-na-made': '{name} créé', 'set-na-made-to': '{name} créé et relié à {to}', 'set-na-another': 'En créer un autre', 'set-na-done': 'Terminé',
+    'set-na-will': 'Sera donné à {name}', 'set-na-level': 'Ce qu\'il pourra faire',
+    'set-na-made': '{name} créé', 'set-na-made-to': '{name} créé et donné à {to}', 'set-na-another': 'En créer un autre', 'set-na-done': 'Terminé',
     'set-na-create': 'Créer', 'set-na-new-key': '+ Nouvelle clé…',
     /* The top bar's way back (06-11, kit.js TopBar). */
     'set-back': 'Retour', 'set-back-convs': 'Conversations',
@@ -101,7 +101,7 @@ export const SETTINGS_WORDS_FR = {
     'set-as-nobody': 'personne',
     /* The one list of assets (06-11, kit AssetList): its views, its one button, a group's head, what an empty one says. */
     'set-as-new': 'Nouveau', 'set-as-by-group': 'Groupes', 'set-as-by-type': 'Types', 'set-as-no-group': 'Sans groupe',
-    'set-as-fold': 'Replier', 'set-as-unfold': 'Déplier', 'set-as-group-open': 'Réglages de {name}', 'set-as-group-gear': 'Donner, renommer, supprimer',
+    'set-as-fold': 'Replier', 'set-as-unfold': 'Déplier', 'set-as-group-gear': 'Donner, renommer, supprimer',
     'set-as-group-empty': 'Vide : glissez un asset ici', 'set-as-all-grouped': 'Chaque asset est dans un groupe',
     'set-as-no-groups': 'Créez un groupe, puis glissez-y un asset',
     /* One asset opened (06-11, kit AssetPanel, AccessList): who has it, its kind, what a calendar's levels mean, delete. */
@@ -140,7 +140,6 @@ export const SETTINGS_WORDS_FR = {
     'set-as-card': '1 carte', 'set-as-cards': '{n} cartes', 'set-as-linked': 'lié : {list}',
     'set-as-to-send': 'À envoyer', 'set-as-to-send-sub': 'tous les dépôts, relus et envoyés ensemble', 'set-as-waiting': '{n} vous attendent',
     'set-as-none-given': 'Rien ne lui est encore donné.', 'set-as-no-match': 'Rien à ce nom.',
-    'set-as-group': 'Groupe', 'set-as-group-make': 'Créez-en un dans la vue « Groupes ».',
     'set-as-files': 'Fichiers', 'set-as-browse': 'Parcourir',
     'set-cx-mail': 'boîte mail', 'set-cx-calendar': 'agenda', 'set-cx-contacts': 'carnet d\'adresses', 'set-cx-files': 'dossier en ligne',
     /* External MCP servers (mcpx.mjs): the form, their tools, the rights in their own words. */
@@ -160,9 +159,21 @@ export const SETTINGS_WORDS_FR = {
     'set-rt-mcp-hint-propose': 'Tous les outils, chaque modification approuvée', 'set-rt-mcp-hint-free': 'Tous les outils ; suppressions demandées',
     'set-rt-mcp-hint-frame': 'Votre choix pour chaque sorte d\'outil',
     'set-cx-ssh': 'machine', 'set-cx-computer': 'ordinateur', 'set-cx-browser': 'navigateur', 'set-cx-screen': 'écran', 'set-cx-device': 'appareil',
-    'set-acc-share': 'Partager avec un appareil…', 'set-acc-in-assets': 'Ouvrir dans Assets', 'set-acc-detach': 'Retirer',
+    'set-acc-share': 'Partager avec un appareil…', 'set-acc-in-assets': 'Ouvrir dans Assets',
     'set-acc-used-1': 'Utilisé par 1 conversation : mettez « Aucun »', 'set-acc-used-n': 'Utilisé par {n} conversations : mettez « Aucun »',
-    'set-acc-folders': 'Dossiers, dépôts, boîtes mail', 'set-acc-secrets': 'Secrets remis à son outil',
+    /* Give… (07-11, assets step 4): in a conversation's tab; Settings › Access one line; a secret's next start. */
+    'set-give-go': 'Donner', 'set-give-all': 'Elle a déjà chaque asset.',
+    /* A group (07-11, assets step 5): opened in the asset panel, given to every member, made from any view. */
+    'set-group-new': 'Nouveau groupe', 'set-group-new-dots': 'Nouveau groupe…', 'set-group-name': 'Nom du groupe',
+    'set-group-add': 'Ajouter', 'set-group-cancel': 'Annuler', 'set-group-of': 'Groupe de {name}',
+    'set-group-in': 'Dans le groupe', 'set-group-has': '{has} sur {of}', 'set-group-per-asset': 'Le droit reste sur chaque asset.',
+    'set-group-empty-hint': 'Vide : choisissez ce groupe sur un asset.',
+    'set-group-rename': 'Renommer…', 'set-group-save': 'Renommer', 'set-group-remove': 'Retirer le groupe…',
+    'set-group-remove-q': 'Ses assets restent ; seul le groupe part.', 'set-group-remove-yes': 'Retirer',
+    'set-group-skipped-1': '1 ignoré : {why}', 'set-group-skipped-n': '{n} ignorés : {why}',
+    'set-group-only': '{kind}, {levels} seulement', 'set-group-no-device': '{kind}, pas pour un appareil',
+    'set-acc-assets-1': '1 asset · voir', 'set-acc-assets-n': '{n} assets · voir', 'set-acc-asset-1': '1 asset', 'set-acc-asset-n': '{n} assets',
+    'set-secret-next-on': '{name} : remis à son outil au prochain démarrage', 'set-secret-next-off': '{name} : plus remis dès son prochain démarrage',
     'set-files-list': 'Liste', 'set-files-icons': 'Icônes', 'set-files-empty': 'Ce dossier est vide.',
     'set-files-read-only': 'Lecture seule : rien ne peut y être changé.',
     'set-this-conv': 'Cette conversation · {name}', 'set-ask-first': 'Demander avant d\'agir',

package/server/tethers.mjs

@@ -103,6 +103,9 @@ export class Tethers {
     /* Set by the server once the thread is ready (main.mjs): (name, event) => talk.event(...).
        A call waiting for the owner is said in its conversation's thread when there is one. */
     announce = null;
+    /* Set by the server too (main.mjs): the rooms (rooms.mjs) -- a call held for an AI at work for a room is said in
+       that room as well (held: the rooms it went to), and closed there (closed) when it is decided. */
+    rooms = null;
 
     /* `resources`: Resources (workFolder). `conversations()`: the names of the conversations.
        `secrets`: the vault, read by name for a connector only (reveal). `dockets`: { on(name), post(name,
@@ -152,7 +155,10 @@ export class Tethers {
             /* `request`: the card Parley draws (demandes.mjs); the text and its buttons stay for an older screen. */
             let request;
             try { request = demandeView(r); } catch { request = undefined; }
-            try { this.announce(name, { kind: 'tether-demande', text: text || (r.verb ?? 'A Tether call'), topic: TOPIC_REQUEST, tone: 'warn', actions: [`allow:${r.id}`, `deny:${r.id}`], ...(request ? { request } : {}) }); } catch { /* its chat is off */ }
+            const event = { kind: 'tether-demande', text: text || (r.verb ?? 'A Tether call'), topic: TOPIC_REQUEST, tone: 'warn', actions: [`allow:${r.id}`, `deny:${r.id}`], ...(request ? { request } : {}) };
+            try { this.announce(name, event); } catch { /* its chat is off */ }
+            /* At work for a room (a message of it not yet answered): the same card there, decided there as here. */
+            try { const ids = this.rooms?.held(name, event); if (Array.isArray(ids) && ids.length) this.#seen.get(r.id).rooms = ids; } catch { /* its rooms' */ }
         }
         /* An approved call only the owner's browser can do (a device to flash): said once, with where to do it. */
         let jobs = [];
@@ -178,7 +184,9 @@ export class Tethers {
             const accepted = outcome === 'yes' || outcome === 'always';
             if (accepted) { this.#acting.push({ id, ...info }); if (this.#acting.length > ACTING_MAX) this.#acting.shift(); }
             const text = endedLine(info.verb, outcome);
-            try { this.announce(info.name, { kind: 'tether-done', text, topic: TOPIC_REQUEST, brief: id, ...(outcome ? { outcome } : {}) }); } catch { /* its chat is off */ }
+            const done = { kind: 'tether-done', text, topic: TOPIC_REQUEST, brief: id, ...(outcome ? { outcome } : {}) };
+            try { this.announce(info.name, done); } catch { /* its chat is off */ }
+            if (info.rooms) try { this.rooms?.closed(info.rooms, done); } catch { /* its rooms' */ }
         }
         for (const id of [...this.#ended.keys()]) if (!this.#seen.has(id)) this.#ended.delete(id);
     }