clavarium 0.2.370-next.1 → 0.2.372-next.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "clavarium",
-  "version": "0.2.370-next.1",
+  "version": "0.2.372-next.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.2.370-next.1",
+      "version": "0.2.372-next.1",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",
@@ -14,7 +14,7 @@
         "clavarium-binder": "0.1.62-next.1",
         "clavarium-docket": "0.1.2-next.2",
         "clavarium-parley": "0.17.86-next.1",
-        "clavarium-tether": "0.1.0-next.55",
+        "clavarium-tether": "0.1.0-next.57",
         "mammoth": "1.13.0",
         "mermaid": "11.17.2",
         "node-pty": "^1.1.0",
@@ -800,9 +800,9 @@
       }
     },
     "node_modules/clavarium-tether": {
-      "version": "0.1.0-next.55",
-      "resolved": "https://registry.npmjs.org/clavarium-tether/-/clavarium-tether-0.1.0-next.55.tgz",
-      "integrity": "sha512-JQfEM0scuNU2TQCp0dOc8U/1M9lJt7ciSerok6BDA1lC2RINhHbRiucEMWGss145/R+DfTIgR2mNfuZ8U0r/jg==",
+      "version": "0.1.0-next.57",
+      "resolved": "https://registry.npmjs.org/clavarium-tether/-/clavarium-tether-0.1.0-next.57.tgz",
+      "integrity": "sha512-klagmTU3NdzMO6fA+nMvLg9UTW9XOWN1QYa1JF4ywykeliJsAMNOIWzAvlsVFEMPSg0t4IkcZq/Ui7dyTdDHDg==",
       "license": "MIT",
       "bin": {
         "tether": "bin/cli.mjs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clavarium",
-  "version": "0.2.370-next.1",
+  "version": "0.2.372-next.1",
   "license": "MIT",
   "type": "module",
   "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",
@@ -47,7 +47,7 @@
     "clavarium-binder": "0.1.62-next.1",
     "clavarium-docket": "0.1.2-next.2",
     "clavarium-parley": "0.17.86-next.1",
-    "clavarium-tether": "0.1.0-next.55",
+    "clavarium-tether": "0.1.0-next.57",
     "mammoth": "1.13.0",
     "mermaid": "11.17.2",
     "node-pty": "^1.1.0",

package/server/api.mjs

@@ -167,6 +167,7 @@ import { WORK_TAB } from './resources.mjs';
 import { transcribe, AUDIO_MAX } from './voice.mjs';
 import { FILE_MAX } from './setup.mjs';
 import { demandeView } from './demandes.mjs';
+import { mcpAdd, mcpImport, mcpRefresh, mcpRights, mcpSeen, forgetKey } from './mcpx.mjs';
 
 const BODY_MAX = 16 * 1024;
 /* A setup file travels inside the JSON of a request: room for it, escaped. */
@@ -614,7 +615,18 @@ export async function handleApi(request, response, conversations, headers, resou
         /* Assets > Access: the owner sets a conversation's level and rules on a
            target, decides a call that waited, or removes a target. Each is an op the
            keeper runs as the owner (person), never as an agent. */
+        /* External MCP servers (mcpx.mjs): added with their key (kept host-only in the vault, Tether given its name),
+           imported from a pasted mcpServers block, listed again, a conversation's rights on their tools, new tools seen. */
+        const mcpOp = /^\/api\/tether\/mcp-(add|import|refresh|rights|seen)$/.exec(pathname);
+        if (mcpOp && tethers) {
+            const ctx = { tethers, secrets };
+            const done = await { add: mcpAdd, import: mcpImport, refresh: mcpRefresh, rights: mcpRights, seen: mcpSeen }[mcpOp[1]](ctx, body ?? {});
+            return send(mcpOp[1] === 'add' || mcpOp[1] === 'import' ? 201 : 200, done), true;
+        }
+        /* A server taken away: the key kept for it goes too. */
+        const mcpGone = pathname === '/api/tether/remove-target' && tethers ? tethers.store().target(String(body?.target ?? '')) : null;
         const tetherOp = /^\/api\/tether\/(level|allow|unallow|decide|remove-target|stop|resume|job-done|job-file)$/.exec(pathname);
+        if (tetherOp && tethers && mcpGone?.kind === 'mcp') { const r = await tethers.act('remove-target', body, ''); if (!r.ok) throw new Refusal(400, r.text); forgetKey(secrets, mcpGone); return send(200, r.data ?? { ok: true }), true; }
         if (tetherOp && tethers) { const r = await tethers.act(tetherOp[1], body, ''); if (!r.ok) throw new Refusal(400, r.text); return send(200, r.data ?? { ok: true }), true; }
         /* A mailbox's signature (Markdown), added under what the agent sends from it. */
         if (pathname === '/api/tether/signature' && tethers) {

package/server/demandes.mjs

@@ -32,6 +32,34 @@ const whom = (list) => (list.length ? `${list[0]}${list.length > 1 ? ` +${list.l
 const plain = (body) => String(body ?? '').replace(/\*\*(\S[^*\n]*?)\*\*/g, '$1').replace(/__(\S[^_\n]*?)__/g, '$1').replace(/(^|[^*\w])\*(\S[^*\n]*?)\*(?!\w)/g, '$1$2')
     .replace(/\[([^\]\n]+)\]\(([^)\s]+)\)/g, '$1 ($2)').replace(/^#{1,6}\s+/gm, '');
 
+/* A CALL OF AN EXTERNAL MCP SERVER'S TOOL (Tether's card { kind: 'mcp', action: 'call', server, tool, title?, class, open?,
+ * fresh?, args }, 07-11): which server, which tool, its class, its arguments in short, the AI's why. Parley has no card
+ * of this kind nor its words yet: drawn as its generic card (kind 'other'), each word with its English (`t`), which an
+ * older or unknowing screen says as it is. A tool that deletes or overwrites: irreversible (amber, never in Accept all). */
+export const MCP_CLASS_SAID = { read: 'Reads only', write: 'Writes', destructive: 'Deletes or overwrites' };
+const MCP_ARGS_MAX = 6; const MCP_ARG_MAX = 160;
+const said = (k, t, v) => ({ k, ...(v ? { v } : {}), t });
+function mcpCard(c, v, sub) {
+    const server = String(c.server ?? '') || 'an MCP server';
+    const tool = String(c.title || c.tool || 'a tool');
+    const cls = Object.hasOwn(MCP_CLASS_SAID, c.class) ? c.class : 'destructive';
+    v.title = said('req-mcp-call', `Use ${tool} on ${server}`, { tool, server });
+    sub.push(server, said(`req-mcp-class-${cls}`, MCP_CLASS_SAID[cls]));
+    v.facts.push([said('req-fact-server', 'Server'), server]);
+    v.facts.push([said('req-fact-tool', 'Tool'), c.title && c.tool && c.title !== c.tool ? `${c.title} (${c.tool})` : tool]);
+    v.facts.push([said('req-fact-class', 'Kind'), said(`req-mcp-class-${cls}`, MCP_CLASS_SAID[cls])]);
+    if (c.fresh === true) v.risk.push(said('req-risk-mcp-fresh', 'New or changed on its server'));
+    if (cls === 'destructive') v.risk.push(said('req-risk-mcp-destructive', 'May delete or overwrite'));
+    if (c.open === true && cls !== 'read') v.risk.push(said('req-risk-mcp-open', 'Reaches outside'));
+    /* Its arguments, in short: a name and its value on a line each, the first few. */
+    const args = Array.isArray(c.args) ? c.args.filter((a) => a && typeof a.name === 'string') : [];
+    if (args.length) {
+        const line = (a) => { const t = String(a.value ?? '').replace(/\s+/g, ' ').trim(); return `${a.name}: ${t.length > MCP_ARG_MAX ? `${t.slice(0, MCP_ARG_MAX - 1)}…` : t}`; };
+        v.code = [...args.slice(0, MCP_ARGS_MAX).map(line), ...(args.length > MCP_ARGS_MAX ? [`… +${args.length - MCP_ARGS_MAX}`] : [])].join('\n');
+    }
+    v.irreversible = cls === 'destructive';
+}
+
 export function demandeView(q) {
     const c = q?.card ?? {}; const about = c.about ?? {};
     const kind = KINDS.has(c.kind) ? c.kind : 'other';
@@ -152,6 +180,7 @@ export function demandeView(q) {
         v.yes = c.action === 'delete' ? 'delete' : c.action === 'move' ? 'move' : 'write';
         if (c.action === 'delete') { v.irreversible = true; v.risk.push(w('req-risk-final')); }
     } else if (c.kind === 'browser' && c.action === 'open') { v.title = w('req-browser-open', { url: String(c.url) }); v.yes = 'open'; if (where) sub.push(where); }
+    else if (c.kind === 'mcp') mcpCard(c, v, sub);
     else { v.title = `${q?.verb ?? 'action'}${q?.detail ? ` ${q.detail}` : ''}`; if (where) sub.push(where); }
     const id = String(q?.id ?? '');
     return {

package/server/mcpx.mjs

@@ -0,0 +1,154 @@
+/* EXTERNAL MCP SERVERS, THROUGH TETHER (07-11). The owner adds a server reached over Streamable HTTP
+ * (Assets › Access): its name, its address, its key. Tether (clavarium-tether 0.1.0-next.56, a target of
+ * kind `mcp`) lists its tools, sorts them by their annotations (read / write / destructive), offers them to
+ * each conversation by its rights, and asks a person where they say so (a card, demandes.mjs).
+ *
+ * THE KEY STAYS HERE. It is kept in this server's vault as a host-only secret (secrets.mjs: never put in a
+ * machine), named MCP_<ID>_KEY, and Tether is handed only that NAME: the keeper reveals it for the
+ * connector alone. It is never logged, returned or said back -- not even in an error (every answer is
+ * scrubbed of it before it leaves). A pasted `mcpServers` file names its keys the same way ("${NAME}"),
+ * each a secret already in the vault; a value written in it, or a program to start (stdio), is refused.
+ *
+ * Each function answers the route's body, or throws a Refusal (the page says its message). */
+import { Refusal } from './conversations.mjs';
+
+const AGENT = 'conversation:';
+export const KEY_PREFIX = 'MCP_';
+export const KEY_SUFFIX = '_KEY';
+/* MCP_ + the id + _KEY within a secret's 40 characters. */
+const ID_MAX = 40 - KEY_PREFIX.length - KEY_SUFFIX.length;
+const REF = /^[A-Z][A-Z0-9_]{0,39}$/;
+const HEADER_REF = /^(Bearer\s+)?\$\{([A-Za-z0-9_][A-Za-z0-9_.:-]{0,99})\}$/;
+const CLASSES = ['read', 'write', 'destructive'];
+const GOES = ['yes', 'ask', 'no'];
+
+/* A server's id from its name: small letters, digits and dashes, as Tether keeps it. */
+export function serverId(name) {
+    return String(name ?? '').normalize('NFKD').replace(/[̀-ͯ]/g, '').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, ID_MAX).replace(/-+$/, '');
+}
+/* The vault's name for a server's key. */
+export const keyName = (id) => `${KEY_PREFIX}${String(id).toUpperCase().replace(/[^A-Z0-9]/g, '_')}${KEY_SUFFIX}`;
+
+/* Everything said back, scrubbed of the key: a server that echoes it, an error that quotes it. */
+function scrub(data, key) {
+    if (!key) return data;
+    try { return JSON.parse(JSON.stringify(data ?? null).split(key).join('[key]').split(JSON.stringify(key).slice(1, -1)).join('[key]')); } catch { return null; }
+}
+const said = (text, key) => (key ? String(text ?? '').split(key).join('[key]') : String(text ?? ''));
+const known = (secrets, name) => { try { return (secrets?.list({ held: true }) ?? []).some((s) => s.name === name); } catch { return false; } };
+/* A target as the page reads it: never a secret's value (Tether gives only their slots' names). */
+const shown = (t) => { if (!t || typeof t !== 'object') return t; const { secrets: _s, ...rest } = t; return { ...rest, secrets: Array.isArray(_s) ? _s : Object.keys(_s ?? {}) }; };
+
+/* ADD (or set again) one server: { name, url, key?, header?, allowHttp? } -> the target, its tools listed (or `error`). */
+export async function mcpAdd({ tethers, secrets }, body = {}) {
+    const name = String(body.name ?? '').trim();
+    const url = String(body.url ?? '').trim();
+    const key = typeof body.key === 'string' ? body.key.trim() : '';
+    if (!name) throw new Refusal(400, 'Give the server a name.');
+    if (name.length > 120) throw new Refusal(400, 'A name is 120 characters at most.');
+    const id = serverId(name);
+    if (!id) throw new Refusal(400, 'Give the server a name with letters or digits.');
+    if (!url) throw new Refusal(400, 'Give the server\'s address (https://...).');
+    if (key && /[\r\n\0]/.test(key)) throw new Refusal(400, 'A key is one line.');
+    const before = tethers.store().target(id);
+    if (before && before.kind !== 'mcp') throw new Refusal(409, 'That name is taken by another access.');
+    const ref = keyName(id);
+    const had = known(secrets, ref);
+    /* Its key, in the vault, host-only: Tether gets its name. None given: the one it had, or none. */
+    let secret = '';
+    if (key) { secrets.set({ name: ref, value: key, hostOnly: true }); secret = ref; }
+    else if (before?.secrets?.token) secret = String(before.secrets.token);
+    const r = await tethers.act('mcp-add', { id, name, url, ...(secret ? { secret } : {}), ...(body.header ? { header: String(body.header) } : {}), ...(body.allowHttp === true ? { allowHttp: true } : {}) }, '');
+    if (!r.ok) {
+        /* Nothing was made: a key kept for it alone goes too. */
+        if (key && !had && !before) { try { secrets.remove(ref); } catch { /* not there */ } }
+        throw new Refusal(400, said(r.text, key));
+    }
+    return scrub(shown(r.data), key);
+}
+
+/* IMPORT a pasted { "mcpServers": { name: { url, headers: { Authorization: "Bearer ${NAME}" } } } }: each key a
+   reference to a secret of the vault (none written in it), no program to start. -> the targets made. */
+export async function mcpImport({ tethers, secrets }, body = {}) {
+    let config = body.config;
+    if (typeof config === 'string') {
+        try { config = JSON.parse(config); } catch { throw new Refusal(400, 'That is not JSON: paste the whole { "mcpServers": ... } block.'); }
+    }
+    const all = config && typeof config === 'object' ? (config.mcpServers ?? config.servers) : null;
+    if (!all || typeof all !== 'object' || Array.isArray(all) || !Object.keys(all).length) throw new Refusal(400, 'Paste a block like { "mcpServers": { "name": { "url": "https://...", "headers": { "Authorization": "Bearer ${SECRET}" } } } }.');
+    const servers = {};
+    for (const [name, s] of Object.entries(all)) {
+        const label = String(name).slice(0, 60);
+        if (!s || typeof s !== 'object' || Array.isArray(s)) throw new Refusal(400, `${label}: not a server.`);
+        if (s.command !== undefined || s.args !== undefined || s.type === 'stdio') throw new Refusal(400, `${label}: a program to start (stdio) is not run here. Only a server reached by its address.`);
+        const heads = s.headers && typeof s.headers === 'object' && !Array.isArray(s.headers) ? Object.entries(s.headers) : [];
+        if (heads.length > 1) throw new Refusal(400, `${label}: one header for the key at most.`);
+        for (const [h, v] of heads) {
+            const m = HEADER_REF.exec(String(v ?? '').trim());
+            /* Never said back: the header holds a value, whatever it is. */
+            if (!m) throw new Refusal(400, `${label}: the header ${String(h).slice(0, 60)} holds a value. Write a reference instead: "\${SECRET_NAME}".`);
+            if (!REF.test(m[2]) || !known(secrets, m[2])) throw new Refusal(400, `${label}: no secret named ${m[2].slice(0, 60)} here. Add it in Secrets first.`);
+        }
+        if (s.env && typeof s.env === 'object' && Object.keys(s.env).length) throw new Refusal(400, `${label}: "env" is for a program to start. Only a server reached by its address.`);
+        servers[name] = { url: s.url ?? s.serverUrl, ...(heads.length ? { headers: Object.fromEntries(heads) } : {}), ...(s.allowHttp === true ? { allowHttp: true } : {}) };
+    }
+    const r = await tethers.act('mcp-import', { config: { mcpServers: servers } }, '');
+    if (!r.ok) throw new Refusal(400, r.text);
+    return { servers: (Array.isArray(r.data) ? r.data : []).map(shown) };
+}
+
+/* LIST AGAIN one server's tools, now. */
+export async function mcpRefresh({ tethers }, body = {}) {
+    const target = String(body.target ?? '');
+    const t = tethers.store().target(target);
+    if (!t || t.kind !== 'mcp') throw new Refusal(404, 'No such MCP server.');
+    const r = await tethers.act('mcp-refresh', { target }, '');
+    const now = tethers.store().target(target);
+    /* Not reached: said, its last list kept. */
+    return { catalog: now?.catalog ?? null, ...(r.ok ? {} : { error: r.text }) };
+}
+
+/* ONE CONVERSATION'S RIGHTS on a server, beyond its level: { target, agent, classes?, tools?, askOpen? } (null takes
+   a setting back). Its level (Off / Read / All with approval / All / Custom) is /api/tether/level. */
+export async function mcpRights({ tethers }, body = {}) {
+    const target = String(body.target ?? '');
+    const agent = String(body.agent ?? '');
+    const t = tethers.store().target(target);
+    if (!t || t.kind !== 'mcp') throw new Refusal(404, 'No such MCP server.');
+    if (!agent.startsWith(AGENT) || agent.length <= AGENT.length) throw new Refusal(400, 'Rights are given to a conversation.');
+    const args = { target, agent };
+    if (body.classes !== undefined) {
+        if (!body.classes || typeof body.classes !== 'object' || Array.isArray(body.classes)) throw new Refusal(400, 'classes: { read, write, destructive }, each yes, ask or no.');
+        for (const [k, v] of Object.entries(body.classes)) if (!CLASSES.includes(k) || !(v === null || GOES.includes(v))) throw new Refusal(400, 'classes: { read, write, destructive }, each yes, ask or no.');
+        args.classes = body.classes;
+    }
+    if (body.tools !== undefined) {
+        if (!body.tools || typeof body.tools !== 'object' || Array.isArray(body.tools)) throw new Refusal(400, 'tools: { name: yes, ask or no }.');
+        for (const v of Object.values(body.tools)) if (!(v === null || GOES.includes(v))) throw new Refusal(400, 'tools: { name: yes, ask or no }.');
+        args.tools = body.tools;
+    }
+    if (body.askOpen !== undefined) args.askOpen = body.askOpen === null ? null : body.askOpen === true;
+    const r = await tethers.act('mcp-rights', args, '');
+    if (!r.ok) throw new Refusal(400, r.text);
+    return r.data;
+}
+
+/* NEW TOOLS SEEN (Tether 0.1.0-next.57): a tool new on its server, or whose annotations changed, is `fresh` -- asked
+   even at All until a person approves one call of it or marks it seen here. { target, tools? } (absent: every fresh
+   tool of that server) -> { seen: [names] }. A Tether without the op says so. */
+export async function mcpSeen({ tethers }, body = {}) {
+    const target = String(body.target ?? '');
+    const t = tethers.store().target(target);
+    if (!t || t.kind !== 'mcp') throw new Refusal(404, 'No such MCP server.');
+    if (body.tools !== undefined && (!Array.isArray(body.tools) || body.tools.some((x) => typeof x !== 'string'))) throw new Refusal(400, 'tools: a list of tool names.');
+    const r = await tethers.act('mcp-seen', { target, ...(body.tools ? { tools: body.tools } : {}) }, '');
+    if (!r.ok) throw new Refusal(/there is no mcp-seen/.test(r.text ?? '') ? 501 : 400, /there is no mcp-seen/.test(r.text ?? '') ? 'This Tether cannot mark tools as seen yet: update it.' : r.text);
+    return { seen: Array.isArray(r.data?.seen) ? r.data.seen : [] };
+}
+
+/* A server taken away: its key goes with it (only the one kept for it here). */
+export function forgetKey(secrets, target) {
+    const ref = target?.kind === 'mcp' ? String(target.secrets?.token ?? '') : '';
+    if (!ref || ref !== keyName(target.id)) return;
+    try { secrets?.remove(ref); } catch { /* not there */ }
+}

package/server/settingswords.mjs

@@ -142,6 +142,22 @@ export const SETTINGS_WORDS_FR = {
     '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. */
+    'set-na-k-mcp': 'Serveur MCP', 'set-cx-mcp': 'serveur MCP',
+    'set-mcp-head': 'Ajouter un serveur MCP', 'set-mcp-hint': 'Ses outils pour vos IA ; la clé reste ici.',
+    'set-mcp-name': 'Nom', 'set-mcp-url': 'Adresse', 'set-mcp-key': 'Clé', 'set-mcp-add': 'Ajouter',
+    'set-mcp-paste': 'Coller une configuration', 'set-mcp-paste-hint': 'Clés en secrets : ${NOM}. Aucun programme.',
+    'set-mcp-import': 'Importer', 'set-mcp-tools': 'Outils', 'set-mcp-refresh': 'Actualiser', 'set-mcp-seen': 'Marquer comme vu',
+    'set-mcp-none': 'Aucun outil listé pour l\'instant.', 'set-mcp-unreached': 'Injoignable : {why}', 'set-mcp-open': 'atteint l\'extérieur',
+    'set-mcp-fresh': 'Nouveau : demandé jusqu\'à ce que vous l\'ayez vu',
+    'set-mcp-c-read': 'Lecture seule', 'set-mcp-c-write': 'Écrit', 'set-mcp-c-destructive': 'Supprime ou écrase',
+    'set-mcp-custom': 'Droits personnalisés', 'set-mcp-yes': 'Oui', 'set-mcp-ask': 'Demander', 'set-mcp-no': 'Non',
+    'set-rt-mcp-none': 'Coupé', 'set-rt-mcp-watch': 'Lit', 'set-rt-mcp-propose': 'Tout, approuvé', 'set-rt-mcp-free': 'Tout', 'set-rt-mcp-frame': 'Personnalisé',
+    'set-rt-mcp-pick-none': 'Coupé', 'set-rt-mcp-pick-watch': 'Lecture', 'set-rt-mcp-pick-propose': 'Tout avec accord',
+    'set-rt-mcp-pick-free': 'Tout', 'set-rt-mcp-pick-frame': 'Personnalisé',
+    'set-rt-mcp-hint-none': 'Pas donné', 'set-rt-mcp-hint-watch': 'Ses outils en lecture seule',
+    '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-used-1': 'Utilisé par 1 conversation : mettez « Aucun »', 'set-acc-used-n': 'Utilisé par {n} conversations : mettez « Aucun »',

package/web/app.js

@@ -3947,7 +3947,7 @@
         line.append(summary, el('pre', '', rest));
         return line;
     }
-    const kindIcon = (kind) => { const name = kind === 'send' || kind === 'demandes' ? 'arrow-up' : kind === 'box' ? 'mic' : kind === 'device' ? 'smartphone' : ASSET_KINDS.find((k) => k[0] === kind)?.[2]; const holder = el('span', 'as-ic'); holder.dataset.kind = kind; const svg = kind === 'list' ? listIcon() : name ? window.clavariumIcons?.icon(name) : null; if (svg) holder.append(svg); return holder; };
+    const kindIcon = (kind) => { const name = kind === 'send' || kind === 'demandes' ? 'arrow-up' : kind === 'box' ? 'mic' : kind === 'device' ? 'smartphone' : kind === 'mcp' ? 'link' : ASSET_KINDS.find((k) => k[0] === kind)?.[2]; const holder = el('span', 'as-ic'); holder.dataset.kind = kind; const svg = kind === 'list' ? listIcon() : name ? window.clavariumIcons?.icon(name) : null; if (svg) holder.append(svg); return holder; };
     /* A list (Binder's): the set has no such sign, so it is drawn here, in its style. */
     function listIcon() {
         const SVG = 'http://www.w3.org/2000/svg';
@@ -4916,7 +4916,7 @@
         await refresh();
     }
     /* The plain word for a Tether target's kind, in a Connexion's sub-line. */
-    const CONNEXION_SUB = { mail: 'mailbox', calendar: 'calendar', contacts: 'address book', files: 'online folder', ssh: 'machine', computer: 'computer', browser: 'browser', screen: 'screen', device: 'device' };
+    const CONNEXION_SUB = { mail: 'mailbox', calendar: 'calendar', contacts: 'address book', files: 'online folder', ssh: 'machine', computer: 'computer', browser: 'browser', screen: 'screen', device: 'device', mcp: 'MCP server' };
     const connexionSub = (kind) => (kind in CONNEXION_SUB ? uiSaid(`set-cx-${kind}`, CONNEXION_SUB[kind]) : kind);
     const connexionOwnSub = (kind) => (tetherCat(kind) === 'acces' ? connexionSub(kind) : '');
     /* Give a Tether target to a conversation at a level, or take it back (none). */
@@ -5034,7 +5034,7 @@
     const newKinds = () => [['folder', uiSaid('set-na-k-folder', 'Folder')], ['git', uiSaid('set-na-k-git', 'Git repository')], ['mailbox', uiSaid('set-na-k-mailbox', 'Mailbox')],
         ['agenda', uiSaid('set-na-k-agenda', 'Calendar')], ['contacts', uiSaid('set-na-k-contacts', 'Contacts')], ['secret', uiSaid('set-na-k-secret', 'Secret')], ['list', uiSaid('set-na-k-list', LISTS_WORD.one)],
         /* Step 4: a voice box (paired with a code) and a device (the share sheet, its code) are two kinds of it too. */
-        ['box', uiSaid('set-na-k-box', 'Voice box')], ['device', uiSaid('set-na-k-device', 'Device')]]
+        ['box', uiSaid('set-na-k-box', 'Voice box')], ['device', uiSaid('set-na-k-device', 'Device')], ['mcp', uiSaid('set-na-k-mcp', 'MCP server')]]
         .map(([kind, label]) => ({ kind, label, icon: kindIcon(kind) }));
     /* A voice box's steps after its kind (the flow: "A NEW VOICE BOX", with the boxes), and the one under way. */
     const BOX_STEPS = ['where', 'plug', 'pair'];
@@ -5131,6 +5131,70 @@
         await repaintAsset();
         return true;
     }
+    /* AN EXTERNAL MCP SERVER (mcpx.mjs, Tether's mcp target): its address, its tools each with its kind, « Refresh »;
+       a new tool marked until seen (« Mark as seen »); then, for each conversation at Custom, what each kind may do. */
+    const MCP_CLASS = { read: ['set-mcp-c-read', 'Reads only'], write: ['set-mcp-c-write', 'Writes'], destructive: ['set-mcp-c-destructive', 'Deletes or overwrites'] };
+    const mcpClass = (c) => uiSaid(...(MCP_CLASS[c] ?? MCP_CLASS.destructive));
+    function mcpParts(t) {
+        const out = [];
+        if (t.config?.url) out.push(el('p', 'hint mcp-url', t.config.url));
+        const tools = Array.isArray(t.catalog?.tools) ? t.catalog.tools : [];
+        const refresh = el('button', '', uiSaid('set-mcp-refresh', 'Refresh')); refresh.type = 'button'; refresh.dataset.act = 'mcp-refresh';
+        refresh.addEventListener('click', async () => {
+            refresh.disabled = true; $(asErrId()).hidden = true;
+            try { const r = await post(`${API}/tether/mcp-refresh`, { target: t.id }); if (r?.error) sayAsErr(new Error(r.error)); }
+            catch (error) { sayAsErr(error); }
+            await repaintAsset();
+        });
+        const fresh = tools.filter((x) => x.fresh === true);
+        const seen = fresh.length ? el('button', '', uiSaid('set-mcp-seen', 'Mark as seen')) : null;
+        if (seen) {
+            seen.type = 'button'; seen.dataset.act = 'mcp-seen';
+            seen.addEventListener('click', async () => {
+                seen.disabled = true; $(asErrId()).hidden = true;
+                try { await post(`${API}/tether/mcp-seen`, { target: t.id }); } catch (error) { sayAsErr(error); }
+                await repaintAsset();
+            });
+        }
+        const list = el('ul', 'mcp-tools');
+        for (const x of tools) {
+            const li = el('li', 'mcp-tool'); li.dataset.tool = x.name; li.dataset.class = x.class;
+            const nm = el('span', 'mcp-tool-name', x.title || x.name);
+            if (x.description) nm.title = x.description;
+            const kind = el('small', 'mcp-tool-class', mcpClass(x.class)); kind.dataset.class = x.class;
+            li.append(nm, kind);
+            if (x.open && x.class !== 'read') li.append(el('small', 'hint', uiSaid('set-mcp-open', 'reaches outside')));
+            if (x.fresh === true) li.append(el('small', 'mcp-tool-fresh', uiSaid('set-mcp-fresh', 'New — asked until you\'ve seen it')));
+            list.append(li);
+        }
+        const body = [];
+        if (t.catalog?.error) body.push(el('p', 'error', uiSaid('set-mcp-unreached', 'Not reached: {why}', { why: t.catalog.error })));
+        body.push(tools.length ? list : el('p', 'hint', uiSaid('set-mcp-none', 'No tools listed yet.')));
+        out.push({ title: uiSaid('set-mcp-tools', 'Tools'), extra: [seen, refresh], body, cls: 'as-mcp-tools' });
+        /* Custom: each kind of tool Yes / Ask / No, for each conversation set to it. */
+        const custom = Object.entries(t.grants ?? {}).filter(([id, g]) => id.startsWith('conversation:') && g?.level === 'frame');
+        if (custom.length) {
+            const goes = [['yes', uiSaid('set-mcp-yes', 'Yes')], ['ask', uiSaid('set-mcp-ask', 'Ask')], ['no', uiSaid('set-mcp-no', 'No')]].map(([value, label]) => ({ value, label }));
+            const rows = custom.map(([id, g]) => {
+                const box = el('div', 'mcp-custom'); box.dataset.conversation = id.slice('conversation:'.length);
+                const who = conversations.find((c) => c.name === id.slice('conversation:'.length));
+                box.append(el('b', '', (who && shownName(who)) || id.slice('conversation:'.length)));
+                for (const c of ['read', 'write', 'destructive']) {
+                    const now = g.classes?.[c] ?? (c === 'read' ? 'yes' : 'ask');
+                    const line = el('div', 'mcp-custom-line'); line.dataset.class = c;
+                    line.append(el('span', '', mcpClass(c)), KIT.Segmented({ options: goes, value: now, label: mcpClass(c), onChange: async (go) => {
+                        $(asErrId()).hidden = true;
+                        try { await post(`${API}/tether/mcp-rights`, { target: t.id, agent: id, classes: { [c]: go } }); } catch (error) { sayAsErr(error); }
+                        await repaintAsset();
+                    } }));
+                    box.append(line);
+                }
+                return box;
+            });
+            out.push({ title: uiSaid('set-mcp-custom', 'Custom rights'), body: rows, cls: 'as-mcp-custom' });
+        }
+        return out;
+    }
     /* `detail`: where it is drawn. `from`: the conversation it is seen from ('' : the menu). `back`: the way back (a phone).
        `tether`, `groups`: as the page read them. `gits`: the conversation's repositories (To send, beside). */
     async function assetPanel(detail, chosen, { from = '', back, tether = {}, groups = [], gits = [] } = {}) {
@@ -5217,6 +5281,7 @@
                 box.append(lab, ta, row);
                 parts.push(box);
             }
+            if (t.kind === 'mcp') parts.push(...mcpParts(t));
             if (chosen.siblings?.length) {
                 const a = el('p', 'as-assoc hint');
                 a.append(el('b', '', 'Linked'), document.createTextNode(` to the same account: ${chosen.siblings.join(', ')}. They share the account's sign-in (kept on the server); rights are given separately.`));
@@ -5315,7 +5380,8 @@
             parts.push({ title: 'Settings', extra: [edit], body }, gitHolder);
         }
         if (t) {
-            parts.push(el('p', 'hint', 'A level is: watch (read only), propose (asks before each action), frame (acts within its rules, asks for the rest), free (acts, kept in the journal).'));
+            /* An MCP server's rights say themselves (Off / Read / All with approval / All / Custom): no levels' words under them. */
+            if (t.kind !== 'mcp') parts.push(el('p', 'hint', 'A level is: watch (read only), propose (asks before each action), frame (acts within its rules, asks for the rest), free (acts, kept in the journal).'));
             /* Calls waiting for a person (propose/frame). Accept or refuse each. */
             const waiting = (Array.isArray(tether.approvals) ? tether.approvals : []).filter((q) => (q.target?.id ?? q.target) === t.id);
             if (waiting.length) {
@@ -8789,6 +8855,34 @@
         btn.disabled = false; btn.textContent = was;
         await paintAssets();
     });
+    /* ADD AN MCP SERVER (mcpx.mjs): its name, address and key -- the key kept on the server, never shown again. Or a
+       pasted { "mcpServers": ... } block, its keys named as secrets. */
+    $('mcp-new').addEventListener('submit', async (event) => {
+        event.preventDefault();
+        $('mcp-error').hidden = true;
+        const btn = $('mcp-add'); btn.disabled = true;
+        try {
+            const made = await post(`${API}/tether/mcp-add`, { name: $('mcp-name').value.trim(), url: $('mcp-url').value.trim(), key: $('mcp-key').value });
+            $('mcp-new').reset();
+            await assetMade($('mcp-box'), { key: `connexion:${made.id}`, name: made.title, note: made.error ? uiSaid('set-mcp-unreached', 'Not reached: {why}', { why: made.error }) : '',
+                give: (to, level) => grantTarget(made.id, to, targetLevel(level)) });
+        } catch (error) { $('mcp-error').textContent = error.message; $('mcp-error').hidden = false; }
+        $('mcp-key').value = '';
+        btn.disabled = false;
+        await paintAssets();
+    });
+    $('mcp-import').addEventListener('click', async () => {
+        $('mcp-error').hidden = true;
+        const btn = $('mcp-import'); btn.disabled = true;
+        try {
+            const made = await post(`${API}/tether/mcp-import`, { config: $('mcp-config').value });
+            $('mcp-config').value = '';
+            const first = made.servers?.[0];
+            if (first) await assetMade($('mcp-box'), { key: `connexion:${first.id}`, name: first.title, give: (to, level) => Promise.all(made.servers.map((x) => grantTarget(x.id, to, targetLevel(level)))) });
+        } catch (error) { $('mcp-error').textContent = error.message; $('mcp-error').hidden = false; }
+        btn.disabled = false;
+        await paintAssets();
+    });
     const connexionKinds = () => [['connexion-mail', 'mail'], ['connexion-calendar', 'calendar'], ['connexion-contacts', 'contacts']].filter(([id]) => $(id).checked && !$(id).disabled).map(([, k]) => k);
     $('connexion-open').addEventListener('click', async () => {
         $('connexion-error').hidden = true;

package/web/index.html

@@ -879,6 +879,24 @@
             <p id="connexion-error" class="error" role="alert" hidden></p>
           </form>
           </div>
+          <div id="mcp-box" class="as-form" data-kind="mcp"><h3 data-said="set-mcp-head">Add an MCP server</h3>
+          <p class="hint" data-said="set-mcp-hint">Its tools, given to the AIs you choose. The key stays on the server.</p>
+          <form id="mcp-new" autocomplete="off">
+            <label for="mcp-name" data-said="set-mcp-name">Name</label>
+            <input id="mcp-name" maxlength="120" spellcheck="false" placeholder="CRM" required>
+            <label for="mcp-url" data-said="set-mcp-url">Address</label>
+            <input id="mcp-url" type="url" spellcheck="false" autocapitalize="off" placeholder="https://mcp.example.com/mcp" required>
+            <label for="mcp-key" data-said="set-mcp-key">Key</label>
+            <input id="mcp-key" type="password" autocomplete="new-password" placeholder="optional, never shown again">
+            <div class="row"><button type="submit" id="mcp-add" class="primary" data-said="set-mcp-add">Add</button></div>
+            <details class="more"><summary data-said="set-mcp-paste">Paste a configuration</summary>
+              <textarea id="mcp-config" rows="6" spellcheck="false" autocapitalize="off" aria-label="mcpServers configuration" placeholder='{ "mcpServers": { "crm": { "url": "https://mcp.example.com/mcp", "headers": { "Authorization": "Bearer ${CRM_KEY}" } } } }'></textarea>
+              <p class="hint" data-said="set-mcp-paste-hint">Keys named as secrets: ${NAME}. No programs to start.</p>
+              <div class="row"><button type="button" id="mcp-import" data-said="set-mcp-import">Import</button></div>
+            </details>
+            <p id="mcp-error" class="error" role="alert" hidden></p>
+          </form>
+          </div>
           <div id="list-box" class="as-form" data-kind="list"><h3 id="listnew-head">New binder</h3>
         <form id="list-new" autocomplete="off">
           <label for="listnew-template">Template</label>

package/web/kit.js

@@ -470,11 +470,13 @@
         secret: { conversation: ['none', 'use'] },
         list: { conversation: ['none', 'read', 'write'] },
         connexion: { conversation: ['none', 'watch', 'propose', 'frame', 'free'] },
+        /* An external MCP server (Tether's mcp target): the same levels, said by what they let its tools do. */
+        mcp: { conversation: ['none', 'watch', 'propose', 'free', 'frame'] },
         conversation: { device: ['none', 'terminal', 'chat', 'both'] },
     };
     const HOLDERS = ['conversation', 'device'];
     /* The table's key of an asset: a live link is a connexion, whatever it links; else its kind. */
-    const rightsKey = (a) => (a?.live || a?.target ? 'connexion' : a?.kind ?? '');
+    const rightsKey = (a) => (a?.target?.kind === 'mcp' ? 'mcp' : a?.live || a?.target ? 'connexion' : a?.kind ?? '');
     const rightsFor = (key, holder = 'conversation') => [...(RIGHTS[key]?.[HOLDERS.includes(holder) ? holder : 'conversation'] ?? [])];
     /* The lightest real level (what "give the group" gives): the first after none. */
     const lightest = (key, holder) => rightsFor(key, holder)[1] ?? null;
@@ -506,12 +508,22 @@
         return say(`set-rt-${form === 'badge' ? '' : `${form}-`}${level in RIGHT_LEVELS ? level : 'none'}`, l[form] ?? l.badge);
     };
 
+    /* AN MCP SERVER'S LEVELS, in its own words: Off, Read, All with approval, All, Custom (Tether's table). */
+    const MCP_WORDS = {
+        none: { pick: 'Off', badge: 'Off', hint: 'Not given' },
+        watch: { pick: 'Read', badge: 'Reads', hint: 'Its read-only tools' },
+        propose: { pick: 'All with approval', badge: 'All, approved', hint: 'Every tool, you approve each change' },
+        free: { pick: 'All', badge: 'All', hint: 'Every tool; deletes still asked' },
+        frame: { pick: 'Custom', badge: 'Custom', hint: 'Your choice for each kind of tool' },
+    };
+    const wordOf = (key, level, form) => (key === 'mcp' && MCP_WORDS[level] ? say(`set-rt-mcp-${form === 'badge' ? '' : `${form}-`}${level}`, MCP_WORDS[level][form] ?? MCP_WORDS[level].pick) : rightWord(level, form));
+
     /* A RIGHT, READ: a small pill, its tone by what it lets do. `level`, or `value` as kept (with its `key`, `holder`). */
     function RightsBadge(opts = {}) {
         const level = levelOf(opts);
-        const b = node('span', `kit-rights${opts.cls ? ` ${opts.cls}` : ''}`, rightWord(level, 'badge'));
+        const b = node('span', `kit-rights${opts.cls ? ` ${opts.cls}` : ''}`, wordOf(opts.key, level, 'badge'));
         b.dataset.level = level; b.dataset.tone = RIGHT_LEVELS[level].tone;
-        b.title = rightWord(level, 'hint');
+        b.title = wordOf(opts.key, level, 'hint');
         return b;
     }
 
@@ -524,7 +536,7 @@
         const levels = rightsFor(key, holder);
         if (!levels.length) return null;
         const now = level ?? rightOf(key, value, holder);
-        const options = levels.map((l) => ({ value: l, label: rightWord(l, 'pick') }));
+        const options = levels.map((l) => ({ value: l, label: wordOf(key, l, 'pick') }));
         let held = now;
         const pick = Segmented({ options, value: now, label, onChange: async (l) => {
             if (l === held) return;
@@ -537,7 +549,7 @@
         pick.dataset.key = key; pick.dataset.holder = holder;
         const same = key === 'connexion' ? RIGHT_SAME[kind] : null;
         for (const b of pick.children) {
-            b.title = rightWord(b.dataset.value, 'hint');
+            b.title = wordOf(key, b.dataset.value, 'hint');
             const as = same?.[b.dataset.value];
             if (as) { const w = rightWord(as, 'pick'); b.append(node('small', 'kit-rights-same', `= ${w}`)); b.title = `${b.title} (= ${w})`; }
         }
@@ -876,7 +888,7 @@
     window.clavariumKit = {
         collectModel,
         AssetIcon, AssetCard, Holders, MemberStack, memberStackModel, roomPatch, RightsBadge, RightsPicker, AssetList, assetListModel, AccessList, accessModel, AssetPanel, AssetDelete, RIGHT_SAME,
-        ASSET_ICONS, ASSET_KINDS, RIGHTS, RIGHT_LEVELS, rightsKey, rightsFor, rightOf, storedOf, lightest, rightWord,
+        ASSET_ICONS, ASSET_KINDS, RIGHTS, RIGHT_LEVELS, MCP_WORDS, rightsKey, rightsFor, rightOf, storedOf, lightest, rightWord,
         shareSlices, ShareDonut, ShareKey,
         STATES, STATE_WORDS, stateOf, hueOf, initialOf, IDLE_MS, idleFor, idleWords, tidyList,
         setWords(fn) { if (typeof fn === 'function') words = fn; },

package/web/style.css

@@ -2159,6 +2159,17 @@ details.commit > pre { margin: 6px 0 0 1.6em; white-space: pre-wrap; overflow-wr
 .demandes-box { display: flex; flex-direction: column; gap: 10px; }
 .as-signature { display: flex; flex-direction: column; gap: 6px; margin: .6rem 0; }
 .as-signature textarea { width: 100%; font: inherit; }
+/* An external MCP server (app.js mcpParts): its tools, each with its kind; a new one marked; Custom rights by kind. */
+.mcp-url { overflow-wrap: anywhere; }
+.mcp-tools { list-style: none; margin: .3rem 0; padding: 0; display: flex; flex-direction: column; gap: 4px; }
+.mcp-tool { display: flex; flex-wrap: wrap; align-items: baseline; gap: 4px 10px; padding: 4px 0; border-bottom: 1px solid var(--line); }
+.mcp-tool-name { font-weight: 600; overflow-wrap: anywhere; }
+.mcp-tool-class { color: var(--ink2); }
+.mcp-tool-class[data-class="destructive"] { color: var(--danger); }
+.mcp-tool-fresh { color: var(--warn); }
+.mcp-custom { display: flex; flex-direction: column; gap: 4px; margin: .4rem 0 .8rem; }
+.mcp-custom-line { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 6px; }
+#mcp-config { width: 100%; font: .8125rem var(--mono, monospace); }
 .as-drag-ghost { position: fixed; z-index: 90; pointer-events: none; opacity: .9; box-shadow: 0 12px 30px -10px rgba(0,0,0,.5); border-radius: 10px; background: var(--panel); }
 .kit-aslist-group.as-drop-over { outline: 2px dashed var(--brass); outline-offset: 2px; border-radius: 10px; background: color-mix(in srgb, var(--brass) 7%, transparent); }
 body.as-dragging { user-select: none; -webkit-user-select: none; }